patch 9.0.0165: looking up a text property type by ID is slow

Problem: Looking up a text property type by ID is slow. Solution: Keep an array of property types sorted on ID.
patch 9.0.0164: using freed memory with put command
2022-08-07 18:20:08 +01:00 · 2022-08-07 18:09:10 +01:00 · 2022-08-07 14:55:14 +01:00 · 2022-08-07 11:53:40 +01:00 · 2022-08-06 22:38:02 +01:00 · 2022-08-06 22:23:40 +01:00
303 changed files with 23520 additions and 11727 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -107,13 +107,18 @@ runtime/ftplugin/cs.vim			@nickspoons
 runtime/ftplugin/csh.vim		@dkearns
 runtime/ftplugin/css.vim		@dkearns
 runtime/ftplugin/cucumber.vim		@tpope
+runtime/ftplugin/desktop.vim		@e-kwsm
 runtime/ftplugin/dosbatch.vim		@mrdubya
 runtime/ftplugin/eiffel.vim		@dkearns
+runtime/ftplugin/expect.vim		@dkearns
 runtime/ftplugin/erlang.vim		@hcs42
 runtime/ftplugin/eruby.vim		@tpope @dkearns
+runtime/ftplugin/fennel.vim		@gpanders
+runtime/ftplugin/fetchmail.vim		@dkearns
 runtime/ftplugin/fpcmake.vim		@dkearns
 runtime/ftplugin/freebasic.vim		@dkearns
 runtime/ftplugin/fstab.vim		@rid9
+runtime/ftplugin/gdb.vim		@xeyownt
 runtime/ftplugin/git.vim		@tpope
 runtime/ftplugin/gitcommit.vim		@tpope
 runtime/ftplugin/gitconfig.vim		@tpope
@@ -123,6 +128,7 @@ runtime/ftplugin/go.vim			@dbarnett
 runtime/ftplugin/gprof.vim		@dpelle
 runtime/ftplugin/haml.vim		@tpope
 runtime/ftplugin/hgcommit.vim		@k-takata
+runtime/ftplugin/html.vim		@dkearns
 runtime/ftplugin/i3config.vim		@hiqua
 runtime/ftplugin/icon.vim		@dkearns
 runtime/ftplugin/indent.vim		@dkearns
@@ -168,6 +174,7 @@ runtime/ftplugin/scss.vim		@tpope
 runtime/ftplugin/sdoc.vim		@gpanders
 runtime/ftplugin/solution.vim		@dkearns
 runtime/ftplugin/spec.vim		@ignatenkobrain
+runtime/ftplugin/swayconfig.vim		@jamespeapen
 runtime/ftplugin/systemverilog.vim	@Kocha
 runtime/ftplugin/tap.vim		@petdance
 runtime/ftplugin/tcsh.vim		@dkearns
@@ -296,10 +303,14 @@ runtime/syntax/eiffel.vim		@jocelyn
 runtime/syntax/elmfilt.vim		@cecamp
 runtime/syntax/erlang.vim		@hcs42
 runtime/syntax/eruby.vim		@tpope @dkearns
+runtime/syntax/expect.vim		@dkearns
 runtime/syntax/exports.vim		@cecamp
 runtime/syntax/falcon.vim		@steveno
+runtime/syntax/fennel.vim		@gpanders
+runtime/syntax/fetchmail.vim		@dkearns
 runtime/syntax/forth.vim		@jkotlinski
 runtime/syntax/fpcmake.vim		@dkearns
+runtime/syntax/freebasic.vim		@dkearns
 runtime/syntax/fstab.vim		@rid9
 runtime/syntax/git.vim			@tpope
 runtime/syntax/gitcommit.vim		@tpope
@@ -313,6 +324,7 @@ runtime/syntax/groff.vim		@jmarshall
 runtime/syntax/haml.vim			@tpope
 runtime/syntax/haskell.vim		@coot
 runtime/syntax/hgcommit.vim		@k-takata
+runtime/syntax/html.vim		@dkearns
 runtime/syntax/i3config.vim		@hiqua
 runtime/syntax/icon.vim			@dkearns
 runtime/syntax/indent.vim		@dkearns
@@ -384,6 +396,7 @@ runtime/syntax/sshconfig.vim		@Jakuje
 runtime/syntax/sshdconfig.vim		@Jakuje
 runtime/syntax/sudoers.vim		@e-kwsm
 runtime/syntax/svn.vim			@hdima
+runtime/syntax/swayconfig.vim       @jamespeapen
 runtime/syntax/systemverilog.vim	@Kocha
 runtime/syntax/tags.vim			@cecamp
 runtime/syntax/tap.vim			@petdance
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,288 +0,0 @@
-language: c
-
-env:
-  global:
-    - BUILD=yes TEST=test CONFOPT= LEAK_CFLAGS="-DEXITFREE" SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no LOG_DIR="$TRAVIS_BUILD_DIR/logs"
-
-_anchors:
-  envs:
-    - &tiny-nogui
-      FEATURES=tiny TEST=testtiny CONFOPT="--disable-gui"
-    - &tiny
-      FEATURES=tiny TEST=testtiny
-    - &small
-      FEATURES=small TEST=testtiny
-    - &normal
-      FEATURES=normal
-    - &linux-huge
-      FEATURES=huge TEST="scripttests test_libvterm"
-      CONFOPT="--enable-perlinterp --enable-pythoninterp --enable-python3interp --enable-rubyinterp --enable-luainterp --enable-tclinterp"
-    - &osx-huge # macOS build
-      FEATURES=huge
-      CONFOPT="--enable-perlinterp --enable-python3interp --enable-rubyinterp --enable-luainterp --enable-tclinterp"
-    - &unittests
-      BUILD=no TEST=unittests FEATURES=huge CHECK_AUTOCONF=yes
-    - &coverage
-      CFLAGS="--coverage -DUSE_GCOV_FLUSH" LDFLAGS=--coverage
-    - &asan # ASAN build
-      SANITIZER_CFLAGS="-g -O1 -DABORT_ON_INTERNAL_ERROR -DEXITFREE -fsanitize-recover=all -fsanitize=address -fsanitize=undefined -fno-omit-frame-pointer"
-      ASAN_OPTIONS="print_stacktrace=1 log_path=$LOG_DIR/asan" UBSAN_OPTIONS="print_stacktrace=1 log_path=$LOG_DIR/ubsan" LSAN_OPTIONS="suppressions=$TRAVIS_BUILD_DIR/src/testdir/lsan-suppress.txt"
-    - &shadowopt
-      SHADOWOPT="-C src/shadow" SRCDIR=./src/shadow
-
-  linux: &linux
-    os: linux
-    dist: bionic
-    addons:
-      apt:
-        packages: &apt-packages
-          - autoconf
-          - clang
-          - lcov
-          - gettext
-          - libcanberra-dev
-          - libperl-dev
-          - python-dev
-          - python3-dev
-          - liblua5.3-dev
-          - lua5.3
-          - ruby-dev
-          - tcl-dev
-          - cscope
-          - libgtk2.0-dev
-          - desktop-file-utils
-          - libtool-bin
-    services:
-      - xvfb
-    before_install:
-      - rvm reset
-      # Use llvm-cov instead of gcov when compiler is clang.
-      - |
-        if [[ "${CC}" = "clang" ]]; then
-          ln -sf "$(command -v llvm-cov)" /home/travis/bin/gcov
-        fi
-      # Setup lua5.3 manually since its package doesn't provide alternative.
-      # https://bugs.launchpad.net/ubuntu/+source/lua5.3/+bug/1707212
-      - |
-        if [[ "${CONFOPT}" =~ luainterp ]]; then
-          sudo update-alternatives --install /usr/bin/lua lua /usr/bin/lua5.3 10
-        fi
-    before_script:
-      - sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=0
-      # It appears we can load "snd-dummy" on only amd64.
-      - |
-        if [[ "${TRAVIS_CPU_ARCH}" = amd64 ]]; then
-          sudo bash ci/load-snd-dummy.sh || true
-        fi
-      - sudo usermod -a -G audio $USER
-      - do_test() { sg audio "sg $(id -gn) '$*'"; }
-
-  osx: &osx
-    os: osx
-    before_script:
-      - do_test() { "$@"; }
-
-  homebrew: &osx-homebrew
-    addons:
-      homebrew:
-        packages:
-          - lua
-        update: true
-    cache:
-      directories:
-        - /usr/local/Homebrew/Library/Homebrew/vendor/
-        - /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/
-    before_install:
-      - rvm reset
-      # Lua is not installed on macOS
-      - export LUA_PREFIX=/usr/local
-
-  coverage: &eval-coverage
-    # needed for https support for coveralls building cffi only works with gcc,
-    # not with clang
-    - CC=gcc pip install --user cpp-coveralls pyopenssl ndg-httpsclient pyasn1
-    - ~/.local/bin/coveralls -b "${SRCDIR}" -x .xs -e "${SRCDIR}"/if_perl.c -e "${SRCDIR}"/xxd -e "${SRCDIR}"/libvterm --encodings utf-8
-    - (cd "${SRCDIR}" && bash <(curl -s https://codecov.io/bash))
-
-  asan_symbolize: &asan_symbolize
-    # Update pyenv to fix the error "/opt/pyenv/libexec/pyenv: line 43: cd: asan_symbolize-6.0: Not a directory".
-    # https://github.com/pyenv/pyenv/issues/580
-    - (cd "${PYENV_ROOT}" && git fetch -p origin && git checkout "$(git rev-list --tags -n1)") &>/dev/null || true
-    - for f in $(grep -l '#[[:digit:]]* *0x[[:digit:]a-fA-F]*' "$LOG_DIR"/*); do asan_symbolize-11 -l "$f"; done
-
-branches:
-  except:
-    - /^v[0-9]/
-
-script:
-  - mkdir -p "$LOG_DIR"
-  - NPROC=$(getconf _NPROCESSORS_ONLN)
-  - set -o errexit
-  - echo -e "\\033[33;1mConfiguring Vim\\033[0m" && echo -en "travis_fold:start:configure\\r\\033[0K"
-  - |
-    if [[ "${CHECK_AUTOCONF}" = "yes" ]] && [[ "${CC}" = "gcc" ]]; then
-      make -C src autoconf
-    fi
-  - |
-    if [[ -n "${SHADOWOPT}" ]]; then
-      make -C src shadow
-    fi
-  # "./configure" changes its working directory into "$SRCDIR".
-  - ./configure --with-features=${FEATURES} ${CONFOPT} --enable-fail-if-missing
-  - echo -en "travis_fold:end:configure\\r\\033[0K"
-  - echo -e "\\033[33;1mBuilding Vim\\033[0m" && echo -en "travis_fold:start:build\\r\\033[0K"
-  - |
-    if [[ "${BUILD}" = "yes" ]]; then
-      # Append various warning flags to CFLAGS.
-      # BSD sed needs backup extension specified.
-      sed -i.bak -f ci/config.mk.sed ${SRCDIR}/auto/config.mk
-      if [[ "${TRAVIS_OS_NAME}" = "osx" ]] || [[ "${CC}" = "clang-11" ]]; then
-        # On macOS, the entity of gcc is clang.
-        sed -i.bak -f ci/config.mk.clang.sed ${SRCDIR}/auto/config.mk
-      else
-        sed -i.bak -f ci/config.mk.${CC}.sed ${SRCDIR}/auto/config.mk
-      fi
-      make ${SHADOWOPT} -j${NPROC}
-    fi
-  - echo -en "travis_fold:end:build\\r\\033[0K"
-  - set +o errexit
-  # Show Vim version and also if_xx versions.
-  - |
-    if [[ "${BUILD}" = "yes" ]]; then
-      "${SRCDIR}"/vim --version
-      "${SRCDIR}"/vim -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-1.vim -c quit
-      "${SRCDIR}"/vim -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-2.vim -c quit
-    fi
-  - echo -e "\\033[33;1mTesting Vim\\033[0m" && echo -en "travis_fold:start:test\\r\\033[0K"
-  - do_test make ${SHADOWOPT} ${TEST} && FOLD_MARKER=travis_fold
-  - echo -en "${FOLD_MARKER}:end:test\\r\\033[0K"
-  - |
-    # Not all sanitizers will cause the tests to fail.  This helps since we can
-    # see all the failures instead of just the first one, but we still want the
-    # test phase to fail if any sanitizer issues are detected.
-    if [[ -n "${ASAN_OPTIONS}" ]]; then
-      if grep -q '#[[:digit:]]* *0x[[:digit:]a-fA-F]*' "$LOG_DIR"/*; then
-        false
-      fi
-    fi
-
-# Instead of using all environments with both compilers on both systems,
-# exclude some builds on mac os x and linux.
-# On mac os x "tiny" is always without GUI, use 2 compilers in 2 environments.
-# Linux: 2 compilers on some of the environments + gcc on os390
-jobs:
-  include:
-    #- <<: *osx
-    #  name: tiny-nogui/clang
-    #  compiler: clang
-    #  env: *tiny-nogui
-    #- <<: *osx
-    #  name: tiny-nogui/gcc
-    #  compiler: gcc
-    #  env: *tiny-nogui
-    #- <<: *osx
-    #  <<: *osx-homebrew
-    #  name: huge/clang
-    #  compiler: clang
-    #  env: *osx-huge
-    #- <<: *osx
-    #  <<: *osx-homebrew
-    #  name: huge/gcc
-    #  compiler: gcc
-    #  env: *osx-huge
-    #- <<: *linux
-    #  name: tiny-nogui/clang
-    #  compiler: clang
-    #  env: *tiny-nogui
-    #- <<: *linux
-    #  name: tiny-nogui/gcc
-    #  compiler: gcc
-    #  env: *tiny-nogui
-    #- <<: *linux
-    #  name: tiny/clang
-    #  compiler: clang
-    #  env: *tiny
-    #- <<: *linux
-    #  name: tiny/gcc
-    #  compiler: gcc
-    #  env: *tiny
-    #- <<: *linux
-    #  name: small/gcc
-    #  compiler: gcc
-    #  env: *small
-    #- <<: *linux
-    #  name: normal+shadow/clang
-    #  compiler: clang
-    #  env:
-    #    - *normal
-    #    - *shadowopt
-    #- <<: *linux
-    #  name: normal+shadow/gcc
-    #  compiler: gcc
-    #  env:
-    #    - *normal
-    #    - *shadowopt
-    - <<: *linux
-      arch: s390x
-      name: huge/gcc-s390x
-      compiler: gcc
-      env: *linux-huge
-      services: []
-    - <<: *linux
-      arch: arm64
-      name: huge/gcc-arm64
-      compiler: gcc
-      env: *linux-huge
-      services: []
-    #- <<: *linux
-    #  name: huge+coverage/clang
-    #  compiler: clang
-    #  env:
-    #    - *linux-huge
-    #    - *coverage
-    #  after_success: *eval-coverage
-    #- <<: *linux
-    #  name: huge+coverage/gcc
-    #  compiler: gcc
-    #  env:
-    #    - *linux-huge
-    #    - *coverage
-    #  after_success: *eval-coverage
-    #- <<: *linux # ASAN
-    #  name: huge+asan/clang
-    #  compiler: clang-11
-    #  addons:
-    #    apt:
-    #      sources:
-    #        - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main'
-    #          key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
-    #      packages:
-    #        - *apt-packages
-    #        - clang-11
-    #  env:
-    #    - *linux-huge
-    #    - *asan
-    #  after_failure: *asan_symbolize
-    #- <<: *linux
-    #  name: huge-testgui+coverage/gcc
-    #  compiler: gcc
-    #  env:
-    #    - *linux-huge
-    #    - *coverage
-    #    - TEST="-C src testgui"
-    #  after_success: *eval-coverage
-    #- <<: *linux
-    #  name: unittests+coverage/gcc
-    #  compiler: gcc
-    #  env:
-    #    - *unittests
-    #    - *coverage
-    #  after_success: *eval-coverage
-    #- <<: *linux
-    #  name: vimtags/gcc
-    #  compiler: gcc
-    #  env:
-    #    - *normal
-    #    - TEST="-C runtime/doc vimtags VIMEXE=../../${SRCDIR}/vim"
-
-# vim:set sts=2 sw=2 tw=0 et:
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -65,9 +65,6 @@ If the maintainer does not respond, contact the vim-dev maillist.

 # Translations

-Translations of this CONTRIBUTING file:
-[Korean](https://github.com/cjw1359/opensource/blob/master/Vim/CONTRIBUTING_ko.md)
-
 Translating messages and runtime files is very much appreciated!  These things
 can be translated:
 *   Messages in Vim, see [src/po/README.txt][1]
--- a/3
+++ b/3
@@ -15,7 +15,6 @@ SRC_ALL =	\
 		.gitignore \
 		.hgignore \
 		.lgtm.yml \
-		.travis.yml \
 		.appveyor.yml \
 		.codecov.yml \
 		ci/appveyor.bat \
@@ -625,6 +624,7 @@ SRC_DOS_BIN =	\
 		src/xpm/x86/lib-vc14/libXpm.lib \
 		src/xpm/x86/lib/libXpm.a \
 		src/xpm/x86/lib/libXpm.lib \
+		runtime/bitmaps/vim.ico \
 		nsis/icons.zip \

 # source files for Amiga, DOS, etc. (also in the extra archive)
@@ -1017,6 +1017,7 @@ LANG_GEN = \
 		runtime/spell/??/*.diff \
 		runtime/spell/??/main.aap \
 		runtime/spell/sr/README_sr.txt \
+		runtime/spell/sr/convert.vim \
 		runtime/spell/tet/*.diff \
 		runtime/spell/tet/main.aap \
 		runtime/spell/check/main.aap \
--- a/4
+++ b/4
@@ -414,6 +414,7 @@ dossrc: dist no_title.vim dist/$(COMMENT_SRC) \
 	tar cf - \
 		$(SRC_ALL) \
 		$(SRC_DOS) \
+		$(SRC_DOS_BIN) \
 		$(SRC_AMI_DOS) \
 		$(SRC_DOS_UNIX) \
 		runtime/doc/uganda.nsis.txt \
@@ -423,9 +424,6 @@ dossrc: dist no_title.vim dist/$(COMMENT_SRC) \
 	rmdir dist/vim/$(VIMRTDIR)/runtime
 	# This file needs to be in dos fileformat for NSIS.
 	$(VIM) -e -X -u no_title.vim -c ":set tx|wq" dist/vim/$(VIMRTDIR)/doc/uganda.nsis.txt
-	tar cf - \
-		$(SRC_DOS_BIN) \
-		| (cd dist/vim/$(VIMRTDIR); tar xf -)
 	cd dist && zip -9 -rD -z vim$(VERSION)src.zip vim <$(COMMENT_SRC)

 runtime/doc/uganda.nsis.txt: runtime/doc/uganda.txt
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![Vim Logo](https://github.com/vim/vim/raw/master/runtime/vimlogo.gif)](https://www.vim.org)

-[![Github Build status](https://github.com/vim/vim/workflows/GitHub%20CI/badge.svg)](https://github.com/vim/vim/actions?query=workflow%3A%22GitHub+CI%22) [![Travis Build Status](https://travis-ci.com/vim/vim.svg?branch=master)](https://travis-ci.com/github/vim/vim) [![Appveyor Build status](https://ci.appveyor.com/api/projects/status/o2qht2kjm02sgghk?svg=true)](https://ci.appveyor.com/project/chrisbra/vim) [![Cirrus Build Status](https://api.cirrus-ci.com/github/vim/vim.svg)](https://cirrus-ci.com/github/vim/vim) [![Coverage Status](https://codecov.io/gh/vim/vim/coverage.svg?branch=master)](https://codecov.io/gh/vim/vim?branch=master) [![Coverity Scan](https://scan.coverity.com/projects/241/badge.svg)](https://scan.coverity.com/projects/vim) [![Language Grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/vim/vim.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/vim/vim/context:cpp) [![Debian CI](https://badges.debian.net/badges/debian/testing/vim/version.svg)](https://buildd.debian.org/vim) [![Packages](https://repology.org/badge/tiny-repos/vim.svg)](https://repology.org/metapackage/vim) [![Fossies codespell report](https://fossies.org/linux/test/vim-master.tar.gz/codespell.svg)](https://fossies.org/linux/test/vim-master.tar.gz/codespell.html)
+[![Github Build status](https://github.com/vim/vim/workflows/GitHub%20CI/badge.svg)](https://github.com/vim/vim/actions?query=workflow%3A%22GitHub+CI%22) [![Appveyor Build status](https://ci.appveyor.com/api/projects/status/o2qht2kjm02sgghk?svg=true)](https://ci.appveyor.com/project/chrisbra/vim) [![Cirrus Build Status](https://api.cirrus-ci.com/github/vim/vim.svg)](https://cirrus-ci.com/github/vim/vim) [![Coverage Status](https://codecov.io/gh/vim/vim/coverage.svg?branch=master)](https://codecov.io/gh/vim/vim?branch=master) [![Coverity Scan](https://scan.coverity.com/projects/241/badge.svg)](https://scan.coverity.com/projects/vim) [![Language Grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/vim/vim.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/vim/vim/context:cpp) [![Debian CI](https://badges.debian.net/badges/debian/testing/vim/version.svg)](https://buildd.debian.org/vim) [![Packages](https://repology.org/badge/tiny-repos/vim.svg)](https://repology.org/metapackage/vim) [![Fossies codespell report](https://fossies.org/linux/test/vim-master.tar.gz/codespell.svg)](https://fossies.org/linux/test/vim-master.tar.gz/codespell.html)

 <sub>For translations of this README see the end.</sub>

@@ -128,6 +128,8 @@ If you would like to help making Vim better, see the

 ## Information ##

+If you are on macOS, you can use [Macvim](https://macvim-dev.github.io/macvim/).
+
 The latest news about Vim can be found on the Vim home page:
 	https://www.vim.org/

@@ -150,8 +152,3 @@ Send any other comments, patches, flowers and suggestions to:


 This is `README.md` for version 9.0 of Vim: Vi IMproved.
-
-
-## Translations of this README ##
-
-[Korean](https://github.com/cjw1359/opensource/blob/master/Vim/README_ko.md)
--- a/runtime/autoload/bitbake.vim
+++ b/runtime/autoload/bitbake.vim
@@ -0,0 +1,95 @@
+" Support for bitbake indenting, see runtime/indent/bitbake.vim
+
+function s:is_bb_python_func_def(lnum)
+    let stack = synstack(a:lnum, 1)
+    if len(stack) == 0
+        return 0
+    endif
+
+    return synIDattr(stack[0], "name") == "bbPyFuncDef"
+endfunction
+
+function bitbake#Indent(lnum)
+    if !has('syntax_items')
+        return -1
+    endif
+
+    let stack = synstack(a:lnum, 1)
+    if len(stack) == 0
+        return -1
+    endif
+
+    let name = synIDattr(stack[0], "name")
+
+    " TODO: support different styles of indentation for assignments. For now,
+    " we only support like this:
+    " VAR = " \
+    "     value1 \
+    "     value2 \
+    " "
+    "
+    " i.e. each value indented by shiftwidth(), with the final quote " completely unindented.
+    if name == "bbVarValue"
+        " Quote handling is tricky. kernel.bbclass has this line for instance:
+        "     EXTRA_OEMAKE = " HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" " HOSTCPP="${BUILD_CPP}""
+        " Instead of trying to handle crazy cases like that, just assume that a
+        " double-quote on a line by itself (following an assignment) means the
+        " user is closing the assignment, and de-dent.
+        if getline(a:lnum) =~ '^\s*"$'
+            return 0
+        endif
+
+        let prevstack = synstack(a:lnum - 1, 1)
+        if len(prevstack) == 0
+            return -1
+        endif
+
+        let prevname = synIDattr(prevstack[0], "name")
+
+        " Only indent if there was actually a continuation character on
+        " the previous line, to avoid misleading indentation.
+        let prevlinelastchar = synIDattr(synID(a:lnum - 1, col([a:lnum - 1, "$"]) - 1, 1), "name")
+        let prev_continued = prevlinelastchar == "bbContinue"
+
+        " Did the previous line introduce an assignment?
+        if index(["bbVarDef", "bbVarFlagDef"], prevname) != -1
+            if prev_continued
+                return shiftwidth()
+            endif
+        endif
+
+        if !prev_continued
+            return 0
+        endif
+
+        " Autoindent can take it from here
+        return -1
+    endif
+
+    if index(["bbPyDefRegion", "bbPyFuncRegion"], name) != -1
+        let ret = python#GetIndent(a:lnum, function('s:is_bb_python_func_def'))
+        " Should normally always be indented by at least one shiftwidth; but allow
+        " return of -1 (defer to autoindent) or -2 (force indent to 0)
+        if ret == 0
+            return shiftwidth()
+        elseif ret == -2
+            return 0
+        endif
+        return ret
+    endif
+
+    " TODO: GetShIndent doesn't detect tasks prepended with 'fakeroot'
+    " Need to submit a patch upstream to Vim to provide an extension point.
+    " Unlike the Python indenter, the Sh indenter is way too large to copy and
+    " modify here.
+    if name == "bbShFuncRegion"
+        return GetShIndent()
+    endif
+
+    " TODO:
+    "   + heuristics for de-denting out of a bbPyDefRegion? e.g. when the user
+    "       types an obvious BB keyword like addhandler or addtask, or starts
+    "       writing a shell task. Maybe too hard to implement...
+
+    return -1
+endfunction
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -72,22 +72,35 @@ export def FTbas()

  # 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_preproc  = '\c^\s*\%(' ..
+                      # preprocessor
+                      '#\s*\a\+\|' ..
+                      # compiler option
+                      'option\s\+\%(byval\|dynamic\|escape\|\%(no\)\=gosub\|nokeyword\|private\|static\)\>\|' ..
+                      # metacommand
+                      '\%(''\|rem\)\s*\$lang\>\|' ..
+                      # default datatype
+                      'def\%(byte\|longint\|short\|ubyte\|uint\|ulongint\|ushort\)\>' ..
+                    '\)'
  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, ft_visual_basic_content) > -1
-    setf vb
-  else
-    setf basic
-  endif
+  for lnum in range(1, min([line("$"), 100]))
+    var line = getline(lnum)
+    if line =~ ft_visual_basic_content
+      setf vb
+      return
+    elseif line =~ fb_preproc || line =~ fb_comment || line =~ fb_keywords
+      setf freebasic
+      return
+    elseif line =~ qb64_preproc
+      setf qb64
+      return
+    endif
+  endfor
+  setf basic
 enddef

 export def FTbtm()
@@ -126,6 +139,23 @@ export def FTcfg()
  endif
 enddef

+export def FTcls()
+  if exists("g:filetype_cls")
+    exe "setf " .. g:filetype_cls
+    return
+  endif
+
+  if getline(1) =~ '^%'
+    setf tex
+  elseif getline(1)[0] == '#' && getline(1) =~ 'rexx'
+    setf rexx
+  elseif getline(1) == 'VERSION 1.0 CLASS'
+    setf vb
+  else
+    setf st
+  endif
+enddef
+
 export def FTlpc()
  if exists("g:lpc_syntax_for_c")
    var lnum = 1
@@ -429,7 +459,7 @@ export def FTmm()
  setf nroff
 enddef

-# Returns true if file content looks like LambdaProlog
+# Returns true if file content looks like LambdaProlog module
 def IsLProlog(): bool
  # skip apparent comments and blank lines, what looks like 
  # LambdaProlog comment may be RAPID header
@@ -489,12 +519,14 @@ export def FTinc()
    # headers so assume POV-Ray
    elseif lines =~ '^\s*\%({\|(\*\)' || lines =~? ft_pascal_keywords
      setf pascal
+    elseif lines =~# '\<\%(require\|inherit\)\>' || lines =~# '[A-Z][A-Za-z0-9_:${}]*\s\+\%(??\|[?:+]\)\?= '
+      setf bitbake
    else
      FTasmsyntax()
      if exists("b:asmsyntax")
-	exe "setf " .. fnameescape(b:asmsyntax)
+        exe "setf " .. fnameescape(b:asmsyntax)
      else
-	setf pov
+        setf pov
      endif
    endif
  endif
@@ -818,6 +850,27 @@ export def FTperl(): number
  return 0
 enddef

+# LambdaProlog and Standard ML signature files
+export def FTsig()
+  if exists("g:filetype_sig")
+    exe "setf " .. g:filetype_sig
+    return
+  endif
+
+  var lprolog_comment = '^\s*\%(/\*\|%\)'
+  var lprolog_keyword = '^\s*sig\s\+\a'
+  var sml_comment = '^\s*(\*'
+  var sml_keyword = '^\s*\%(signature\|structure\)\s\+\a'
+
+  var line = getline(nextnonblank(1))
+
+  if line =~ lprolog_comment || line =~# lprolog_keyword
+    setf lprolog
+  elseif line =~ sml_comment || line =~# sml_keyword
+    setf sml
+  endif
+enddef
+
 export def FTsys()
  if exists("g:filetype_sys")
    exe "setf " .. g:filetype_sys
--- a/runtime/autoload/dist/script.vim
+++ b/runtime/autoload/dist/script.vim
@@ -193,6 +193,10 @@ def DetectFromHashBang(firstline: string)
  elseif name =~ 'icon\>'
    set ft=icon

+    # Guile
+  elseif name =~ 'guile'
+    set ft=scheme
+
  endif
 enddef

--- a/runtime/autoload/freebasic.vim
+++ b/runtime/autoload/freebasic.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:	FreeBASIC
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2021 Mar 16
+" Last Change:	2022 June 24

 " Dialects can be one of fb, qb, fblite, or deprecated
 " Precedence is forcelang > #lang > lang
@@ -18,17 +18,16 @@ function! freebasic#GetDialect() abort

  " 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)
+  let lnum = search(pat, 'cn')
  call setpos('.', save_cursor)

  if lnum
    let word = matchlist(getline(lnum), pat)[1]
-    if word =~? '\%(fb\|deprecated\|fblite\|qb\)'
+    if word =~? '\<\%(fb\|deprecated\|fblite\|qb\)\>'
      let dialect = word
    else
      echomsg "freebasic#GetDialect: Invalid lang, found '" .. word .. "' at line " .. lnum .. " " .. getline(lnum)
--- a/runtime/autoload/python.vim
+++ b/runtime/autoload/python.vim
@@ -0,0 +1,228 @@
+" Support for Python indenting, see runtime/indent/python.vim
+
+let s:keepcpo= &cpo
+set cpo&vim
+
+" See if the specified line is already user-dedented from the expected value.
+function s:Dedented(lnum, expected)
+  return indent(a:lnum) <= a:expected - shiftwidth()
+endfunction
+
+let s:maxoff = 50       " maximum number of lines to look backwards for ()
+
+" Some other filetypes which embed Python have slightly different indent
+" rules (e.g. bitbake). Those filetypes can pass an extra funcref to this
+" function which is evaluated below.
+function python#GetIndent(lnum, ...)
+  let ExtraFunc = a:0 > 0 ? a:1 : 0
+
+  " 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
+
+  call cursor(plnum, 1)
+
+  " Identing inside parentheses can be very slow, regardless of the searchpair()
+  " timeout, so let the user disable this feature if he doesn't need it
+  let disable_parentheses_indenting = get(g:, "pyindent_disable_parentheses_indenting", 0)
+
+  if disable_parentheses_indenting == 1
+    let plindent = indent(plnum)
+    let plnumstart = plnum
+  else
+    " searchpair() can be slow sometimes, limit the time to 150 msec or what is
+    " put in g:pyindent_searchpair_timeout
+    let searchpair_stopline = 0
+    let searchpair_timeout = get(g:, 'pyindent_searchpair_timeout', 150)
+
+    " 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.
+    let parlnum = searchpair('(\|{\|\[', '', ')\|}\|\]', 'nbW',
+            \ "line('.') < " . (plnum - s:maxoff) . " ? dummy :"
+            \ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
+            \ . " =~ '\\(Comment\\|Todo\\|String\\)$'",
+            \ searchpair_stopline, searchpair_timeout)
+    if parlnum > 0
+      if a:0 > 0 && ExtraFunc(parlnum)
+        " We may have found the opening brace of a bitbake Python task, e.g. 'python do_task {'
+        " If so, ignore it here - it will be handled later.
+        let parlnum = 0
+        let plindent = indent(plnum)
+        let plnumstart = plnum
+      else
+        let plindent = indent(parlnum)
+        let plnumstart = parlnum
+      endif
+    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\\)$'",
+            \ searchpair_stopline, searchpair_timeout)
+    if p > 0
+      if a:0 > 0 && ExtraFunc(p)
+        " Currently only used by bitbake
+        " Handle first non-empty line inside a bitbake Python task
+        if p == plnum
+          return shiftwidth()
+        endif
+
+        " Handle the user actually trying to close a bitbake Python task
+        let line = getline(a:lnum)
+        if line =~ '^\s*}'
+          return -2
+        endif
+
+        " Otherwise ignore the brace
+        let p = 0
+      else
+        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\\)$'",
+              \ searchpair_stopline, searchpair_timeout)
+          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
+    endif
+  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\|raise\|return\|pass\)\>'
+    " See if the user has already dedented
+    if s:Dedented(a:lnum, indent(plnum))
+      " If so, trust the user
+      return -1
+    endif
+    " If not, recommend one dedent
+    return indent(plnum) - shiftwidth()
+  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\|elif\|try\)\>'
+      return plindent
+    endif
+
+    " Or the user has already dedented
+    if s:Dedented(a:lnum, plindent)
+      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
+    " ...unless the user has already dedented
+    if s:Dedented(a:lnum, plindent)
+        return -1
+    else
+        return plindent
+    endif
+  endif
+
+  return -1
+endfunction
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
--- a/runtime/bitmaps/vim.ico
+++ b/runtime/bitmaps/vim.ico
--- a/runtime/colors/blue.vim
+++ b/runtime/colors/blue.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Steven Vertigan <steven@vertigan.wattle.id.au>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sat 11 Jun 2022 11:16:14 MSK
+" Last Updated: 2022-07-26 15:49:58

 " Generated by Colortemplate v2.2.0

@@ -13,7 +13,7 @@ set background=dark
 hi clear
 let g:colors_name = 'blue'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#000000', '#870000', '#006400', '#878700', '#000087', '#870087', '#008787', '#bcbcbc', '#878787', '#d70000', '#00ff00', '#ffdf00', '#5fafff', '#d787d7', '#5fffff', '#ffffff']
--- a/runtime/colors/darkblue.vim
+++ b/runtime/colors/darkblue.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original author Bohdan Vlasyuk <bohdan@vstu.edu.ua>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sat 11 Jun 2022 14:37:41 MSK
+" Last Updated: 2022-07-26 15:49:59

 " Generated by Colortemplate v2.2.0

@@ -13,7 +13,7 @@ set background=dark
 hi clear
 let g:colors_name = 'darkblue'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#000000', '#8b0000', '#90f020', '#ffa500', '#00008b', '#8b008b', '#008b8b', '#c0c0c0', '#808080', '#ffa0a0', '#90f020', '#ffff60', '#0030ff', '#ff00ff', '#90fff0', '#ffffff']
--- a/runtime/colors/delek.vim
+++ b/runtime/colors/delek.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer David Schweikert <david@schweikert.ch>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun Jun 12 10:50:30 2022
+" Last Updated: 2022-07-26 15:50:00

 " Generated by Colortemplate v2.2.0

@@ -13,7 +13,7 @@ set background=light
 hi clear
 let g:colors_name = 'delek'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#ffffff', '#0000ff', '#00cd00', '#cd00cd', '#008b8b', '#0000ff', '#ff1493', '#bcbcbc', '#ee0000', '#0000ff', '#00cd00', '#cd00cd', '#008b8b', '#0000ff', '#ff1493', '#000000']
--- a/runtime/colors/desert.vim
+++ b/runtime/colors/desert.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Hans Fugal <hans@fugal.net>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun Jun 12 10:51:36 2022
+" Last Updated: 2022-07-26 15:50:01

 " Generated by Colortemplate v2.2.0

@@ -13,7 +13,7 @@ set background=dark
 hi clear
 let g:colors_name = 'desert'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#7f7f8c', '#cd5c5c', '#9acd32', '#bdb76b', '#75a0ff', '#eeee00', '#cd853f', '#666666', '#8a7f7f', '#ff0000', '#89fb98', '#f0e68c', '#6dceeb', '#ffde9b', '#ffa0a0', '#c2bfa5']
@@ -40,7 +40,7 @@ hi TabLineFill guifg=NONE guibg=#c2bfa5 gui=NONE cterm=NONE
 hi TabLineSel guifg=#333333 guibg=#f0e68c gui=NONE cterm=NONE
 hi ToolbarLine guifg=NONE guibg=#666666 gui=NONE cterm=NONE
 hi ToolbarButton guifg=#333333 guibg=#ffde9b gui=bold cterm=bold
-hi NonText guifg=#6dceeb guibg=NONE gui=NONE cterm=NONE
+hi NonText guifg=#6dceeb guibg=#4d4d4d gui=NONE cterm=NONE
 hi SpecialKey guifg=#9acd32 guibg=NONE gui=NONE cterm=NONE
 hi Folded guifg=#eeee00 guibg=#4d4d4d gui=NONE cterm=NONE
 hi Visual guifg=#f0e68c guibg=#6b8e24 gui=NONE cterm=NONE
@@ -112,7 +112,7 @@ if s:t_Co >= 256
  hi TabLineSel ctermfg=236 ctermbg=186 cterm=NONE
  hi ToolbarLine ctermfg=NONE ctermbg=241 cterm=NONE
  hi ToolbarButton ctermfg=236 ctermbg=222 cterm=bold
-  hi NonText ctermfg=81 ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=81 ctermbg=239 cterm=NONE
  hi SpecialKey ctermfg=112 ctermbg=NONE cterm=NONE
  hi Folded ctermfg=226 ctermbg=239 cterm=NONE
  hi Visual ctermfg=186 ctermbg=64 cterm=NONE
--- a/runtime/colors/elflord.vim
+++ b/runtime/colors/elflord.vim
@@ -3,7 +3,7 @@
 " Maintainer:   original maintainer Ron Aaron <ron@ronware.org>
 " Website:      https://www.github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun Jun 12 10:48:00 2022
+" Last Updated: 2022-07-26 15:50:02

 " Generated by Colortemplate v2.2.0

@@ -12,7 +12,7 @@ set background=dark
 hi clear
 let g:colors_name = 'elflord'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1

 hi! link Terminal Normal
 hi! link Boolean Constant
--- a/runtime/colors/evening.vim
+++ b/runtime/colors/evening.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Steven Vertigan <steven@vertigan.wattle.id.au>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun Jun 12 10:52:56 2022
+" Last Updated: 2022-07-26 15:50:03

 " Generated by Colortemplate v2.2.0

@@ -13,7 +13,7 @@ set background=dark
 hi clear
 let g:colors_name = 'evening'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#000000', '#ffa500', '#2e8b57', '#ffff00', '#006faf', '#8b008b', '#008b8b', '#bebebe', '#4d4d4d', '#ff5f5f', '#00ff00', '#ffff60', '#0087ff', '#ff80ff', '#00ffff', '#ffffff']
--- a/runtime/colors/habamax.vim
+++ b/runtime/colors/habamax.vim
@@ -0,0 +1,519 @@
+" Name:         habamax
+" Description:  Hubba hubba hubba.
+" Author:       Maxim Kim <habamax@gmail.com>
+" Maintainer:   Maxim Kim <habamax@gmail.com>
+" Website:      https://github.com/vim/colorschemes
+" License:      Same as Vim
+" Last Updated: 2022-07-26 15:50:04
+
+" Generated by Colortemplate v2.2.0
+
+set background=dark
+
+hi clear
+let g:colors_name = 'habamax'
+
+let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1
+
+if (has('termguicolors') && &termguicolors) || has('gui_running')
+  let g:terminal_ansi_colors = ['#1c1c1c', '#d75f5f', '#87af87', '#afaf87', '#5f87af', '#af87af', '#5f8787', '#9e9e9e', '#767676', '#df875f', '#afd7af', '#dfdf87', '#87afd7', '#dfafdf', '#87afaf', '#bcbcbc']
+endif
+hi! link Terminal Normal
+hi! link StatuslineTerm Statusline
+hi! link StatuslineTermNC StatuslineNC
+hi! link javaScriptFunction Statement
+hi! link javaScriptIdentifier Statement
+hi! link sqlKeyword Statement
+hi! link yamlBlockMappingKey Statement
+hi! link rubyMacro Statement
+hi! link rubyDefine Statement
+hi! link vimVar Normal
+hi! link vimOper Normal
+hi! link vimSep Normal
+hi! link vimParenSep Normal
+hi! link vimCommentString Comment
+hi! link gitCommitSummary Title
+hi! link markdownUrl String
+hi! link elixirOperator Statement
+hi! link elixirKeyword Statement
+hi! link elixirBlockDefinition Statement
+hi! link elixirDefine Statement
+hi! link elixirPrivateDefine Statement
+hi! link elixirGuard Statement
+hi! link elixirPrivateGuard Statement
+hi! link elixirModuleDefine Statement
+hi! link elixirProtocolDefine Statement
+hi! link elixirImplDefine Statement
+hi! link elixirRecordDefine Statement
+hi! link elixirPrivateRecordDefine Statement
+hi! link elixirMacroDefine Statement
+hi! link elixirPrivateMacroDefine Statement
+hi! link elixirDelegateDefine Statement
+hi! link elixirOverridableDefine Statement
+hi! link elixirExceptionDefine Statement
+hi! link elixirCallbackDefine Statement
+hi! link elixirStructDefine Statement
+hi! link elixirExUnitMacro Statement
+hi! link elixirInclude Statement
+hi! link elixirAtom PreProc
+hi! link elixirDocTest String
+hi ALEErrorSign guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE
+hi ALEInfoSign guifg=#dfdf87 guibg=NONE gui=NONE cterm=NONE
+hi ALEWarningSign guifg=#af87af guibg=NONE gui=NONE cterm=NONE
+hi ALEError guifg=#1c1c1c guibg=#d75f5f gui=NONE cterm=NONE
+hi ALEVirtualTextError guifg=#1c1c1c guibg=#d75f5f gui=NONE cterm=NONE
+hi ALEWarning guifg=#1c1c1c guibg=#af87af gui=NONE cterm=NONE
+hi ALEVirtualTextWarning guifg=#1c1c1c guibg=#af87af gui=NONE cterm=NONE
+hi ALEInfo guifg=#dfdf87 guibg=NONE gui=NONE cterm=NONE
+hi ALEVirtualTextInfo guifg=#dfdf87 guibg=NONE gui=NONE cterm=NONE
+hi Normal guifg=#bcbcbc guibg=#1c1c1c gui=NONE cterm=NONE
+hi Statusline guifg=#1c1c1c guibg=#9e9e9e gui=NONE cterm=NONE
+hi StatuslineNC guifg=#1c1c1c guibg=#767676 gui=NONE cterm=NONE
+hi VertSplit guifg=#767676 guibg=#767676 gui=NONE cterm=NONE
+hi TabLine guifg=#1c1c1c guibg=#767676 gui=NONE cterm=NONE
+hi TabLineFill guifg=#1c1c1c guibg=#767676 gui=NONE cterm=NONE
+hi TabLineSel guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
+hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi ToolbarButton guifg=#9e9e9e guibg=#1c1c1c gui=bold,reverse cterm=bold,reverse
+hi QuickFixLine guifg=#1c1c1c guibg=#5f87af gui=NONE cterm=NONE
+hi CursorLineNr guifg=#ffaf5f guibg=NONE gui=bold cterm=bold
+hi LineNr guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+hi LineNrAbove guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+hi LineNrBelow guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+hi NonText guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+hi EndOfBuffer guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+hi SpecialKey guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+hi FoldColumn guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+hi Visual guifg=#1c1c1c guibg=#87afaf gui=NONE cterm=NONE
+hi VisualNOS guifg=#1c1c1c guibg=#5f8787 gui=NONE cterm=NONE
+hi Pmenu guifg=NONE guibg=#262626 gui=NONE cterm=NONE
+hi PmenuThumb guifg=NONE guibg=#767676 gui=NONE cterm=NONE
+hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi PmenuSel guifg=#1c1c1c guibg=#afaf87 gui=NONE cterm=NONE
+hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi Error guifg=#d75f5f guibg=#1c1c1c gui=reverse cterm=reverse
+hi ErrorMsg guifg=#d75f5f guibg=#1c1c1c gui=reverse cterm=reverse
+hi ModeMsg guifg=#1c1c1c guibg=#dfdf87 gui=NONE cterm=NONE
+hi MoreMsg guifg=#87af87 guibg=NONE gui=NONE cterm=NONE
+hi Question guifg=#afaf87 guibg=NONE gui=NONE cterm=NONE
+hi WarningMsg guifg=#df875f guibg=NONE gui=NONE cterm=NONE
+hi Todo guifg=#dfdf87 guibg=#1c1c1c gui=reverse cterm=reverse
+hi MatchParen guifg=#5f8787 guibg=#1c1c1c gui=reverse cterm=reverse
+hi Search guifg=#1c1c1c guibg=#87af87 gui=NONE cterm=NONE
+hi IncSearch guifg=#1c1c1c guibg=#ffaf5f gui=NONE cterm=NONE
+hi CurSearch guifg=#1c1c1c guibg=#afaf87 gui=NONE cterm=NONE
+hi WildMenu guifg=#1c1c1c guibg=#dfdf87 gui=NONE cterm=NONE
+hi debugPC guifg=#1c1c1c guibg=#5f87af gui=NONE cterm=NONE
+hi debugBreakpoint guifg=#1c1c1c guibg=#df875f gui=NONE cterm=NONE
+hi Cursor guifg=#1c1c1c guibg=#ffaf5f gui=NONE cterm=NONE
+hi lCursor guifg=#1c1c1c guibg=#5fff00 gui=NONE cterm=NONE
+hi CursorLine guifg=NONE guibg=#303030 gui=NONE cterm=NONE
+hi CursorColumn guifg=NONE guibg=#303030 gui=NONE cterm=NONE
+hi Folded guifg=#9e9e9e guibg=#262626 gui=NONE cterm=NONE
+hi ColorColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE
+hi SpellBad guifg=NONE guibg=NONE guisp=#d75f5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
+hi SpellCap guifg=NONE guibg=NONE guisp=#5f87af gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
+hi SpellLocal guifg=NONE guibg=NONE guisp=#87af87 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
+hi SpellRare guifg=NONE guibg=NONE guisp=#dfafdf gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
+hi Comment guifg=#767676 guibg=NONE gui=NONE cterm=NONE
+hi Constant guifg=#df875f guibg=NONE gui=NONE cterm=NONE
+hi String guifg=#87af87 guibg=NONE gui=NONE cterm=NONE
+hi Character guifg=#afd7af guibg=NONE gui=NONE cterm=NONE
+hi Identifier guifg=#87afaf guibg=NONE gui=NONE cterm=NONE
+hi Statement guifg=#af87af guibg=NONE gui=NONE cterm=NONE
+hi PreProc guifg=#afaf87 guibg=NONE gui=NONE cterm=NONE
+hi Type guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE
+hi Special guifg=#5f8787 guibg=NONE gui=NONE cterm=NONE
+hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
+hi Title guifg=#dfdf87 guibg=NONE gui=bold cterm=bold
+hi Directory guifg=#87afaf guibg=NONE gui=bold cterm=bold
+hi Conceal guifg=#767676 guibg=NONE gui=NONE cterm=NONE
+hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi Debug guifg=#5f8787 guibg=NONE gui=NONE cterm=NONE
+hi DiffAdd guifg=#000000 guibg=#87af87 gui=NONE cterm=NONE
+hi DiffDelete guifg=#af875f guibg=NONE gui=NONE cterm=NONE
+hi diffAdded guifg=#87af87 guibg=NONE gui=NONE cterm=NONE
+hi diffRemoved guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE
+hi diffSubname guifg=#af87af guibg=NONE gui=NONE cterm=NONE
+hi DiffText guifg=#000000 guibg=#dfdfdf gui=NONE cterm=NONE
+hi DiffChange guifg=#000000 guibg=#afafaf gui=NONE cterm=NONE
+
+if s:t_Co >= 256
+  hi! link Terminal Normal
+  hi! link StatuslineTerm Statusline
+  hi! link StatuslineTermNC StatuslineNC
+  hi! link javaScriptFunction Statement
+  hi! link javaScriptIdentifier Statement
+  hi! link sqlKeyword Statement
+  hi! link yamlBlockMappingKey Statement
+  hi! link rubyMacro Statement
+  hi! link rubyDefine Statement
+  hi! link vimVar Normal
+  hi! link vimOper Normal
+  hi! link vimSep Normal
+  hi! link vimParenSep Normal
+  hi! link vimCommentString Comment
+  hi! link gitCommitSummary Title
+  hi! link markdownUrl String
+  hi! link elixirOperator Statement
+  hi! link elixirKeyword Statement
+  hi! link elixirBlockDefinition Statement
+  hi! link elixirDefine Statement
+  hi! link elixirPrivateDefine Statement
+  hi! link elixirGuard Statement
+  hi! link elixirPrivateGuard Statement
+  hi! link elixirModuleDefine Statement
+  hi! link elixirProtocolDefine Statement
+  hi! link elixirImplDefine Statement
+  hi! link elixirRecordDefine Statement
+  hi! link elixirPrivateRecordDefine Statement
+  hi! link elixirMacroDefine Statement
+  hi! link elixirPrivateMacroDefine Statement
+  hi! link elixirDelegateDefine Statement
+  hi! link elixirOverridableDefine Statement
+  hi! link elixirExceptionDefine Statement
+  hi! link elixirCallbackDefine Statement
+  hi! link elixirStructDefine Statement
+  hi! link elixirExUnitMacro Statement
+  hi! link elixirInclude Statement
+  hi! link elixirAtom PreProc
+  hi! link elixirDocTest String
+  hi ALEErrorSign ctermfg=167 ctermbg=NONE cterm=NONE
+  hi ALEInfoSign ctermfg=186 ctermbg=NONE cterm=NONE
+  hi ALEWarningSign ctermfg=139 ctermbg=NONE cterm=NONE
+  hi ALEError ctermfg=234 ctermbg=167 cterm=NONE
+  hi ALEVirtualTextError ctermfg=234 ctermbg=167 cterm=NONE
+  hi ALEWarning ctermfg=234 ctermbg=139 cterm=NONE
+  hi ALEVirtualTextWarning ctermfg=234 ctermbg=139 cterm=NONE
+  hi ALEInfo ctermfg=186 ctermbg=NONE cterm=NONE
+  hi ALEVirtualTextInfo ctermfg=186 ctermbg=NONE cterm=NONE
+  hi Normal ctermfg=250 ctermbg=234 cterm=NONE
+  hi Statusline ctermfg=234 ctermbg=247 cterm=NONE
+  hi StatuslineNC ctermfg=234 ctermbg=243 cterm=NONE
+  hi VertSplit ctermfg=243 ctermbg=243 cterm=NONE
+  hi TabLine ctermfg=234 ctermbg=243 cterm=NONE
+  hi TabLineFill ctermfg=234 ctermbg=243 cterm=NONE
+  hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarButton ctermfg=247 ctermbg=234 cterm=bold,reverse
+  hi QuickFixLine ctermfg=234 ctermbg=67 cterm=NONE
+  hi CursorLineNr ctermfg=215 ctermbg=NONE cterm=bold
+  hi LineNr ctermfg=240 ctermbg=NONE cterm=NONE
+  hi LineNrAbove ctermfg=240 ctermbg=NONE cterm=NONE
+  hi LineNrBelow ctermfg=240 ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=240 ctermbg=NONE cterm=NONE
+  hi EndOfBuffer ctermfg=240 ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=240 ctermbg=NONE cterm=NONE
+  hi FoldColumn ctermfg=240 ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=234 ctermbg=109 cterm=NONE
+  hi VisualNOS ctermfg=234 ctermbg=66 cterm=NONE
+  hi Pmenu ctermfg=NONE ctermbg=235 cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=243 cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=234 ctermbg=144 cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Error ctermfg=167 ctermbg=234 cterm=reverse
+  hi ErrorMsg ctermfg=167 ctermbg=234 cterm=reverse
+  hi ModeMsg ctermfg=234 ctermbg=186 cterm=NONE
+  hi MoreMsg ctermfg=108 ctermbg=NONE cterm=NONE
+  hi Question ctermfg=144 ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=173 ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=186 ctermbg=234 cterm=reverse
+  hi MatchParen ctermfg=66 ctermbg=234 cterm=reverse
+  hi Search ctermfg=234 ctermbg=108 cterm=NONE
+  hi IncSearch ctermfg=234 ctermbg=215 cterm=NONE
+  hi CurSearch ctermfg=234 ctermbg=144 cterm=NONE
+  hi WildMenu ctermfg=234 ctermbg=186 cterm=NONE
+  hi debugPC ctermfg=234 ctermbg=67 cterm=NONE
+  hi debugBreakpoint ctermfg=234 ctermbg=173 cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE
+  hi CursorColumn ctermfg=NONE ctermbg=236 cterm=NONE
+  hi Folded ctermfg=247 ctermbg=235 cterm=NONE
+  hi ColorColumn ctermfg=NONE ctermbg=235 cterm=NONE
+  hi SpellBad ctermfg=167 ctermbg=NONE cterm=underline
+  hi SpellCap ctermfg=67 ctermbg=NONE cterm=underline
+  hi SpellLocal ctermfg=108 ctermbg=NONE cterm=underline
+  hi SpellRare ctermfg=182 ctermbg=NONE cterm=underline
+  hi Comment ctermfg=243 ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=173 ctermbg=NONE cterm=NONE
+  hi String ctermfg=108 ctermbg=NONE cterm=NONE
+  hi Character ctermfg=151 ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=109 ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=139 ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=144 ctermbg=NONE cterm=NONE
+  hi Type ctermfg=110 ctermbg=NONE cterm=NONE
+  hi Special ctermfg=66 ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Title ctermfg=186 ctermbg=NONE cterm=bold
+  hi Directory ctermfg=109 ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=243 ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Debug ctermfg=66 ctermbg=NONE cterm=NONE
+  hi DiffAdd ctermfg=16 ctermbg=108 cterm=NONE
+  hi DiffDelete ctermfg=137 ctermbg=NONE cterm=NONE
+  hi diffAdded ctermfg=108 ctermbg=NONE cterm=NONE
+  hi diffRemoved ctermfg=167 ctermbg=NONE cterm=NONE
+  hi diffSubname ctermfg=139 ctermbg=NONE cterm=NONE
+  hi DiffText ctermfg=16 ctermbg=254 cterm=NONE
+  hi DiffChange ctermfg=16 ctermbg=145 cterm=NONE
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 16
+  hi ALEErrorSign ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi ALEInfoSign ctermfg=yellow ctermbg=NONE cterm=NONE
+  hi ALEWarningSign ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi ALEError ctermfg=black ctermbg=darkred cterm=NONE
+  hi ALEVirtualTextError ctermfg=black ctermbg=darkred cterm=NONE
+  hi ALEWarning ctermfg=black ctermbg=darkmagenta cterm=NONE
+  hi ALEVirtualTextWarning ctermfg=black ctermbg=darkmagenta cterm=NONE
+  hi ALEInfo ctermfg=yellow ctermbg=NONE cterm=NONE
+  hi ALEVirtualTextInfo ctermfg=yellow ctermbg=NONE cterm=NONE
+  hi Normal ctermfg=white ctermbg=black cterm=NONE
+  hi Statusline ctermfg=black ctermbg=gray cterm=NONE
+  hi StatuslineNC ctermfg=black ctermbg=darkgray cterm=NONE
+  hi VertSplit ctermfg=darkgray ctermbg=darkgray cterm=NONE
+  hi TabLine ctermfg=black ctermbg=darkgray cterm=NONE
+  hi TabLineFill ctermfg=black ctermbg=darkgray cterm=NONE
+  hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarButton ctermfg=gray ctermbg=black cterm=bold,reverse
+  hi QuickFixLine ctermfg=black ctermbg=blue cterm=NONE
+  hi CursorLineNr ctermfg=red ctermbg=NONE cterm=bold
+  hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi LineNrAbove ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi LineNrBelow ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Visual ctermfg=black ctermbg=cyan cterm=NONE
+  hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi Pmenu ctermfg=NONE ctermbg=darkgrey cterm=NONE
+  hi PmenuThumb ctermfg=NONE ctermbg=darkgray cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Error ctermfg=darkred ctermbg=black cterm=reverse
+  hi ErrorMsg ctermfg=darkred ctermbg=black cterm=reverse
+  hi ModeMsg ctermfg=black ctermbg=yellow cterm=NONE
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Question ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=yellow ctermbg=black cterm=reverse
+  hi MatchParen ctermfg=darkcyan ctermbg=black cterm=reverse
+  hi Search ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi IncSearch ctermfg=black ctermbg=red cterm=NONE
+  hi CurSearch ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
+  hi debugPC ctermfg=black ctermbg=blue cterm=NONE
+  hi debugBreakpoint ctermfg=black ctermbg=red cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
+  hi SpellCap ctermfg=blue ctermbg=NONE cterm=underline
+  hi SpellLocal ctermfg=darkgreen ctermbg=NONE cterm=underline
+  hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
+  hi Comment ctermfg=darkgray ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=red ctermbg=NONE cterm=NONE
+  hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Character ctermfg=green ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Type ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Title ctermfg=yellow ctermbg=NONE cterm=bold
+  hi Directory ctermfg=cyan ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=darkgray ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Debug ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi DiffAdd ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi DiffDelete ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi diffAdded ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi diffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi diffSubname ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi DiffText ctermfg=black ctermbg=lightgrey cterm=NONE
+  hi DiffChange ctermfg=black ctermbg=darkgray cterm=NONE
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 8
+  hi Normal ctermfg=gray ctermbg=black cterm=NONE
+  hi Statusline ctermfg=gray ctermbg=black cterm=bold,reverse
+  hi StatuslineNC ctermfg=gray ctermbg=black cterm=reverse
+  hi VertSplit ctermfg=gray ctermbg=black cterm=reverse
+  hi TabLine ctermfg=black ctermbg=gray cterm=NONE
+  hi TabLineFill ctermfg=black ctermbg=gray cterm=NONE
+  hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi ToolbarButton ctermfg=gray ctermbg=black cterm=bold,reverse
+  hi QuickFixLine ctermfg=black ctermbg=blue cterm=NONE
+  hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi LineNr ctermfg=gray ctermbg=NONE cterm=bold
+  hi LineNrAbove ctermfg=gray ctermbg=NONE cterm=bold
+  hi LineNrBelow ctermfg=gray ctermbg=NONE cterm=bold
+  hi NonText ctermfg=gray ctermbg=NONE cterm=bold
+  hi EndOfBuffer ctermfg=gray ctermbg=NONE cterm=bold
+  hi SpecialKey ctermfg=gray ctermbg=NONE cterm=bold
+  hi FoldColumn ctermfg=gray ctermbg=NONE cterm=bold
+  hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Pmenu ctermfg=black ctermbg=gray cterm=NONE
+  hi PmenuThumb ctermfg=gray ctermbg=black cterm=NONE
+  hi PmenuSbar ctermfg=NONE ctermbg=gray cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Error ctermfg=darkred ctermbg=gray cterm=bold,reverse
+  hi ErrorMsg ctermfg=darkred ctermbg=gray cterm=bold,reverse
+  hi ModeMsg ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Question ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=darkyellow ctermbg=black cterm=reverse
+  hi MatchParen ctermfg=darkcyan ctermbg=black cterm=reverse
+  hi Search ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi IncSearch ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi CurSearch ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi debugPC ctermfg=black ctermbg=blue cterm=NONE
+  hi debugBreakpoint ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
+  hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi SpellBad ctermfg=darkred ctermbg=gray cterm=reverse
+  hi SpellCap ctermfg=blue ctermbg=gray cterm=reverse
+  hi SpellLocal ctermfg=darkgreen ctermbg=black cterm=reverse
+  hi SpellRare ctermfg=darkmagenta ctermbg=gray cterm=reverse
+  hi Comment ctermfg=gray ctermbg=NONE cterm=bold
+  hi Constant ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Character ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=gray ctermbg=NONE cterm=NONE
+  hi Statement ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Type ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+  hi Title ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
+  hi Conceal ctermfg=gray ctermbg=NONE cterm=NONE
+  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Debug ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi DiffAdd ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi DiffDelete ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi diffAdded ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi diffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi diffSubname ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi DiffText ctermfg=white ctermbg=black cterm=bold,reverse
+  hi DiffChange ctermfg=black ctermbg=white cterm=NONE
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 0
+  hi Normal term=NONE
+  hi ColorColumn term=reverse
+  hi Conceal term=NONE
+  hi Cursor term=reverse
+  hi CursorColumn term=NONE
+  hi CursorLine term=underline
+  hi CursorLineNr term=bold
+  hi DiffAdd term=reverse
+  hi DiffChange term=NONE
+  hi DiffDelete term=reverse
+  hi DiffText term=reverse
+  hi Directory term=NONE
+  hi EndOfBuffer term=NONE
+  hi ErrorMsg term=bold,reverse
+  hi FoldColumn term=NONE
+  hi Folded term=NONE
+  hi IncSearch term=bold,reverse,underline
+  hi LineNr term=NONE
+  hi MatchParen term=bold,underline
+  hi ModeMsg term=bold
+  hi MoreMsg term=NONE
+  hi NonText term=NONE
+  hi Pmenu term=reverse
+  hi PmenuSbar term=reverse
+  hi PmenuSel term=bold
+  hi PmenuThumb term=NONE
+  hi Question term=standout
+  hi Search term=reverse
+  hi SignColumn term=reverse
+  hi SpecialKey term=bold
+  hi SpellBad term=underline
+  hi SpellCap term=underline
+  hi SpellLocal term=underline
+  hi SpellRare term=underline
+  hi StatusLine term=bold,reverse
+  hi StatusLineNC term=bold,underline
+  hi TabLine term=bold,underline
+  hi TabLineFill term=NONE
+  hi Terminal term=NONE
+  hi TabLineSel term=bold,reverse
+  hi Title term=NONE
+  hi VertSplit term=NONE
+  hi Visual term=reverse
+  hi VisualNOS term=NONE
+  hi WarningMsg term=standout
+  hi WildMenu term=bold
+  hi CursorIM term=NONE
+  hi ToolbarLine term=reverse
+  hi ToolbarButton term=bold,reverse
+  hi CurSearch term=reverse
+  hi CursorLineFold term=underline
+  hi CursorLineSign term=underline
+  hi Comment term=bold
+  hi Constant term=NONE
+  hi Error term=bold,reverse
+  hi Identifier term=NONE
+  hi Ignore term=NONE
+  hi PreProc term=NONE
+  hi Special term=NONE
+  hi Statement term=NONE
+  hi Todo term=bold,reverse
+  hi Type term=NONE
+  hi Underlined term=underline
+  unlet s:t_Co
+  finish
+endif
+
+" Background: dark
+" Color: color00          #1C1C1C        234            black
+" Color: color08          #767676        243            darkgray
+" Color: color01          #D75F5F        167            darkred
+" Color: color09          #DF875F        173            red
+" Color: color02          #87AF87        108            darkgreen
+" Color: color10          #AFD7AF        151            green
+" Color: color03          #AFAF87        144            darkyellow
+" Color: color11          #DFDF87        186            yellow
+" Color: color04          #5F87AF        67             blue
+" Color: color12          #87AFD7        110            blue
+" Color: color05          #AF87AF        139            darkmagenta
+" Color: color13          #DFAFDF        182            magenta
+" Color: color06          #5F8787        66             darkcyan
+" Color: color14          #87AFAF        109            cyan
+" Color: color07          #9E9E9E        247            gray
+" Color: color15          #BCBCBC        250            white
+" Color: colorLine        #303030        236            darkgrey
+" Color: colorB           #262626        235            darkgrey
+" Color: colorNonT        #585858        240            darkgrey
+" Color: colorC           #FFAF5F        215            red
+" Color: colorlC          #5FFF00        ~
+" Color: colorV           #1F3F5F        109            cyan
+" Color: diffAdd          #87AF87        108            darkgreen
+" Color: diffDelete       #af875f        137            darkyellow
+" Color: diffChange       #AFAFAF        145            darkgray
+" Color: diffText         #DFDFDF        254            lightgrey
+" Color: black            #000000        16             black
+" Color: white            #FFFFFF        231            white
+" Term colors: color00 color01 color02 color03 color04 color05 color06 color07
+" Term colors: color08 color09 color10 color11 color12 color13 color14 color15
+" vim: et ts=2 sw=2
--- a/runtime/colors/industry.vim
+++ b/runtime/colors/industry.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Shian Lee.
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun Jun 12 10:53:58 2022
+" Last Updated: 2022-07-26 15:50:05

 " Generated by Colortemplate v2.2.0

@@ -13,7 +13,7 @@ set background=dark
 hi clear
 let g:colors_name = 'industry'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#303030', '#870000', '#5fd75f', '#afaf00', '#87afff', '#af00af', '#00afaf', '#6c6c6c', '#444444', '#ff0000', '#00ff00', '#ffff00', '#005fff', '#ff00ff', '#00ffff', '#ffffff']
--- a/runtime/colors/koehler.vim
+++ b/runtime/colors/koehler.vim
@@ -3,7 +3,7 @@
 " Maintainer:   original maintainer Ron Aaron <ron@ronware.org>
 " Website:      https://www.github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sat 11 Jun 2022 11:24:58 MSK
+" Last Updated: 2022-07-26 15:50:06

 " Generated by Colortemplate v2.2.0

@@ -12,7 +12,7 @@ set background=dark
 hi clear
 let g:colors_name = 'koehler'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1

 hi! link Terminal Normal
 hi! link Boolean Constant
--- a/runtime/colors/morning.vim
+++ b/runtime/colors/morning.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Bram Moolenaar <Bram@vim.org>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun Jun 12 10:55:30 2022
+" Last Updated: 2022-07-26 15:50:07

 " Generated by Colortemplate v2.2.0

@@ -13,7 +13,7 @@ set background=light
 hi clear
 let g:colors_name = 'morning'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#e4e4e4', '#a52a2a', '#ff00ff', '#6a0dad', '#008787', '#2e8b57', '#6a5acd', '#bcbcbc', '#0000ff', '#a52a2a', '#ff00ff', '#6a0dad', '#008787', '#2e8b57', '#6a5acd', '#000000']
--- a/runtime/colors/murphy.vim
+++ b/runtime/colors/murphy.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Ron Aaron <ron@ronware.org>.
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun Jun 12 10:56:21 2022
+" Last Updated: 2022-07-26 15:50:08

 " Generated by Colortemplate v2.2.0

@@ -13,7 +13,7 @@ set background=dark
 hi clear
 let g:colors_name = 'murphy'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#303030', '#ffa700', '#005f00', '#ffd7af', '#87afff', '#ffafaf', '#00afaf', '#bcbcbc', '#444444', '#ff0000', '#00875f', '#ffff00', '#005fff', '#ff00ff', '#00ffff', '#ffffff']
--- a/runtime/colors/pablo.vim
+++ b/runtime/colors/pablo.vim
@@ -3,7 +3,7 @@
 " Maintainer:   Original maintainerRon Aaron <ron@ronware.org>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun Jun 12 10:57:11 2022
+" Last Updated: 2022-07-26 15:50:09

 " Generated by Colortemplate v2.2.0

@@ -12,7 +12,7 @@ set background=dark
 hi clear
 let g:colors_name = 'pablo'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
--- a/runtime/colors/peachpuff.vim
+++ b/runtime/colors/peachpuff.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun Jun 12 10:58:17 2022
+" Last Updated: 2022-07-26 15:50:10

 " Generated by Colortemplate v2.2.0

@@ -13,7 +13,7 @@ set background=light
 hi clear
 let g:colors_name = 'peachpuff'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#ffdab9', '#a52a2a', '#c00058', '#cd00cd', '#008b8b', '#2e8b57', '#6a5acd', '#737373', '#406090', '#a52a2a', '#c00058', '#cd00cd', '#008b8b', '#2e8b57', '#6a5acd', '#000000']
--- a/runtime/colors/quiet.vim
+++ b/runtime/colors/quiet.vim
@@ -0,0 +1,707 @@
+" Name:         quiet
+" Description:  `monochrome`, but less ugly, with diffs, searches, a few other niceties, and both light and dark versions.
+" Author:       neutaaaaan <neutaaaaan-gh@protonmail.com>
+" Maintainer:   neutaaaaan <neutaaaaan-gh@protonmail.com>
+" Website:      https://github.com/vim/colorschemes
+" License:      Vim License (see `:help license`)`
+" Last Updated: 2022-08-01 15:13:21
+
+" Generated by Colortemplate v2.2.0
+
+hi clear
+let g:colors_name = 'quiet'
+
+let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1
+
+hi! link StatusLineTerm StatusLine
+hi! link StatusLineTermNC StatusLineNC
+hi! link Boolean Constant
+hi! link Character Constant
+hi! link Conditional Statement
+hi! link Define PreProc
+hi! link Debug Special
+hi! link Delimiter Special
+hi! link Exception Statement
+hi! link Float Constant
+hi! link Function Identifier
+hi! link Include PreProc
+hi! link Keyword Statement
+hi! link Label Statement
+hi! link Macro PreProc
+hi! link Number Constant
+hi! link Operator Statement
+hi! link PreCondit PreProc
+hi! link Repeat Statement
+hi! link SpecialChar Special
+hi! link SpecialComment Special
+hi! link StorageClass Type
+hi! link String Constant
+hi! link Structure Type
+hi! link Tag Special
+hi! link Typedef Type
+hi! link lCursor Cursor
+hi! link debugBreakpoint ModeMsg
+hi! link debugPC CursorLine
+
+if &background ==# 'dark'
+  if (has('termguicolors') && &termguicolors) || has('gui_running')
+    let g:terminal_ansi_colors = ['#080808', '#d7005f', '#00af5f', '#d78700', '#0087d7', '#d787d7', '#00afaf', '#dadada', '#707070', '#ff005f', '#00d75f', '#ffaf00', '#5fafff', '#ff87ff', '#00d7d7', '#ffffff']
+  endif
+  hi Normal guifg=#dadada guibg=#080808 gui=NONE cterm=NONE
+  hi Terminal guifg=#dadada guibg=#080808 gui=NONE cterm=NONE
+  hi ColorColumn guifg=NONE guibg=#1c1c1c gui=NONE cterm=NONE
+  hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi CursorColumn guifg=NONE guibg=#303030 gui=NONE cterm=NONE
+  hi CursorLine guifg=NONE guibg=#303030 gui=NONE cterm=NONE
+  hi CursorLineNr guifg=#dadada guibg=#303030 gui=NONE cterm=NONE
+  hi DiffAdd guifg=#00af00 guibg=#080808 gui=reverse cterm=reverse
+  hi DiffChange guifg=#87afd7 guibg=#080808 gui=reverse cterm=reverse
+  hi DiffDelete guifg=#d75f5f guibg=#080808 gui=reverse cterm=reverse
+  hi DiffText guifg=#d787d7 guibg=#080808 gui=reverse cterm=reverse
+  hi Directory guifg=#dadada guibg=#080808 gui=NONE cterm=NONE
+  hi EndOfBuffer guifg=#dadada guibg=#080808 gui=NONE cterm=NONE
+  hi ErrorMsg guifg=#dadada guibg=#080808 gui=reverse cterm=reverse
+  hi FoldColumn guifg=#707070 guibg=#080808 gui=NONE cterm=NONE
+  hi Folded guifg=#707070 guibg=#080808 gui=NONE cterm=NONE
+  hi IncSearch guifg=#ffaf00 guibg=#080808 gui=reverse cterm=reverse
+  hi LineNr guifg=#444444 guibg=#080808 gui=NONE cterm=NONE
+  hi MatchParen guifg=#ff00af guibg=#080808 gui=bold cterm=bold
+  hi ModeMsg guifg=#dadada guibg=#080808 gui=bold cterm=bold
+  hi MoreMsg guifg=#dadada guibg=#080808 gui=NONE cterm=NONE
+  hi NonText guifg=#707070 guibg=NONE gui=NONE cterm=NONE
+  hi Pmenu guifg=#080808 guibg=#87afd7 gui=NONE cterm=NONE
+  hi PmenuSbar guifg=#dadada guibg=#707070 gui=NONE cterm=NONE
+  hi PmenuSel guifg=#080808 guibg=#d787d7 gui=NONE cterm=NONE
+  hi PmenuThumb guifg=#dadada guibg=#d787d7 gui=NONE cterm=NONE
+  hi Question guifg=#dadada guibg=#080808 gui=NONE cterm=NONE
+  hi QuickFixLine guifg=#d787d7 guibg=#080808 gui=reverse cterm=reverse
+  hi Search guifg=#00afff guibg=#080808 gui=reverse cterm=reverse
+  hi SignColumn guifg=#dadada guibg=#080808 gui=NONE cterm=NONE
+  hi SpecialKey guifg=#dadada guibg=#080808 gui=NONE cterm=NONE
+  hi SpellBad guifg=#d7005f guibg=#080808 guisp=#d7005f gui=undercurl cterm=underline
+  hi SpellCap guifg=#0087d7 guibg=#080808 guisp=#0087d7 gui=undercurl cterm=underline
+  hi SpellLocal guifg=#d787d7 guibg=#080808 guisp=#d787d7 gui=undercurl cterm=underline
+  hi SpellRare guifg=#00afaf guibg=#080808 guisp=#00afaf gui=undercurl cterm=underline
+  hi StatusLine guifg=#080808 guibg=#dadada gui=bold cterm=bold
+  hi StatusLineNC guifg=#707070 guibg=#080808 gui=underline cterm=underline
+  hi TabLine guifg=#707070 guibg=#080808 gui=underline cterm=underline
+  hi TabLineFill guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi TabLineSel guifg=#080808 guibg=#dadada gui=bold cterm=bold
+  hi Title guifg=#dadada guibg=#080808 gui=NONE cterm=NONE
+  hi VertSplit guifg=#707070 guibg=#080808 gui=NONE cterm=NONE
+  hi Visual guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS guifg=NONE guibg=#303030 gui=NONE cterm=NONE
+  hi WarningMsg guifg=#dadada guibg=#080808 gui=NONE cterm=NONE
+  hi WildMenu guifg=#00afff guibg=#080808 gui=bold cterm=bold
+  hi Comment guifg=#707070 guibg=#080808 gui=bold cterm=bold
+  hi Constant guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi Error guifg=#ff005f guibg=#080808 gui=bold,reverse cterm=bold,reverse
+  hi Identifier guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi Ignore guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi PreProc guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi Special guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi Statement guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi Todo guifg=#00ffaf guibg=NONE gui=bold,reverse cterm=bold,reverse
+  hi Type guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi Underlined guifg=#dadada guibg=NONE gui=underline cterm=underline
+  hi CursorIM guifg=#080808 guibg=#afff00 gui=NONE cterm=NONE
+  hi ToolbarLine guifg=NONE guibg=#080808 gui=NONE cterm=NONE
+  hi ToolbarButton guifg=#dadada guibg=#080808 gui=bold cterm=bold
+else
+  " Light background
+  if (has('termguicolors') && &termguicolors) || has('gui_running')
+    let g:terminal_ansi_colors = ['#080808', '#af0000', '#005f00', '#af5f00', '#005faf', '#870087', '#008787', '#d7d7d7', '#626262', '#d70000', '#008700', '#d78700', '#0087d7', '#af00af', '#00afaf', '#ffffff']
+  endif
+  hi Normal guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi Terminal guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi ColorColumn guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi CursorColumn guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
+  hi CursorLine guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
+  hi CursorLineNr guifg=#080808 guibg=#eeeeee gui=NONE cterm=NONE
+  hi DiffAdd guifg=#87d787 guibg=#080808 gui=reverse cterm=reverse
+  hi DiffChange guifg=#afafd7 guibg=#080808 gui=reverse cterm=reverse
+  hi DiffDelete guifg=#d78787 guibg=#080808 gui=reverse cterm=reverse
+  hi DiffText guifg=#d787d7 guibg=#080808 gui=reverse cterm=reverse
+  hi Directory guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi EndOfBuffer guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi ErrorMsg guifg=#080808 guibg=#d7d7d7 gui=reverse cterm=reverse
+  hi FoldColumn guifg=#626262 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi Folded guifg=#626262 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi IncSearch guifg=#ffaf00 guibg=#080808 gui=reverse cterm=reverse
+  hi LineNr guifg=#a8a8a8 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi MatchParen guifg=#ff00af guibg=#d7d7d7 gui=bold cterm=bold
+  hi ModeMsg guifg=#080808 guibg=#d7d7d7 gui=bold cterm=bold
+  hi MoreMsg guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi NonText guifg=#626262 guibg=NONE gui=NONE cterm=NONE
+  hi Pmenu guifg=#080808 guibg=#afafd7 gui=NONE cterm=NONE
+  hi PmenuSbar guifg=#080808 guibg=#626262 gui=NONE cterm=NONE
+  hi PmenuSel guifg=#080808 guibg=#d787d7 gui=NONE cterm=NONE
+  hi PmenuThumb guifg=#080808 guibg=#d787d7 gui=NONE cterm=NONE
+  hi Question guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi QuickFixLine guifg=#d787d7 guibg=#080808 gui=reverse cterm=reverse
+  hi Search guifg=#00afff guibg=#080808 gui=reverse cterm=reverse
+  hi SignColumn guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi SpecialKey guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi SpellBad guifg=#af0000 guibg=#d7d7d7 guisp=#af0000 gui=undercurl cterm=underline
+  hi SpellCap guifg=#005faf guibg=#d7d7d7 guisp=#005faf gui=undercurl cterm=underline
+  hi SpellLocal guifg=#870087 guibg=#d7d7d7 guisp=#870087 gui=undercurl cterm=underline
+  hi SpellRare guifg=#008787 guibg=#d7d7d7 guisp=#008787 gui=undercurl cterm=underline
+  hi StatusLine guifg=#eeeeee guibg=#080808 gui=bold cterm=bold
+  hi StatusLineNC guifg=#080808 guibg=#a8a8a8 gui=NONE cterm=NONE
+  hi TabLine guifg=#080808 guibg=#a8a8a8 gui=NONE cterm=NONE
+  hi TabLineFill guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi TabLineSel guifg=#eeeeee guibg=#080808 gui=bold cterm=bold
+  hi Title guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi VertSplit guifg=#626262 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi Visual guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi VisualNOS guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
+  hi WarningMsg guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi WildMenu guifg=#080808 guibg=#eeeeee gui=bold cterm=bold
+  hi Comment guifg=#080808 guibg=#d7d7d7 gui=bold cterm=bold
+  hi Constant guifg=#080808 guibg=NONE gui=NONE cterm=NONE
+  hi Error guifg=#ff005f guibg=#080808 gui=bold,reverse cterm=bold,reverse
+  hi Identifier guifg=#080808 guibg=NONE gui=NONE cterm=NONE
+  hi Ignore guifg=#080808 guibg=NONE gui=NONE cterm=NONE
+  hi PreProc guifg=#080808 guibg=NONE gui=NONE cterm=NONE
+  hi Special guifg=#080808 guibg=NONE gui=NONE cterm=NONE
+  hi Statement guifg=#080808 guibg=NONE gui=NONE cterm=NONE
+  hi Todo guifg=#00ffaf guibg=#080808 gui=bold,reverse cterm=bold,reverse
+  hi Type guifg=#080808 guibg=NONE gui=NONE cterm=NONE
+  hi Underlined guifg=#080808 guibg=NONE gui=underline cterm=underline
+  hi CursorIM guifg=#080808 guibg=#afff00 gui=NONE cterm=NONE
+  hi ToolbarLine guifg=NONE guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi ToolbarButton guifg=#080808 guibg=#d7d7d7 gui=bold cterm=bold
+endif
+
+if s:t_Co >= 256
+  if &background ==# 'dark'
+    hi Normal ctermfg=253 ctermbg=232 cterm=NONE
+    hi Terminal ctermfg=253 ctermbg=232 cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=234 cterm=NONE
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi CursorColumn ctermfg=NONE ctermbg=236 cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE
+    hi CursorLineNr ctermfg=253 ctermbg=236 cterm=NONE
+    hi DiffAdd ctermfg=34 ctermbg=232 cterm=reverse
+    hi DiffChange ctermfg=110 ctermbg=232 cterm=reverse
+    hi DiffDelete ctermfg=167 ctermbg=232 cterm=reverse
+    hi DiffText ctermfg=176 ctermbg=232 cterm=reverse
+    hi Directory ctermfg=253 ctermbg=232 cterm=NONE
+    hi EndOfBuffer ctermfg=253 ctermbg=232 cterm=NONE
+    hi ErrorMsg ctermfg=253 ctermbg=232 cterm=reverse
+    hi FoldColumn ctermfg=242 ctermbg=232 cterm=NONE
+    hi Folded ctermfg=242 ctermbg=232 cterm=NONE
+    hi IncSearch ctermfg=214 ctermbg=232 cterm=reverse
+    hi LineNr ctermfg=238 ctermbg=232 cterm=NONE
+    hi MatchParen ctermfg=199 ctermbg=232 cterm=bold
+    hi ModeMsg ctermfg=253 ctermbg=232 cterm=bold
+    hi MoreMsg ctermfg=253 ctermbg=232 cterm=NONE
+    hi NonText ctermfg=242 ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=232 ctermbg=110 cterm=NONE
+    hi PmenuSbar ctermfg=253 ctermbg=242 cterm=NONE
+    hi PmenuSel ctermfg=232 ctermbg=176 cterm=NONE
+    hi PmenuThumb ctermfg=253 ctermbg=176 cterm=NONE
+    hi Question ctermfg=253 ctermbg=232 cterm=NONE
+    hi QuickFixLine ctermfg=176 ctermbg=232 cterm=reverse
+    hi Search ctermfg=39 ctermbg=232 cterm=reverse
+    hi SignColumn ctermfg=253 ctermbg=232 cterm=NONE
+    hi SpecialKey ctermfg=253 ctermbg=232 cterm=NONE
+    hi SpellBad ctermfg=161 ctermbg=232 cterm=underline
+    hi SpellCap ctermfg=32 ctermbg=232 cterm=underline
+    hi SpellLocal ctermfg=176 ctermbg=232 cterm=underline
+    hi SpellRare ctermfg=37 ctermbg=232 cterm=underline
+    hi StatusLine ctermfg=232 ctermbg=253 cterm=bold
+    hi StatusLineNC ctermfg=242 ctermbg=232 cterm=underline
+    hi TabLine ctermfg=242 ctermbg=232 cterm=underline
+    hi TabLineFill ctermfg=253 ctermbg=NONE cterm=NONE
+    hi TabLineSel ctermfg=232 ctermbg=253 cterm=bold
+    hi Title ctermfg=253 ctermbg=232 cterm=NONE
+    hi VertSplit ctermfg=242 ctermbg=232 cterm=NONE
+    hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi VisualNOS ctermfg=NONE ctermbg=236 cterm=NONE
+    hi WarningMsg ctermfg=253 ctermbg=232 cterm=NONE
+    hi WildMenu ctermfg=39 ctermbg=232 cterm=bold
+    hi Comment ctermfg=242 ctermbg=232 cterm=bold
+    hi Constant ctermfg=253 ctermbg=NONE cterm=NONE
+    hi Error ctermfg=197 ctermbg=232 cterm=bold,reverse
+    hi Identifier ctermfg=253 ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=253 ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=253 ctermbg=NONE cterm=NONE
+    hi Special ctermfg=253 ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=253 ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=49 ctermbg=NONE cterm=bold,reverse
+    hi Type ctermfg=253 ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=253 ctermbg=NONE cterm=underline
+    hi CursorIM ctermfg=232 ctermbg=154 cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=232 cterm=NONE
+    hi ToolbarButton ctermfg=253 ctermbg=232 cterm=bold
+  else
+    " Light background
+    hi Normal ctermfg=232 ctermbg=188 cterm=NONE
+    hi Terminal ctermfg=232 ctermbg=188 cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=254 cterm=NONE
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi CursorColumn ctermfg=NONE ctermbg=255 cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=255 cterm=NONE
+    hi CursorLineNr ctermfg=232 ctermbg=255 cterm=NONE
+    hi DiffAdd ctermfg=114 ctermbg=232 cterm=reverse
+    hi DiffChange ctermfg=146 ctermbg=232 cterm=reverse
+    hi DiffDelete ctermfg=174 ctermbg=232 cterm=reverse
+    hi DiffText ctermfg=176 ctermbg=232 cterm=reverse
+    hi Directory ctermfg=232 ctermbg=188 cterm=NONE
+    hi EndOfBuffer ctermfg=232 ctermbg=188 cterm=NONE
+    hi ErrorMsg ctermfg=232 ctermbg=188 cterm=reverse
+    hi FoldColumn ctermfg=241 ctermbg=188 cterm=NONE
+    hi Folded ctermfg=241 ctermbg=188 cterm=NONE
+    hi IncSearch ctermfg=214 ctermbg=232 cterm=reverse
+    hi LineNr ctermfg=248 ctermbg=188 cterm=NONE
+    hi MatchParen ctermfg=199 ctermbg=188 cterm=bold
+    hi ModeMsg ctermfg=232 ctermbg=188 cterm=bold
+    hi MoreMsg ctermfg=232 ctermbg=188 cterm=NONE
+    hi NonText ctermfg=241 ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=232 ctermbg=146 cterm=NONE
+    hi PmenuSbar ctermfg=232 ctermbg=241 cterm=NONE
+    hi PmenuSel ctermfg=232 ctermbg=176 cterm=NONE
+    hi PmenuThumb ctermfg=232 ctermbg=176 cterm=NONE
+    hi Question ctermfg=232 ctermbg=188 cterm=NONE
+    hi QuickFixLine ctermfg=176 ctermbg=232 cterm=reverse
+    hi Search ctermfg=39 ctermbg=232 cterm=reverse
+    hi SignColumn ctermfg=232 ctermbg=188 cterm=NONE
+    hi SpecialKey ctermfg=232 ctermbg=188 cterm=NONE
+    hi SpellBad ctermfg=124 ctermbg=188 cterm=underline
+    hi SpellCap ctermfg=25 ctermbg=188 cterm=underline
+    hi SpellLocal ctermfg=90 ctermbg=188 cterm=underline
+    hi SpellRare ctermfg=30 ctermbg=188 cterm=underline
+    hi StatusLine ctermfg=255 ctermbg=232 cterm=bold
+    hi StatusLineNC ctermfg=232 ctermbg=248 cterm=NONE
+    hi TabLine ctermfg=232 ctermbg=248 cterm=NONE
+    hi TabLineFill ctermfg=232 ctermbg=188 cterm=NONE
+    hi TabLineSel ctermfg=255 ctermbg=232 cterm=bold
+    hi Title ctermfg=232 ctermbg=188 cterm=NONE
+    hi VertSplit ctermfg=241 ctermbg=188 cterm=NONE
+    hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi VisualNOS ctermfg=NONE ctermbg=255 cterm=NONE
+    hi WarningMsg ctermfg=232 ctermbg=188 cterm=NONE
+    hi WildMenu ctermfg=232 ctermbg=255 cterm=bold
+    hi Comment ctermfg=232 ctermbg=188 cterm=bold
+    hi Constant ctermfg=232 ctermbg=NONE cterm=NONE
+    hi Error ctermfg=197 ctermbg=232 cterm=bold,reverse
+    hi Identifier ctermfg=232 ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=232 ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=232 ctermbg=NONE cterm=NONE
+    hi Special ctermfg=232 ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=232 ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=49 ctermbg=232 cterm=bold,reverse
+    hi Type ctermfg=232 ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=232 ctermbg=NONE cterm=underline
+    hi CursorIM ctermfg=232 ctermbg=154 cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=188 cterm=NONE
+    hi ToolbarButton ctermfg=232 ctermbg=188 cterm=bold
+  endif
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 16
+  if &background ==# 'dark'
+    hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Terminal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
+    hi DiffAdd ctermfg=2 ctermbg=0 cterm=reverse
+    hi DiffChange ctermfg=4 ctermbg=0 cterm=reverse
+    hi DiffDelete ctermfg=1 ctermbg=0 cterm=reverse
+    hi DiffText ctermfg=5 ctermbg=0 cterm=reverse
+    hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi IncSearch ctermfg=3 ctermbg=0 cterm=bold,reverse,underline
+    hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Question ctermfg=NONE ctermbg=NONE cterm=standout
+    hi QuickFixLine ctermfg=5 ctermbg=0 cterm=reverse
+    hi Search ctermfg=6 ctermbg=0 cterm=reverse
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
+    hi SpellBad ctermfg=1 ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=4 ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=5 ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=6 ctermbg=NONE cterm=underline
+    hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
+    hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Special ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Type ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  else
+    " Light background
+    hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Terminal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
+    hi DiffAdd ctermfg=2 ctermbg=0 cterm=reverse
+    hi DiffChange ctermfg=4 ctermbg=0 cterm=reverse
+    hi DiffDelete ctermfg=1 ctermbg=0 cterm=reverse
+    hi DiffText ctermfg=5 ctermbg=0 cterm=reverse
+    hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi IncSearch ctermfg=3 ctermbg=0 cterm=bold,reverse,underline
+    hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Question ctermfg=NONE ctermbg=NONE cterm=standout
+    hi QuickFixLine ctermfg=5 ctermbg=0 cterm=reverse
+    hi Search ctermfg=6 ctermbg=0 cterm=reverse
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
+    hi SpellBad ctermfg=1 ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=4 ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=5 ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=6 ctermbg=NONE cterm=underline
+    hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
+    hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Special ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Type ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  endif
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 8
+  if &background ==# 'dark'
+    hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Terminal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
+    hi DiffAdd ctermfg=2 ctermbg=0 cterm=reverse
+    hi DiffChange ctermfg=4 ctermbg=0 cterm=reverse
+    hi DiffDelete ctermfg=1 ctermbg=0 cterm=reverse
+    hi DiffText ctermfg=5 ctermbg=0 cterm=reverse
+    hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi IncSearch ctermfg=3 ctermbg=0 cterm=bold,reverse,underline
+    hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Question ctermfg=NONE ctermbg=NONE cterm=standout
+    hi QuickFixLine ctermfg=5 ctermbg=0 cterm=reverse
+    hi Search ctermfg=6 ctermbg=0 cterm=reverse
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
+    hi SpellBad ctermfg=1 ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=4 ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=5 ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=6 ctermbg=NONE cterm=underline
+    hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
+    hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Special ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Type ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  else
+    " Light background
+    hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Terminal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi CursorColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi CursorLineNr ctermfg=NONE ctermbg=NONE cterm=bold
+    hi DiffAdd ctermfg=2 ctermbg=0 cterm=reverse
+    hi DiffChange ctermfg=4 ctermbg=0 cterm=reverse
+    hi DiffDelete ctermfg=1 ctermbg=0 cterm=reverse
+    hi DiffText ctermfg=5 ctermbg=0 cterm=reverse
+    hi Directory ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi IncSearch ctermfg=3 ctermbg=0 cterm=bold,reverse,underline
+    hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
+    hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Question ctermfg=NONE ctermbg=NONE cterm=standout
+    hi QuickFixLine ctermfg=5 ctermbg=0 cterm=reverse
+    hi Search ctermfg=6 ctermbg=0 cterm=reverse
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
+    hi SpellBad ctermfg=1 ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=4 ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=5 ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=6 ctermbg=NONE cterm=underline
+    hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
+    hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
+    hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
+    hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Error ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Special ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Todo ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Type ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
+    hi CursorIM ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+  endif
+  unlet s:t_Co
+  finish
+endif
+
+if s:t_Co >= 0
+  hi Normal term=NONE
+  hi ColorColumn term=reverse
+  hi Conceal term=NONE
+  hi Cursor term=reverse
+  hi CursorColumn term=NONE
+  hi CursorLine term=underline
+  hi CursorLineNr term=bold
+  hi DiffAdd term=reverse
+  hi DiffChange term=NONE
+  hi DiffDelete term=reverse
+  hi DiffText term=reverse
+  hi Directory term=NONE
+  hi EndOfBuffer term=NONE
+  hi ErrorMsg term=bold,reverse
+  hi FoldColumn term=NONE
+  hi Folded term=NONE
+  hi IncSearch term=bold,reverse,underline
+  hi LineNr term=NONE
+  hi MatchParen term=bold,underline
+  hi ModeMsg term=bold
+  hi MoreMsg term=NONE
+  hi NonText term=NONE
+  hi Pmenu term=reverse
+  hi PmenuSbar term=reverse
+  hi PmenuSel term=bold
+  hi PmenuThumb term=NONE
+  hi Question term=standout
+  hi Search term=reverse
+  hi SignColumn term=reverse
+  hi SpecialKey term=bold
+  hi SpellBad term=underline
+  hi SpellCap term=underline
+  hi SpellLocal term=underline
+  hi SpellRare term=underline
+  hi StatusLine term=bold,reverse
+  hi StatusLineNC term=bold,underline
+  hi TabLine term=bold,underline
+  hi TabLineFill term=NONE
+  hi Terminal term=NONE
+  hi TabLineSel term=bold,reverse
+  hi Title term=NONE
+  hi VertSplit term=NONE
+  hi Visual term=reverse
+  hi VisualNOS term=NONE
+  hi WarningMsg term=standout
+  hi WildMenu term=bold
+  hi CursorIM term=NONE
+  hi ToolbarLine term=reverse
+  hi ToolbarButton term=bold,reverse
+  hi CurSearch term=reverse
+  hi CursorLineFold term=underline
+  hi CursorLineSign term=underline
+  hi Comment term=bold
+  hi Constant term=NONE
+  hi Error term=bold,reverse
+  hi Identifier term=NONE
+  hi Ignore term=NONE
+  hi PreProc term=NONE
+  hi Special term=NONE
+  hi Statement term=NONE
+  hi Todo term=bold,reverse
+  hi Type term=NONE
+  hi Underlined term=underline
+  unlet s:t_Co
+  finish
+endif
+
+" Background: dark
+" Color: dark0         #080808                       ~     0
+" Color: dark1         #d7005f                       ~     1
+" Color: dark2         #00af5f                       ~     2
+" Color: dark3         #d78700                       ~     3
+" Color: dark4         #0087d7                       ~     4
+" Color: dark5         #d787d7                       ~     5
+" Color: dark6         #00afaf                       ~     6
+" Color: dark7         #dadada                       ~     7
+" Color: dark8         #707070                       ~     8
+" Color: dark9         #ff005f                       ~     9
+" Color: dark10        #00d75f                       ~    10
+" Color: dark11        #ffaf00                       ~    11
+" Color: dark12        #5fafff                       ~    12
+" Color: dark13        #ff87ff                       ~    13
+" Color: dark14        #00d7d7                       ~    14
+" Color: dark15        #ffffff                       ~    15
+" Color: diffred              #d75f5f                ~          
+" Color: diffgreen            #00af00                ~          
+" Color: diffblue             #87afd7                ~          
+" Color: diffpink 	          #d787d7                ~
+" Color: uipink               #ff00af                ~          
+" Color: uilime               #afff00                ~          
+" Color: uiteal               #00ffaf                ~                                      
+" Color: uiblue               #00afff                ~          
+" Color: uipurple             #af00ff                ~          
+" Color: uiamber              #ffaf00                ~          
+" Color: uiblack              #303030                ~          
+" Color: yasogrey             #1c1c1c                ~
+" Color: linenrblack          #444444                ~
+" Color: errorred             #ff005f                ~
+" Term colors: dark0 dark1 dark2 dark3 dark4 dark5 dark6 dark7
+" Term colors: dark8 dark9 dark10 dark11 dark12 dark13 dark14 dark15
+" Background: light
+" Color: brightwhite          #eeeeee                ~   
+" Color: light0        #080808                       ~     0
+" Color: light1        #af0000                       ~     1
+" Color: light2        #005f00                       ~     2
+" Color: light3        #af5f00                       ~     3
+" Color: light4        #005faf                       ~     4
+" Color: light5        #870087                       ~     5
+" Color: light6        #008787                       ~     6
+" Color: light7        #d7d7d7                       ~     7
+" Color: light8        #626262                       ~     8
+" Color: light9        #d70000                       ~     9
+" Color: light10       #008700                       ~    10
+" Color: light11       #d78700                       ~    11
+" Color: light12       #0087d7                       ~    12
+" Color: light13       #af00af                       ~    13
+" Color: light14       #00afaf                       ~    14
+" Color: light15       #ffffff                       ~    15
+" Color: diffred              #d78787                ~   
+" Color: diffgreen            #87d787                ~   
+" Color: diffblue             #afafd7                ~   
+" Color: diffpink 	          #d787d7                ~
+" Color: uipink               #ff00af                ~          
+" Color: uilime               #afff00                ~          
+" Color: uiteal               #00ffaf                ~                                      
+" Color: uiblue               #00afff                ~          
+" Color: uipurple             #af00ff                ~          
+" Color: uiamber              #ffaf00                ~          
+" Color: invisigrey           #a8a8a8                ~   
+" Color: yasogrey             #e4e4e4                ~
+" Color: errorred             #ff005f                ~
+" Term colors: light0 light1 light2 light3 light4 light5 light6 light7
+" Term colors: light8 light9 light10 light11 light12 light13 light14 light15
+" Background: any
+" vim: et ts=2 sw=2
--- a/runtime/colors/ron.vim
+++ b/runtime/colors/ron.vim
@@ -3,7 +3,7 @@
 " Maintainer:   original maintainer Ron Aaron <ron@ronware.org>
 " Website:      https://www.github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sat 11 Jun 2022 11:29:07 MSK
+" Last Updated: 2022-07-26 15:50:11

 " Generated by Colortemplate v2.2.0

@@ -12,7 +12,7 @@ set background=dark
 hi clear
 let g:colors_name = 'ron'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1

 hi! link Terminal Normal
 hi! link Boolean Constant
--- a/runtime/colors/shine.vim
+++ b/runtime/colors/shine.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer is Yasuhiro Matsumoto <mattn@mail.goo.ne.jp>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun Jun 12 11:02:11 2022
+" Last Updated: 2022-07-26 15:50:12

 " Generated by Colortemplate v2.2.0

@@ -13,7 +13,7 @@ set background=light
 hi clear
 let g:colors_name = 'shine'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#000000', '#8b0000', '#006400', '#ffff00', '#00008b', '#6a0dad', '#008b8b', '#dadada', '#767676', '#ffafaf', '#90ee90', '#ffff60', '#add8e6', '#ff00ff', '#00ffff', '#ffffff']
--- a/runtime/colors/slate.vim
+++ b/runtime/colors/slate.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Ralph Amissah <ralph@amissah.com>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun Jun 12 11:03:10 2022
+" Last Updated: 2022-07-26 15:50:14

 " Generated by Colortemplate v2.2.0

@@ -13,7 +13,7 @@ set background=dark
 hi clear
 let g:colors_name = 'slate'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#000000', '#ff0000', '#5f8700', '#ffff00', '#87d7ff', '#d7d787', '#ffd7af', '#666666', '#333333', '#ffafaf', '#00875f', '#ffd700', '#5f87d7', '#afaf87', '#ff8787', '#ffffff']
--- a/runtime/colors/torte.vim
+++ b/runtime/colors/torte.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Thorsten Maerz <info@netztorte.de>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun Jun 12 11:04:48 2022
+" Last Updated: 2022-07-26 15:50:15

 " Generated by Colortemplate v2.2.0

@@ -13,7 +13,7 @@ set background=dark
 hi clear
 let g:colors_name = 'torte'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
--- a/runtime/colors/zellner.vim
+++ b/runtime/colors/zellner.vim
@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Ron Aaron <ron@ronware.org>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun Jun 12 11:05:43 2022
+" Last Updated: 2022-07-26 15:50:16

 " Generated by Colortemplate v2.2.0

@@ -13,7 +13,7 @@ set background=light
 hi clear
 let g:colors_name = 'zellner'

-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
+let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co >= 0 ? &t_Co : -1

 if (has('termguicolors') && &termguicolors) || has('gui_running')
  let g:terminal_ansi_colors = ['#ffffff', '#a52a2a', '#ff00ff', '#a020f0', '#0000ff', '#0000ff', '#ff00ff', '#a9a9a9', '#ff0000', '#a52a2a', '#ff00ff', '#a020f0', '#0000ff', '#0000ff', '#ff00ff', '#000000']
--- a/runtime/delmenu.vim
+++ b/runtime/delmenu.vim
@@ -7,6 +7,31 @@
 aunmenu *
 tlunmenu *

+if exists('#SetupLazyloadMenus')
+  au! SetupLazyloadMenus
+  augroup! SetupLazyloadMenus
+endif
+
+if exists('#buffer_list')
+  au! buffer_list
+  augroup! buffer_list
+endif
+
+if exists('#LoadBufferMenu')
+  au! LoadBufferMenu
+  augroup! LoadBufferMenu
+endif
+
+if exists('#spellmenu')
+  au! spellmenu
+  augroup! spellmenu
+endif
+
+if exists('#SpellPopupMenu')
+  au! SpellPopupMenu
+  augroup! SpellPopupMenu
+endif
+
 unlet! g:did_install_default_menus
 unlet! g:did_install_syntax_menu

--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1275,7 +1275,7 @@ User				Never executed automatically.  To be used for
 				    if exists('#User#MyEvent')
 					doautocmd User MyEvent
 				    endif
-
+<
 							*SigUSR1*
 SigUSR1				After the SIGUSR1 signal has been detected.
 				Could be used if other ways of notifying Vim
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -293,7 +293,7 @@ index({object}, {expr} [, {start} [, {ic}]])
 				Number	index in {object} where {expr} appears
 input({prompt} [, {text} [, {completion}]])
 				String	get input from the user
-inputdialog({prompt} [, {text} [, {completion}]])
+inputdialog({prompt} [, {text} [, {cancelreturn}]])
 				String	like input() but in a GUI dialog
 inputlist({textlist})		Number	let the user pick from a choice list
 inputrestore()			Number	restore typeahead
@@ -1149,7 +1149,7 @@ blob2list({blob})					*blob2list()*

 		Can also be used as a |method|: >
 			GetBlob()->blob2list()
-
+<
 							*browse()*
 browse({save}, {title}, {initdir}, {default})
 		Put up a file requester.  This only works when "has("browse")"
@@ -2316,7 +2316,9 @@ exists({expr})	The result is a Number, which is |TRUE| if {expr} is defined,
 					To check for a supported command
 					always check the return value to be 2.
 			:2match		The |:2match| command.
-			:3match		The |:3match| command.
+			:3match		The |:3match| command (but you
+					probably should not use it, it is
+					reserved for internal usage)
 			#event		autocommand defined for this event
 			#event#pattern	autocommand defined for this event and
 					pattern (the pattern is taken
@@ -2872,6 +2874,10 @@ fnamemodify({fname}, {mods})				*fnamemodify()*
 			/home/user/vim/vim/src
 <		If {mods} is empty or an unsupported modifier is used then
 		{fname} is returned.
+		When {fname} is empty then with {mods} ":h" returns ".", so
+		that `:cd` can be used with it.  This is different from
+		expand('%:h') without a buffer name, which returns an empty
+		string.
 		Note: Environment variables don't work in {fname}, use
 		|expand()| first then.

@@ -5769,8 +5775,10 @@ matchadd({group}, {pattern} [, {priority} [, {id} [, {dict}]]])
 		message will appear and the match will not be added.  An ID
 		is specified as a positive integer (zero excluded).  IDs 1, 2
 		and 3 are reserved for |:match|, |:2match| and |:3match|,
-		respectively.  If the {id} argument is not specified or -1,
-		|matchadd()| automatically chooses a free ID.
+		respectively.  3 is reserved for use by the |matchparen|
+		plugin.
+		If the {id} argument is not specified or -1, |matchadd()|
+		automatically chooses a free ID.

 		The optional {dict} argument allows for further custom
 		values. Currently this is used to specify a match specific
@@ -7379,7 +7387,7 @@ search({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])
 <		When {stopline} is used and it is not zero this also implies
 		that the search does not wrap around the end of the file.
 		A zero value is equal to not giving the argument.
-
+				*E1285* *E1286* *E1287* *E1288* *E1289*
 		When the {timeout} argument is given the search stops when
 		more than this many milliseconds have passed.  Thus when
 		{timeout} is 500 the search stops after half a second.
@@ -7471,7 +7479,7 @@ searchcount([{options}])					*searchcount()*
 			" to 1)
 			let result = searchcount()
 <
-		The function is useful to add the count to |statusline|: >
+		The function is useful to add the count to 'statusline': >
 			function! LastSearchCount() abort
 			  let result = searchcount(#{recompute: 0})
 			  if empty(result)
@@ -9225,6 +9233,7 @@ synIDattr({synID}, {what} [, {mode}])			*synIDattr()*
 		"underline"	"1" if underlined
 		"undercurl"	"1" if undercurled
 		"strike"	"1" if strikethrough
+		"nocombine"	"1" if nocombine

 		Returns an empty string on error.

--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -802,6 +802,8 @@ When the {string} starts with "\=" it is evaluated as an expression, see
 |sub-replace-expression|.  You can use that for complex replacement or special
 characters.

+The substitution is limited in recursion to 4 levels. *E1290*
+
 Otherwise these characters in {string} have a special meaning:
 								*:s%*
 When {string} is equal to "%" and '/' is included with the 'cpoptions' option,
--- a/runtime/doc/channel.txt
+++ b/runtime/doc/channel.txt
@@ -27,6 +27,7 @@ The Netbeans interface also uses a channel. |netbeans|
 14. Using a prompt buffer		|prompt-buffer|
 15. Language Server Protocol		|language-server-protocol|

+							*E1277*
 {only when compiled with the |+channel| feature for channel stuff}
 	You can check this with: `has('channel')`
 {only when compiled with the |+job| feature for job stuff}
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -1147,6 +1147,8 @@ character that indicates the type of command-line being edited, see

 Vim will be in Normal mode when the editor is opened, except when 'insertmode'
 is set.
+								*E1292*
+Once a command-line window is open it is not possible to open another one.

 The height of the window is specified with 'cmdwinheight' (or smaller if there
 is no room).  The window is always full width and is positioned just above the
--- a/runtime/doc/doctags.c
+++ b/runtime/doc/doctags.c
@@ -21,6 +21,8 @@ main(int argc, char **argv)
 	char	*p1, *p2;
 	char	*p;
 	FILE	*fd;
+	int		len;
+	int		in_example;

 	if (argc <= 1)
 	{
@@ -37,22 +39,28 @@ main(int argc, char **argv)
 			fprintf(stderr, "Unable to open %s for reading\n", argv[0]);
 			continue;
 		}
+		in_example = 0;
 		while (fgets(line, LINELEN, fd) != NULL)
 		{
-			p1 = strchr(line, '*');				/* find first '*' */
+			if (in_example)
+			{
+				// skip over example; non-blank in first column ends example
+				if (strchr(" \t\n\r", line[0]) != NULL)
+					continue;
+				in_example = 0;
+			}
+			p1 = strchr(line, '*');				// find first '*'
 			while (p1 != NULL)
 			{
-				p2 = strchr(p1 + 1, '*');		/* find second '*' */
-				if (p2 != NULL && p2 > p1 + 1)	/* skip "*" and "**" */
+				p2 = strchr(p1 + 1, '*');		// find second '*'
+				if (p2 != NULL && p2 > p1 + 1)	// skip "*" and "**"
 				{
 					for (p = p1 + 1; p < p2; ++p)
 						if (*p == ' ' || *p == '\t' || *p == '|')
 							break;
-					/*
-					 * Only accept a *tag* when it consists of valid
-					 * characters, there is white space before it and is
-					 * followed by a white character or end-of-line.
-					 */
+					// Only accept a *tag* when it consists of valid
+					// characters, there is white space before it and is
+					// followed by a white character or end-of-line.
 					if (p == p2
 							&& (p1 == line || p1[-1] == ' ' || p1[-1] == '\t')
 								&& (strchr(" \t\n\r", p[1]) != NULL
@@ -63,18 +71,22 @@ main(int argc, char **argv)
 						printf("%s\t%s\t/*", p1, argv[0]);
 						while (*p1)
 						{
-							/* insert backslash before '\\' and '/' */
+							// insert backslash before '\\' and '/'
 							if (*p1 == '\\' || *p1 == '/')
 								putchar('\\');
 							putchar(*p1);
 							++p1;
 						}
 						printf("*\n");
-						p2 = strchr(p2 + 1, '*');		/* find next '*' */
+						p2 = strchr(p2 + 1, '*');		// find next '*'
 					}
 				}
 				p1 = p2;
 			}
+			len = strlen(line);
+			if ((len == 2 && strcmp(&line[len - 2], ">\n") == 0)
+					|| (len >= 3 && strcmp(&line[len - 3], " >\n") == 0))
+				in_example = 1;
 		}
 		fclose(fd);
 	}
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1399,7 +1399,7 @@ parenthesis), or any expression in parentheses: >
 	base->alist[idx](args)
 	base->(getFuncRef())(args)
 Note that in the last call the base is passed to the function resulting from
-"(getFuncRef())", inserted before "args".
+"(getFuncRef())", inserted before "args".  *E1275*

 							*E274*
 "->name(" must not contain white space.  There can be white space before the
@@ -1549,7 +1549,7 @@ to be doubled.  These two commands are equivalent: >
 	if a =~ '\s*'


-interpolated-string				*$quote* *interp-string* *E256*
+interpolated-string				*$quote* *interp-string*
 --------------------
 $"string"		interpolated string constant		*expr-$quote*
 $'string'		interpolated literal string constant	*expr-$'*
@@ -1559,7 +1559,7 @@ allowing the inclusion of Vim script expressions (see |expr1|).  Any
 expression returning a value can be enclosed between curly braces.  The value
 is converted to a string.  All the text and results of the expressions
 are concatenated to make a new string.
-								*E1278*
+							*E1278* *E1279*
 To include an opening brace '{' or closing brace '}' in the string content
 double it.  For double quoted strings using a backslash also works.  A single
 closing brace '}' will result in an error.
@@ -2005,6 +2005,8 @@ v:completed_item
 		|Dictionary| containing the |complete-items| for the most
 		recently completed word after |CompleteDone|.  The
 		|Dictionary| is empty if the completion failed.
+		Note: Plugins can modify the value to emulate the builtin
+		|CompleteDone| event behavior.

 					*v:count* *count-variable*
 v:count		The count given for the last Normal mode command.  Can be used
@@ -2680,7 +2682,7 @@ See |:verbose-cmd| for more information.
 			Define a new function by the name {name}.  The body of
 			the function follows in the next lines, until the
 			matching |:endfunction|.
-
+								*E1267*
 			The name must be made of alphanumeric characters and
 			'_', and must start with a capital or "s:" (see
 			above).  Note that using "b:" or "g:" is not allowed.
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -143,6 +143,7 @@ variables can be used to overrule the filetype used for certain extensions:
 	*.asp		g:filetype_asp	|ft-aspvbs-syntax| |ft-aspperl-syntax|
 	*.bas		g:filetype_bas	|ft-basic-syntax|
 	*.cfg		g:filetype_cfg
+	*.cls		g:filetype_cls
 	*.csh		g:filetype_csh	|ft-csh-syntax|
 	*.dat		g:filetype_dat
 	*.frm		g:filetype_frm	|ft-form-syntax|
@@ -156,6 +157,7 @@ variables can be used to overrule the filetype used for certain extensions:
 	*.pp		g:filetype_pp	|ft-pascal-syntax|
 	*.prg		g:filetype_prg
 	*.r		g:filetype_r
+	*.sig		g:filetype_sig
 	*.sql		g:filetype_sql	|ft-sql-syntax|
 	*.src		g:filetype_src
 	*.sys		g:filetype_sys
@@ -554,12 +556,30 @@ For further discussion of fortran_have_tabs and the method used for the
 detection of source format see |ft-fortran-syntax|.


+FREEBASIC						*ft-freebasic-plugin*
+
+This plugin aims to treat the four FreeBASIC dialects, "fb", "qb", "fblite"
+and "deprecated", as distinct languages.
+
+The dialect will be set to the first name found in g:freebasic_forcelang, any
+#lang directive or $lang metacommand in the file being edited, or finally
+g:freebasic_lang.  These global variables conceptually map to the fbc options
+-forcelang and -lang.  If no dialect is explicitly specified "fb" will be
+used.
+
+For example, to set the dialect to a default of "fblite" but still allow for
+any #lang directive overrides, use the following command: >
+
+     let g:freebasic_lang = "fblite"
+
+
 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.

+
 GPROF							*ft-gprof-plugin*

 The gprof filetype plugin defines a mapping <C-]> to jump from a function
@@ -569,6 +589,7 @@ to the details of that function in the call graph.
 The mapping can be disabled with: >
 	let g:no_gprof_maps = 1

+
 MAIL							*ft-mail-plugin*

 Options:
--- a/runtime/doc/ft_sql.txt
+++ b/runtime/doc/ft_sql.txt
@@ -506,7 +506,7 @@ documentation.
 Assuming you have followed the dbext-tutorial you can press <C-C>t to
 display a list of tables.  There is a delay while dbext is creating the table
 list.  After the list is displayed press <C-W>.  This will remove both the
-popup window and the table name already chosen when the list became active. >
+popup window and the table name already chosen when the list became active.

 4.3.1 Table Completion:			*sql-completion-tables*

@@ -514,7 +514,7 @@ Press <C-C>t to display a list of tables from within the database you
 have connected via the dbext plugin.
 NOTE: All of the SQL completion popups support typing a prefix before pressing
 the key map.  This will limit the contents of the popup window to just items
-beginning with those characters.  >
+beginning with those characters.

 4.3.2 Column Completion:			*sql-completion-columns*

@@ -587,13 +587,13 @@ popup a list of columns for the customer table.  It does this by looking back
 to the beginning of the select statement and finding a list of the tables
 specified in the FROM clause.  In this case it notes that in the string
 "customer c", "c" is an alias for the customer table.  The optional "AS"
-keyword is also supported, "customer AS c". >
+keyword is also supported, "customer AS c".


 4.3.3 Procedure Completion:			*sql-completion-procedures*

 Similar to the table list, <C-C>p, will display a list of stored
-procedures stored within the database. >
+procedures stored within the database.

 4.3.4 View Completion:				*sql-completion-views*

--- a/runtime/doc/gui_x11.txt
+++ b/runtime/doc/gui_x11.txt
@@ -679,6 +679,9 @@ Of these three, Vim uses PRIMARY when reading and writing the "* register
 |'clipboard'| of "autoselect"), and CLIPBOARD when reading and writing the "+
 register.  Vim does not access the SECONDARY selection.

+This applies both to the GUI and the terminal version.  For non-X11 systems
+the plus and the star register both use the system clipboard.
+
 Examples: (assuming the default option values)
 - Select a URL in Visual mode in Vim.  Go to your browser and click the
  middle mouse button in the URL text field.  The selected text will be
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -388,10 +388,10 @@ CTRL-G CTRL-J	cursor one line down, insert start column    *i_CTRL-G_CTRL-J*
 CTRL-O		execute one command, return to Insert mode   *i_CTRL-O*
 CTRL-\ CTRL-O	like CTRL-O but don't move the cursor	     *i_CTRL-\_CTRL-O*
 CTRL-L		when 'insertmode' is set: go to Normal mode  *i_CTRL-L*
-CTRL-G u	break undo sequence, start new change	     *i_CTRL-G_u*
-CTRL-G U	don't break undo with next left/right cursor *i_CTRL-G_U*
-		movement, if the cursor stays within the
-		same line
+CTRL-G u	close undo sequence, start new change	     *i_CTRL-G_u*
+CTRL-G U	don't start a new undo block with the next   *i_CTRL-G_U*
+		left/right cursor movement, if the cursor
+		stays within the same line
 -----------------------------------------------------------------------

 Note: If the cursor keys take you out of Insert mode, check the 'noesckeys'
@@ -428,8 +428,8 @@ that, with CTRL-O u.  Another example: >

 	:inoremap <CR> <C-]><C-G>u<CR>

-This breaks undo at each line break.  It also expands abbreviations before
-this.
+This starts a new undo block at each line break.  It also expands
+abbreviations before this.

 An example for using CTRL-G U: >

@@ -443,9 +443,9 @@ An example for using CTRL-G U: >
 	inoremap <expr> <End> repeat('<C-G>U<Right>', col('$') - col('.'))
 	inoremap ( ()<C-G>U<Left>

-This makes it possible to use the cursor keys in Insert mode, without breaking
-the undo sequence and therefore using |.| (redo) will work as expected.
-Also entering a text like (with the "(" mapping from above):
+This makes it possible to use the cursor keys in Insert mode, without starting
+a new undo block and therefore using |.| (redo) will work as expected.  Also
+entering a text like (with the "(" mapping from above):

   Lorem ipsum (dolor

--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -697,7 +697,8 @@ Q			Switch to "Ex" mode.  This is a bit like typing ":"
 			line-input editing commands (<Del> or <BS> to erase,
 			CTRL-U to kill the whole line).
 			Vim will enter this mode by default if it's invoked as
-			"ex" on the command-line.
+			"ex" on the command-line or the |-e| command line
+			argument was used.
 			Use the ":vi" command |:visual| to exit "Ex" mode.
 			Note: In older versions of Vim "Q" formatted text,
 			that is now done with |gq|.  But if you use the
@@ -708,7 +709,7 @@ Q			Switch to "Ex" mode.  This is a bit like typing ":"
 gQ			Switch to "Ex" mode like with "Q", but really behave
 			like typing ":" commands after another.  All command
 			line editing, completion etc. is available.
-			Use the ":vi" command |:visual| to exit "Ex" mode.
+			Use the `:vi` command (`:visual`) to exit "Ex" mode.

 ==============================================================================
 7. The window contents					*window-contents*
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -374,15 +374,17 @@ command: it is executed as if an (unrestricted) |autocommand| was invoked.
 <ScriptCmd> is like <Cmd> but sets the context to the script the mapping was
 defined in, for the duration of the command execution.  This is especially
 useful for |Vim9| script.  It also works to access an import, which is useful
-in a plugin using an autoload script: >
+in a plugin using a, possibly autoloaded, script: >
 	vim9script
 	import autoload 'implementation.vim' as impl
 	nnoremap <F4> <ScriptCmd>impl.DoTheWork()<CR>
-
+<
 No matter where <F4> is typed, the "impl" import will be found in the script
-context of where the mapping was defined.  And since it's an autoload import,
-the "implementation.vim" script will only be loaded once <F4> is typed, not
-when the mapping is defined.
+context of where the mapping was defined.  When it's an autoload import, as in
+the example, the "implementation.vim" script will only be loaded once <F4> is
+typed, not when the mapping is defined.
+
+Without <ScriptCmd> using "s:impl" would result in "E121: Undefined variable".

 Note:
 - Because <Cmd> and <ScriptCmd> avoid mode-changes it does not trigger
@@ -680,19 +682,22 @@ two bytes 0xc3 0xa1.  You don't want the 0xc3 byte to be mapped then or
 otherwise it would be impossible to type the á character.

 					*<Leader>* *mapleader*
-To define a mapping which uses the "mapleader" variable, the special string
-"<Leader>" can be used.  It is replaced with the string value of "mapleader".
-If "mapleader" is not set or empty, a backslash is used instead.  Example: >
-	:map <Leader>A  oanother line<Esc>
+To define a mapping which uses the "g:mapleader" variable, the special string
+"<Leader>" can be used.  It is replaced with the string value of
+"g:mapleader".  If "g:mapleader" is not set or empty, a backslash is used
+instead.  Example: >
+	map <Leader>A  oanother line<Esc>
 Works like: >
-	:map \A  oanother line<Esc>
-But after: >
-	:let mapleader = ","
+	map \A  oanother line<Esc>
+But after (legacy script): >
+	let mapleader = ","
+Or (Vim9 script): >
+	g:mapleader = ","
 It works like: >
-	:map ,A  oanother line<Esc>
+	map ,A  oanother line<Esc>

-Note that the value of "mapleader" is used at the moment the mapping is
-defined.  Changing "mapleader" after that has no effect for already defined
+Note that the value of "g:mapleader" is used at the moment the mapping is
+defined.  Changing "g:mapleader" after that has no effect for already defined
 mappings.

 					*<LocalLeader>* *maplocalleader*
@@ -1721,10 +1726,10 @@ The valid escape sequences are
 		nothing. Supported modifiers are |:aboveleft|, |:belowright|,
 		|:botright|, |:browse|, |:confirm|, |:hide|, |:keepalt|,
 		|:keepjumps|, |:keepmarks|, |:keeppatterns|, |:leftabove|,
-		|:lockmarks|, |:noswapfile| |:rightbelow|, |:silent|, |:tab|,
-		|:topleft|, |:verbose|, and |:vertical|.
-		Note that these are not yet supported: |:noautocmd|,
-		|:sandbox| and |:unsilent|.
+		|:lockmarks|, |:noautocmd|, |:noswapfile| |:rightbelow|,
+		|:sandbox|, |:silent|, |:tab|, |:topleft|, |:unsilent|,
+		|:verbose|, and |:vertical|.
+		Note that |:filter| is not supported.
 		Examples: >
 		    command! -nargs=+ -complete=file MyEdit
 				\ for f in expand(<q-args>, 0, 1) |
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1677,7 +1677,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			feature is included}
 	This option is a list of comma-separated names.
 	Note: if one of the items is "exclude:", then you can't add an item
-	after that.  Therefore do append an item with += but use ^= to
+	after that.  Therefore do not append an item with += but use ^= to
 	prepend, e.g.: >
 		set clipboard^=unnamed
 <	These names are recognized:
@@ -1760,12 +1760,15 @@ A jump table for the options with a short description can be found at |Q_op|.

 						*'cmdheight'* *'ch'*
 'cmdheight' 'ch'	number	(default 1)
-			global
+			global or local to tab page
 	Number of screen lines to use for the command-line.  Helps avoiding
 	|hit-enter| prompts.
 	The value of this option is stored with the tab page, so that each tab
 	page can have a different value.

+	When 'cmdheight' is zero, there is no command-line unless it is being
+	used.  Any messages will cause the |hit-enter| prompt.
+
 						*'cmdwinheight'* *'cwh'*
 'cmdwinheight' 'cwh'	number	(default 7)
 			global
@@ -3376,22 +3379,24 @@ A jump table for the options with a short description can be found at |Q_op|.

 						*'fillchars'* *'fcs'*
 'fillchars' 'fcs'	string	(default "vert:|,fold:-,eob:~")
-			global
+			global or local to window |global-local|
 			{not available when compiled without the |+folding|
 			feature}
-	Characters to fill the statuslines and vertical separators.
-	It is a comma-separated list of items:
+	Characters to fill the statuslines, vertical separators and special
+	lines in the window.
+	It is a comma-separated list of items.  Each item has a name, a colon
+	and the value of that item:

-	  item		default		Used for ~
-	  stl:c		' ' or '^'	statusline of the current window
-	  stlnc:c	' ' or '='	statusline of the non-current windows
-	  vert:c	'|'		vertical separators |:vsplit|
-	  fold:c	'-'		filling 'foldtext'
-	  foldopen:c	'-'		mark the beginning of a fold
-	  foldclose:c	'+'		show a closed fold
-	  foldsep:c	'|'		open fold middle character
-	  diff:c	'-'		deleted lines of the 'diff' option
-	  eob:c		'~'		empty lines below the end of a buffer
+	  item name	default		Used for ~
+	  stl		' ' or '^'	statusline of the current window
+	  stlnc		' ' or '='	statusline of the non-current windows
+	  vert		'|'		vertical separators |:vsplit|
+	  fold		'-'		filling 'foldtext'
+	  foldopen	'-'		mark the beginning of a fold
+	  foldclose	'+'		show a closed fold
+	  foldsep	'|'		open fold middle character
+	  diff		'-'		deleted lines of the 'diff' option
+	  eob		'~'		empty lines below the end of a buffer

 	Any one that is omitted will fall back to the default.  For "stl" and
 	"stlnc" the space will be used when there is highlighting, '^' or '='
@@ -3407,13 +3412,13 @@ A jump table for the options with a short description can be found at |Q_op|.
 	characters are not supported.

 	The highlighting used for these items:
-	  item		highlight group ~
-	  stl:c		StatusLine		|hl-StatusLine|
-	  stlnc:c	StatusLineNC		|hl-StatusLineNC|
-	  vert:c	VertSplit		|hl-VertSplit|
-	  fold:c	Folded			|hl-Folded|
-	  diff:c	DiffDelete		|hl-DiffDelete|
-	  eob:c		EndOfBuffer		|hl-EndOfBuffer|
+	  item name	highlight group ~
+	  stl		StatusLine		|hl-StatusLine|
+	  stlnc		StatusLineNC		|hl-StatusLineNC|
+	  vert		VertSplit		|hl-VertSplit|
+	  fold		Folded			|hl-Folded|
+	  diff		DiffDelete		|hl-DiffDelete|
+	  eob		EndOfBuffer		|hl-EndOfBuffer|

 		*'fixendofline'* *'fixeol'* *'nofixendofline'* *'nofixeol'*
 'fixendofline' 'fixeol'	boolean	(default on)
@@ -4211,7 +4216,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 		b	bold		(termcap entry "md" and "me")
 		s	standout	(termcap entry "so" and "se")
 		u	underline	(termcap entry "us" and "ue")
-		c	undercurl	(termcap entry "Cs" and "Ce")
+		c	undercurl	(termcap entry "Us" and "Ce")
+		2	double underline (termcap entry "Ds" and "Ce")
+		d	dotted underline (termcap entry "ds" and "Ce")
+		=	dashed underline (termcap entry "Ds" and "Ce")
 		t	strikethrough	(termcap entry "Ts" and "Te")
 		n	no highlighting
 		-	no highlighting
@@ -4838,7 +4846,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	help.  (Note that previously setting the global option to the empty
 	value did this, which is now deprecated.)
 	When the first character is ":", the command is invoked as a Vim
-	Ex command prefixed with [count].
+	Ex command with [count] added as an argument if it is not zero.
 	When "man", "man -s" or an Ex command is used, Vim will automatically
 	translate a count for the "K" command and pass it as the first
 	argument.  For "man -s" the "-s" is removed when there is no count.
@@ -6441,9 +6449,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 		45%	relative position in the file
 	If 'rulerformat' is set, it will determine the contents of the ruler.
 	Each window has its own ruler.  If a window has a status line, the
-	ruler is shown there.  Otherwise it is shown in the last line of the
-	screen.  If the statusline is given by 'statusline' (i.e. not empty),
-	this option takes precedence over 'ruler' and 'rulerformat'
+	ruler is shown there.  If a window doesn't have a status line and
+	'cmdheight' is zero, the ruler is not shown.  Otherwise it is shown in
+	the last line of the screen.  If the statusline is given by
+	'statusline' (i.e. not empty), this option takes precedence over
+	'ruler' and 'rulerformat'.
 	If the number of characters displayed is different from the number of
 	bytes in the text (e.g., for a TAB or a multibyte character), both
 	the text column (byte number) and the screen column are shown,
@@ -7093,6 +7103,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			|+cmdline_info| feature}
 	Show (partial) command in the last line of the screen.  Set this
 	option off if your terminal is slow.
+	The option has no effect when 'cmdheight' is zero.
 	In Visual mode the size of the selected area is shown:
 	- When selecting characters within a line, the number of characters.
 	  If the number of bytes is different it is also displayed: "2-6"
@@ -7142,6 +7153,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	If in Insert, Replace or Visual mode put a message on the last line.
 	Use the 'M' flag in 'highlight' to set the type of highlighting for
 	this message.
+	The option has no effect when 'cmdheight' is zero.
 	When |XIM| may be used the message will include "XIM".  But this
 	doesn't mean XIM is really active, especially when 'imactivatekey' is
 	not set.
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -928,7 +928,7 @@ $	At end of pattern or in front of "\|", "\)" or "\n" ('magic' on):
 	becomes invalid.  Vim doesn't automatically update the matches.
 	Similar to moving the cursor for "\%#" |/\%#|.

-					*/\%l* */\%>l* */\%<l* *E951* *E1204*
+				*/\%l* */\%>l* */\%<l* *E951* *E1204* *E1273*
 \%23l	Matches in a specific line.
 \%<23l	Matches above a specific line (lower line number).
 \%>23l	Matches below a specific line (higher line number).
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -3918,7 +3918,7 @@ netrw:
 				* Installed |g:netrw_clipboard| setting
 				* Installed option bypass for |'guioptions'|
 				  a/A settings
-				* Changed popup_beval() to |popup_atcursor|()
+				* Changed popup_beval() to |popup_atcursor()|
 				  in netrw#ErrorMsg (lacygoill). Apparently
 				  popup_beval doesn't reliably close the
 				  popup when the mouse is moved.
--- a/runtime/doc/popup.txt
+++ b/runtime/doc/popup.txt
@@ -591,7 +591,7 @@ POPUP_CREATE() ARGUMENTS			 *popup_create-arguments*

 The first argument of |popup_create()| (and the second argument to
 |popup_settext()|) specifies the text to be displayed, and optionally text
-properties.  It is in one of four forms:
+properties.  It is in one of four forms:  *E1284*
 - a buffer number
 - a string
 - a list of strings
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -568,6 +568,9 @@ pattern is used.
 The |:Lfilter| command does the same as |:Cfilter| but operates on the current
 location list.

+The current quickfix/location list is not modified by these commands, so you
+can go back to the unfiltered list using the |:colder|/|:lolder| command.
+
 =============================================================================
 2. The error window					*quickfix-window*

--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -231,7 +231,7 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 			Examples: >
 				:4,5source
 				:10,18source ++clear
-
+<
 							*:source!*
 :so[urce]! {file}	Read Vim commands from {file}.  These are commands
 			that are executed from Normal mode, like you type
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -103,7 +103,7 @@ zuW							*zuG* *zuW*
 zuG			Undo |zW| and |zG|, remove the word from the internal
 			word list.  Count used as with |zg|.

-							*:spe* *:spellgood*
+						*:spe* *:spellgood* *E1280*
 :[count]spe[llgood] {word}
 			Add {word} as a good word to 'spellfile', like with
 			|zg|.  Without count the first name is used, with a
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1694,6 +1694,21 @@ because Fortran90 has no reserved words.
 For further information related to fortran, see |ft-fortran-indent| and
 |ft-fortran-plugin|.

+FREEBASIC				*freebasic.vim* *ft-freebasic-syntax*
+
+FreeBASIC files will be highlighted differently for each of the four available
+dialects, "fb", "qb", "fblite" and "deprecated".  See |ft-freebasic-plugin|
+for how to select the correct dialect.
+
+Highlighting is further configurable via the following variables.
+
+Variable			Highlight ~
+*freebasic_no_comment_fold*	disable multiline comment folding
+*freebasic_operators*		non-alpha operators
+*freebasic_space_errors*	trailing white space and spaces before a <Tab>
+*freebasic_type_suffixes*	QuickBASIC style type suffixes
+
+

 FVWM CONFIGURATION FILES			*fvwm.vim* *ft-fvwm-syntax*

@@ -5002,14 +5017,18 @@ the same syntax file on all terminals, and use the optimal highlighting.
 1. highlight arguments for normal terminals

 					*bold* *underline* *undercurl*
-					*inverse* *italic* *standout*
-					*nocombine* *strikethrough*
+					*underdouble* *underdotted*
+					*underdashed* *inverse* *italic*
+					*standout* *nocombine* *strikethrough*
 term={attr-list}			*attr-list* *highlight-term* *E418*
 	attr-list is a comma-separated list (without spaces) of the
 	following items (in any order):
 		bold
 		underline
 		undercurl	not always available
+		underdouble	not always available
+		underdotted	not always available
+		underdashed	not always available
 		strikethrough	not always available
 		reverse
 		inverse		same as reverse
@@ -5020,6 +5039,7 @@ term={attr-list}			*attr-list* *highlight-term* *E418*

 	Note that "bold" can be used here and by using a bold font.  They
 	have the same effect.
+							*underline-codes*
 	"undercurl" is a curly underline.  When "undercurl" is not possible
 	then "underline" is used.  In general "undercurl" and "strikethrough"
 	are only available in the GUI and some terminals.  The color is set
@@ -5028,6 +5048,17 @@ term={attr-list}			*attr-list* *highlight-term* *E418*
 	    let &t_Cs = "\e[4:3m"
 	    let &t_Ce = "\e[4:0m"

+<	"underdouble" is a double underline, "underdotted" is a dotted
+	underline and "underdashed" is a dashed underline.  These are only
+	supported by some terminals.  If your terminal supports them you may
+	have to specify the codes like this: >
+	    let &t_Us = "\e[4:2m"
+	    let &t_ds = "\e[4:4m"
+	    let &t_Ds = "\e[4:5m"
+<	They are reset with |t_Ce|, the same as curly underline (undercurl).
+	When t_Us, t_ds or t_Ds is not set then underline will be used as a
+	fallback.
+

 start={term-list}				*highlight-start* *E422*
 stop={term-list}				*term-list* *highlight-stop*
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -988,6 +988,7 @@ $quote	eval.txt	/*$quote*
 't_Co'	term.txt	/*'t_Co'*
 't_Cs'	term.txt	/*'t_Cs'*
 't_DL'	term.txt	/*'t_DL'*
+'t_Ds'	term.txt	/*'t_Ds'*
 't_EC'	term.txt	/*'t_EC'*
 't_EI'	term.txt	/*'t_EI'*
 't_F1'	term.txt	/*'t_F1'*
@@ -1044,6 +1045,7 @@ $quote	eval.txt	/*$quote*
 't_TI'	term.txt	/*'t_TI'*
 't_Te'	term.txt	/*'t_Te'*
 't_Ts'	term.txt	/*'t_Ts'*
+'t_Us'	term.txt	/*'t_Us'*
 't_VS'	term.txt	/*'t_VS'*
 't_WP'	term.txt	/*'t_WP'*
 't_WS'	term.txt	/*'t_WS'*
@@ -1059,6 +1061,7 @@ $quote	eval.txt	/*$quote*
 't_da'	term.txt	/*'t_da'*
 't_db'	term.txt	/*'t_db'*
 't_dl'	term.txt	/*'t_dl'*
+'t_ds'	term.txt	/*'t_ds'*
 't_fd'	term.txt	/*'t_fd'*
 't_fe'	term.txt	/*'t_fe'*
 't_fs'	term.txt	/*'t_fs'*
@@ -2100,7 +2103,6 @@ $quote	eval.txt	/*$quote*
 :XMLent	insert.txt	/*:XMLent*
 :XMLns	insert.txt	/*:XMLns*
 :[range]	motion.txt	/*:[range]*
-:[vV\x16]	autocmd.txt	/*:[vV\\x16]*
 :\bar	cmdline.txt	/*:\\bar*
 :_!	cmdline.txt	/*:_!*
 :_#	cmdline.txt	/*:_#*
@@ -4065,10 +4067,12 @@ E1079	vim9.txt	/*E1079*
 E108	eval.txt	/*E108*
 E1080	vim9.txt	/*E1080*
 E1081	eval.txt	/*E1081*
+E1082	vim9.txt	/*E1082*
 E1083	editing.txt	/*E1083*
 E1084	eval.txt	/*E1084*
 E1085	eval.txt	/*E1085*
 E1087	vim9.txt	/*E1087*
+E1088	vim9.txt	/*E1088*
 E1089	eval.txt	/*E1089*
 E109	eval.txt	/*E109*
 E1090	eval.txt	/*E1090*
@@ -4266,17 +4270,36 @@ E1263	eval.txt	/*E1263*
 E1264	vim9.txt	/*E1264*
 E1265	eval.txt	/*E1265*
 E1266	if_pyth.txt	/*E1266*
+E1267	eval.txt	/*E1267*
+E1268	vim9.txt	/*E1268*
+E1269	vim9.txt	/*E1269*
 E127	eval.txt	/*E127*
 E1270	change.txt	/*E1270*
 E1271	vim9.txt	/*E1271*
+E1272	vim9.txt	/*E1272*
+E1273	pattern.txt	/*E1273*
 E1274	cmdline.txt	/*E1274*
+E1275	eval.txt	/*E1275*
 E1276	builtin.txt	/*E1276*
+E1277	channel.txt	/*E1277*
 E1278	eval.txt	/*E1278*
+E1279	eval.txt	/*E1279*
 E128	eval.txt	/*E128*
+E1280	spell.txt	/*E1280*
 E1281	pattern.txt	/*E1281*
 E1282	eval.txt	/*E1282*
 E1283	eval.txt	/*E1283*
+E1284	popup.txt	/*E1284*
+E1285	builtin.txt	/*E1285*
+E1286	builtin.txt	/*E1286*
+E1287	builtin.txt	/*E1287*
+E1288	builtin.txt	/*E1288*
+E1289	builtin.txt	/*E1289*
 E129	eval.txt	/*E129*
+E1290	change.txt	/*E1290*
+E1291	testing.txt	/*E1291*
+E1292	cmdline.txt	/*E1292*
+E1293	textprop.txt	/*E1293*
 E13	message.txt	/*E13*
 E131	eval.txt	/*E131*
 E132	eval.txt	/*E132*
@@ -4413,7 +4436,6 @@ E252	options.txt	/*E252*
 E253	mbyte.txt	/*E253*
 E254	message.txt	/*E254*
 E255	sign.txt	/*E255*
-E256	eval.txt	/*E256*
 E257	if_cscop.txt	/*E257*
 E258	remote.txt	/*E258*
 E259	if_cscop.txt	/*E259*
@@ -5036,7 +5058,6 @@ E835	options.txt	/*E835*
 E836	if_pyth.txt	/*E836*
 E837	if_pyth.txt	/*E837*
 E838	netbeans.txt	/*E838*
-E839	vim9.txt	/*E839*
 E84	windows.txt	/*E84*
 E840	insert.txt	/*E840*
 E841	map.txt	/*E841*
@@ -6875,6 +6896,11 @@ format-formatexpr	change.txt	/*format-formatexpr*
 formatting	change.txt	/*formatting*
 forth.vim	syntax.txt	/*forth.vim*
 fortran.vim	syntax.txt	/*fortran.vim*
+freebasic.vim	syntax.txt	/*freebasic.vim*
+freebasic_no_comment_fold	syntax.txt	/*freebasic_no_comment_fold*
+freebasic_operators	syntax.txt	/*freebasic_operators*
+freebasic_space_errors	syntax.txt	/*freebasic_space_errors*
+freebasic_type_suffixes	syntax.txt	/*freebasic_type_suffixes*
 friendship	intro.txt	/*friendship*
 frombook	usr_01.txt	/*frombook*
 ft-abel-syntax	syntax.txt	/*ft-abel-syntax*
@@ -6931,6 +6957,8 @@ ft-forth-syntax	syntax.txt	/*ft-forth-syntax*
 ft-fortran-indent	indent.txt	/*ft-fortran-indent*
 ft-fortran-plugin	filetype.txt	/*ft-fortran-plugin*
 ft-fortran-syntax	syntax.txt	/*ft-fortran-syntax*
+ft-freebasic-plugin	filetype.txt	/*ft-freebasic-plugin*
+ft-freebasic-syntax	syntax.txt	/*ft-freebasic-syntax*
 ft-fvwm-syntax	syntax.txt	/*ft-fvwm-syntax*
 ft-gitcommit-plugin	filetype.txt	/*ft-gitcommit-plugin*
 ft-gprof-plugin	filetype.txt	/*ft-gprof-plugin*
@@ -7871,6 +7899,7 @@ if_sniff.txt	if_sniff.txt	/*if_sniff.txt*
 if_tcl.txt	if_tcl.txt	/*if_tcl.txt*
 ignore-errors	eval.txt	/*ignore-errors*
 ignore-timestamp	editing.txt	/*ignore-timestamp*
+import-legacy	vim9.txt	/*import-legacy*
 improved-autocmds-5.4	version5.txt	/*improved-autocmds-5.4*
 improved-quickfix	version5.txt	/*improved-quickfix*
 improved-sessions	version5.txt	/*improved-sessions*
@@ -8060,6 +8089,7 @@ lcs-space	options.txt	/*lcs-space*
 lcs-tab	options.txt	/*lcs-tab*
 lcs-trail	options.txt	/*lcs-trail*
 left-right-motions	motion.txt	/*left-right-motions*
+legacy-import	vim9.txt	/*legacy-import*
 len()	builtin.txt	/*len()*
 less	various.txt	/*less*
 letter	print.txt	/*letter*
@@ -9726,6 +9756,7 @@ t_Ce	term.txt	/*t_Ce*
 t_Co	term.txt	/*t_Co*
 t_Cs	term.txt	/*t_Cs*
 t_DL	term.txt	/*t_DL*
+t_Ds	term.txt	/*t_Ds*
 t_EC	term.txt	/*t_EC*
 t_EI	term.txt	/*t_EI*
 t_F1	term.txt	/*t_F1*
@@ -9782,6 +9813,7 @@ t_TE	term.txt	/*t_TE*
 t_TI	term.txt	/*t_TI*
 t_Te	term.txt	/*t_Te*
 t_Ts	term.txt	/*t_Ts*
+t_Us	term.txt	/*t_Us*
 t_VS	term.txt	/*t_VS*
 t_WP	term.txt	/*t_WP*
 t_WS	term.txt	/*t_WS*
@@ -9808,6 +9840,7 @@ t_da	term.txt	/*t_da*
 t_db	term.txt	/*t_db*
 t_dict-variable	eval.txt	/*t_dict-variable*
 t_dl	term.txt	/*t_dl*
+t_ds	term.txt	/*t_ds*
 t_ed	version4.txt	/*t_ed*
 t_el	version4.txt	/*t_el*
 t_f1	version4.txt	/*t_f1*
@@ -10190,25 +10223,27 @@ try-finally	eval.txt	/*try-finally*
 try-nested	eval.txt	/*try-nested*
 try-nesting	eval.txt	/*try-nesting*
 tutor	usr_01.txt	/*tutor*
-twice	if_cscop.txt	/*twice*
 two-engines	pattern.txt	/*two-engines*
 type()	builtin.txt	/*type()*
 type-casting	vim9.txt	/*type-casting*
 type-checking	vim9.txt	/*type-checking*
 type-inference	vim9.txt	/*type-inference*
 type-mistakes	tips.txt	/*type-mistakes*
-typecorrect-settings	usr_51.txt	/*typecorrect-settings*
-typecorrect.txt	usr_51.txt	/*typecorrect.txt*
 typename()	builtin.txt	/*typename()*
 u	undo.txt	/*u*
 uganda	uganda.txt	/*uganda*
 uganda.txt	uganda.txt	/*uganda.txt*
 undercurl	syntax.txt	/*undercurl*
+underdashed	syntax.txt	/*underdashed*
+underdotted	syntax.txt	/*underdotted*
+underdouble	syntax.txt	/*underdouble*
 underline	syntax.txt	/*underline*
+underline-codes	syntax.txt	/*underline-codes*
 undo	undo.txt	/*undo*
 undo-blocks	undo.txt	/*undo-blocks*
 undo-branches	undo.txt	/*undo-branches*
 undo-break	undo.txt	/*undo-break*
+undo-close-block	undo.txt	/*undo-close-block*
 undo-commands	undo.txt	/*undo-commands*
 undo-persistence	undo.txt	/*undo-persistence*
 undo-redo	undo.txt	/*undo-redo*
@@ -10674,6 +10709,7 @@ vimscript-versions	eval.txt	/*vimscript-versions*
 vimtutor	usr_01.txt	/*vimtutor*
 virtcol()	builtin.txt	/*virtcol()*
 virtcol2col()	builtin.txt	/*virtcol2col()*
+virtual-text	textprop.txt	/*virtual-text*
 visual-block	visual.txt	/*visual-block*
 visual-change	visual.txt	/*visual-change*
 visual-examples	visual.txt	/*visual-examples*
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -372,8 +372,11 @@ OUTPUT CODES						*terminal-output-codes*

 Added by Vim (there are no standard codes for these):
 	t_AU	set underline color (ANSI)			*t_AU* *'t_AU'*
-	t_Ce	undercurl end					*t_Ce* *'t_Ce'*
-	t_Cs	undercurl mode					*t_Cs* *'t_Cs'*
+	t_Ce	undercurl and underline end			*t_Ce* *'t_Ce'*
+	t_Cs	undercurl (curly underline) mode		*t_Cs* *'t_Cs'*
+	t_Us	double underline mode				*t_Us* *'t_Us'*
+	t_ds	dotted underline mode				*t_ds* *'t_ds'*
+	t_Ds	dashed underline mode				*t_Ds* *'t_Ds'*
 	t_Te	strikethrough end				*t_Te* *'t_Te'*
 	t_Ts	strikethrough mode				*t_Ts* *'t_Ts'*
 	t_IS	set icon text start				*t_IS* *'t_IS'*
@@ -630,10 +633,13 @@ When the GUI is running 't_Co' is set to 16777216.
 				*termcap-cursor-shape* *termcap-cursor-color*
 When Vim enters Insert mode the 't_SI' escape sequence is sent.  When Vim
 enters Replace mode the 't_SR' escape sequence is sent if it is set, otherwise
-'t_SI' is sent.  When leaving Insert mode or Replace mode 't_EI' is used. This
-can be used to change the shape or color of the cursor in Insert or Replace
-mode. These are not standard termcap/terminfo entries, you need to set them
-yourself.
+'t_SI' is sent.  When leaving Insert mode or Replace mode 't_EI' is used.
+Note: When 't_EI' is not set then 't_SI' and 't_SR' will not be sent.  And
+when 't_SI' or 't_SR' is not set then 't_EI' is sent only once.
+
+This can be used to change the shape or color of the cursor in Insert or
+Replace mode. These are not standard termcap/terminfo entries, you need to set
+them yourself.
 Example for an xterm, this changes the color of the cursor: >
    if &term =~ "xterm"
 	let &t_SI = "\<Esc>]12;purple\x7"
--- a/runtime/doc/testing.txt
+++ b/runtime/doc/testing.txt
@@ -94,6 +94,7 @@ test_gui_event({event}, {args})
 		    "findrepl"  search and replace text.
 		    "mouse"	mouse button click event.
 		    "scrollbar" move or drag the scrollbar.
+		    "sendevent" send a low-level GUI event.
 		    "tabline"	select a tab page by mouse click.
 		    "tabmenu"	select a tabline menu entry.

@@ -177,6 +178,16 @@ test_gui_event({event}, {args})
 		    dragging:	1 to drag the scrollbar and 0 to click in the
 				scrollbar.

+		"sendevent":
+		  Send a low-level GUI event (e.g. key-up or down).
+		  Currently only supported on MS-Windows.
+		  The supported items in {args} are:
+		    event:	The supported string values are:
+				    keyup   generate a keyup event
+				    keydown generate a keydown event
+		    keycode:    Keycode to use for a keyup or a keydown event.
+								*E1291*
+
 		"tabline":
 		  Inject a mouse click event on the tabline to select a
 		  tabpage. The supported items in {args} are:
@@ -268,6 +279,9 @@ test_override({name}, {val})				*test_override()*
 		Current supported values for {name} are:

 		{name}	     effect when {val} is non-zero ~
+		alloc_lines  make a copy of every buffer line into allocated
+			     memory, so that memory access errors can be found
+			     by valgrind
 		autoload     `import autoload` will load the script right
 			     away, not postponed until an item is used
 		char_avail   disable the char_avail() function
@@ -287,7 +301,8 @@ test_override({name}, {val})				*test_override()*
 		uptime 	     overrules sysinfo.uptime
 		vterm_title  setting the window title by a job running in a
 			     terminal window
-		ALL	     clear all overrides ({val} is not used)
+		ALL	     clear all overrides, except alloc_lines ({val} is
+			     not used)

 		"starting" is to be used when a test should behave like
 		startup was done.  Since the tests are run by sourcing a
--- a/runtime/doc/textprop.txt
+++ b/runtime/doc/textprop.txt
@@ -137,7 +137,24 @@ prop_add({lnum}, {col}, {props})
 		   bufnr	buffer to add the property to; when omitted
 				the current buffer is used
 		   id		user defined ID for the property; must be a
-				number; when omitted zero is used
+				number, should be positive; when using "text"
+				then "id" must not be present and will be set
+				automatically to a negative number; otherwise
+				zero is used
+		   text		text to be displayed before {col}, or after the
+				line if {col} is zero
+		   text_align	when "text" is present and {col} is zero
+				specifies where to display the text:
+				   after   after the end of the line
+				   right   right aligned in the window
+				   below   in the next screen line
+				When omitted "after" is used.
+		   text_wrap	when "text" is present and {col} is zero,
+				specifies what happens if the text doesn't
+				fit:
+				   wrap      wrap the text to the next line
+				   truncate  truncate the text to make it fit
+		   		When omitted "truncate" is used.
 		   type		name of the text property type
 		All fields except "type" are optional.

@@ -157,6 +174,29 @@ prop_add({lnum}, {col}, {props})
 		"type" will first be looked up in the buffer the property is
 		added to. When not found, the global property types are used.
 		If not found an error is given.
+							*virtual-text*
+		When "text" is used and the column is non-zero then this text
+		will be displayed at the start location of the text property
+		after the text.  The text of the buffer line will be shifted
+		to make room.  This is called "virtual text".
+		When the column is zero the virtual text will appear after the
+		buffer text.  The "text_align" and "text_wrap" arguments
+		determine how it is displayed.
+		The text will be displayed but it is not part of the actual
+		buffer line, the cursor cannot be placed on it.  A mouse click
+		in the text will move the cursor to the first character after
+		the text, or the last character of the line.
+		A negative "id" will be chosen and is returned.  Once a
+		Any Tab in the text will be changed to a space (Rationale:
+		otherwise the size of the text is difficult to compute).
+		property with "text" has been added for a buffer then using a
+		negative "id" for any other property will give an error:
+		*E1293*
+		Make sure to use a highlight that makes clear to the user that
+		this is virtual text, otherwise it will be very confusing that
+		the text cannot be edited.
+		To separate the virtual text from the buffer text prepend
+		and/or append spaces to the "text" field.

 		Can also be used as a |method|: >
 			GetLnum()->prop_add(col, props)
@@ -181,6 +221,9 @@ prop_add_list({props}, [[{lnum}, {col}, {end-lnum}, {end-col}], ...])
 		two items {end-lnum} and {end-col} specify the position just
 		after the text.

+		It is not possible to add a text property with a "text" field
+		here.
+
 		Example:
 			call prop_add_list(#{type: 'MyProp', id: 2},
 					\ [[1, 4, 1, 7],
@@ -334,6 +377,8 @@ prop_type_add({name}, {props})		*prop_type_add()* *E969* *E970*
 		   combine	when omitted or TRUE combine the highlight
 				with any syntax highlight; when FALSE syntax
 				highlight will not be used
+		   override	when TRUE the highlight overrides any other,
+				including 'cursorline' and Visual
 		   start_incl	when TRUE inserts at the start position will
 				be included in the text property
 		   end_incl	when TRUE inserts at the end position will be
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -38,8 +38,19 @@ browser use: https://github.com/vim/vim/issues/1234
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------

-Prepare for the Vim 9.0 release:
- Update version number in help
+Support virtual text:  #7553
+- Wrong cursor position in Insert mode, wrong pos after typing char #10786
+- implement "text_align" - right
+    when not truncated, may increase line height
+- implement "text_align" - below
+    need to compute extra screen line
+- implement "text_wrap" - truncate
+- when Tab is in text handle it like a space
+- Also consider an empty line, should fix #10786.  Also check inserting text.
+- win_lbr_chartabsize() TODO item: count screen cells
+- check that when inserting/deleting text col == MAXCOL isn't changed
+- wrong cursor position (Yegappan, July 27)
+- many tests

 Further Vim9 improvements, possibly after launch:
 - Use Vim9 for more runtime files.
@@ -71,10 +82,16 @@ Further Vim9 improvements, possibly after launch:
 - Implement as part of an expression: ++expr, --expr, expr++, expr--.

 Update list of features to vote on:
- multiple cursors
- built-in LSP support
- virtual text, using text properties
- start first line halfway, scroll per screen line
+- Remove Athena item (won't happen)
+- Remove "add open mode" (won't happen)
+- Remove "editing of a hidden buffer" (done)
+- Change "add IDE features" to "improve terminal debugger"
+- Change "diff/merge capability for CVS" to "CVS and git"
+- Remove "pre-compile them" from "improve the performance of Vim scripts"
+- Add: multiple cursors, edit text in more than one place at a time
+- Add: fast syntax highlighting with parser instead of regex patterns
+- Add: virtual text, text properties can insert text in the line
+- Add: start first line halfway, scroll per wrapped screen line

 Popup windows:
 - Preview popup not properly updated when it overlaps with completion menu.
@@ -120,8 +137,6 @@ Text properties:
  if the priority is above a certain value?  (#7392)
  Combining text property with 'cursorline' does not always work (Billie
  Cleek, #5533)
- "C" works OK.  "dd" fails to delete text property in a buffer with a single
-  line.
 - Add text property that shifts text to make room for annotation (e.g.
  variable type).  Like the opposite of conceal.  Requires fixing the cursor
  positioning and mouse clicks as with conceal mode.
@@ -201,19 +216,13 @@ Terminal emulator window:
  conversions.

 Patches considered for including:
- make functions static if possible, add a few tests. #10612
- use ngettext() in a few more places #10606
- move f_hasmapto() to map.c  #10611
+- use int instead of char_ for index  #10818  needs a test
+- Add "-n" option to xxd. #10599  needs a test
 - allow for nesting of timeout, sketch in #10595
- Add "-n" option to xxd. #10599
- Add support for "underdouble", "underdot" and "underdash". #9553
- Patch to implement the vimtutor with a plugin: #6414
-  Was originally written by Felipe Morales.
- Patch to make fillchars global-local. (#5206)
- Version of getchar() that does not move the cursor - #10603
-  Use a separate argument for the new flag.
- Improved VB filetype detection. (Doug Kearns, June 26)
- Improved FreeBasic runtime files (and a second one). (Doug Kearns, June 26)
+
+Add 'splitscroll'  #10682  Useful?  Any trouble? Null Chilly says it's OK.
+    suggestion: names instead of numbers for the option value
+    problem depending on whether window is focused or not

 Autoconf: must use autoconf 2.69, later version generates lots of warnings
 - try using autoconf 2.71 and fix all "obsolete" warnings
@@ -234,8 +243,20 @@ entry separately. #6609
 Multiplexers (screen, tmux) can request it to the underlying terminal, and
 pass it on with modifications.

+Using "A" and "o" in manually created fold (in empty buffer) does not behave
+consistenly (James McCoy, #10698)
+
+To avoid flicker: add an option that when a screen clear is requested, instead
+of clearing it draws everything and uses "clear to end of line" for every line.
+
+When scheme can't be found by configure there is no clear "not found" message:
+    configure:5769: checking MzScheme install prefix
+    configure:5781: result: 
+
 Can "CSI nr X" be used instead of outputting spaces?  Is it faster?  #8002

+Typed keys invisible after calling interrupt() from a timer. #10631
+
 With a window height of 6 and 'scrolloff' set to 3, using "j" does not scroll
 evenly. (#10545)  Need to handle this in scroll_cursor_bot().

@@ -254,6 +275,9 @@ The line number can be obtained from win->w_lines[].

 MS-Windows: did path modifier :p:8 stop working?  #8600

+Version of getchar() that does not move the cursor - #10603 Use a separate
+argument for the new flag.
+
 test_arglist func Test_all_not_allowed_from_cmdwin() hangs on MS-Windows.

 Information for a specific terminal (e.g. gnome, tmux, konsole, alacritty) is
@@ -295,6 +319,8 @@ inconsistent with the documentation.

 globpath() does not use 'wildignorecase' at all? (related to #8350)

+mksession uses :buffer instead of :edit in one place but not another. #10629
+
 Add 'termguiattr' option, use "gui=" attributes in the terminal?  Would work
 with 'termguicolors'. #1740

@@ -1163,9 +1189,6 @@ cmap using execute() has side effects. (Killthemule, 2016 Aug 17, #983)

 Patch to order results from taglist(). (Duncan McDougall, 2016 Oct 25)

-Syntax highlighting for messages with RFC3339 timestamp (#946)
-Did maintainer reply?
-
 ml_get errors when reloading file. (Chris Desjardins, 2016 Apr 19)
 Also with latest version.

@@ -3761,7 +3784,10 @@ Printing:
 Syntax highlighting:
    Long term goal: faster, better, etc.  Options:
    - use treesitter, NeoVim uses it - Many people don't like it.
-    - use TextMate, vscode uses it.  #9087 - possibly a long term solution
+    - use TextMate, vscode uses it.  #9087 - Other people don't like it.
+      Vscode is asked to switch to treesitter:
+      https://github.com/microsoft/vscode/issues/50140
+    - sublime grammar?
 8   Make ":syn off" use 'runtimepath' instead of $VIMRUNTIME. (Gary Johnson)
    Should do the same for ":syn on" and ":syn manual".
 8   Support "containedin" argument for ":syn include", so that the defined
@@ -4423,6 +4449,8 @@ GUI:


 Autocommands:
+9   Add WinNewPre - before creating a new window. #10635
+9   When triggering WinNew provide the window ID somehow.  #10633
 9   Rework the code from FEAT_OSFILETYPE for autocmd-osfiletypes to use
    'filetype'.  Only for when the current buffer is known.
 -   Put autocommand event names in a hashtable for faster lookup?
--- a/runtime/doc/undo.txt
+++ b/runtime/doc/undo.txt
@@ -105,13 +105,13 @@ change again.  But you can do something like this: >

 After this a "u" command will undo the delete command and the previous
 change.
-							*undo-break*
-To do the opposite, break a change into two undo blocks, in Insert mode use
-CTRL-G u.  This is useful if you want an insert command to be undoable in
+					*undo-break* *undo-close-block*
+To do the opposite, use a new undo block for the next change, in Insert mode
+use CTRL-G u.  This is useful if you want an insert command to be undoable in
 parts.  E.g., for each sentence.  |i_CTRL-G_u|

-Setting the value of 'undolevels' also breaks undo.  Even when the new value
-is equal to the old value.  In |Vim9| script: >
+Setting the value of 'undolevels' also closes the undo block.  Even when the
+new value is equal to the old value.  In |Vim9| script: >
 	&undolevels = &undolevels
 In legacy script: >
 	let &undolevels = &undolevels
--- a/runtime/doc/vim9.txt
+++ b/runtime/doc/vim9.txt
@@ -107,7 +107,7 @@ script and `:def` functions; details are below:
 	`:t`
  	`:xit`
 - Some commands, especially those used for flow control, cannot be shortened.
-  E.g., `:throw` cannot be written as `:th`. *E839*
+  E.g., `:throw` cannot be written as `:th`.
 - You cannot use curly-braces names.
 - A range before a command must be prefixed with a colon: >
 	:%s/this/that
@@ -145,6 +145,17 @@ Do not start a comment with #{, it looks like the legacy dictionary literal
 and produces an error where this might be confusing.  #{{ or #{{{ are OK,
 these can be used to start a fold.

+When starting to read a script file Vim doesn't know it is |Vim9| script until
+the `vim9script` command is found.  Until that point you would need to use
+legacy comments: >
+	" legacy comment
+	vim9script
+	# Vim9 comment
+
+That looks ugly, better put `vim9script` in the very first line: >
+	vim9script
+	# Vim9 comment
+
 In legacy Vim script # is also used for the alternate file name.  In Vim9
 script you need to use %% instead.  Instead of ## use %%% (stands for all
 arguments).
@@ -270,7 +281,7 @@ start with an upper case letter even when using the "s:" prefix.  In legacy
 script "s:funcref" could be used, because it could not be referred to with
 "funcref".  In Vim9 script it can, therefore "s:Funcref" must be used to avoid
 that the name interferes with builtin functions.
-							*vim9-s-namespace*
+						*vim9-s-namespace* *E1268*
 The use of the "s:" prefix is not supported at the Vim9 script level.  All
 functions and variables without a prefix are script-local.

@@ -846,6 +857,8 @@ No curly braces expansion ~
 Command modifiers are not ignored ~
 								*E1176*
 Using a command modifier for a command that does not use it gives an error.
+								*E1082*
+Also, using a command modifier without a following command is now an error.


 Dictionary literals ~
@@ -1223,6 +1236,9 @@ variables can be accessed without the "s:" prefix.  They must be defined
 before the function is compiled.  If the script the function is defined in is
 legacy script, then script-local variables must be accessed with the "s:"
 prefix if they do not exist at the time of compiling.
+							*E1269*
+Script-local variables in a |Vim9| script must be declared at the script
+level.  They cannot be created in a function, also not in a legacy function.

 						*:defc* *:defcompile*
 :defc[ompile]		Compile functions defined in the current script that
@@ -1481,6 +1497,8 @@ value is not actually changed.  If you need to change the type, e.g. to change
 it to a string, use the |string()| function.  Or use |str2nr()| to convert a
 string to a number.

+If a type is given where it is not expected you can get *E1272* .
+

 Type inference ~
 							*type-inference*
@@ -1685,23 +1703,36 @@ be exported. {not implemented yet: class, interface}


 Import ~
-					*:import* *:imp* *E1094* *E1047* *E1262*
-					*E1048* *E1049* *E1053* *E1071* *E1236*
-The exported items can be imported in another Vim9 script: >
+				*:import* *:imp* *E1094* *E1047* *E1262*
+				*E1048* *E1049* *E1053* *E1071* *E1088* *E1236*
+The exported items can be imported in another script. The import syntax has
+two forms. The simple form: >
+	import {filename}
+<
+Where {filename} is an expression that must evaluate to a string.  In this
+form the filename should end in ".vim" and the portion before ".vim" will
+become the script local name of the namespace. For example: >
 	import "myscript.vim"
-
-This makes each item available as "myscript.item".
+<
+This makes each exported item in "myscript.vim" available as "myscript.item".
 						*:import-as* *E1257* *E1261*
-In case the name is long or ambiguous, another name can be specified: >
-	import "thatscript.vim" as that
+In case the name is long or ambiguous, this form can be used to specify
+another name: >
+	import {longfilename} as {name}
+<
+In this form {name} becomes a specific script local name for the imported
+namespace.  Therefore {name} must consist of letters, digits and '_', like
+|internal-variables|.  The {longfilename} expression must evaluate to any
+filename.  For example: >
+	import "thatscript.vim.v2" as that
 <						*E1060* *E1258* *E1259* *E1260*
-Then you can use "that.EXPORTED_CONST", "that.someValue", etc.  You are free
-to choose the name "that".  Use something that will be recognized as referring
-to the imported script.  Avoid command names, command modifiers and builtin
-function names, because the name will shadow them.
-If the name starts with a capital letter it can also shadow global user
-commands and functions.  Also, you cannot use the name for something else in
-the script, such as a function or variable name.
+Then you can use "that.item", etc.  You are free to choose the name "that".
+Use something that will be recognized as referring to the imported script.
+Avoid command names, command modifiers and builtin function names, because the
+name will shadow them.  Better not start the name starts with a capital
+letter, since it can then also shadow global user commands and functions.
+Also, you cannot use the name for something else in the script, such as a
+function or variable name.

 In case the dot in the name is undesired, a local reference can be made for a
 function: >
@@ -1714,15 +1745,6 @@ This does not work for variables, since the value would be copied once and
 when changing the variable the copy will change, not the original variable.
 You will need to use the full name, with the dot.

-The full syntax of the command is:
-	import {filename} [as {name}]
-Where {filename} is an expression that must evaluate to a string.  Without the
-"as {name}" part it must end in ".vim".  {name} must consist of letters,
-digits and '_', like |internal-variables|.
-
-`:import` can also be used in legacy Vim script.  The imported items still
-become script-local, even when the "s:" prefix is not given.
-
 `:import` can not be used in a function.  Imported items are intended to exist
 at the script level and only imported once.

@@ -1752,14 +1774,38 @@ line, there can be no line break: >
 	echo that
 		.name  # Error!

-To refer to a function in an imported script in a mapping, |<SID>| can be
-used: >
+When you've imported a function from one script into a vim9 script you can
+refer to the imported function in a mapping by prefixing it with |<SID>|: >
 	noremap <silent> ,a :call <SID>name.Function()<CR>

 When the mapping is defined "<SID>name." will be replaced with <SNR> and the
 script ID of the imported script.
 An even simpler solution is using |<ScriptCmd>|: >
 	noremap ,a <ScriptCmd>name.Function()<CR>
+
+Note that this does not work for variables, only for functions.
+
+					    *import-legacy* *legacy-import*
+`:import` can also be used in legacy Vim script.  The imported namespace still
+becomes script-local, even when the "s:" prefix is not given. For example: >
+        import "myfile.vim"
+	call s:myfile.MyFunc()
+
+And using the "as name" form: >
+	import "otherfile.vim9script" as that
+	call s:that.OtherFunc()
+
+However, the namespace cannot be resolved on it's own: >
+	import "that.vim"
+	echo s:that
+	" ERROR: E1060: Expected dot after name: s:that
+<
+This also affects the use of |<SID>| in the legacy mapping context.  Since
+|<SID>| is only a valid prefix for a function and NOT for a namespace, you
+cannot use it
+to scope a function in a script local namespace. Instead of prefixing the
+function with |<SID>| you should use|<ScriptCmd>|. For example: >
+	noremap ,a <ScriptCmd>:call s:that.OtherFunc()<CR>
 <
 							*:import-cycle*
 The `import` commands are executed when encountered.  If script A imports
--- a/runtime/doc/xxd.1
+++ b/runtime/doc/xxd.1
@@ -113,6 +113,10 @@ Stop after writing
 .RI  < len >
 octets.
 .TP
+.I "\-n name " | " \-name name"
+Override the variable name output when \-i is used. The array is named
+\fIname\fP and the length is named \fIname\fP_len.
+.TP
 .I \-o offset
 Add
 .RI < offset >
--- a/runtime/doc/xxd.man
+++ b/runtime/doc/xxd.man
@@ -46,7 +46,7 @@ OPTIONS
              long line of output.

       -C | -capitalize
-              Capitalize variable names in C include file  style,  when  using
+              Capitalize  variable  names  in C include file style, when using
              -i.

       -E | -EBCDIC
@@ -57,28 +57,32 @@ OPTIONS
       -e     Switch to little-endian hexdump.  This option treats byte groups
              as words in little-endian byte order.  The default grouping of 4
              bytes may be changed using -g.  This option only applies to hex‐
-              dump, leaving the ASCII (or  EBCDIC)  representation  unchanged.
+              dump,  leaving  the  ASCII (or EBCDIC) representation unchanged.
              The command line switches -r, -p, -i do not work with this mode.

       -g bytes | -groupsize bytes
-              Separate  the  output of every <bytes> bytes (two hex characters
+              Separate the output of every <bytes> bytes (two  hex  characters
              or eight bit-digits each) by a whitespace.  Specify -g 0 to sup‐
              press grouping.  <Bytes> defaults to 2 in normal mode, 4 in lit‐
-              tle-endian mode and 1 in bits mode.  Grouping does not apply  to
+              tle-endian  mode and 1 in bits mode.  Grouping does not apply to
              postscript or include style.

       -h | -help
-              Print  a summary of available commands and exit.  No hex dumping
+              Print a summary of available commands and exit.  No hex  dumping
              is performed.

       -i | -include
-              Output in C include file style. A complete static array  defini‐
-              tion  is  written (named after the input file), unless xxd reads
+              Output  in C include file style. A complete static array defini‐
+              tion is written (named after the input file), unless  xxd  reads
              from stdin.

       -l len | -len len
              Stop after writing <len> octets.

+       -n name  |  -name name
+              Override  the variable name output when -i is used. The array is
+              named name and the length is named name_len.
+
       -o offset
              Add <offset> to the displayed file position.

@@ -91,8 +95,8 @@ OPTIONS
              not writing to stdout, xxd writes into its output  file  without
              truncating it. Use the combination -r -p to read plain hexadeci‐
              mal dumps without line number information and without a particu‐
-              lar  column  layout.  Additional  Whitespace and line-breaks are
-              allowed anywhere.
+              lar column layout. Additional Whitespace and line-breaks are al‐
+              lowed anywhere.

       -seek offset
              When used after -r: revert with <offset> added to file positions
@@ -209,8 +213,8 @@ EXAMPLES
       *
       000fffc: 0000 0000 40                   ....A

-       Create  a  1  byte  file containing a single 'A' character.  The number
-       after '-r -s' adds to the linenumbers found in the file; in effect, the
+       Create a 1 byte file containing a single 'A' character.  The number af‐
+       ter '-r -s' adds to the linenumbers found in the file; in  effect,  the
       leading bytes are suppressed.
       % echo "010000: 41" | xxd -r -s -0x10000 > file

--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2022 Jun 03
+" Last Change:	2022 Jul 5

 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -252,11 +252,14 @@ au BufNewFile,BufRead *.db			call dist#ft#BindzoneCheck('')
 " Blank
 au BufNewFile,BufRead *.bl			setf blank

+" Bitbake
+au BufNewFile,BufRead *.bb,*.bbappend,*.bbclass,*/build/conf/*.conf,*/meta{-*,}/conf/*.conf	setf bitbake
+
 " Blkid cache file
 au BufNewFile,BufRead */etc/blkid.tab,*/etc/blkid.tab.old   setf xml

 " BSDL
-au BufNewFile,BufRead *bsd,*.bsdl		setf bsdl
+au BufNewFile,BufRead *.bsd,*.bsdl			setf bsdl

 " Bazel (http://bazel.io)
 autocmd BufRead,BufNewFile *.bzl,*.bazel,WORKSPACE	setf bzl
@@ -404,6 +407,9 @@ au BufNewFile,BufRead configure.in,configure.ac setf config
 " Cooklang
 au BufNewFile,BufRead *.cook			setf cook

+" CSV Files
+au BufNewFile,BufRead *.csv			setf csv
+
 " CUDA Compute Unified Device Architecture
 au BufNewFile,BufRead *.cu,*.cuh		setf cuda

@@ -789,6 +795,9 @@ au BufNewFile,BufRead *.hsm			setf hamster
 " Handlebars
 au BufNewFile,BufRead *.hbs			setf handlebars

+" Hare
+au BufNewFile,BufRead *.ha			setf hare
+
 " Haskell
 au BufNewFile,BufRead *.hs,*.hsc,*.hs-boot,*.hsig setf haskell
 au BufNewFile,BufRead *.lhs			setf lhaskell
@@ -850,9 +859,13 @@ 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
+" i3
+au BufNewFile,BufRead */i3/config		setf i3config
+au BufNewFile,BufRead */.i3/config  	setf i3config
+
+" sway
+au BufNewFile,BufRead */sway/config		setf swayconfig
+au BufNewFile,BufRead */.sway/config	setf swayconfig

 " Icon
 au BufNewFile,BufRead *.icn			setf icon
@@ -994,8 +1007,8 @@ au BufNewFile,BufRead *.latte,*.lte		setf latte
 " Limits
 au BufNewFile,BufRead */etc/limits,*/etc/*limits.conf,*/etc/*limits.d/*.conf	setf limits

-" LambdaProlog (see dist#ft#FTmod for *.mod)
-au BufNewFile,BufRead *.sig			setf lprolog
+" LambdaProlog or SML (see dist#ft#FTmod for *.mod)
+au BufNewFile,BufRead *.sig			call dist#ft#FTsig()

 " LDAP LDIF
 au BufNewFile,BufRead *.ldif			setf ldif
@@ -1795,16 +1808,11 @@ au BufNewFile,BufRead *.il,*.ils,*.cdf		setf skill
 au BufNewFile,BufRead .slrnrc			setf slrnrc
 au BufNewFile,BufRead *.score			setf slrnsc

-" Smalltalk (and TeX)
+" Smalltalk
 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
+
+" Smalltalk (and Rexx, TeX, and Visual Basic)
+au BufNewFile,BufRead *.cls                     call dist#ft#FTcls()

 " Smarty templates
 au BufNewFile,BufRead *.tpl			setf smarty
@@ -1978,8 +1986,8 @@ au BufRead,BufNewFile *.ttl
 " Terminfo
 au BufNewFile,BufRead *.ti			setf terminfo

-" Terraform
-au BufRead,BufNewFile *.tfvars			setf terraform
+" Terraform variables
+au BufRead,BufNewFile *.tfvars			setf terraform-vars

 " TeX
 au BufNewFile,BufRead *.latex,*.sty,*.dtx,*.ltx,*.bbl	setf tex
@@ -2030,6 +2038,9 @@ au BufNewFile,BufReadPost *.tssop		setf tssop
 " TSS - Command Line (temporary)
 au BufNewFile,BufReadPost *.tsscl		setf tsscl

+" TSV Files
+au BufNewFile,BufRead *.tsv			setf tsv
+
 " TWIG files
 au BufNewFile,BufReadPost *.twig		setf twig

@@ -2391,7 +2402,7 @@ au BufNewFile,BufRead *fvwm2rc*
 au BufNewFile,BufRead */tmp/lltmp*		call s:StarSetf('gedcom')

 " Git
-au BufNewFile,BufRead */.gitconfig.d/*,/etc/gitconfig.d/*	call s:StarSetf('gitconfig')
+au BufNewFile,BufRead */.gitconfig.d/*,*/etc/gitconfig.d/*	call s:StarSetf('gitconfig')

 " Gitolite
 au BufNewFile,BufRead */gitolite-admin/conf/*	call s:StarSetf('gitolite')
@@ -2456,7 +2467,7 @@ au BufNewFile,BufRead neomuttrc*,Neomuttrc*		call s:StarSetf('neomuttrc')
 au BufNewFile,BufRead tmac.*			call s:StarSetf('nroff')

 " OpenBSD hostname.if
-au BufNewFile,BufRead /etc/hostname.*		call s:StarSetf('config')
+au BufNewFile,BufRead */etc/hostname.*		call s:StarSetf('config')

 " Pam conf
 au BufNewFile,BufRead */etc/pam.d/*		call s:StarSetf('pamconf')
--- a/runtime/ftplugin/basic.vim
+++ b/runtime/ftplugin/basic.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:	BASIC (QuickBASIC 4.5)
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2021 Mar 16
+" Last Change:	2022 Jun 22

 if exists("b:did_ftplugin")
  finish
@@ -15,6 +15,8 @@ setlocal comments=:REM\ ,:Rem\ ,:rem\ ,:'
 setlocal commentstring='\ %s
 setlocal formatoptions-=t formatoptions+=croql

+let b:undo_ftplugin = "setl fo< com< cms<"
+
 " TODO: support exit ... as middle matches?
 if exists("loaded_matchit") && !exists("b:match_words")
  let s:line_start	= '\%(^\s*\)\@<='
@@ -33,10 +35,11 @@ if exists("loaded_matchit") && !exists("b:match_words")
 		\     '\<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\\+"'

+  let b:undo_ftplugin ..= " | unlet! b:match_ignorecase b:match_skip b:match_words"
+
  unlet s:line_start s:not_end s:not_end_or_exit
 endif

@@ -44,12 +47,10 @@ if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
  let b:browsefilter = "BASIC Source Files (*.bas)\t*.bas\n" ..
 		\      "BASIC Include Files (*.bi, *.bm)\t*.bi;*.bm\n" ..
 		\      "All Files (*.*)\t*.*\n"
+  let b:basic_set_browsefilter = 1
+  let b:undo_ftplugin ..= " | unlet! b:browsefilter b:basic_set_browsefilter"
 endif

-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

--- a/runtime/ftplugin/bitbake.vim
+++ b/runtime/ftplugin/bitbake.vim
@@ -0,0 +1,16 @@
+" Vim filetype plugin file
+" Language: Bitbake
+" Maintainer: Gregory Anders <greg@gpanders.com>
+" Repository: https://github.com/openembedded/bitbake
+" Latest Revision: 2022-07-23
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal commentstring=#%s
+setlocal comments=:#
+setlocal suffixesadd=.bb,.bbclass
+
+let b:undo_ftplugin = "setl cms< com< sua<"
--- a/runtime/ftplugin/debchangelog.vim
+++ b/runtime/ftplugin/debchangelog.vim
@@ -1,9 +1,9 @@
 " Vim filetype plugin file (GUI menu, folding and completion)
 " Language:     Debian Changelog
-" Maintainer:   Debian Vim Maintainers
+" Maintainer:   Debian Vim Maintainers <team+vim@tracker.debian.org>
 " Former Maintainers:   Michael Piefel <piefel@informatik.hu-berlin.de>
 "                       Stefano Zacchiroli <zack@debian.org>
-" Last Change:  2018-01-28
+" Last Change:  2022 Jul 25
 " License:      Vim License
 " URL:          https://salsa.debian.org/vim-team/vim-debian/blob/master/ftplugin/debchangelog.vim

@@ -35,6 +35,11 @@ if exists('g:did_changelog_ftplugin')
  finish
 endif

+" 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
+
 " Don't load another plugin (this is global)
 let g:did_changelog_ftplugin = 1

@@ -101,13 +106,13 @@ 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
+    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.U&nfinalise
+    amenu enable &Changelog.&Finalise
    call append(0, substitute(getline(1), '-\([[:digit:]]\+\))', '-$$\1)', ''))
    call append(1, '')
    call append(2, '')
@@ -117,7 +122,9 @@ function NewVersion()
    normal! 1G0
    call search(')')
    normal! h
-    normal! 
+    " ':normal' doens't support key annotation (<c-a>) directly.
+    " Vim's manual recommends using ':exe' to use key annotation indirectly (backslash-escaping needed though).
+    exe "normal! \<c-a>"
    call setline(1, substitute(getline(1), '-\$\$', '-', ''))
    if exists('g:debchangelog_fold_enable')
        foldopen
@@ -161,13 +168,13 @@ 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
+    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.U&nfinalise
+    amenu enable &Changelog.&Finalise
 endfunction

 function Unfinalise()
@@ -179,13 +186,13 @@ 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
+    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.U&nfinalise
+    amenu disable &Changelog.&Finalise
 endfunction

 function Finalise()
@@ -198,26 +205,26 @@ 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.&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\ &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>
+    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>
+    menu &Changelog.-sep-				<nul>
+    amenu &Changelog.U&nfinalise				:call Unfinalise()<CR>
+    amenu &Changelog.&Finalise				:call Finalise()<CR>

    if <SID>Finalised()
 	call <SID>FinaliseMenu()
@@ -228,7 +235,7 @@ endfunction

 augroup changelogMenu
 au BufEnter * if &filetype == "debchangelog" | call <SID>MakeMenu() | endif
-au BufLeave * if &filetype == "debchangelog" | silent! aunmenu Changelog | endif
+au BufLeave * if &filetype == "debchangelog" | silent! aunmenu &Changelog | endif
 augroup END

 " }}}
@@ -380,4 +387,8 @@ setlocal omnifunc=DebCompleteBugs

 " }}}

+" Restore the previous value of 'cpoptions'.
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
 " vim: set foldmethod=marker:
--- a/runtime/ftplugin/desktop.vim
+++ b/runtime/ftplugin/desktop.vim
@@ -0,0 +1,13 @@
+" Vim filetype plugin file
+" Language: XDG desktop entry
+" Maintainer: Eisuke Kawashima ( e.kawaschima+vim AT gmail.com )
+" Last Change: 2022-07-26
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = v:true
+
+setl comments=:#
+setl commentstring=#%s
+let b:undo_ftplugin = 'setl com< cms<'
--- a/runtime/ftplugin/expect.vim
+++ b/runtime/ftplugin/expect.vim
@@ -0,0 +1,24 @@
+" Vim filetype plugin file
+" Language:	Expect
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2022 Jul 16
+
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Syntax is similar to Tcl
+runtime! ftplugin/tcl.vim
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+  let b:browsefilter = "Expect Command Files (*.exp)\t*.exp\n" ..
+	\	       "All Files (*.*)\t*.*\n"
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: nowrap sw=2 sts=2 ts=8
--- a/runtime/ftplugin/fetchmail.vim
+++ b/runtime/ftplugin/fetchmail.vim
@@ -1,19 +1,16 @@
 " Vim filetype plugin file
-" Language:             fetchmail(1) RC File
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2008-07-09
+" Language:		fetchmail(1) RC File
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
+" Latest Revision:	2022 Jun 30

 if exists("b:did_ftplugin")
  finish
 endif
 let b:did_ftplugin = 1

-let s:cpo_save = &cpo
-set cpo&vim
+setlocal comments=:# commentstring=#\ %s
+setlocal formatoptions-=t formatoptions+=croql

 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
--- a/runtime/ftplugin/freebasic.vim
+++ b/runtime/ftplugin/freebasic.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:	FreeBASIC
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2021 Mar 16
+" Last Change:	2022 Jun 24

 " Setup {{{1
 if exists("b:did_ftplugin")
@@ -21,7 +21,8 @@ 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 s:line_start = '\%(^\s*\)\@<='
+  let s:not_end    = '\%(end\s\+\)\@<!'

  let b:match_words ..= ','

@@ -49,17 +50,32 @@ if exists("loaded_matchit")
  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\>'
+		\     s:line_start .. '#\s*\%(if\|ifdef\|ifndef\)\>:' ..
+		\       s:line_start .. '#\s*\%(else\|elseif\)\>:' ..
+		\     s:line_start .. '#\s*endif\>,' ..
+		\     s:line_start .. '#\s*macro\>:' .. s:line_start .. '#\s*endmacro\>,' ..
+		\     "/':'/"

-  " skip "function = <retval>"
-  let b:match_skip ..= '|| strpart(getline("."), col(".") - 1) =~? "^\\<function\\s\\+="'
+  " skip "function = <retval>" and "continue { do | for | while }"
+  if s:dialect == "qb"
+    let s:continue = "__continue"
+  else
+    let s:continue = "continue"
+  endif
+  let b:match_skip ..= ' || strpart(getline("."), col(".") - 1) =~? "^\\<function\\s\\+="' ..
+		  \    ' || strpart(getline("."), 0, col(".") ) =~? "\\<' .. s:continue .. '\\s\\+"'

-  unlet s:not_end
+  unlet s:not_end s:line_start
+endif
+
+if (has("gui_win32") || has("gui_gtk")) && exists("b:basic_set_browsefilter")
+  let b:browsefilter = "FreeBASIC Source Files (*.bas)\t*.bas\n" ..
+		\      "FreeBASIC Header Files (*.bi)\t*.bi\n" ..
+		\      "All Files (*.*)\t*.*\n"
 endif

 " Cleanup {{{1
 let &cpo = s:cpo_save
-unlet s:cpo_save
+unlet s:cpo_save s:dialect

 " vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
--- a/runtime/ftplugin/html.vim
+++ b/runtime/ftplugin/html.vim
@@ -1,16 +1,14 @@
 " Vim filetype plugin file
-" Language:	html
-"
-" This runtime file is looking for a new maintainer.
-"
-" Former maintainer:	Dan Sharp
-" Last Changed: 20 Jan 2009
+" Language:		HTML
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Dan Sharp
+" Last Changed:		2022 Jul 20

-if exists("b:did_ftplugin") | finish | endif
+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

@@ -18,36 +16,40 @@ 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
+let b:undo_ftplugin = "setlocal comments< commentstring< matchpairs<"
+
+if get(g:, "ft_html_autocomment", 0)
+  setlocal formatoptions-=t formatoptions+=croql
+  let b:undo_ftplugin ..= " | setlocal formatoptions<"
 endif

 if exists('&omnifunc')
  setlocal omnifunc=htmlcomplete#CompleteTags
  call htmlcomplete#DetectOmniFlavor()
+  let b:undo_ftplugin ..= " | setlocal omnifunc<"
 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>'
+" HTML: thanks to Johannes Zellner and Benji Fisher.
+if exists("loaded_matchit") && !exists("b:match_words")
+  let b:match_ignorecase = 1
+  let b:match_words = '<!--:-->,' ..
+	\	      '<:>,' ..
+	\	      '<\@<=[ou]l\>[^>]*\%(>\|$\):<\@<=li\>:<\@<=/[ou]l>,' ..
+	\	      '<\@<=dl\>[^>]*\%(>\|$\):<\@<=d[td]\>:<\@<=/dl>,' ..
+	\	      '<\@<=\([^/!][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>'
+  let b:html_set_match_words = 1
+  let b:undo_ftplugin ..= " | unlet! b:match_ignorecase b:match_words b:html_set_match_words"
 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"
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+  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"
+  let b:html_set_browsefilter = 1
+  let b:undo_ftplugin ..= " | unlet! b:browsefilter b:html_set_browsefilter"
 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
--- a/runtime/ftplugin/swayconfig.vim
+++ b/runtime/ftplugin/swayconfig.vim
@@ -0,0 +1,16 @@
+" Vim filetype plugin file
+" Language: sway config file
+" Original Author: James Eapen <james.eapen@vai.org>
+" Maintainer: James Eapen <james.eapen@vai.org>
+" Version: 0.1
+" Last Change: 2022 June 07
+
+if exists("b:did_ftplugin")
+  finish
+endif
+
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setlocal cms<"
+
+setlocal commentstring=#\ %s
--- a/runtime/ftplugin/vim.vim
+++ b/runtime/ftplugin/vim.vim
@@ -16,7 +16,7 @@ set cpo&vim

 if !exists('*VimFtpluginUndo')
  func VimFtpluginUndo()
-    setl fo< isk< com< tw< commentstring<
+    setl fo< isk< com< tw< commentstring< include< define<
    if exists('b:did_add_maps')
      silent! nunmap <buffer> [[
      silent! vunmap <buffer> [[
@@ -59,6 +59,11 @@ else
  setlocal commentstring=\"%s
 endif

+" set 'include' to recognize import commands
+setlocal include=\\v^\\s*import\\s*(autoload)?
+
+" set 'define' to recognize export commands
+setlocal define=\\v^\\s*export\\s*(def\|const\|var\|final)

 " Format comments to be up to 78 characters long
 if &tw == 0
--- a/runtime/ftplugin/vue.vim
+++ b/runtime/ftplugin/vue.vim
@@ -0,0 +1,24 @@
+" Vim filetype plugin file
+" Language:	vue
+
+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
+
+" Copied from ftplugin/html.vim
+" Original 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
+
+" Restore the saved compatibility options.
+let &cpo = s:save_cpo
+unlet s:save_cpo
--- a/runtime/indent/bitbake.vim
+++ b/runtime/indent/bitbake.vim
@@ -0,0 +1,22 @@
+" Vim indent file
+" Language:             BitBake
+" Copyright:            Copyright (C) 2019 Agilent Technologies, Inc.
+" Maintainer:           Chris Laplante <chris.laplante@agilent.com>
+" License:              You may redistribute this under the same terms as Vim itself
+
+if exists("b:did_indent")
+    finish
+endif
+
+runtime! indent/sh.vim
+
+setlocal indentexpr=bitbake#Indent(v:lnum)
+setlocal autoindent
+setlocal nolisp
+setlocal shiftwidth=4
+setlocal expandtab
+setlocal indentkeys+=<:>,=elif,=except,0=\"
+
+let b:undo_indent .= ' inde< ai< lisp< sw< et< indk<'
+
+let b:did_indent = 1
--- a/runtime/indent/expect.vim
+++ b/runtime/indent/expect.vim
@@ -0,0 +1,11 @@
+" Vim indent file
+" Language:	Expect
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2022 Jul 16
+
+if exists("b:did_indent")
+  finish
+endif
+
+" Syntax is similar to Tcl
+runtime! indent/tcl.vim
--- a/runtime/indent/html.vim
+++ b/runtime/indent/html.vim
@@ -600,7 +600,7 @@ func s:Alien3()
  endif
  if b:hi_indent.scripttype == "javascript"
    " indent for further lines
-    return eval(b:hi_js1indent) + GetJavascriptIndent()
+    return GetJavascriptIndent()
  else
    return -1
  endif
--- a/runtime/indent/javascript.vim
+++ b/runtime/indent/javascript.vim
@@ -473,6 +473,12 @@ function GetJavascriptIndent()
  elseif num
    return s:Nat(num_ind + get(l:,'case_offset',s:sw()) + l:switch_offset + b_l + is_op)
  endif
+
+  let nest = get(get(b:, 'hi_indent', {}), 'blocklnr')
+  if nest
+    return indent(nextnonblank(nest + 1)) + b_l + is_op
+  endif
+
  return b_l + is_op
 endfunction

--- a/runtime/indent/python.vim
+++ b/runtime/indent/python.vim
@@ -14,7 +14,7 @@ let b:did_indent = 1
 setlocal nolisp		" Make sure lisp indenting doesn't supersede us
 setlocal autoindent	" indentexpr isn't much help otherwise

-setlocal indentexpr=GetPythonIndent(v:lnum)
+setlocal indentexpr=python#GetIndent(v:lnum)
 setlocal indentkeys+=<:>,=elif,=except

 let b:undo_indent = "setl ai< inde< indk< lisp<"
@@ -23,206 +23,11 @@ let b:undo_indent = "setl ai< inde< indk< lisp<"
 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 ()
-
-" See if the specified line is already user-dedented from the expected value.
-function s:Dedented(lnum, expected)
-  return indent(a:lnum) <= a:expected - shiftwidth()
-endfunction

+" Keep this for backward compatibility, new scripts should use
+" python#GetIndent()
 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
-
-  call cursor(plnum, 1)
-
-  " Identing inside parentheses can be very slow, regardless of the searchpair()
-  " timeout, so let the user disable this feature if he doesn't need it
-  let disable_parentheses_indenting = get(g:, "pyindent_disable_parentheses_indenting", 0)
-
-  if disable_parentheses_indenting == 1
-    let plindent = indent(plnum)
-    let plnumstart = plnum
-  else
-    " searchpair() can be slow sometimes, limit the time to 150 msec or what is
-    " put in g:pyindent_searchpair_timeout
-    let searchpair_stopline = 0
-    let searchpair_timeout = get(g:, 'pyindent_searchpair_timeout', 150)
-
-    " 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.
-    let parlnum = searchpair('(\|{\|\[', '', ')\|}\|\]', 'nbW',
-            \ "line('.') < " . (plnum - s:maxoff) . " ? dummy :"
-            \ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
-            \ . " =~ '\\(Comment\\|Todo\\|String\\)$'",
-            \ searchpair_stopline, searchpair_timeout)
-    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\\)$'",
-            \ searchpair_stopline, searchpair_timeout)
-    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\\)$'",
-            \ searchpair_stopline, searchpair_timeout)
-        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
-
-  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\|raise\|return\|pass\)\>'
-    " See if the user has already dedented
-    if s:Dedented(a:lnum, indent(plnum))
-      " If so, trust the user
-      return -1
-    endif
-    " If not, recommend one dedent
-    return indent(plnum) - shiftwidth()
-  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\|elif\|try\)\>'
-      return plindent
-    endif
-
-    " Or the user has already dedented
-    if s:Dedented(a:lnum, plindent)
-      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
-    " ...unless the user has already dedented
-    if s:Dedented(a:lnum, plindent)
-        return -1
-    else
-        return plindent
-    endif
-  endif
-
-  return -1
-
+  return python#GetIndent(a:lnum)
 endfunction

-let &cpo = s:keepcpo
-unlet s:keepcpo
-
 " vim:sw=2
--- a/runtime/indent/testdir/bitbake.in
+++ b/runtime/indent/testdir/bitbake.in
@@ -0,0 +1,19 @@
+# vim: set filetype=bitbake :
+
+# START_INDENT
+FOO = " \
+    bar \
+    baz \
+    qux \
+    "
+
+do_configure() {
+oe_conf
+}
+
+python do_task() {
+def foo(x):
+if y:
+print(x)
+}
+# END_INDENT
--- a/runtime/indent/testdir/bitbake.ok
+++ b/runtime/indent/testdir/bitbake.ok
@@ -0,0 +1,19 @@
+# vim: set filetype=bitbake :
+
+# START_INDENT
+FOO = " \
+    bar \
+    baz \
+    qux \
+"
+
+do_configure() {
+    oe_conf
+}
+
+python do_task() {
+    def foo(x):
+        if y:
+            print(x)
+}
+# END_INDENT
--- a/runtime/lang/Makefile
+++ b/runtime/lang/Makefile
@@ -22,6 +22,9 @@ all: \
 		menu_sr_rs.iso_8859-2.vim \
 		menu_sr_rs.ascii.vim \
 		menu_czech_czech_republic.ascii.vim \
+		menu_hu_hu.iso_8859-2.vim \
+		menu_sk_sk.iso_8859-2.vim \
+

 # Convert menu_zh_cn.utf-8.vim to create menu_chinese_gb.936.vim.
 menu_chinese_gb.936.vim: menu_zh_cn.utf-8.vim
@@ -39,7 +42,7 @@ menu_chinese_taiwan.950.vim: menu_zh_tw.utf-8.vim
 menu_cs_cz.iso_8859-2.vim: menu_cs_cz.utf-8.vim
 	rm -f menu_cs_cz.iso_8859-2.vim
 	iconv -f utf-8 -t iso8859-2 menu_cs_cz.utf-8.vim | \
-		sed -e 's/scriptencoding utf-8/scriptencoding iso8859-2/' \
+		sed -e 's/scriptencoding utf-8/scriptencoding iso-8859-2/' \
 			-e 's/" Original translations/" Generated from menu_cs_cz.utf-8.vim, DO NOT EDIT/' \
 			-e 's/\(" Menu Translations:.*\)(.*)/\1(ISO8859-2)/'  \
 			> menu_cs_cz.iso_8859-2.vim
@@ -95,7 +98,7 @@ menu_ko_kr.euckr.vim: menu_ko_kr.utf-8.vim
 menu_pl_pl.iso_8859-2.vim: menu_pl_pl.utf-8.vim
 	rm -f menu_pl_pl.iso_8859-2.vim
 	iconv -f utf-8 -t iso8859-2 menu_pl_pl.utf-8.vim | \
-		sed -e 's/scriptencoding utf-8/scriptencoding iso8859-2/' -e 's/" Original translations/" Generated from menu_pl_pl.utf-8.vim, DO NOT EDIT/' > menu_pl_pl.iso_8859-2.vim
+		sed -e 's/scriptencoding utf-8/scriptencoding iso-8859-2/' -e 's/" Original translations/" Generated from menu_pl_pl.utf-8.vim, DO NOT EDIT/' > menu_pl_pl.iso_8859-2.vim

 # Convert menu_pl_pl.utf-8.vim to create menu_polish_poland.1250.vim.
 menu_polish_poland.1250.vim: menu_pl_pl.utf-8.vim
@@ -194,3 +197,15 @@ menu_uk_ua.koi8-u.vim: menu_uk_ua.utf-8.vim
 	rm -f menu_uk_ua.koi8-u.vim
 	iconv -f utf-8 -t koi8-u menu_uk_ua.utf-8.vim | \
 		sed -e 's/scriptencoding utf-8/scriptencoding koi8-u/' -e 's/" Original translations/" Generated from menu_uk_ua.utf-8.vim, DO NOT EDIT/' > menu_uk_ua.koi8-u.vim
+
+# Convert menu_hu_hu.utf-8.vim to create menu_hu_hu.iso_8859-2.vim.
+menu_hu_hu.iso_8859-2.vim: menu_hu_hu.utf-8.vim
+	rm -f menu_hu_hu.iso_8859-2.vim
+	iconv -f utf-8 -t iso8859-2 menu_hu_hu.utf-8.vim | \
+		sed -e 's/scriptencoding utf-8/scriptencoding iso-8859-2/' -e 's/" Original translations/" Generated from menu_hu_hu.utf-8.vim, DO NOT EDIT/' > menu_hu_hu.iso_8859-2.vim
+
+# Convert menu_slovak_slovak_republic.1250.vim to create menu_sk_sk.iso_8859-2.vim.
+menu_sk_sk.iso_8859-2.vim: menu_slovak_slovak_republic.1250.vim
+	rm -f menu_sk_sk.iso_8859-2.vim
+	iconv -f cp1250 -t iso8859-2 menu_slovak_slovak_republic.1250.vim | \
+		sed -e 's/scriptencoding cp1250/scriptencoding iso-8859-2/' -e 's/" Original translations/" Generated from menu_slovak_slovak_republic.1250.vim, DO NOT EDIT/' > menu_sk_sk.iso_8859-2.vim
--- a/runtime/lang/menu_chinese_gb.936.vim
+++ b/runtime/lang/menu_chinese_gb.936.vim
@@ -1,10 +1,15 @@
 " Menu Translations:    Simplified Chinese
-" Maintainer:           Shun Bai <baishunde@gmail.com>
-" Previous Maintainer:  Yuheng Xie <elephant@linux.net.cn>
-" Last Change:          2022 Feb 19
+" Maintainer:           Ada (Haowen) Yu <me@yuhaowen.com>
+" Previous Maintainer:  Shun Bai <baishunde@gmail.com>, Yuheng Xie <elephant@linux.net.cn>
+" Last Change:          2022 July 9
 " Generated from menu_zh_cn.utf-8.vim, DO NOT EDIT
+"
+" Generated with the scripts from:
+"
+"       https://github.com/adaext/vim-menutrans-helper

 " Quit when menu translations have already been done.
+
 if exists("did_menu_trans")
  finish
 endif
@@ -15,18 +20,18 @@ set cpo&vim
 scriptencoding cp936

 " Help menu
-menutrans &Help		帮助(&H)
+menutrans &Help 帮助(&H)
 " Help menuitems and dialog {{{1
-menutrans &Overview<Tab><F1>	概述(&O)<Tab><F1>
-menutrans &User\ Manual			用户手册(&U)
-menutrans &How-to\ Links		如何使用(&H)
-menutrans &Find\.\.\.			查找(&F)\.\.\.
-menutrans &Credits				致谢(&C)
-menutrans Co&pying				版权(&P)
-menutrans &Sponsor/Register		赞助/注册(&S)
-menutrans O&rphans				拯救孤儿(&R)
-menutrans &Version				版本(&V)
-menutrans &About				关于(&A)
+menutrans &Overview<Tab><F1> 概述(&O)<Tab><F1>
+menutrans &User\ Manual 用户手册(&U)
+menutrans &How-to\ Links 如何使用(&H)
+menutrans &Find\.\.\. 查找(&F)\.\.\.
+menutrans &Credits 致谢(&C)
+menutrans Co&pying 版权(&P)
+menutrans &Sponsor/Register 赞助/注册(&S)
+menutrans O&rphans 拯救孤儿(&R)
+menutrans &Version 版本(&V)
+menutrans &About 关于(&A)

 " fun! s:Helpfind()
 if !exists("g:menutrans_help_dialog")
@@ -35,67 +40,68 @@ endif
 " }}}

 " File menu
-menutrans &File		文件(&F)
+menutrans &File 文件(&F)
 " File menuitems {{{1
-menutrans &Open\.\.\.<Tab>:e			打开(&O)\.\.\.<Tab>:e
-menutrans Sp&lit-Open\.\.\.<Tab>:sp		在拆分窗口打开(&L)\.\.\.<Tab>:sp
-menutrans Open\ Tab\.\.\.<Tab>:tabnew	在标签页打开\.\.\.<Tab>:tabnew
-menutrans &New<Tab>:enew				新建(&N)<Tab>:enew
-menutrans &Close<Tab>:close				关闭(&C)<Tab>:close
-menutrans &Save<Tab>:w					保存(&S)<Tab>:w
-menutrans Save\ &As\.\.\.<Tab>:sav		另存为(&A)\.\.\.<Tab>:sav
-menutrans Split\ &Diff\ With\.\.\.		拆分窗口以对比差异(Diff)(&D)\.\.\.
-menutrans Split\ Patched\ &By\.\.\.		拆分窗口以进行修补(Patch)(&B)\.\.\.
-menutrans &Print						打印(&P)
-menutrans Sa&ve-Exit<Tab>:wqa			保存并退出(&V)<Tab>:wqa
-menutrans E&xit<Tab>:qa					退出(&X)<Tab>:qa
+menutrans &Open\.\.\.<Tab>:e 打开(&O)\.\.\.<Tab>:e
+menutrans Sp&lit-Open\.\.\.<Tab>:sp 在拆分窗口打开(&L)\.\.\.<Tab>:sp
+menutrans Open\ Tab\.\.\.<Tab>:tabnew 在标签页打开\.\.\.<Tab>:tabnew
+menutrans &New<Tab>:enew 新建(&N)<Tab>:enew
+menutrans &Close<Tab>:close 关闭(&C)<Tab>:close
+menutrans &Save<Tab>:w 保存(&S)<Tab>:w
+menutrans Save\ &As\.\.\.<Tab>:sav 另存为(&A)\.\.\.<Tab>:sav
+menutrans Split\ &Diff\ With\.\.\. 拆分窗口以对比差异(Diff)(&D)\.\.\.
+menutrans Split\ Patched\ &By\.\.\. 拆分窗口以进行修补(Patch)(&B)\.\.\.
+menutrans &Print 打印(&P)
+menutrans Sa&ve-Exit<Tab>:wqa 保存并退出(&V)<Tab>:wqa
+menutrans E&xit<Tab>:qa 退出(&X)<Tab>:qa
 " }}}

 " Edit menu
-menutrans &Edit		编辑(&E)
+menutrans &Edit 编辑(&E)
 " Edit menuitems {{{1
-menutrans &Undo<Tab>u						撤销(&U)<Tab>u
-menutrans &Redo<Tab>^R						恢复(&R)<Tab>^R
-menutrans Rep&eat<Tab>\.					重复(&E)<Tab>\.
-menutrans Cu&t<Tab>"+x						剪切(&T)<Tab>"+x
-menutrans &Copy<Tab>"+y						复制(&C)<Tab>"+y
-menutrans &Paste<Tab>"+gP					粘贴(&P)<Tab>"+gP
-menutrans Put\ &Before<Tab>[p				粘贴到光标前(&B)<Tab>[p
-menutrans Put\ &After<Tab>]p				粘贴到光标后(&A)<Tab>]p
-menutrans &Delete<Tab>x						删除(&D)<Tab>x
-menutrans &Select\ All<Tab>ggVG				全选(&S)<Tab>ggVG
-menutrans &Find\.\.\.						查找(&F)\.\.\.
-menutrans Find\ and\ Rep&lace\.\.\.			查找和替换(&L)\.\.\.
-menutrans &Find<Tab>/						查找(&F)<Tab>/
-menutrans Find\ and\ Rep&lace<Tab>:%s		查找和替换(&L)<Tab>:%s
-menutrans Settings\ &Window					设置窗口(&W)
-menutrans Startup\ &Settings				启动设置(&S)
+menutrans &Undo<Tab>u 撤销(&U)<Tab>u
+menutrans &Redo<Tab>^R 恢复(&R)<Tab>^R
+menutrans Rep&eat<Tab>\. 重复(&E)<Tab>\.
+menutrans Cu&t<Tab>"+x 剪切(&T)<Tab>"+x
+menutrans &Copy<Tab>"+y 复制(&C)<Tab>"+y
+menutrans &Paste<Tab>"+gP 粘贴(&P)<Tab>"+gP
+menutrans Put\ &Before<Tab>[p 粘贴到光标前(&B)<Tab>[p
+menutrans Put\ &After<Tab>]p 粘贴到光标后(&A)<Tab>]p
+menutrans &Delete<Tab>x 删除(&D)<Tab>x
+menutrans &Select\ All<Tab>ggVG 全选(&S)<Tab>ggVG
+menutrans &Find\.\.\. 查找(&F)\.\.\.
+menutrans Find\ and\ Rep&lace\.\.\. 查找和替换(&L)\.\.\.
+menutrans &Find<Tab>/ 查找(&F)<Tab>/
+menutrans Find\ and\ Rep&lace<Tab>:%s 查找和替换(&L)<Tab>:%s
+menutrans Find\ and\ Rep&lace<Tab>:s 查找和替换(&L)<Tab>:s
+menutrans Settings\ &Window 设置窗口(&W)
+menutrans Startup\ &Settings 启动设置(&S)

 " Edit/Global Settings
-menutrans &Global\ Settings					全局设置(&G)
+menutrans &Global\ Settings 全局设置(&G)
 " Edit.Global Settings menuitems and dialogs {{{2
-menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!		开/关高亮查找内容(&H)<Tab>:set\ hls!
-menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic!				开/关忽略大小写(&I)<Tab>:set\ ic!
-menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm!	开/关显示括号匹配(&S)<Tab>:set\ sm!
-menutrans &Context\ Lines									上下文行数(&C)
-menutrans &Virtual\ Edit									虚拟编辑(&V)
+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! 开/关高亮查找内容(&H)<Tab>:set\ hls!
+menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic! 开/关忽略大小写(&I)<Tab>:set\ ic!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm! 开/关显示括号匹配(&S)<Tab>:set\ sm!
+menutrans &Context\ Lines 上下文行数(&C)
+menutrans &Virtual\ Edit 虚拟编辑(&V)
 " Edit.Global Settings.Virtual Edit menuitems {{{3
-menutrans Never					从不
-menutrans Block\ Selection		只在选定矩形块时
-menutrans Insert\ Mode			只在插入模式时
-menutrans Block\ and\ Insert	在选定矩形块和插入模式时
-menutrans Always				始终
+menutrans Never 从不
+menutrans Block\ Selection 只在选定矩形块时
+menutrans Insert\ Mode 只在插入模式时
+menutrans Block\ and\ Insert 在选定矩形块和插入模式时
+menutrans Always 始终
 " }}}
-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!				开/关插入模式(&M)<Tab>:set\ im!
-menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!			开/关\ Vi\ 兼容性(&O)<Tab>:set\ cp!
-menutrans Search\ &Path\.\.\.								搜索路径(&P)\.\.\.
-menutrans Ta&g\ Files\.\.\.									标记文件(Tags)(&G)\.\.\.
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im! 开/关插入模式(&M)<Tab>:set\ im!
+menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp! 开/关\ Vi\ 兼容性(&O)<Tab>:set\ cp!
+menutrans Search\ &Path\.\.\. 搜索路径(&P)\.\.\.
+menutrans Ta&g\ Files\.\.\. 标记文件(Tags)(&G)\.\.\.

 " GUI options
-menutrans Toggle\ &Toolbar									开/关工具栏(&T)
-menutrans Toggle\ &Bottom\ Scrollbar						开/关底部滚动条(&B)
-menutrans Toggle\ &Left\ Scrollbar							开/关左侧滚动条(&L)
-menutrans Toggle\ &Right\ Scrollbar							开/关右侧滚动条(&R)
+menutrans Toggle\ &Toolbar 开/关工具栏(&T)
+menutrans Toggle\ &Bottom\ Scrollbar 开/关底部滚动条(&B)
+menutrans Toggle\ &Left\ Scrollbar 开/关左侧滚动条(&L)
+menutrans Toggle\ &Right\ Scrollbar 开/关右侧滚动条(&R)

 " fun! s:SearchP()
 if !exists("g:menutrans_path_dialog")
@@ -109,23 +115,23 @@ endif
 " }}}

 " Edit/File Settings
-menutrans F&ile\ Settings					文件设置(&I)
+menutrans F&ile\ Settings 文件设置(&I)
 " Edit.File Settings menuitems and dialogs {{{2
 " Boolean options
-menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!			开/关行号(&N)<Tab>:set\ nu!
-menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu!	开/关相对行号(&V)<Tab>:set\ rnu!
-menutrans Toggle\ &List\ Mode<Tab>:set\ list!				开/关列表模式(&L)<Tab>:set\ list!
-menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap!			开/关换行(&W)<Tab>:set\ wrap!
-menutrans Toggle\ W&rapping\ at\ Word<Tab>:set\ lbr!		开/关词尾换行(&R)<Tab>:set\ lbr!
-menutrans Toggle\ Tab\ &Expanding<Tab>:set\ et!				开/关制表符扩展(&E)<Tab>:set\ et!
-menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai!			开/关自动缩进(&A)<Tab>:set\ ai!
-menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin!		开/关\ C\ 语言式缩进(&C)<Tab>:set\ cin!
+menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu! 开/关行号(&N)<Tab>:set\ nu!
+menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu! 开/关相对行号(&V)<Tab>:set\ rnu!
+menutrans Toggle\ &List\ Mode<Tab>:set\ list! 开/关列表模式(&L)<Tab>:set\ list!
+menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap! 开/关换行(&W)<Tab>:set\ wrap!
+menutrans Toggle\ W&rapping\ at\ Word<Tab>:set\ lbr! 开/关词尾换行(&R)<Tab>:set\ lbr!
+menutrans Toggle\ Tab\ &Expanding<Tab>:set\ et! 开/关制表符扩展(&E)<Tab>:set\ et!
+menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai! 开/关自动缩进(&A)<Tab>:set\ ai!
+menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin! 开/关\ C\ 语言式缩进(&C)<Tab>:set\ cin!

 " other options
-menutrans &Shiftwidth										缩进宽度(&S)
-menutrans Soft\ &Tabstop									软制表位宽度(Soft\ Tabstop)(&T)
-menutrans Te&xt\ Width\.\.\.								文本宽度(&X)\.\.\.
-menutrans &File\ Format\.\.\.								文件格式(&F)\.\.\.
+menutrans &Shiftwidth 缩进宽度(&S)
+menutrans Soft\ &Tabstop 软制表位宽度(Soft\ Tabstop)(&T)
+menutrans Te&xt\ Width\.\.\. 文本宽度(&X)\.\.\.
+menutrans &File\ Format\.\.\. 文件格式(&F)\.\.\.

 " fun! s:TextWidth()
 if !exists("g:menutrans_textwidth_dialog")
@@ -140,36 +146,36 @@ if !exists("g:menutrans_fileformat_choices")
  let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n取消(&C)"
 endif
 " }}}
-menutrans Show\ C&olor\ Schemes\ in\ Menu	在菜单中显示配色方案(&O)
-menutrans C&olor\ Scheme					配色方案(&O)
-menutrans Show\ &Keymaps\ in\ Menu			在菜单中显示键盘映射(&K)
-menutrans &Keymap							键盘映射(&K)
-menutrans Select\ Fo&nt\.\.\.				选择字体(&N)\.\.\.
+menutrans Show\ C&olor\ Schemes\ in\ Menu 在菜单中显示配色方案(&O)
+menutrans C&olor\ Scheme 配色方案(&O)
+menutrans Show\ &Keymaps\ in\ Menu 在菜单中显示键盘映射(&K)
+menutrans &Keymap 键盘映射(&K)
+menutrans Select\ Fo&nt\.\.\. 选择字体(&N)\.\.\.
 " }}}

 " Programming menu
-menutrans &Tools	工具(&T)
+menutrans &Tools 工具(&T)
 " Tools menuitems {{{1
-menutrans &Jump\ to\ This\ Tag<Tab>g^]			跳转到这个标记(Tag)(&J)<Tab>g^]
-menutrans Jump\ &Back<Tab>^T					跳转回(&B)<Tab>^T
-menutrans Build\ &Tags\ File					生成标记文件(Tags)(&T)
+menutrans &Jump\ to\ This\ Tag<Tab>g^] 跳转到这个标记(Tag)(&J)<Tab>g^]
+menutrans Jump\ &Back<Tab>^T 跳转回(&B)<Tab>^T
+menutrans Build\ &Tags\ File 生成标记文件(Tags)(&T)

 " Tools.Spelling Menu
-menutrans &Spelling								拼写检查(&S)
+menutrans &Spelling 拼写检查(&S)
 " Tools.Spelling menuitems and dialog {{{2
-menutrans &Spell\ Check\ On						打开拼写检查(&S)
-menutrans Spell\ Check\ &Off					关闭拼写检查(&O)
-menutrans To\ &Next\ Error<Tab>]s				上一个错误(&N)<Tab>]s
-menutrans To\ &Previous\ Error<Tab>[s			下一个错误(&P)<Tab>[s
-menutrans Suggest\ &Corrections<Tab>z=			更正建议(&C)<Tab>z=
-menutrans &Repeat\ Correction<Tab>:spellrepall	更正全部同类错误(&R)<Tab>:spellrepall
-menutrans Set\ Language\ to\ "en"				设置语言为\ "en"
-menutrans Set\ Language\ to\ "en_au"			设置语言为\ "en_au"
-menutrans Set\ Language\ to\ "en_ca"			设置语言为\ "en_ca"
-menutrans Set\ Language\ to\ "en_gb"			设置语言为\ "en_gb"
-menutrans Set\ Language\ to\ "en_nz"			设置语言为\ "en_nz"
-menutrans Set\ Language\ to\ "en_us"			设置语言为\ "en_us"
-menutrans &Find\ More\ Languages				查找更多语言(&F)
+menutrans &Spell\ Check\ On 打开拼写检查(&S)
+menutrans Spell\ Check\ &Off 关闭拼写检查(&O)
+menutrans To\ &Next\ Error<Tab>]s 上一个错误(&N)<Tab>]s
+menutrans To\ &Previous\ Error<Tab>[s 下一个错误(&P)<Tab>[s
+menutrans Suggest\ &Corrections<Tab>z= 更正建议(&C)<Tab>z=
+menutrans &Repeat\ Correction<Tab>:spellrepall 更正全部同类错误(&R)<Tab>:spellrepall
+menutrans Set\ Language\ to\ "en" 设置语言为\ "en"
+menutrans Set\ Language\ to\ "en_au" 设置语言为\ "en_au"
+menutrans Set\ Language\ to\ "en_ca" 设置语言为\ "en_ca"
+menutrans Set\ Language\ to\ "en_gb" 设置语言为\ "en_gb"
+menutrans Set\ Language\ to\ "en_nz" 设置语言为\ "en_nz"
+menutrans Set\ Language\ to\ "en_us" 设置语言为\ "en_us"
+menutrans &Find\ More\ Languages 查找更多语言(&F)

 " func! s:SpellLang()
 if !exists("g:menutrans_set_lang_to")
@@ -178,113 +184,113 @@ endif
 " }}}

 " Tools.Fold Menu
-menutrans &Folding								折叠(&F)
+menutrans &Folding 折叠(&F)
 " Tools.Fold menuitems {{{2
 " open close folds
-menutrans &Enable/Disable\ Folds<Tab>zi			启用/禁用折叠(&E)<Tab>zi
-menutrans &View\ Cursor\ Line<Tab>zv			展开光标所在行(&V)<Tab>zv
-menutrans Vie&w\ Cursor\ Line\ Only<Tab>zMzx	只展开光标所在行(&W)<Tab>zMzx
-menutrans C&lose\ More\ Folds<Tab>zm			折叠一级(&L)<Tab>zm
-menutrans &Close\ All\ Folds<Tab>zM				折叠全部(&C)<Tab>zM
-menutrans O&pen\ More\ Folds<Tab>zr				展开一级(&P)<Tab>zr
-menutrans &Open\ All\ Folds<Tab>zR				展开全部(&O)<Tab>zR
+menutrans &Enable/Disable\ Folds<Tab>zi 启用/禁用折叠(&E)<Tab>zi
+menutrans &View\ Cursor\ Line<Tab>zv 展开光标所在行(&V)<Tab>zv
+menutrans Vie&w\ Cursor\ Line\ Only<Tab>zMzx 只展开光标所在行(&W)<Tab>zMzx
+menutrans C&lose\ More\ Folds<Tab>zm 折叠一级(&L)<Tab>zm
+menutrans &Close\ All\ Folds<Tab>zM 折叠全部(&C)<Tab>zM
+menutrans O&pen\ More\ Folds<Tab>zr 展开一级(&P)<Tab>zr
+menutrans &Open\ All\ Folds<Tab>zR 展开全部(&O)<Tab>zR
 " fold method
-menutrans Fold\ Met&hod							折叠方式(&H)
+menutrans Fold\ Met&hod 折叠方式(&H)
 " Tools.Fold.Fold Method menuitems {{{3
-menutrans M&anual		手动(&A)
-menutrans I&ndent		缩进(&N)
-menutrans E&xpression	表达式(&X)
-menutrans S&yntax		语法(&Y)
-menutrans &Diff			差异(Diff)(&D)
-menutrans Ma&rker		记号(Marker)(&R)
+menutrans M&anual 手动(&A)
+menutrans I&ndent 缩进(&N)
+menutrans E&xpression 表达式(&X)
+menutrans S&yntax 语法(&Y)
+menutrans &Diff 差异(Diff)(&D)
+menutrans Ma&rker 记号(Marker)(&R)
 " }}}
 " create and delete folds
-menutrans Create\ &Fold<Tab>zf					创建折叠(&F)<Tab>zf
-menutrans &Delete\ Fold<Tab>zd					删除折叠(&D)<Tab>zd
-menutrans Delete\ &All\ Folds<Tab>zD			删除全部折叠(&A)<Tab>zD
+menutrans Create\ &Fold<Tab>zf 创建折叠(&F)<Tab>zf
+menutrans &Delete\ Fold<Tab>zd 删除折叠(&D)<Tab>zd
+menutrans Delete\ &All\ Folds<Tab>zD 删除全部折叠(&A)<Tab>zD
 " moving around in folds
-menutrans Fold\ Col&umn\ Width					折叠操作栏宽度(&W)
+menutrans Fold\ Col&umn\ Width 折叠操作栏宽度(&W)
 " }}}

 " Tools.Diff Menu
-menutrans &Diff									差异(Diff)(&D)
+menutrans &Diff 差异(Diff)(&D)
 " Tools.Diff menuitems {{{2
-menutrans &Update		刷新(&U)
-menutrans &Get\ Block	采用对侧文本块(&G)
-menutrans &Put\ Block	采用本侧文本块(&P)
+menutrans &Update 刷新(&U)
+menutrans &Get\ Block 采用对侧文本块(&G)
+menutrans &Put\ Block 采用本侧文本块(&P)
 " }}}

-menutrans &Make<Tab>:make						生成(Make)(&M)<Tab>:make
-menutrans &List\ Errors<Tab>:cl					列出错误(&L)<Tab>:cl
-menutrans L&ist\ Messages<Tab>:cl!				列出消息(&I)<Tab>:cl!
-menutrans &Next\ Error<Tab>:cn					下一个错误(&N)<Tab>:cn
-menutrans &Previous\ Error<Tab>:cp				上一个错误(&P)<Tab>:cp
-menutrans &Older\ List<Tab>:cold				较旧的错误列表(&O)<Tab>:cold
-menutrans N&ewer\ List<Tab>:cnew				较新的错误列表(&E)<Tab>:cnew
-menutrans Error\ &Window						错误窗口(&W)
+menutrans &Make<Tab>:make 生成(Make)(&M)<Tab>:make
+menutrans &List\ Errors<Tab>:cl 列出错误(&L)<Tab>:cl
+menutrans L&ist\ Messages<Tab>:cl! 列出消息(&I)<Tab>:cl!
+menutrans &Next\ Error<Tab>:cn 下一个错误(&N)<Tab>:cn
+menutrans &Previous\ Error<Tab>:cp 上一个错误(&P)<Tab>:cp
+menutrans &Older\ List<Tab>:cold 较旧的错误列表(&O)<Tab>:cold
+menutrans N&ewer\ List<Tab>:cnew 较新的错误列表(&E)<Tab>:cnew
+menutrans Error\ &Window 错误窗口(&W)
 " Tools.Error Window menuitems {{{2
-menutrans &Update<Tab>:cwin		刷新(&U)<Tab>:cwin
-menutrans &Open<Tab>:copen		打开(&O)<Tab>:copen
-menutrans &Close<Tab>:cclose	关闭(&C)<Tab>:cclose
+menutrans &Update<Tab>:cwin 刷新(&U)<Tab>:cwin
+menutrans &Open<Tab>:copen 打开(&O)<Tab>:copen
+menutrans &Close<Tab>:cclose 关闭(&C)<Tab>:cclose
 " }}}
-menutrans Show\ Compiler\ Se&ttings\ in\ Menu	在菜单中显示编译器设置(&T)
-menutrans Se&t\ Compiler						设置编译器(&T)
-menutrans &Convert\ to\ HEX<Tab>:%!xxd			转换成十六进制(&C)<Tab>:%!xxd
-menutrans Conve&rt\ Back<Tab>:%!xxd\ -r			转换回(&R)<Tab>:%!xxd\ -r
+menutrans Show\ Compiler\ Se&ttings\ in\ Menu 在菜单中显示编译器设置(&T)
+menutrans Se&t\ Compiler 设置编译器(&T)
+menutrans &Convert\ to\ HEX<Tab>:%!xxd 转换成十六进制(&C)<Tab>:%!xxd
+menutrans Conve&rt\ Back<Tab>:%!xxd\ -r 转换回(&R)<Tab>:%!xxd\ -r
 " }}}

 " Buffer menu
-menutrans &Buffers	缓冲区(&B)
+menutrans &Buffers 缓冲区(&B)
 " Buffer menuitems and dialog {{{1
-menutrans &Refresh\ Menu	刷新本菜单(&R)
-menutrans &Delete			删除(&D)
-menutrans &Alternate		切换(&A)
-menutrans &Next				下一个(&N)
-menutrans &Previous			上一个(&P)
+menutrans &Refresh\ Menu 刷新本菜单(&R)
+menutrans &Delete 删除(&D)
+menutrans &Alternate 切换(&A)
+menutrans &Next 下一个(&N)
+menutrans &Previous 上一个(&P)

-" func! s:BMMunge(fname, bnum) 
+" func! s:BMMunge(fname, bnum)
 if !exists("g:menutrans_no_file")
  let g:menutrans_no_file = "[无文件]"
 endif
 " }}}

 " Window menu
-menutrans &Window	窗口(&W)
+menutrans &Window 窗口(&W)
 " Window menuitems {{{1
-menutrans &New<Tab>^Wn					新建(&N)<Tab>^Wn
-menutrans S&plit<Tab>^Ws				拆分(&P)<Tab>^Ws
-menutrans Sp&lit\ To\ #<Tab>^W^^		拆分并显示缓冲区\ #(&L)<Tab>^W^^
-menutrans Split\ &Vertically<Tab>^Wv	垂直拆分(&V)<Tab>^Wv
-menutrans Split\ File\ E&xplorer		拆分并打开文件浏览器(&X)
-menutrans &Close<Tab>^Wc				关闭(&C)<Tab>^Wc
-menutrans Close\ &Other(s)<Tab>^Wo		除此之外全部关闭(&O)<Tab>^Wo
-menutrans Move\ &To						移动到(&T)
-menutrans &Top<Tab>^WK					顶端(&T)<Tab>^WK
-menutrans &Bottom<Tab>^WJ				底端(&B)<Tab>^WJ
-menutrans &Left\ Side<Tab>^WH			左边(&L)<Tab>^WH
-menutrans &Right\ Side<Tab>^WL			右边(&R)<Tab>^WL
-menutrans Rotate\ &Up<Tab>^WR			向上轮换(&U)<Tab>^WR
-menutrans Rotate\ &Down<Tab>^Wr			向下轮换(&D)<Tab>^Wr
-menutrans &Equal\ Size<Tab>^W=			平均分布(&E)<Tab>^W=
-menutrans &Max\ Height<Tab>^W_			最大高度(&M)<Tab>^W
-menutrans M&in\ Height<Tab>^W1_			最小高度(&I)<Tab>^W1_
-menutrans Max\ &Width<Tab>^W\|			最大宽度(&W)<Tab>^W\|
-menutrans Min\ Widt&h<Tab>^W1\|			最小宽度(&H)<Tab>^W1\|
+menutrans &New<Tab>^Wn 新建(&N)<Tab>^Wn
+menutrans S&plit<Tab>^Ws 拆分(&P)<Tab>^Ws
+menutrans Sp&lit\ To\ #<Tab>^W^^ 拆分并显示缓冲区\ #(&L)<Tab>^W^^
+menutrans Split\ &Vertically<Tab>^Wv 垂直拆分(&V)<Tab>^Wv
+menutrans Split\ File\ E&xplorer 拆分并打开文件浏览器(&X)
+menutrans &Close<Tab>^Wc 关闭(&C)<Tab>^Wc
+menutrans Close\ &Other(s)<Tab>^Wo 除此之外全部关闭(&O)<Tab>^Wo
+menutrans Move\ &To 移动到(&T)
+menutrans &Top<Tab>^WK 顶端(&T)<Tab>^WK
+menutrans &Bottom<Tab>^WJ 底端(&B)<Tab>^WJ
+menutrans &Left\ Side<Tab>^WH 左边(&L)<Tab>^WH
+menutrans &Right\ Side<Tab>^WL 右边(&R)<Tab>^WL
+menutrans Rotate\ &Up<Tab>^WR 向上轮换(&U)<Tab>^WR
+menutrans Rotate\ &Down<Tab>^Wr 向下轮换(&D)<Tab>^Wr
+menutrans &Equal\ Size<Tab>^W= 平均分布(&E)<Tab>^W=
+menutrans &Max\ Height<Tab>^W_ 最大高度(&M)<Tab>^W
+menutrans M&in\ Height<Tab>^W1_ 最小高度(&I)<Tab>^W1_
+menutrans Max\ &Width<Tab>^W\| 最大宽度(&W)<Tab>^W\|
+menutrans Min\ Widt&h<Tab>^W1\| 最小宽度(&H)<Tab>^W1\|
 " }}}

 " The popup menu {{{1
-menutrans &Undo					撤销(&U)
-menutrans Cu&t					剪切(&T)
-menutrans &Copy					复制(&C)
-menutrans &Paste				粘贴(&P)
-menutrans &Delete				删除(&D)
-menutrans Select\ Blockwise		改为选定矩形块
-menutrans Select\ &Word			选定单词(&W)
-menutrans Select\ &Sentence		选定句(&S)
-menutrans Select\ Pa&ragraph	选定段落(&R)
-menutrans Select\ &Line			选定行(&L)
-menutrans Select\ &Block		选定矩形块(&B)
-menutrans Select\ &All			全选(&A)
+menutrans &Undo 撤销(&U)
+menutrans Cu&t 剪切(&T)
+menutrans &Copy 复制(&C)
+menutrans &Paste 粘贴(&P)
+menutrans &Delete 删除(&D)
+menutrans Select\ Blockwise 改为选定矩形块
+menutrans Select\ &Word 选定单词(&W)
+menutrans Select\ &Sentence 选定句(&S)
+menutrans Select\ Pa&ragraph 选定段落(&R)
+menutrans Select\ &Line 选定行(&L)
+menutrans Select\ &Block 选定矩形块(&B)
+menutrans Select\ &All 全选(&A)

 " func! <SID>SpellPopup()
 if !exists("g:menutrans_spell_change_ARG_to")
@@ -305,148 +311,260 @@ if has("toolbar")
  endif
  fun Do_toolbar_tmenu()
    let did_toolbar_tmenu = 1
-    tmenu ToolBar.Open			打开文件
-    tmenu ToolBar.Save			保存当前文件
-    tmenu ToolBar.SaveAll		全部保存
-    tmenu ToolBar.Print			打印
-    tmenu ToolBar.Undo			撤销
-    tmenu ToolBar.Redo			恢复
-    tmenu ToolBar.Cut			剪切到剪贴板
-    tmenu ToolBar.Copy			复制到剪贴板
-    tmenu ToolBar.Paste			从剪贴板粘贴
+    tmenu ToolBar.Open 打开文件
+    tmenu ToolBar.Save 保存当前文件
+    tmenu ToolBar.SaveAll 全部保存
+    tmenu ToolBar.Print 打印
+    tmenu ToolBar.Undo 撤销
+    tmenu ToolBar.Redo 恢复
+    tmenu ToolBar.Cut 剪切到剪贴板
+    tmenu ToolBar.Copy 复制到剪贴板
+    tmenu ToolBar.Paste 从剪贴板粘贴
    if !has("gui_athena")
-      tmenu ToolBar.Replace		查找和替换...
-      tmenu ToolBar.FindNext	查找下一个
-      tmenu ToolBar.FindPrev	查找上一个
+      tmenu ToolBar.Replace 查找和替换...
+      tmenu ToolBar.FindNext 查找下一个
+      tmenu ToolBar.FindPrev 查找上一个
    endif
-    tmenu ToolBar.LoadSesn		加载会话
-    tmenu ToolBar.SaveSesn		保存当前会话
-    tmenu ToolBar.RunScript		运行 Vim 脚本
-    tmenu ToolBar.Make			生成当前项目 (:make)
-    tmenu ToolBar.RunCtags		在当前目录生成标记(Tags) (!ctags -R .)
-    tmenu ToolBar.TagJump		跳转到光标所在标记(Tag)
-    tmenu ToolBar.Help			Vim 帮助
-    tmenu ToolBar.FindHelp		在 Vim 帮助中查找
+    tmenu ToolBar.LoadSesn 加载会话
+    tmenu ToolBar.SaveSesn 保存当前会话
+    tmenu ToolBar.RunScript 运行 Vim 脚本
+    tmenu ToolBar.Make 生成当前项目 (:make)
+    tmenu ToolBar.RunCtags 在当前目录生成标记(Tags) (!ctags -R .)
+    tmenu ToolBar.TagJump 跳转到光标所在标记(Tag)
+    tmenu ToolBar.Help Vim 帮助
+    tmenu ToolBar.FindHelp 在 Vim 帮助中查找
  endfun
 endif
 " }}}

 " Syntax menu
-menutrans &Syntax	语法(&S)
+menutrans &Syntax 语法(&S)
 " Syntax menuitems {{{1
-menutrans &Show\ File\ Types\ in\ Menu	在菜单中显示文件类型(&S)
-menutrans &Off							关闭(&O)
-menutrans &Manual						手动(&M)
-menutrans A&utomatic					自动(&U)
-menutrans On/Off\ for\ &This\ File		只对这个文件开/关(&T)
-menutrans Co&lor\ Test					色彩测试(&L)
-menutrans &Highlight\ Test				高亮测试(&H)
-menutrans &Convert\ to\ HTML			转换成\ HTML(&C)
+menutrans &Show\ File\ Types\ in\ Menu 在菜单中显示文件类型(&S)
+menutrans &Off 关闭(&O)
+menutrans &Manual 手动(&M)
+menutrans A&utomatic 自动(&U)
+menutrans On/Off\ for\ &This\ File 只对这个文件开/关(&T)
+menutrans Co&lor\ Test 色彩测试(&L)
+menutrans &Highlight\ Test 高亮测试(&H)
+menutrans &Convert\ to\ HTML 转换成\ HTML(&C)
+
 " From synmenu.vim
-menutrans Set\ '&syntax'\ Only			只设置\ 'syntax'(&S)
-menutrans Set\ '&filetype'\ Too			也设置\ 'filetype'(&F)
+menutrans Set\ '&syntax'\ Only 只设置\ 'syntax'(&S)
+menutrans Set\ '&filetype'\ Too 也设置\ 'filetype'(&F)
+menutrans Oracle\ config Oracle\ 配置文件
+menutrans Vim\ help\ file Vim\ 帮助文件
+menutrans Vim\ script Vim\ 脚本
+menutrans Viminfo\ file Vim\ 信息文件
+menutrans Virata\ config Virata\ 配置文件
+menutrans Whitespace\ (add) 增加加亮空格
 " }}}

 " Netrw menu {{{1
 " Plugin loading may be after menu translation
 " So giveup testing if Netrw Plugin is loaded
 " if exists("g:loaded_netrwPlugin")
-  menutrans Help<tab><F1>					帮助<tab><F1>
-  menutrans Bookmarks						书签
-  menutrans History							历史记录
-  menutrans Go\ Up\ Directory<tab>-			向上一级<tab>-
-  menutrans Apply\ Special\ Viewer<tab>x	用默认程序打开<tab>x
-  menutrans Bookmarks\ and\ History			书签和历史记录
+  menutrans Help<tab><F1> 帮助<tab><F1>
+  menutrans Bookmarks 书签
+  menutrans History 历史记录
+  menutrans Go\ Up\ Directory<tab>- 向上一级<tab>-
+  menutrans Apply\ Special\ Viewer<tab>x 用默认程序打开<tab>x
+  menutrans Bookmarks\ and\ History 书签和历史记录
  " Netrw.Bookmarks and History menuitems {{{2
-  menutrans Bookmark\ Current\ Directory<tab>mb		添加书签<tab>mb
-  menutrans Bookmark\ Delete						移除书签
-  menutrans Goto\ Prev\ Dir\ (History)<tab>u		后退(历史记录)<tab>u
-  menutrans Goto\ Next\ Dir\ (History)<tab>U		前进(历史记录)<tab>U
-  menutrans List<tab>qb								完整列表<tab>qb
+  menutrans Bookmark\ Current\ Directory<tab>mb 添加书签<tab>mb
+  menutrans Bookmark\ Delete 移除书签
+  menutrans Goto\ Prev\ Dir\ (History)<tab>u 后退(历史记录)<tab>u
+  menutrans Goto\ Next\ Dir\ (History)<tab>U 前进(历史记录)<tab>U
+  menutrans List<tab>qb 完整列表<tab>qb
  " }}}
-  menutrans Browsing\ Control				控制
+  menutrans Browsing\ Control 控制
  " Netrw.Browsing Control menuitems {{{2
-  menutrans Horizontal\ Split<tab>o					在拆分窗口打开<tab>o
-  menutrans Vertical\ Split<tab>v					在垂直拆分窗口打开<tab>v
-  menutrans New\ Tab<tab>t							在标签页打开<tab>t	
-  menutrans Preview<tab>p							预览<tab>p
-  menutrans Edit\ File\ Hiding\ List<tab><ctrl-h>	编辑隐藏条件(Hiding\ List)<tab><ctrl-h>
-  menutrans Edit\ Sorting\ Sequence<tab>S			编辑排序条件(Sorting\ Sequence)<tab>S
-  menutrans Quick\ Hide/Unhide\ Dot\ Files<tab>gh	快速隐藏/显示以\.开头的文件<tab>gh
-  menutrans Refresh\ Listing<tab><ctrl-l>			刷新<tab><ctrl-l>
-  menutrans Settings/Options<tab>:NetrwSettings		设置/选项<tab>:NetrwSettings
+  menutrans Horizontal\ Split<tab>o 在拆分窗口打开<tab>o
+  menutrans Vertical\ Split<tab>v 在垂直拆分窗口打开<tab>v
+  menutrans New\ Tab<tab>t 在标签页打开<tab>t
+  menutrans Preview<tab>p 预览<tab>p
+  menutrans Edit\ File\ Hiding\ List<tab><ctrl-h> 编辑隐藏条件(Hiding\ List)<tab><ctrl-h>
+  menutrans Edit\ Sorting\ Sequence<tab>S 编辑排序条件(Sorting\ Sequence)<tab>S
+  menutrans Quick\ Hide/Unhide\ Dot\ Files<tab>gh 快速隐藏/显示以\.开头的文件<tab>gh
+  menutrans Refresh\ Listing<tab><ctrl-l> 刷新<tab><ctrl-l>
+  menutrans Settings/Options<tab>:NetrwSettings 设置/选项<tab>:NetrwSettings
  " }}}
-  menutrans Delete\ File/Directory<tab>D	删除文件/目录<tab>D
-  menutrans Edit\ File/Dir					编辑文件/目录
+  menutrans Delete\ File/Directory<tab>D 删除文件/目录<tab>D
+  menutrans Edit\ File/Dir 编辑文件/目录
  " Netrw.Edit File menuitems {{{2
-  menutrans Create\ New\ File<tab>%				新建文件<tab>%
-  menutrans In\ Current\ Window<tab><cr>		在当前窗口<tab><cr>
-  menutrans Preview\ File/Directory<tab>p		预览文件/目录<tab>p
-  menutrans In\ Previous\ Window<tab>P			在上一个窗口<tab>P
-  menutrans In\ New\ Window<tab>o				在新窗口<tab>o
-  menutrans In\ New\ Tab<tab>t					在新标签页<tab>t
-  menutrans In\ New\ Vertical\ Window<tab>v		在新垂直窗口<tab>v
+  menutrans Create\ New\ File<tab>% 新建文件<tab>%
+  menutrans In\ Current\ Window<tab><cr> 在当前窗口<tab><cr>
+  menutrans Preview\ File/Directory<tab>p 预览文件/目录<tab>p
+  menutrans In\ Previous\ Window<tab>P 在上一个窗口<tab>P
+  menutrans In\ New\ Window<tab>o 在新窗口<tab>o
+  menutrans In\ New\ Tab<tab>t 在新标签页<tab>t
+  menutrans In\ New\ Vertical\ Window<tab>v 在新垂直窗口<tab>v
  " }}}
-  menutrans Explore							浏览
+  menutrans Explore 浏览
  " Netrw.Explore menuitems {{{2
-  menutrans Directory\ Name															指定目录名
-  menutrans Filenames\ Matching\ Pattern\ (curdir\ only)<tab>:Explore\ */			匹配指定文件名模式(当前目录)<tab>:Explore\ */
-  menutrans Filenames\ Matching\ Pattern\ (+subdirs)<tab>:Explore\ **/				匹配指定文件名模式(含子目录)<tab>:Explore\ **/
-  menutrans Files\ Containing\ String\ Pattern\ (curdir\ only)<tab>:Explore\ *//	内容包含指定字符串模式(当前目录)<tab>:Explore\ *//
-  menutrans Files\ Containing\ String\ Pattern\ (+subdirs)<tab>:Explore\ **//		内容包含指定字符串模式(含子目录)<tab>:Explore\ **//
-  menutrans Next\ Match<tab>:Nexplore												下一个匹配项<tab>:Nexplore
-  menutrans Prev\ Match<tab>:Pexplore												上一个匹配项<tab>:Pexplore
+  menutrans Directory\ Name 指定目录名
+  menutrans Filenames\ Matching\ Pattern\ (curdir\ only)<tab>:Explore\ */ 匹配指定文件名模式(当前目录)<tab>:Explore\ */
+  menutrans Filenames\ Matching\ Pattern\ (+subdirs)<tab>:Explore\ **/ 匹配指定文件名模式(含子目录)<tab>:Explore\ **/
+  menutrans Files\ Containing\ String\ Pattern\ (curdir\ only)<tab>:Explore\ *// 内容包含指定字符串模式(当前目录)<tab>:Explore\ *//
+  menutrans Files\ Containing\ String\ Pattern\ (+subdirs)<tab>:Explore\ **// 内容包含指定字符串模式(含子目录)<tab>:Explore\ **//
+  menutrans Next\ Match<tab>:Nexplore 下一个匹配项<tab>:Nexplore
+  menutrans Prev\ Match<tab>:Pexplore 上一个匹配项<tab>:Pexplore
  " }}}
-  menutrans Make\ Subdirectory<tab>d		新建子目录<tab>d
-  menutrans Marked\ Files					选定的(Marked)文件
+  menutrans Make\ Subdirectory<tab>d 新建子目录<tab>d
+  menutrans Marked\ Files 选定的(Marked)文件
  " Netrw.Marked Files menuitems {{{2
-  menutrans Mark\ File<tab>mf						选定(Mark)/取消<tab>mf
-  menutrans Mark\ Files\ by\ Regexp<tab>mr			用正则表达式(Regexp)选定<tab>mr
-  menutrans Hide-Show-List\ Control<tab>a			隐藏/显示<tab>a
-  menutrans Copy\ To\ Target<tab>mc					复制到目标<tab>mc
-  menutrans Delete<tab>D							删除<tab>D
-  menutrans Diff<tab>md								差异(Diff)<tab>md
-  menutrans Edit<tab>me								编辑<tab>me
-  menutrans Exe\ Cmd<tab>mx							作为参数运行命令<tab>mx
-  menutrans Move\ To\ Target<tab>mm					移动到目标<tab>mm
-  menutrans Obtain<tab>O							获取<tab>O
-  menutrans Print<tab>mp							打印<tab>mp
-  menutrans Replace<tab>R							替换<tab>R
-  menutrans Set\ Target<tab>mt						设置目标<tab>mt
-  menutrans Tag<tab>mT								生成标记文件(Tags)<tab>mT
-  menutrans Zip/Unzip/Compress/Uncompress<tab>mz	压缩/解压缩<tab>mz
+  menutrans Mark\ File<tab>mf 选定(Mark)/取消<tab>mf
+  menutrans Mark\ Files\ by\ Regexp<tab>mr 用正则表达式(Regexp)选定<tab>mr
+  menutrans Hide-Show-List\ Control<tab>a 隐藏/显示<tab>a
+  menutrans Copy\ To\ Target<tab>mc 复制到目标<tab>mc
+  menutrans Delete<tab>D 删除<tab>D
+  menutrans Diff<tab>md 差异(Diff)<tab>md
+  menutrans Edit<tab>me 编辑<tab>me
+  menutrans Exe\ Cmd<tab>mx 作为参数运行命令<tab>mx
+  menutrans Move\ To\ Target<tab>mm 移动到目标<tab>mm
+  menutrans Obtain<tab>O 获取<tab>O
+  menutrans Print<tab>mp 打印<tab>mp
+  menutrans Replace<tab>R 替换<tab>R
+  menutrans Set\ Target<tab>mt 设置目标<tab>mt
+  menutrans Tag<tab>mT 生成标记文件(Tags)<tab>mT
+  menutrans Zip/Unzip/Compress/Uncompress<tab>mz 压缩/解压缩<tab>mz
  " }}}
-  menutrans Obtain\ File<tab>O				获取文件<tab>O
-  menutrans Style							显示风格
+  menutrans Obtain\ File<tab>O 获取文件<tab>O
+  menutrans Style 显示风格
  " Netrw.Style menuitems {{{2
-  menutrans Listing							列表形式
+  menutrans Listing 列表形式
  " Netrw.Style.Listing menuitems {{{3
-  menutrans thin<tab>i	紧凑<thin)<tab>i
-  menutrans long<tab>i	详细(long)<tab>i
-  menutrans wide<tab>i	多列(wide)<tab>i
-  menutrans tree<tab>i	树状(tree)<tab>i
+  menutrans thin<tab>i 紧凑<thin)<tab>i
+  menutrans long<tab>i 详细(long)<tab>i
+  menutrans wide<tab>i 多列(wide)<tab>i
+  menutrans tree<tab>i 树状(tree)<tab>i
  " }}}
-  menutrans Normal-Hide-Show				显示/隐藏
+  menutrans Normal-Hide-Show 显示/隐藏
  " Netrw.Style.Normal-Hide_show menuitems {{{3
-  menutrans Show\ All<tab>a		显示全部
-  menutrans Normal<tab>a		不显示隐藏文件
-  menutrans Hidden\ Only<tab>a	只显示隐藏文件
+  menutrans Show\ All<tab>a 显示全部
+  menutrans Normal<tab>a 不显示隐藏文件
+  menutrans Hidden\ Only<tab>a 只显示隐藏文件
  " }}}
-  menutrans Reverse\ Sorting\ Order<tab>r	升序/降序<tab>r
-  menutrans Sorting\ Method					排序方式
+  menutrans Reverse\ Sorting\ Order<tab>r 升序/降序<tab>r
+  menutrans Sorting\ Method 排序方式
  " Netrw.Style.Sorting Method menuitems {{{3
-  menutrans Name<tab>s		文件名<tab>s
-  menutrans Time<tab>s		修改时间<tab>s
-  menutrans Size<tab>s		大小<tab>s
-  menutrans Exten<tab>s		扩展名<tab>s
+  menutrans Name<tab>s 文件名<tab>s
+  menutrans Time<tab>s 修改时间<tab>s
+  menutrans Size<tab>s 大小<tab>s
+  menutrans Exten<tab>s 扩展名<tab>s
  " }}}
  " }}}
-  menutrans Rename\ File/Directory<tab>R	重命名文件/目录<tab>R
-  menutrans Set\ Current\ Directory<tab>c	设置\ Vim\ 工作目录<tab>c
-  menutrans Targets							目标
+  menutrans Rename\ File/Directory<tab>R 重命名文件/目录<tab>R
+  menutrans Set\ Current\ Directory<tab>c 设置\ Vim\ 工作目录<tab>c
+  menutrans Targets 目标
 " endif
 " }}}

+" Shellmenu menu
+" Shellmenu menuitems {{{1
+" From shellmenu.vim
+menutrans ShellMenu Shell\ 菜单
+menutrans Statements 语句
+menutrans Test 测试
+menutrans Existence 存在
+menutrans Existence\ -\ file 存在\ -\ 文件
+menutrans Existence\ -\ file\ (not\ empty) 存在\ -\ 文件(非空)
+menutrans Existence\ -\ directory 存在\ -\ 目录
+menutrans Existence\ -\ executable 存在\ -\ 可执行
+menutrans Existence\ -\ readable 存在\ -\ 可读
+menutrans Existence\ -\ writable 存在\ -\ 可写
+menutrans String\ is\ empty 字符串为空
+menutrans String\ is\ not\ empty 字符串非空
+menutrans Strings\ are\ equal 字符串值相等
+menutrans Strings\ are\ not\ equal 字符串值不相等
+menutrans Value\ is\ greater\ than 值大于
+menutrans Value\ is\ greater\ equal 值大于等于
+menutrans Values\ are\ equal 值相等
+menutrans Values\ are\ not\ equal 值不相等
+menutrans Value\ is\ less\ than 值小于
+menutrans Value\ is\ less\ equal 值小于等于
+menutrans ParmSub 参数替换
+menutrans Substitute\ word\ if\ parm\ not\ set 如果参数没设置就替换该词
+menutrans Set\ parm\ to\ word\ if\ not\ set 参数未设置就设为该词
+menutrans Substitute\ word\ if\ parm\ set\ else\ nothing 如果参数设置就替换该词，否则什么都不做
+menutrans If\ parm\ not\ set\ print\ word\ and\ exit 如果参数没有设置就打印该词并退出
+menutrans SpShVars Shell\ 特殊变量
+menutrans Number\ of\ positional\ parameters 位置参数的数目
+menutrans All\ positional\ parameters\ (quoted\ spaces) 所有位置参数(quoted\ spaces)
+menutrans All\ positional\ parameters\ (unquoted\ spaces) 所有位置参数(unquoted\ spaces)
+menutrans Flags\ set 设置标志
+menutrans Return\ code\ of\ last\ command 返回前一条命令的代码
+menutrans Process\ number\ of\ this\ shell shell\ 自身进程号
+menutrans Process\ number\ of\ last\ background\ command 前一条后台命令的进程号
+menutrans Environ 环境变量
+menutrans Mark\ created\ or\ modified\ variables\ for\ export 标记修改的或者创建的变量为导出
+menutrans Exit\ when\ command\ returns\ non-zero\ status 当命令返回非零状态时退出
+menutrans Disable\ file\ name\ expansion 禁用文件名拓展
+menutrans Locate\ and\ remember\ commands\ when\ being\ looked\ up 当查询命令时定位并记住该命令
+menutrans All\ assignment\ statements\ are\ placed\ in\ the\ environment\ for\ a\ command 所有的赋值参数被放在命令的环境中
+menutrans Read\ commands\ but\ do\ not\ execute\ them 读命令但是不要执行
+menutrans Exit\ after\ reading\ and\ executing\ one\ command 读并执行一个命令之后退出
+menutrans Treat\ unset\ variables\ as\ an\ error\ when\ substituting 替换时把未设置命令视为错误
+menutrans Print\ shell\ input\ lines\ as\ they\ are\ read 读\ shell\ 输入行的时候打印
+menutrans Print\ commands\ and\ their\ arguments\ as\ they\ are\ executed 被执行时打印命令和参数
+" }}}
+
+" termdebug menu
+" termdebug menuitems {{{1
+" From termdebug.vim
+menutrans Set\ breakpoint 设置断点
+menutrans Clear\ breakpoint 清除断点
+menutrans Run\ until 运行到
+menutrans Evaluate 求值
+menutrans WinBar 工具条
+menutrans Step 单步
+menutrans Next 下一个
+menutrans Finish 结束
+menutrans Cont 继续
+menutrans Stop 停止
+" }}}
+
+" debchangelog menu
+" debchangelog menuitems {{{1
+" From debchangelog.vim
+menutrans &Changelog 更新日志(&C)
+menutrans &New\ Version 新版本(&N)
+menutrans &Add\ Entry 添加条目(&A)
+menutrans &Close\ Bug 关闭\ Bug(&C)
+menutrans Set\ &Distribution 设置发行版(&D)
+menutrans &unstable 不稳定(&U)
+menutrans Set\ &Urgency 设置紧急(&U)
+menutrans &low 低(&L)
+menutrans &medium 中(&M)
+menutrans &high 高(&H)
+menutrans U&nfinalise 未完成(&N)
+menutrans &Finalise 完成(&F)
+" }}}
+
+" ada menu
+" ada menuitems {{{1
+" From ada.vim
+menutrans Tag 标签
+menutrans List 列表
+menutrans Jump 跳转
+menutrans Create\ File 创建文件
+menutrans Create\ Dir 创建目录
+menutrans Highlight 高亮
+menutrans Toggle\ Space\ Errors 切换空格错误
+menutrans Toggle\ Lines\ Errors 切换行错误
+menutrans Toggle\ Rainbow\ Color 切换彩虹颜色
+menutrans Toggle\ Standard\ Types 切换标准类型
+" }}}
+
+" gnat menu
+" gnat menuitems {{{1
+" From gnat.vim
+menutrans Build 构建
+menutrans Pretty\ Print 重新格式化代码
+menutrans Find 查找
+menutrans Set\ Projectfile\.\.\. 设置项目文件\.\.\.
+" }}}
+
 let &cpo = s:keepcpo
 unlet s:keepcpo

--- a/runtime/lang/menu_hu_hu.iso_8859-2.vim
+++ b/runtime/lang/menu_hu_hu.iso_8859-2.vim
@@ -2,26 +2,10 @@
 " Original Translation:	Zoltán Árpádffy
 " Maintained By:	Kontra Gergely <kgergely@mcl.hu>
 " Last Change:		2020 Apr 23
-" Original translations
-" I'm working on defining (unaccented) hotkeys for everything.
-" I want to remove y and z hotkeys, because on the hungarian keymap they're at
-" a differrent place.
-" I also want to avoid g and j shortcuts, because you cannot see, wheter
-" they're underlined or not.
-" If the hotkeys are not uniq (pressing the hotkey doesn't executes the menu,
-" just one menupoint is selected), or you find any other undesired behaviour,
-" please report it to me.
-" All kind of feedback is welcome.
 "
-" Igyekeztem mindenhez gyorsbillentyût rendelni, lehetõleg nem ékezeteset.
-" További tennivaló az y és z gyorsbillentyûk kiirtása, ezenkívül a g, j
-" billentyûk irtása is, mivel ez utóbbiak aláhúzott változatát nem könnyû
-" felismerni.
-" Amennyiben valahol nem egyértelmûk a gyorsbillentyûk (a gyorsbillentyût
-" leütve nem hajtódik végre a kiszemelt menüpont, hanem csak kiválasztódik,
-" vagy másik menüpont választódik ki), vagy egyéb hibát találsz, kérlek jelezd
-" nekem a fenti email címen.
-" Mindennemû visszajelzést szívesen fogadok.
+" This file was converted from menu_hu_hu.iso_8859-2.vim.  See there for
+" remarks.
+" Generated from menu_hu_hu.utf-8.vim, DO NOT EDIT

 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
--- a/runtime/lang/menu_sk_sk.iso_8859-2.vim
+++ b/runtime/lang/menu_sk_sk.iso_8859-2.vim
@@ -1,7 +1,7 @@
 " Menu Translations:	Slovak
 " Translated By:	Martin Lacko <lacko@host.sk>
 " Last Change:		2020 Apr 23
-" Original translations
+" Generated from menu_slovak_slovak_republic.1250.vim, DO NOT EDIT

 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
--- a/runtime/lang/menu_zh_cn.utf-8.vim
+++ b/runtime/lang/menu_zh_cn.utf-8.vim
@@ -1,10 +1,15 @@
 " Menu Translations:    Simplified Chinese
-" Maintainer:           Shun Bai <baishunde@gmail.com>
-" Previous Maintainer:  Yuheng Xie <elephant@linux.net.cn>
-" Last Change:          2022 Feb 19
+" Maintainer:           Ada (Haowen) Yu <me@yuhaowen.com>
+" Previous Maintainer:  Shun Bai <baishunde@gmail.com>, Yuheng Xie <elephant@linux.net.cn>
+" Last Change:          2022 July 9
 " Original translations
+"
+" Generated with the scripts from:
+"
+"       https://github.com/adaext/vim-menutrans-helper

 " Quit when menu translations have already been done.
+
 if exists("did_menu_trans")
  finish
 endif
@@ -15,18 +20,18 @@ set cpo&vim
 scriptencoding utf-8

 " Help menu
-menutrans &Help		帮助(&H)
+menutrans &Help 帮助(&H)
 " Help menuitems and dialog {{{1
-menutrans &Overview<Tab><F1>	概述(&O)<Tab><F1>
-menutrans &User\ Manual			用户手册(&U)
-menutrans &How-to\ Links		如何使用(&H)
-menutrans &Find\.\.\.			查找(&F)\.\.\.
-menutrans &Credits				致谢(&C)
-menutrans Co&pying				版权(&P)
-menutrans &Sponsor/Register		赞助/注册(&S)
-menutrans O&rphans				拯救孤儿(&R)
-menutrans &Version				版本(&V)
-menutrans &About				关于(&A)
+menutrans &Overview<Tab><F1> 概述(&O)<Tab><F1>
+menutrans &User\ Manual 用户手册(&U)
+menutrans &How-to\ Links 如何使用(&H)
+menutrans &Find\.\.\. 查找(&F)\.\.\.
+menutrans &Credits 致谢(&C)
+menutrans Co&pying 版权(&P)
+menutrans &Sponsor/Register 赞助/注册(&S)
+menutrans O&rphans 拯救孤儿(&R)
+menutrans &Version 版本(&V)
+menutrans &About 关于(&A)

 " fun! s:Helpfind()
 if !exists("g:menutrans_help_dialog")
@@ -35,67 +40,68 @@ endif
 " }}}

 " File menu
-menutrans &File		文件(&F)
+menutrans &File 文件(&F)
 " File menuitems {{{1
-menutrans &Open\.\.\.<Tab>:e			打开(&O)\.\.\.<Tab>:e
-menutrans Sp&lit-Open\.\.\.<Tab>:sp		在拆分窗口打开(&L)\.\.\.<Tab>:sp
-menutrans Open\ Tab\.\.\.<Tab>:tabnew	在标签页打开\.\.\.<Tab>:tabnew
-menutrans &New<Tab>:enew				新建(&N)<Tab>:enew
-menutrans &Close<Tab>:close				关闭(&C)<Tab>:close
-menutrans &Save<Tab>:w					保存(&S)<Tab>:w
-menutrans Save\ &As\.\.\.<Tab>:sav		另存为(&A)\.\.\.<Tab>:sav
-menutrans Split\ &Diff\ With\.\.\.		拆分窗口以对比差异(Diff)(&D)\.\.\.
-menutrans Split\ Patched\ &By\.\.\.		拆分窗口以进行修补(Patch)(&B)\.\.\.
-menutrans &Print						打印(&P)
-menutrans Sa&ve-Exit<Tab>:wqa			保存并退出(&V)<Tab>:wqa
-menutrans E&xit<Tab>:qa					退出(&X)<Tab>:qa
+menutrans &Open\.\.\.<Tab>:e 打开(&O)\.\.\.<Tab>:e
+menutrans Sp&lit-Open\.\.\.<Tab>:sp 在拆分窗口打开(&L)\.\.\.<Tab>:sp
+menutrans Open\ Tab\.\.\.<Tab>:tabnew 在标签页打开\.\.\.<Tab>:tabnew
+menutrans &New<Tab>:enew 新建(&N)<Tab>:enew
+menutrans &Close<Tab>:close 关闭(&C)<Tab>:close
+menutrans &Save<Tab>:w 保存(&S)<Tab>:w
+menutrans Save\ &As\.\.\.<Tab>:sav 另存为(&A)\.\.\.<Tab>:sav
+menutrans Split\ &Diff\ With\.\.\. 拆分窗口以对比差异(Diff)(&D)\.\.\.
+menutrans Split\ Patched\ &By\.\.\. 拆分窗口以进行修补(Patch)(&B)\.\.\.
+menutrans &Print 打印(&P)
+menutrans Sa&ve-Exit<Tab>:wqa 保存并退出(&V)<Tab>:wqa
+menutrans E&xit<Tab>:qa 退出(&X)<Tab>:qa
 " }}}

 " Edit menu
-menutrans &Edit		编辑(&E)
+menutrans &Edit 编辑(&E)
 " Edit menuitems {{{1
-menutrans &Undo<Tab>u						撤销(&U)<Tab>u
-menutrans &Redo<Tab>^R						恢复(&R)<Tab>^R
-menutrans Rep&eat<Tab>\.					重复(&E)<Tab>\.
-menutrans Cu&t<Tab>"+x						剪切(&T)<Tab>"+x
-menutrans &Copy<Tab>"+y						复制(&C)<Tab>"+y
-menutrans &Paste<Tab>"+gP					粘贴(&P)<Tab>"+gP
-menutrans Put\ &Before<Tab>[p				粘贴到光标前(&B)<Tab>[p
-menutrans Put\ &After<Tab>]p				粘贴到光标后(&A)<Tab>]p
-menutrans &Delete<Tab>x						删除(&D)<Tab>x
-menutrans &Select\ All<Tab>ggVG				全选(&S)<Tab>ggVG
-menutrans &Find\.\.\.						查找(&F)\.\.\.
-menutrans Find\ and\ Rep&lace\.\.\.			查找和替换(&L)\.\.\.
-menutrans &Find<Tab>/						查找(&F)<Tab>/
-menutrans Find\ and\ Rep&lace<Tab>:%s		查找和替换(&L)<Tab>:%s
-menutrans Settings\ &Window					设置窗口(&W)
-menutrans Startup\ &Settings				启动设置(&S)
+menutrans &Undo<Tab>u 撤销(&U)<Tab>u
+menutrans &Redo<Tab>^R 恢复(&R)<Tab>^R
+menutrans Rep&eat<Tab>\. 重复(&E)<Tab>\.
+menutrans Cu&t<Tab>"+x 剪切(&T)<Tab>"+x
+menutrans &Copy<Tab>"+y 复制(&C)<Tab>"+y
+menutrans &Paste<Tab>"+gP 粘贴(&P)<Tab>"+gP
+menutrans Put\ &Before<Tab>[p 粘贴到光标前(&B)<Tab>[p
+menutrans Put\ &After<Tab>]p 粘贴到光标后(&A)<Tab>]p
+menutrans &Delete<Tab>x 删除(&D)<Tab>x
+menutrans &Select\ All<Tab>ggVG 全选(&S)<Tab>ggVG
+menutrans &Find\.\.\. 查找(&F)\.\.\.
+menutrans Find\ and\ Rep&lace\.\.\. 查找和替换(&L)\.\.\.
+menutrans &Find<Tab>/ 查找(&F)<Tab>/
+menutrans Find\ and\ Rep&lace<Tab>:%s 查找和替换(&L)<Tab>:%s
+menutrans Find\ and\ Rep&lace<Tab>:s 查找和替换(&L)<Tab>:s
+menutrans Settings\ &Window 设置窗口(&W)
+menutrans Startup\ &Settings 启动设置(&S)

 " Edit/Global Settings
-menutrans &Global\ Settings					全局设置(&G)
+menutrans &Global\ Settings 全局设置(&G)
 " Edit.Global Settings menuitems and dialogs {{{2
-menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!		开/关高亮查找内容(&H)<Tab>:set\ hls!
-menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic!				开/关忽略大小写(&I)<Tab>:set\ ic!
-menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm!	开/关显示括号匹配(&S)<Tab>:set\ sm!
-menutrans &Context\ Lines									上下文行数(&C)
-menutrans &Virtual\ Edit									虚拟编辑(&V)
+menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls! 开/关高亮查找内容(&H)<Tab>:set\ hls!
+menutrans Toggle\ &Ignoring\ Case<Tab>:set\ ic! 开/关忽略大小写(&I)<Tab>:set\ ic!
+menutrans Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm! 开/关显示括号匹配(&S)<Tab>:set\ sm!
+menutrans &Context\ Lines 上下文行数(&C)
+menutrans &Virtual\ Edit 虚拟编辑(&V)
 " Edit.Global Settings.Virtual Edit menuitems {{{3
-menutrans Never					从不
-menutrans Block\ Selection		只在选定矩形块时
-menutrans Insert\ Mode			只在插入模式时
-menutrans Block\ and\ Insert	在选定矩形块和插入模式时
-menutrans Always				始终
+menutrans Never 从不
+menutrans Block\ Selection 只在选定矩形块时
+menutrans Insert\ Mode 只在插入模式时
+menutrans Block\ and\ Insert 在选定矩形块和插入模式时
+menutrans Always 始终
 " }}}
-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!				开/关插入模式(&M)<Tab>:set\ im!
-menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!			开/关\ Vi\ 兼容性(&O)<Tab>:set\ cp!
-menutrans Search\ &Path\.\.\.								搜索路径(&P)\.\.\.
-menutrans Ta&g\ Files\.\.\.									标记文件(Tags)(&G)\.\.\.
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im! 开/关插入模式(&M)<Tab>:set\ im!
+menutrans Toggle\ Vi\ C&ompatibility<Tab>:set\ cp! 开/关\ Vi\ 兼容性(&O)<Tab>:set\ cp!
+menutrans Search\ &Path\.\.\. 搜索路径(&P)\.\.\.
+menutrans Ta&g\ Files\.\.\. 标记文件(Tags)(&G)\.\.\.

 " GUI options
-menutrans Toggle\ &Toolbar									开/关工具栏(&T)
-menutrans Toggle\ &Bottom\ Scrollbar						开/关底部滚动条(&B)
-menutrans Toggle\ &Left\ Scrollbar							开/关左侧滚动条(&L)
-menutrans Toggle\ &Right\ Scrollbar							开/关右侧滚动条(&R)
+menutrans Toggle\ &Toolbar 开/关工具栏(&T)
+menutrans Toggle\ &Bottom\ Scrollbar 开/关底部滚动条(&B)
+menutrans Toggle\ &Left\ Scrollbar 开/关左侧滚动条(&L)
+menutrans Toggle\ &Right\ Scrollbar 开/关右侧滚动条(&R)

 " fun! s:SearchP()
 if !exists("g:menutrans_path_dialog")
@@ -109,23 +115,23 @@ endif
 " }}}

 " Edit/File Settings
-menutrans F&ile\ Settings					文件设置(&I)
+menutrans F&ile\ Settings 文件设置(&I)
 " Edit.File Settings menuitems and dialogs {{{2
 " Boolean options
-menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!			开/关行号(&N)<Tab>:set\ nu!
-menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu!	开/关相对行号(&V)<Tab>:set\ rnu!
-menutrans Toggle\ &List\ Mode<Tab>:set\ list!				开/关列表模式(&L)<Tab>:set\ list!
-menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap!			开/关换行(&W)<Tab>:set\ wrap!
-menutrans Toggle\ W&rapping\ at\ Word<Tab>:set\ lbr!		开/关词尾换行(&R)<Tab>:set\ lbr!
-menutrans Toggle\ Tab\ &Expanding<Tab>:set\ et!				开/关制表符扩展(&E)<Tab>:set\ et!
-menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai!			开/关自动缩进(&A)<Tab>:set\ ai!
-menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin!		开/关\ C\ 语言式缩进(&C)<Tab>:set\ cin!
+menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu! 开/关行号(&N)<Tab>:set\ nu!
+menutrans Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu! 开/关相对行号(&V)<Tab>:set\ rnu!
+menutrans Toggle\ &List\ Mode<Tab>:set\ list! 开/关列表模式(&L)<Tab>:set\ list!
+menutrans Toggle\ Line\ &Wrapping<Tab>:set\ wrap! 开/关换行(&W)<Tab>:set\ wrap!
+menutrans Toggle\ W&rapping\ at\ Word<Tab>:set\ lbr! 开/关词尾换行(&R)<Tab>:set\ lbr!
+menutrans Toggle\ Tab\ &Expanding<Tab>:set\ et! 开/关制表符扩展(&E)<Tab>:set\ et!
+menutrans Toggle\ &Auto\ Indenting<Tab>:set\ ai! 开/关自动缩进(&A)<Tab>:set\ ai!
+menutrans Toggle\ &C-Style\ Indenting<Tab>:set\ cin! 开/关\ C\ 语言式缩进(&C)<Tab>:set\ cin!

 " other options
-menutrans &Shiftwidth										缩进宽度(&S)
-menutrans Soft\ &Tabstop									软制表位宽度(Soft\ Tabstop)(&T)
-menutrans Te&xt\ Width\.\.\.								文本宽度(&X)\.\.\.
-menutrans &File\ Format\.\.\.								文件格式(&F)\.\.\.
+menutrans &Shiftwidth 缩进宽度(&S)
+menutrans Soft\ &Tabstop 软制表位宽度(Soft\ Tabstop)(&T)
+menutrans Te&xt\ Width\.\.\. 文本宽度(&X)\.\.\.
+menutrans &File\ Format\.\.\. 文件格式(&F)\.\.\.

 " fun! s:TextWidth()
 if !exists("g:menutrans_textwidth_dialog")
@@ -140,36 +146,36 @@ if !exists("g:menutrans_fileformat_choices")
  let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n取消(&C)"
 endif
 " }}}
-menutrans Show\ C&olor\ Schemes\ in\ Menu	在菜单中显示配色方案(&O)
-menutrans C&olor\ Scheme					配色方案(&O)
-menutrans Show\ &Keymaps\ in\ Menu			在菜单中显示键盘映射(&K)
-menutrans &Keymap							键盘映射(&K)
-menutrans Select\ Fo&nt\.\.\.				选择字体(&N)\.\.\.
+menutrans Show\ C&olor\ Schemes\ in\ Menu 在菜单中显示配色方案(&O)
+menutrans C&olor\ Scheme 配色方案(&O)
+menutrans Show\ &Keymaps\ in\ Menu 在菜单中显示键盘映射(&K)
+menutrans &Keymap 键盘映射(&K)
+menutrans Select\ Fo&nt\.\.\. 选择字体(&N)\.\.\.
 " }}}

 " Programming menu
-menutrans &Tools	工具(&T)
+menutrans &Tools 工具(&T)
 " Tools menuitems {{{1
-menutrans &Jump\ to\ This\ Tag<Tab>g^]			跳转到这个标记(Tag)(&J)<Tab>g^]
-menutrans Jump\ &Back<Tab>^T					跳转回(&B)<Tab>^T
-menutrans Build\ &Tags\ File					生成标记文件(Tags)(&T)
+menutrans &Jump\ to\ This\ Tag<Tab>g^] 跳转到这个标记(Tag)(&J)<Tab>g^]
+menutrans Jump\ &Back<Tab>^T 跳转回(&B)<Tab>^T
+menutrans Build\ &Tags\ File 生成标记文件(Tags)(&T)

 " Tools.Spelling Menu
-menutrans &Spelling								拼写检查(&S)
+menutrans &Spelling 拼写检查(&S)
 " Tools.Spelling menuitems and dialog {{{2
-menutrans &Spell\ Check\ On						打开拼写检查(&S)
-menutrans Spell\ Check\ &Off					关闭拼写检查(&O)
-menutrans To\ &Next\ Error<Tab>]s				上一个错误(&N)<Tab>]s
-menutrans To\ &Previous\ Error<Tab>[s			下一个错误(&P)<Tab>[s
-menutrans Suggest\ &Corrections<Tab>z=			更正建议(&C)<Tab>z=
-menutrans &Repeat\ Correction<Tab>:spellrepall	更正全部同类错误(&R)<Tab>:spellrepall
-menutrans Set\ Language\ to\ "en"				设置语言为\ "en"
-menutrans Set\ Language\ to\ "en_au"			设置语言为\ "en_au"
-menutrans Set\ Language\ to\ "en_ca"			设置语言为\ "en_ca"
-menutrans Set\ Language\ to\ "en_gb"			设置语言为\ "en_gb"
-menutrans Set\ Language\ to\ "en_nz"			设置语言为\ "en_nz"
-menutrans Set\ Language\ to\ "en_us"			设置语言为\ "en_us"
-menutrans &Find\ More\ Languages				查找更多语言(&F)
+menutrans &Spell\ Check\ On 打开拼写检查(&S)
+menutrans Spell\ Check\ &Off 关闭拼写检查(&O)
+menutrans To\ &Next\ Error<Tab>]s 上一个错误(&N)<Tab>]s
+menutrans To\ &Previous\ Error<Tab>[s 下一个错误(&P)<Tab>[s
+menutrans Suggest\ &Corrections<Tab>z= 更正建议(&C)<Tab>z=
+menutrans &Repeat\ Correction<Tab>:spellrepall 更正全部同类错误(&R)<Tab>:spellrepall
+menutrans Set\ Language\ to\ "en" 设置语言为\ "en"
+menutrans Set\ Language\ to\ "en_au" 设置语言为\ "en_au"
+menutrans Set\ Language\ to\ "en_ca" 设置语言为\ "en_ca"
+menutrans Set\ Language\ to\ "en_gb" 设置语言为\ "en_gb"
+menutrans Set\ Language\ to\ "en_nz" 设置语言为\ "en_nz"
+menutrans Set\ Language\ to\ "en_us" 设置语言为\ "en_us"
+menutrans &Find\ More\ Languages 查找更多语言(&F)

 " func! s:SpellLang()
 if !exists("g:menutrans_set_lang_to")
@@ -178,113 +184,113 @@ endif
 " }}}

 " Tools.Fold Menu
-menutrans &Folding								折叠(&F)
+menutrans &Folding 折叠(&F)
 " Tools.Fold menuitems {{{2
 " open close folds
-menutrans &Enable/Disable\ Folds<Tab>zi			启用/禁用折叠(&E)<Tab>zi
-menutrans &View\ Cursor\ Line<Tab>zv			展开光标所在行(&V)<Tab>zv
-menutrans Vie&w\ Cursor\ Line\ Only<Tab>zMzx	只展开光标所在行(&W)<Tab>zMzx
-menutrans C&lose\ More\ Folds<Tab>zm			折叠一级(&L)<Tab>zm
-menutrans &Close\ All\ Folds<Tab>zM				折叠全部(&C)<Tab>zM
-menutrans O&pen\ More\ Folds<Tab>zr				展开一级(&P)<Tab>zr
-menutrans &Open\ All\ Folds<Tab>zR				展开全部(&O)<Tab>zR
+menutrans &Enable/Disable\ Folds<Tab>zi 启用/禁用折叠(&E)<Tab>zi
+menutrans &View\ Cursor\ Line<Tab>zv 展开光标所在行(&V)<Tab>zv
+menutrans Vie&w\ Cursor\ Line\ Only<Tab>zMzx 只展开光标所在行(&W)<Tab>zMzx
+menutrans C&lose\ More\ Folds<Tab>zm 折叠一级(&L)<Tab>zm
+menutrans &Close\ All\ Folds<Tab>zM 折叠全部(&C)<Tab>zM
+menutrans O&pen\ More\ Folds<Tab>zr 展开一级(&P)<Tab>zr
+menutrans &Open\ All\ Folds<Tab>zR 展开全部(&O)<Tab>zR
 " fold method
-menutrans Fold\ Met&hod							折叠方式(&H)
+menutrans Fold\ Met&hod 折叠方式(&H)
 " Tools.Fold.Fold Method menuitems {{{3
-menutrans M&anual		手动(&A)
-menutrans I&ndent		缩进(&N)
-menutrans E&xpression	表达式(&X)
-menutrans S&yntax		语法(&Y)
-menutrans &Diff			差异(Diff)(&D)
-menutrans Ma&rker		记号(Marker)(&R)
+menutrans M&anual 手动(&A)
+menutrans I&ndent 缩进(&N)
+menutrans E&xpression 表达式(&X)
+menutrans S&yntax 语法(&Y)
+menutrans &Diff 差异(Diff)(&D)
+menutrans Ma&rker 记号(Marker)(&R)
 " }}}
 " create and delete folds
-menutrans Create\ &Fold<Tab>zf					创建折叠(&F)<Tab>zf
-menutrans &Delete\ Fold<Tab>zd					删除折叠(&D)<Tab>zd
-menutrans Delete\ &All\ Folds<Tab>zD			删除全部折叠(&A)<Tab>zD
+menutrans Create\ &Fold<Tab>zf 创建折叠(&F)<Tab>zf
+menutrans &Delete\ Fold<Tab>zd 删除折叠(&D)<Tab>zd
+menutrans Delete\ &All\ Folds<Tab>zD 删除全部折叠(&A)<Tab>zD
 " moving around in folds
-menutrans Fold\ Col&umn\ Width					折叠操作栏宽度(&W)
+menutrans Fold\ Col&umn\ Width 折叠操作栏宽度(&W)
 " }}}

 " Tools.Diff Menu
-menutrans &Diff									差异(Diff)(&D)
+menutrans &Diff 差异(Diff)(&D)
 " Tools.Diff menuitems {{{2
-menutrans &Update		刷新(&U)
-menutrans &Get\ Block	采用对侧文本块(&G)
-menutrans &Put\ Block	采用本侧文本块(&P)
+menutrans &Update 刷新(&U)
+menutrans &Get\ Block 采用对侧文本块(&G)
+menutrans &Put\ Block 采用本侧文本块(&P)
 " }}}

-menutrans &Make<Tab>:make						生成(Make)(&M)<Tab>:make
-menutrans &List\ Errors<Tab>:cl					列出错误(&L)<Tab>:cl
-menutrans L&ist\ Messages<Tab>:cl!				列出消息(&I)<Tab>:cl!
-menutrans &Next\ Error<Tab>:cn					下一个错误(&N)<Tab>:cn
-menutrans &Previous\ Error<Tab>:cp				上一个错误(&P)<Tab>:cp
-menutrans &Older\ List<Tab>:cold				较旧的错误列表(&O)<Tab>:cold
-menutrans N&ewer\ List<Tab>:cnew				较新的错误列表(&E)<Tab>:cnew
-menutrans Error\ &Window						错误窗口(&W)
+menutrans &Make<Tab>:make 生成(Make)(&M)<Tab>:make
+menutrans &List\ Errors<Tab>:cl 列出错误(&L)<Tab>:cl
+menutrans L&ist\ Messages<Tab>:cl! 列出消息(&I)<Tab>:cl!
+menutrans &Next\ Error<Tab>:cn 下一个错误(&N)<Tab>:cn
+menutrans &Previous\ Error<Tab>:cp 上一个错误(&P)<Tab>:cp
+menutrans &Older\ List<Tab>:cold 较旧的错误列表(&O)<Tab>:cold
+menutrans N&ewer\ List<Tab>:cnew 较新的错误列表(&E)<Tab>:cnew
+menutrans Error\ &Window 错误窗口(&W)
 " Tools.Error Window menuitems {{{2
-menutrans &Update<Tab>:cwin		刷新(&U)<Tab>:cwin
-menutrans &Open<Tab>:copen		打开(&O)<Tab>:copen
-menutrans &Close<Tab>:cclose	关闭(&C)<Tab>:cclose
+menutrans &Update<Tab>:cwin 刷新(&U)<Tab>:cwin
+menutrans &Open<Tab>:copen 打开(&O)<Tab>:copen
+menutrans &Close<Tab>:cclose 关闭(&C)<Tab>:cclose
 " }}}
-menutrans Show\ Compiler\ Se&ttings\ in\ Menu	在菜单中显示编译器设置(&T)
-menutrans Se&t\ Compiler						设置编译器(&T)
-menutrans &Convert\ to\ HEX<Tab>:%!xxd			转换成十六进制(&C)<Tab>:%!xxd
-menutrans Conve&rt\ Back<Tab>:%!xxd\ -r			转换回(&R)<Tab>:%!xxd\ -r
+menutrans Show\ Compiler\ Se&ttings\ in\ Menu 在菜单中显示编译器设置(&T)
+menutrans Se&t\ Compiler 设置编译器(&T)
+menutrans &Convert\ to\ HEX<Tab>:%!xxd 转换成十六进制(&C)<Tab>:%!xxd
+menutrans Conve&rt\ Back<Tab>:%!xxd\ -r 转换回(&R)<Tab>:%!xxd\ -r
 " }}}

 " Buffer menu
-menutrans &Buffers	缓冲区(&B)
+menutrans &Buffers 缓冲区(&B)
 " Buffer menuitems and dialog {{{1
-menutrans &Refresh\ Menu	刷新本菜单(&R)
-menutrans &Delete			删除(&D)
-menutrans &Alternate		切换(&A)
-menutrans &Next				下一个(&N)
-menutrans &Previous			上一个(&P)
+menutrans &Refresh\ Menu 刷新本菜单(&R)
+menutrans &Delete 删除(&D)
+menutrans &Alternate 切换(&A)
+menutrans &Next 下一个(&N)
+menutrans &Previous 上一个(&P)

-" func! s:BMMunge(fname, bnum) 
+" func! s:BMMunge(fname, bnum)
 if !exists("g:menutrans_no_file")
  let g:menutrans_no_file = "[无文件]"
 endif
 " }}}

 " Window menu
-menutrans &Window	窗口(&W)
+menutrans &Window 窗口(&W)
 " Window menuitems {{{1
-menutrans &New<Tab>^Wn					新建(&N)<Tab>^Wn
-menutrans S&plit<Tab>^Ws				拆分(&P)<Tab>^Ws
-menutrans Sp&lit\ To\ #<Tab>^W^^		拆分并显示缓冲区\ #(&L)<Tab>^W^^
-menutrans Split\ &Vertically<Tab>^Wv	垂直拆分(&V)<Tab>^Wv
-menutrans Split\ File\ E&xplorer		拆分并打开文件浏览器(&X)
-menutrans &Close<Tab>^Wc				关闭(&C)<Tab>^Wc
-menutrans Close\ &Other(s)<Tab>^Wo		除此之外全部关闭(&O)<Tab>^Wo
-menutrans Move\ &To						移动到(&T)
-menutrans &Top<Tab>^WK					顶端(&T)<Tab>^WK
-menutrans &Bottom<Tab>^WJ				底端(&B)<Tab>^WJ
-menutrans &Left\ Side<Tab>^WH			左边(&L)<Tab>^WH
-menutrans &Right\ Side<Tab>^WL			右边(&R)<Tab>^WL
-menutrans Rotate\ &Up<Tab>^WR			向上轮换(&U)<Tab>^WR
-menutrans Rotate\ &Down<Tab>^Wr			向下轮换(&D)<Tab>^Wr
-menutrans &Equal\ Size<Tab>^W=			平均分布(&E)<Tab>^W=
-menutrans &Max\ Height<Tab>^W_			最大高度(&M)<Tab>^W
-menutrans M&in\ Height<Tab>^W1_			最小高度(&I)<Tab>^W1_
-menutrans Max\ &Width<Tab>^W\|			最大宽度(&W)<Tab>^W\|
-menutrans Min\ Widt&h<Tab>^W1\|			最小宽度(&H)<Tab>^W1\|
+menutrans &New<Tab>^Wn 新建(&N)<Tab>^Wn
+menutrans S&plit<Tab>^Ws 拆分(&P)<Tab>^Ws
+menutrans Sp&lit\ To\ #<Tab>^W^^ 拆分并显示缓冲区\ #(&L)<Tab>^W^^
+menutrans Split\ &Vertically<Tab>^Wv 垂直拆分(&V)<Tab>^Wv
+menutrans Split\ File\ E&xplorer 拆分并打开文件浏览器(&X)
+menutrans &Close<Tab>^Wc 关闭(&C)<Tab>^Wc
+menutrans Close\ &Other(s)<Tab>^Wo 除此之外全部关闭(&O)<Tab>^Wo
+menutrans Move\ &To 移动到(&T)
+menutrans &Top<Tab>^WK 顶端(&T)<Tab>^WK
+menutrans &Bottom<Tab>^WJ 底端(&B)<Tab>^WJ
+menutrans &Left\ Side<Tab>^WH 左边(&L)<Tab>^WH
+menutrans &Right\ Side<Tab>^WL 右边(&R)<Tab>^WL
+menutrans Rotate\ &Up<Tab>^WR 向上轮换(&U)<Tab>^WR
+menutrans Rotate\ &Down<Tab>^Wr 向下轮换(&D)<Tab>^Wr
+menutrans &Equal\ Size<Tab>^W= 平均分布(&E)<Tab>^W=
+menutrans &Max\ Height<Tab>^W_ 最大高度(&M)<Tab>^W
+menutrans M&in\ Height<Tab>^W1_ 最小高度(&I)<Tab>^W1_
+menutrans Max\ &Width<Tab>^W\| 最大宽度(&W)<Tab>^W\|
+menutrans Min\ Widt&h<Tab>^W1\| 最小宽度(&H)<Tab>^W1\|
 " }}}

 " The popup menu {{{1
-menutrans &Undo					撤销(&U)
-menutrans Cu&t					剪切(&T)
-menutrans &Copy					复制(&C)
-menutrans &Paste				粘贴(&P)
-menutrans &Delete				删除(&D)
-menutrans Select\ Blockwise		改为选定矩形块
-menutrans Select\ &Word			选定单词(&W)
-menutrans Select\ &Sentence		选定句(&S)
-menutrans Select\ Pa&ragraph	选定段落(&R)
-menutrans Select\ &Line			选定行(&L)
-menutrans Select\ &Block		选定矩形块(&B)
-menutrans Select\ &All			全选(&A)
+menutrans &Undo 撤销(&U)
+menutrans Cu&t 剪切(&T)
+menutrans &Copy 复制(&C)
+menutrans &Paste 粘贴(&P)
+menutrans &Delete 删除(&D)
+menutrans Select\ Blockwise 改为选定矩形块
+menutrans Select\ &Word 选定单词(&W)
+menutrans Select\ &Sentence 选定句(&S)
+menutrans Select\ Pa&ragraph 选定段落(&R)
+menutrans Select\ &Line 选定行(&L)
+menutrans Select\ &Block 选定矩形块(&B)
+menutrans Select\ &All 全选(&A)

 " func! <SID>SpellPopup()
 if !exists("g:menutrans_spell_change_ARG_to")
@@ -305,148 +311,260 @@ if has("toolbar")
  endif
  fun Do_toolbar_tmenu()
    let did_toolbar_tmenu = 1
-    tmenu ToolBar.Open			打开文件
-    tmenu ToolBar.Save			保存当前文件
-    tmenu ToolBar.SaveAll		全部保存
-    tmenu ToolBar.Print			打印
-    tmenu ToolBar.Undo			撤销
-    tmenu ToolBar.Redo			恢复
-    tmenu ToolBar.Cut			剪切到剪贴板
-    tmenu ToolBar.Copy			复制到剪贴板
-    tmenu ToolBar.Paste			从剪贴板粘贴
+    tmenu ToolBar.Open 打开文件
+    tmenu ToolBar.Save 保存当前文件
+    tmenu ToolBar.SaveAll 全部保存
+    tmenu ToolBar.Print 打印
+    tmenu ToolBar.Undo 撤销
+    tmenu ToolBar.Redo 恢复
+    tmenu ToolBar.Cut 剪切到剪贴板
+    tmenu ToolBar.Copy 复制到剪贴板
+    tmenu ToolBar.Paste 从剪贴板粘贴
    if !has("gui_athena")
-      tmenu ToolBar.Replace		查找和替换...
-      tmenu ToolBar.FindNext	查找下一个
-      tmenu ToolBar.FindPrev	查找上一个
+      tmenu ToolBar.Replace 查找和替换...
+      tmenu ToolBar.FindNext 查找下一个
+      tmenu ToolBar.FindPrev 查找上一个
    endif
-    tmenu ToolBar.LoadSesn		加载会话
-    tmenu ToolBar.SaveSesn		保存当前会话
-    tmenu ToolBar.RunScript		运行 Vim 脚本
-    tmenu ToolBar.Make			生成当前项目 (:make)
-    tmenu ToolBar.RunCtags		在当前目录生成标记(Tags) (!ctags -R .)
-    tmenu ToolBar.TagJump		跳转到光标所在标记(Tag)
-    tmenu ToolBar.Help			Vim 帮助
-    tmenu ToolBar.FindHelp		在 Vim 帮助中查找
+    tmenu ToolBar.LoadSesn 加载会话
+    tmenu ToolBar.SaveSesn 保存当前会话
+    tmenu ToolBar.RunScript 运行 Vim 脚本
+    tmenu ToolBar.Make 生成当前项目 (:make)
+    tmenu ToolBar.RunCtags 在当前目录生成标记(Tags) (!ctags -R .)
+    tmenu ToolBar.TagJump 跳转到光标所在标记(Tag)
+    tmenu ToolBar.Help Vim 帮助
+    tmenu ToolBar.FindHelp 在 Vim 帮助中查找
  endfun
 endif
 " }}}

 " Syntax menu
-menutrans &Syntax	语法(&S)
+menutrans &Syntax 语法(&S)
 " Syntax menuitems {{{1
-menutrans &Show\ File\ Types\ in\ Menu	在菜单中显示文件类型(&S)
-menutrans &Off							关闭(&O)
-menutrans &Manual						手动(&M)
-menutrans A&utomatic					自动(&U)
-menutrans On/Off\ for\ &This\ File		只对这个文件开/关(&T)
-menutrans Co&lor\ Test					色彩测试(&L)
-menutrans &Highlight\ Test				高亮测试(&H)
-menutrans &Convert\ to\ HTML			转换成\ HTML(&C)
+menutrans &Show\ File\ Types\ in\ Menu 在菜单中显示文件类型(&S)
+menutrans &Off 关闭(&O)
+menutrans &Manual 手动(&M)
+menutrans A&utomatic 自动(&U)
+menutrans On/Off\ for\ &This\ File 只对这个文件开/关(&T)
+menutrans Co&lor\ Test 色彩测试(&L)
+menutrans &Highlight\ Test 高亮测试(&H)
+menutrans &Convert\ to\ HTML 转换成\ HTML(&C)
+
 " From synmenu.vim
-menutrans Set\ '&syntax'\ Only			只设置\ 'syntax'(&S)
-menutrans Set\ '&filetype'\ Too			也设置\ 'filetype'(&F)
+menutrans Set\ '&syntax'\ Only 只设置\ 'syntax'(&S)
+menutrans Set\ '&filetype'\ Too 也设置\ 'filetype'(&F)
+menutrans Oracle\ config Oracle\ 配置文件
+menutrans Vim\ help\ file Vim\ 帮助文件
+menutrans Vim\ script Vim\ 脚本
+menutrans Viminfo\ file Vim\ 信息文件
+menutrans Virata\ config Virata\ 配置文件
+menutrans Whitespace\ (add) 增加加亮空格
 " }}}

 " Netrw menu {{{1
 " Plugin loading may be after menu translation
 " So giveup testing if Netrw Plugin is loaded
 " if exists("g:loaded_netrwPlugin")
-  menutrans Help<tab><F1>					帮助<tab><F1>
-  menutrans Bookmarks						书签
-  menutrans History							历史记录
-  menutrans Go\ Up\ Directory<tab>-			向上一级<tab>-
-  menutrans Apply\ Special\ Viewer<tab>x	用默认程序打开<tab>x
-  menutrans Bookmarks\ and\ History			书签和历史记录
+  menutrans Help<tab><F1> 帮助<tab><F1>
+  menutrans Bookmarks 书签
+  menutrans History 历史记录
+  menutrans Go\ Up\ Directory<tab>- 向上一级<tab>-
+  menutrans Apply\ Special\ Viewer<tab>x 用默认程序打开<tab>x
+  menutrans Bookmarks\ and\ History 书签和历史记录
  " Netrw.Bookmarks and History menuitems {{{2
-  menutrans Bookmark\ Current\ Directory<tab>mb		添加书签<tab>mb
-  menutrans Bookmark\ Delete						移除书签
-  menutrans Goto\ Prev\ Dir\ (History)<tab>u		后退(历史记录)<tab>u
-  menutrans Goto\ Next\ Dir\ (History)<tab>U		前进(历史记录)<tab>U
-  menutrans List<tab>qb								完整列表<tab>qb
+  menutrans Bookmark\ Current\ Directory<tab>mb 添加书签<tab>mb
+  menutrans Bookmark\ Delete 移除书签
+  menutrans Goto\ Prev\ Dir\ (History)<tab>u 后退(历史记录)<tab>u
+  menutrans Goto\ Next\ Dir\ (History)<tab>U 前进(历史记录)<tab>U
+  menutrans List<tab>qb 完整列表<tab>qb
  " }}}
-  menutrans Browsing\ Control				控制
+  menutrans Browsing\ Control 控制
  " Netrw.Browsing Control menuitems {{{2
-  menutrans Horizontal\ Split<tab>o					在拆分窗口打开<tab>o
-  menutrans Vertical\ Split<tab>v					在垂直拆分窗口打开<tab>v
-  menutrans New\ Tab<tab>t							在标签页打开<tab>t	
-  menutrans Preview<tab>p							预览<tab>p
-  menutrans Edit\ File\ Hiding\ List<tab><ctrl-h>	编辑隐藏条件(Hiding\ List)<tab><ctrl-h>
-  menutrans Edit\ Sorting\ Sequence<tab>S			编辑排序条件(Sorting\ Sequence)<tab>S
-  menutrans Quick\ Hide/Unhide\ Dot\ Files<tab>gh	快速隐藏/显示以\.开头的文件<tab>gh
-  menutrans Refresh\ Listing<tab><ctrl-l>			刷新<tab><ctrl-l>
-  menutrans Settings/Options<tab>:NetrwSettings		设置/选项<tab>:NetrwSettings
+  menutrans Horizontal\ Split<tab>o 在拆分窗口打开<tab>o
+  menutrans Vertical\ Split<tab>v 在垂直拆分窗口打开<tab>v
+  menutrans New\ Tab<tab>t 在标签页打开<tab>t
+  menutrans Preview<tab>p 预览<tab>p
+  menutrans Edit\ File\ Hiding\ List<tab><ctrl-h> 编辑隐藏条件(Hiding\ List)<tab><ctrl-h>
+  menutrans Edit\ Sorting\ Sequence<tab>S 编辑排序条件(Sorting\ Sequence)<tab>S
+  menutrans Quick\ Hide/Unhide\ Dot\ Files<tab>gh 快速隐藏/显示以\.开头的文件<tab>gh
+  menutrans Refresh\ Listing<tab><ctrl-l> 刷新<tab><ctrl-l>
+  menutrans Settings/Options<tab>:NetrwSettings 设置/选项<tab>:NetrwSettings
  " }}}
-  menutrans Delete\ File/Directory<tab>D	删除文件/目录<tab>D
-  menutrans Edit\ File/Dir					编辑文件/目录
+  menutrans Delete\ File/Directory<tab>D 删除文件/目录<tab>D
+  menutrans Edit\ File/Dir 编辑文件/目录
  " Netrw.Edit File menuitems {{{2
-  menutrans Create\ New\ File<tab>%				新建文件<tab>%
-  menutrans In\ Current\ Window<tab><cr>		在当前窗口<tab><cr>
-  menutrans Preview\ File/Directory<tab>p		预览文件/目录<tab>p
-  menutrans In\ Previous\ Window<tab>P			在上一个窗口<tab>P
-  menutrans In\ New\ Window<tab>o				在新窗口<tab>o
-  menutrans In\ New\ Tab<tab>t					在新标签页<tab>t
-  menutrans In\ New\ Vertical\ Window<tab>v		在新垂直窗口<tab>v
+  menutrans Create\ New\ File<tab>% 新建文件<tab>%
+  menutrans In\ Current\ Window<tab><cr> 在当前窗口<tab><cr>
+  menutrans Preview\ File/Directory<tab>p 预览文件/目录<tab>p
+  menutrans In\ Previous\ Window<tab>P 在上一个窗口<tab>P
+  menutrans In\ New\ Window<tab>o 在新窗口<tab>o
+  menutrans In\ New\ Tab<tab>t 在新标签页<tab>t
+  menutrans In\ New\ Vertical\ Window<tab>v 在新垂直窗口<tab>v
  " }}}
-  menutrans Explore							浏览
+  menutrans Explore 浏览
  " Netrw.Explore menuitems {{{2
-  menutrans Directory\ Name															指定目录名
-  menutrans Filenames\ Matching\ Pattern\ (curdir\ only)<tab>:Explore\ */			匹配指定文件名模式(当前目录)<tab>:Explore\ */
-  menutrans Filenames\ Matching\ Pattern\ (+subdirs)<tab>:Explore\ **/				匹配指定文件名模式(含子目录)<tab>:Explore\ **/
-  menutrans Files\ Containing\ String\ Pattern\ (curdir\ only)<tab>:Explore\ *//	内容包含指定字符串模式(当前目录)<tab>:Explore\ *//
-  menutrans Files\ Containing\ String\ Pattern\ (+subdirs)<tab>:Explore\ **//		内容包含指定字符串模式(含子目录)<tab>:Explore\ **//
-  menutrans Next\ Match<tab>:Nexplore												下一个匹配项<tab>:Nexplore
-  menutrans Prev\ Match<tab>:Pexplore												上一个匹配项<tab>:Pexplore
+  menutrans Directory\ Name 指定目录名
+  menutrans Filenames\ Matching\ Pattern\ (curdir\ only)<tab>:Explore\ */ 匹配指定文件名模式(当前目录)<tab>:Explore\ */
+  menutrans Filenames\ Matching\ Pattern\ (+subdirs)<tab>:Explore\ **/ 匹配指定文件名模式(含子目录)<tab>:Explore\ **/
+  menutrans Files\ Containing\ String\ Pattern\ (curdir\ only)<tab>:Explore\ *// 内容包含指定字符串模式(当前目录)<tab>:Explore\ *//
+  menutrans Files\ Containing\ String\ Pattern\ (+subdirs)<tab>:Explore\ **// 内容包含指定字符串模式(含子目录)<tab>:Explore\ **//
+  menutrans Next\ Match<tab>:Nexplore 下一个匹配项<tab>:Nexplore
+  menutrans Prev\ Match<tab>:Pexplore 上一个匹配项<tab>:Pexplore
  " }}}
-  menutrans Make\ Subdirectory<tab>d		新建子目录<tab>d
-  menutrans Marked\ Files					选定的(Marked)文件
+  menutrans Make\ Subdirectory<tab>d 新建子目录<tab>d
+  menutrans Marked\ Files 选定的(Marked)文件
  " Netrw.Marked Files menuitems {{{2
-  menutrans Mark\ File<tab>mf						选定(Mark)/取消<tab>mf
-  menutrans Mark\ Files\ by\ Regexp<tab>mr			用正则表达式(Regexp)选定<tab>mr
-  menutrans Hide-Show-List\ Control<tab>a			隐藏/显示<tab>a
-  menutrans Copy\ To\ Target<tab>mc					复制到目标<tab>mc
-  menutrans Delete<tab>D							删除<tab>D
-  menutrans Diff<tab>md								差异(Diff)<tab>md
-  menutrans Edit<tab>me								编辑<tab>me
-  menutrans Exe\ Cmd<tab>mx							作为参数运行命令<tab>mx
-  menutrans Move\ To\ Target<tab>mm					移动到目标<tab>mm
-  menutrans Obtain<tab>O							获取<tab>O
-  menutrans Print<tab>mp							打印<tab>mp
-  menutrans Replace<tab>R							替换<tab>R
-  menutrans Set\ Target<tab>mt						设置目标<tab>mt
-  menutrans Tag<tab>mT								生成标记文件(Tags)<tab>mT
-  menutrans Zip/Unzip/Compress/Uncompress<tab>mz	压缩/解压缩<tab>mz
+  menutrans Mark\ File<tab>mf 选定(Mark)/取消<tab>mf
+  menutrans Mark\ Files\ by\ Regexp<tab>mr 用正则表达式(Regexp)选定<tab>mr
+  menutrans Hide-Show-List\ Control<tab>a 隐藏/显示<tab>a
+  menutrans Copy\ To\ Target<tab>mc 复制到目标<tab>mc
+  menutrans Delete<tab>D 删除<tab>D
+  menutrans Diff<tab>md 差异(Diff)<tab>md
+  menutrans Edit<tab>me 编辑<tab>me
+  menutrans Exe\ Cmd<tab>mx 作为参数运行命令<tab>mx
+  menutrans Move\ To\ Target<tab>mm 移动到目标<tab>mm
+  menutrans Obtain<tab>O 获取<tab>O
+  menutrans Print<tab>mp 打印<tab>mp
+  menutrans Replace<tab>R 替换<tab>R
+  menutrans Set\ Target<tab>mt 设置目标<tab>mt
+  menutrans Tag<tab>mT 生成标记文件(Tags)<tab>mT
+  menutrans Zip/Unzip/Compress/Uncompress<tab>mz 压缩/解压缩<tab>mz
  " }}}
-  menutrans Obtain\ File<tab>O				获取文件<tab>O
-  menutrans Style							显示风格
+  menutrans Obtain\ File<tab>O 获取文件<tab>O
+  menutrans Style 显示风格
  " Netrw.Style menuitems {{{2
-  menutrans Listing							列表形式
+  menutrans Listing 列表形式
  " Netrw.Style.Listing menuitems {{{3
-  menutrans thin<tab>i	紧凑<thin)<tab>i
-  menutrans long<tab>i	详细(long)<tab>i
-  menutrans wide<tab>i	多列(wide)<tab>i
-  menutrans tree<tab>i	树状(tree)<tab>i
+  menutrans thin<tab>i 紧凑<thin)<tab>i
+  menutrans long<tab>i 详细(long)<tab>i
+  menutrans wide<tab>i 多列(wide)<tab>i
+  menutrans tree<tab>i 树状(tree)<tab>i
  " }}}
-  menutrans Normal-Hide-Show				显示/隐藏
+  menutrans Normal-Hide-Show 显示/隐藏
  " Netrw.Style.Normal-Hide_show menuitems {{{3
-  menutrans Show\ All<tab>a		显示全部
-  menutrans Normal<tab>a		不显示隐藏文件
-  menutrans Hidden\ Only<tab>a	只显示隐藏文件
+  menutrans Show\ All<tab>a 显示全部
+  menutrans Normal<tab>a 不显示隐藏文件
+  menutrans Hidden\ Only<tab>a 只显示隐藏文件
  " }}}
-  menutrans Reverse\ Sorting\ Order<tab>r	升序/降序<tab>r
-  menutrans Sorting\ Method					排序方式
+  menutrans Reverse\ Sorting\ Order<tab>r 升序/降序<tab>r
+  menutrans Sorting\ Method 排序方式
  " Netrw.Style.Sorting Method menuitems {{{3
-  menutrans Name<tab>s		文件名<tab>s
-  menutrans Time<tab>s		修改时间<tab>s
-  menutrans Size<tab>s		大小<tab>s
-  menutrans Exten<tab>s		扩展名<tab>s
+  menutrans Name<tab>s 文件名<tab>s
+  menutrans Time<tab>s 修改时间<tab>s
+  menutrans Size<tab>s 大小<tab>s
+  menutrans Exten<tab>s 扩展名<tab>s
  " }}}
  " }}}
-  menutrans Rename\ File/Directory<tab>R	重命名文件/目录<tab>R
-  menutrans Set\ Current\ Directory<tab>c	设置\ Vim\ 工作目录<tab>c
-  menutrans Targets							目标
+  menutrans Rename\ File/Directory<tab>R 重命名文件/目录<tab>R
+  menutrans Set\ Current\ Directory<tab>c 设置\ Vim\ 工作目录<tab>c
+  menutrans Targets 目标
 " endif
 " }}}

+" Shellmenu menu
+" Shellmenu menuitems {{{1
+" From shellmenu.vim
+menutrans ShellMenu Shell\ 菜单
+menutrans Statements 语句
+menutrans Test 测试
+menutrans Existence 存在
+menutrans Existence\ -\ file 存在\ -\ 文件
+menutrans Existence\ -\ file\ (not\ empty) 存在\ -\ 文件(非空)
+menutrans Existence\ -\ directory 存在\ -\ 目录
+menutrans Existence\ -\ executable 存在\ -\ 可执行
+menutrans Existence\ -\ readable 存在\ -\ 可读
+menutrans Existence\ -\ writable 存在\ -\ 可写
+menutrans String\ is\ empty 字符串为空
+menutrans String\ is\ not\ empty 字符串非空
+menutrans Strings\ are\ equal 字符串值相等
+menutrans Strings\ are\ not\ equal 字符串值不相等
+menutrans Value\ is\ greater\ than 值大于
+menutrans Value\ is\ greater\ equal 值大于等于
+menutrans Values\ are\ equal 值相等
+menutrans Values\ are\ not\ equal 值不相等
+menutrans Value\ is\ less\ than 值小于
+menutrans Value\ is\ less\ equal 值小于等于
+menutrans ParmSub 参数替换
+menutrans Substitute\ word\ if\ parm\ not\ set 如果参数没设置就替换该词
+menutrans Set\ parm\ to\ word\ if\ not\ set 参数未设置就设为该词
+menutrans Substitute\ word\ if\ parm\ set\ else\ nothing 如果参数设置就替换该词，否则什么都不做
+menutrans If\ parm\ not\ set\ print\ word\ and\ exit 如果参数没有设置就打印该词并退出
+menutrans SpShVars Shell\ 特殊变量
+menutrans Number\ of\ positional\ parameters 位置参数的数目
+menutrans All\ positional\ parameters\ (quoted\ spaces) 所有位置参数(quoted\ spaces)
+menutrans All\ positional\ parameters\ (unquoted\ spaces) 所有位置参数(unquoted\ spaces)
+menutrans Flags\ set 设置标志
+menutrans Return\ code\ of\ last\ command 返回前一条命令的代码
+menutrans Process\ number\ of\ this\ shell shell\ 自身进程号
+menutrans Process\ number\ of\ last\ background\ command 前一条后台命令的进程号
+menutrans Environ 环境变量
+menutrans Mark\ created\ or\ modified\ variables\ for\ export 标记修改的或者创建的变量为导出
+menutrans Exit\ when\ command\ returns\ non-zero\ status 当命令返回非零状态时退出
+menutrans Disable\ file\ name\ expansion 禁用文件名拓展
+menutrans Locate\ and\ remember\ commands\ when\ being\ looked\ up 当查询命令时定位并记住该命令
+menutrans All\ assignment\ statements\ are\ placed\ in\ the\ environment\ for\ a\ command 所有的赋值参数被放在命令的环境中
+menutrans Read\ commands\ but\ do\ not\ execute\ them 读命令但是不要执行
+menutrans Exit\ after\ reading\ and\ executing\ one\ command 读并执行一个命令之后退出
+menutrans Treat\ unset\ variables\ as\ an\ error\ when\ substituting 替换时把未设置命令视为错误
+menutrans Print\ shell\ input\ lines\ as\ they\ are\ read 读\ shell\ 输入行的时候打印
+menutrans Print\ commands\ and\ their\ arguments\ as\ they\ are\ executed 被执行时打印命令和参数
+" }}}
+
+" termdebug menu
+" termdebug menuitems {{{1
+" From termdebug.vim
+menutrans Set\ breakpoint 设置断点
+menutrans Clear\ breakpoint 清除断点
+menutrans Run\ until 运行到
+menutrans Evaluate 求值
+menutrans WinBar 工具条
+menutrans Step 单步
+menutrans Next 下一个
+menutrans Finish 结束
+menutrans Cont 继续
+menutrans Stop 停止
+" }}}
+
+" debchangelog menu
+" debchangelog menuitems {{{1
+" From debchangelog.vim
+menutrans &Changelog 更新日志(&C)
+menutrans &New\ Version 新版本(&N)
+menutrans &Add\ Entry 添加条目(&A)
+menutrans &Close\ Bug 关闭\ Bug(&C)
+menutrans Set\ &Distribution 设置发行版(&D)
+menutrans &unstable 不稳定(&U)
+menutrans Set\ &Urgency 设置紧急(&U)
+menutrans &low 低(&L)
+menutrans &medium 中(&M)
+menutrans &high 高(&H)
+menutrans U&nfinalise 未完成(&N)
+menutrans &Finalise 完成(&F)
+" }}}
+
+" ada menu
+" ada menuitems {{{1
+" From ada.vim
+menutrans Tag 标签
+menutrans List 列表
+menutrans Jump 跳转
+menutrans Create\ File 创建文件
+menutrans Create\ Dir 创建目录
+menutrans Highlight 高亮
+menutrans Toggle\ Space\ Errors 切换空格错误
+menutrans Toggle\ Lines\ Errors 切换行错误
+menutrans Toggle\ Rainbow\ Color 切换彩虹颜色
+menutrans Toggle\ Standard\ Types 切换标准类型
+" }}}
+
+" gnat menu
+" gnat menuitems {{{1
+" From gnat.vim
+menutrans Build 构建
+menutrans Pretty\ Print 重新格式化代码
+menutrans Find 查找
+menutrans Set\ Projectfile\.\.\. 设置项目文件\.\.\.
+" }}}
+
 let &cpo = s:keepcpo
 unlet s:keepcpo

--- a/runtime/pack/dist/opt/cfilter/plugin/cfilter.vim
+++ b/runtime/pack/dist/opt/cfilter/plugin/cfilter.vim
@@ -1,62 +1,72 @@
-" cfilter.vim: Plugin to filter entries from a quickfix/location list
-" Last Change: Aug 23, 2018
-" Maintainer: Yegappan Lakshmanan (yegappan AT yahoo DOT com)
-" Version: 1.1
-"
-" Commands to filter the quickfix list:
-"   :Cfilter[!] /{pat}/
-"       Create a new quickfix list from entries matching {pat} in the current
-"       quickfix list. Both the file name and the text of the entries are
-"       matched against {pat}. If ! is supplied, then entries not matching
-"       {pat} are used. The pattern can be optionally enclosed using one of
-"       the following characters: ', ", /. If the pattern is empty, then the
-"       last used search pattern is used.
-"   :Lfilter[!] /{pat}/
-"       Same as :Cfilter but operates on the current location list.
-"
-if exists("loaded_cfilter")
-    finish
-endif
-let loaded_cfilter = 1
+vim9script

-func s:Qf_filter(qf, searchpat, bang)
-    if a:qf
-	let Xgetlist = function('getqflist')
-	let Xsetlist = function('setqflist')
-	let cmd = ':Cfilter' . a:bang
-    else
-	let Xgetlist = function('getloclist', [0])
-	let Xsetlist = function('setloclist', [0])
-	let cmd = ':Lfilter' . a:bang
-    endif
+# cfilter.vim: Plugin to filter entries from a quickfix/location list
+# Last Change: Jun 30, 2022
+# Maintainer: Yegappan Lakshmanan (yegappan AT yahoo DOT com)
+# Version: 2.0
+#
+# Commands to filter the quickfix list:
+#   :Cfilter[!] /{pat}/
+#       Create a new quickfix list from entries matching {pat} in the current
+#       quickfix list. Both the file name and the text of the entries are
+#       matched against {pat}. If ! is supplied, then entries not matching
+#       {pat} are used. The pattern can be optionally enclosed using one of
+#       the following characters: ', ", /. If the pattern is empty, then the
+#       last used search pattern is used.
+#   :Lfilter[!] /{pat}/
+#       Same as :Cfilter but operates on the current location list.
+#

-    let firstchar = a:searchpat[0]
-    let lastchar = a:searchpat[-1:]
-    if firstchar == lastchar &&
-		\ (firstchar == '/' || firstchar == '"' || firstchar == "'")
-	let pat = a:searchpat[1:-2]
-	if pat == ''
-	    " Use the last search pattern
-	    let pat = @/
-	endif
-    else
-	let pat = a:searchpat
-    endif
+def Qf_filter(qf: bool, searchpat: string, bang: string)
+  var Xgetlist: func
+  var Xsetlist: func
+  var cmd: string
+  var firstchar: string
+  var lastchar: string
+  var pat: string
+  var title: string
+  var Cond: func
+  var items: list<any>

+  if qf
+    Xgetlist = function('getqflist')
+    Xsetlist = function('setqflist')
+    cmd = ':Cfilter' .. bang
+  else
+    Xgetlist = function('getloclist', [0])
+    Xsetlist = function('setloclist', [0])
+    cmd = ':Lfilter' .. bang
+  endif
+
+  firstchar = searchpat[0]
+  lastchar = searchpat[-1 :]
+  if firstchar == lastchar &&
+              (firstchar == '/' || firstchar == '"' || firstchar == "'")
+    pat = searchpat[1 : -2]
    if pat == ''
-	return
+      # Use the last search pattern
+      pat = @/
    endif
+  else
+    pat = searchpat
+  endif

-    if a:bang == '!'
-	let cond = 'v:val.text !~# pat && bufname(v:val.bufnr) !~# pat'
-    else
-	let cond = 'v:val.text =~# pat || bufname(v:val.bufnr) =~# pat'
-    endif
+  if pat == ''
+    return
+  endif

-    let items = filter(Xgetlist(), cond)
-    let title = cmd . ' /' . pat . '/'
-    call Xsetlist([], ' ', {'title' : title, 'items' : items})
-endfunc
+  if bang == '!'
+    Cond = (_, val) => val.text !~# pat && bufname(val.bufnr) !~# pat
+  else
+    Cond = (_, val) => val.text =~# pat || bufname(val.bufnr) =~# pat
+  endif

-com! -nargs=+ -bang Cfilter call s:Qf_filter(1, <q-args>, <q-bang>)
-com! -nargs=+ -bang Lfilter call s:Qf_filter(0, <q-args>, <q-bang>)
+  items = filter(Xgetlist(), Cond)
+  title = cmd .. ' /' .. pat .. '/'
+  Xsetlist([], ' ', {title: title, items: items})
+enddef
+
+command! -nargs=+ -bang Cfilter Qf_filter(true, <q-args>, <q-bang>)
+command! -nargs=+ -bang Lfilter Qf_filter(false, <q-args>, <q-bang>)
+
+# vim: shiftwidth=2 sts=2 expandtab
--- a/runtime/pack/dist/opt/shellmenu/plugin/shellmenu.vim
+++ b/runtime/pack/dist/opt/shellmenu/plugin/shellmenu.vim
@@ -15,89 +15,89 @@
 let s:cpo_save = &cpo
 set cpo&vim

-imenu Stmts.for	for  in <CR>do<CR><CR>done<esc>ki	<esc>kk0elli
-imenu Stmts.case	case  in<CR>) ;;<CR>esac<esc>bki	<esc>k0elli
-imenu Stmts.if	if   <CR>then<CR><CR>fi<esc>ki	<esc>kk0elli
-imenu Stmts.if-else	if   <CR>then<CR><CR>else<CR><CR>fi<esc>ki	<esc>kki	<esc>kk0elli
-imenu Stmts.elif	elif   <CR>then<CR><CR><esc>ki	<esc>kk0elli
-imenu Stmts.while	while   do<CR><CR>done<esc>ki	<esc>kk0elli
-imenu Stmts.break	break 
-imenu Stmts.continue	continue 
-imenu Stmts.function	() {<CR><CR>}<esc>ki	<esc>k0i
-imenu Stmts.return	return 
-imenu Stmts.return-true	return 0
-imenu Stmts.return-false	return 1
-imenu Stmts.exit	exit 
-imenu Stmts.shift	shift 
-imenu Stmts.trap	trap 
-imenu Test.existence	[ -e  ]<esc>hi
-imenu Test.existence\ -\ file		[ -f  ]<esc>hi
-imenu Test.existence\ -\ file\ (not\ empty)	[ -s  ]<esc>hi
-imenu Test.existence\ -\ directory	[ -d  ]<esc>hi
-imenu Test.existence\ -\ executable	[ -x  ]<esc>hi
-imenu Test.existence\ -\ readable	[ -r  ]<esc>hi
-imenu Test.existence\ -\ writable	[ -w  ]<esc>hi
-imenu Test.String\ is\ empty [ x = "x$" ]<esc>hhi
-imenu Test.String\ is\ not\ empty [ x != "x$" ]<esc>hhi
-imenu Test.Strings\ is\ equal [ "" = "" ]<esc>hhhhhhhi
-imenu Test.Strings\ is\ not\ equal [ "" != "" ]<esc>hhhhhhhhi
-imenu Test.Values\ is\ greater\ than [  -gt  ]<esc>hhhhhhi
-imenu Test.Values\ is\ greater\ equal [  -ge  ]<esc>hhhhhhi
-imenu Test.Values\ is\ equal [  -eq  ]<esc>hhhhhhi
-imenu Test.Values\ is\ not\ equal [  -ne  ]<esc>hhhhhhi
-imenu Test.Values\ is\ less\ than [  -lt  ]<esc>hhhhhhi
-imenu Test.Values\ is\ less\ equal [  -le  ]<esc>hhhhhhi
-imenu ParmSub.Substitute\ word\ if\ parm\ not\ set ${:-}<esc>hhi
-imenu ParmSub.Set\ parm\ to\ word\ if\ not\ set ${:=}<esc>hhi
-imenu ParmSub.Substitute\ word\ if\ parm\ set\ else\ nothing ${:+}<esc>hhi
-imenu ParmSub.If\ parm\ not\ set\ print\ word\ and\ exit ${:?}<esc>hhi
-imenu SpShVars.Number\ of\ positional\ parameters ${#}
-imenu SpShVars.All\ positional\ parameters\ (quoted\ spaces) ${*}
-imenu SpShVars.All\ positional\ parameters\ (unquoted\ spaces) ${@}
-imenu SpShVars.Flags\ set ${-}
-imenu SpShVars.Return\ code\ of\ last\ command ${?}
-imenu SpShVars.Process\ number\ of\ this\ shell ${$}
-imenu SpShVars.Process\ number\ of\ last\ background\ command ${!}
-imenu Environ.HOME ${HOME}
-imenu Environ.PATH ${PATH}
-imenu Environ.CDPATH ${CDPATH}
-imenu Environ.MAIL ${MAIL}
-imenu Environ.MAILCHECK ${MAILCHECK}
-imenu Environ.PS1 ${PS1}
-imenu Environ.PS2 ${PS2}
-imenu Environ.IFS ${IFS}
-imenu Environ.SHACCT ${SHACCT}
-imenu Environ.SHELL ${SHELL}
-imenu Environ.LC_CTYPE ${LC_CTYPE}
-imenu Environ.LC_MESSAGES ${LC_MESSAGES}
-imenu Builtins.cd cd
-imenu Builtins.echo echo
-imenu Builtins.eval eval
-imenu Builtins.exec exec
-imenu Builtins.export export
-imenu Builtins.getopts getopts
-imenu Builtins.hash hash
-imenu Builtins.newgrp newgrp
-imenu Builtins.pwd pwd
-imenu Builtins.read read
-imenu Builtins.readonly readonly
-imenu Builtins.return return
-imenu Builtins.times times
-imenu Builtins.type type
-imenu Builtins.umask umask
-imenu Builtins.wait wait
-imenu Set.set set
-imenu Set.unset unset
-imenu Set.mark\ modified\ or\ modified\ variables set -a
-imenu Set.exit\ when\ command\ returns\ non-zero\ exit\ code set -e
-imenu Set.Disable\ file\ name\ generation set -f
-imenu Set.remember\ function\ commands set -h
-imenu Set.All\ keyword\ arguments\ are\ placed\ in\ the\ environment set -k
-imenu Set.Read\ commands\ but\ do\ not\ execute\ them set -n
-imenu Set.Exit\ after\ reading\ and\ executing\ one\ command set -t
-imenu Set.Treat\ unset\ variables\ as\ an\ error\ when\ substituting set -u
-imenu Set.Print\ shell\ input\ lines\ as\ they\ are\ read set -v
-imenu Set.Print\ commands\ and\ their\ arguments\ as\ they\ are\ executed set -x
+imenu ShellMenu.Statements.for	for  in <CR>do<CR><CR>done<esc>ki	<esc>kk0elli
+imenu ShellMenu.Statements.case	case  in<CR>) ;;<CR>esac<esc>bki	<esc>k0elli
+imenu ShellMenu.Statements.if	if   <CR>then<CR><CR>fi<esc>ki	<esc>kk0elli
+imenu ShellMenu.Statements.if-else	if   <CR>then<CR><CR>else<CR><CR>fi<esc>ki	<esc>kki	<esc>kk0elli
+imenu ShellMenu.Statements.elif	elif   <CR>then<CR><CR><esc>ki	<esc>kk0elli
+imenu ShellMenu.Statements.while	while   do<CR><CR>done<esc>ki	<esc>kk0elli
+imenu ShellMenu.Statements.break	break 
+imenu ShellMenu.Statements.continue	continue 
+imenu ShellMenu.Statements.function	() {<CR><CR>}<esc>ki	<esc>k0i
+imenu ShellMenu.Statements.return	return 
+imenu ShellMenu.Statements.return-true	return 0
+imenu ShellMenu.Statements.return-false	return 1
+imenu ShellMenu.Statements.exit	exit 
+imenu ShellMenu.Statements.shift	shift 
+imenu ShellMenu.Statements.trap	trap 
+imenu ShellMenu.Test.Existence	[ -e  ]<esc>hi
+imenu ShellMenu.Test.Existence\ -\ file		[ -f  ]<esc>hi
+imenu ShellMenu.Test.Existence\ -\ file\ (not\ empty)	[ -s  ]<esc>hi
+imenu ShellMenu.Test.Existence\ -\ directory	[ -d  ]<esc>hi
+imenu ShellMenu.Test.Existence\ -\ executable	[ -x  ]<esc>hi
+imenu ShellMenu.Test.Existence\ -\ readable	[ -r  ]<esc>hi
+imenu ShellMenu.Test.Existence\ -\ writable	[ -w  ]<esc>hi
+imenu ShellMenu.Test.String\ is\ empty [ x = "x$" ]<esc>hhi
+imenu ShellMenu.Test.String\ is\ not\ empty [ x != "x$" ]<esc>hhi
+imenu ShellMenu.Test.Strings\ are\ equal [ "" = "" ]<esc>hhhhhhhi
+imenu ShellMenu.Test.Strings\ are\ not\ equal [ "" != "" ]<esc>hhhhhhhhi
+imenu ShellMenu.Test.Value\ is\ greater\ than [  -gt  ]<esc>hhhhhhi
+imenu ShellMenu.Test.Value\ is\ greater\ equal [  -ge  ]<esc>hhhhhhi
+imenu ShellMenu.Test.Values\ are\ equal [  -eq  ]<esc>hhhhhhi
+imenu ShellMenu.Test.Values\ are\ not\ equal [  -ne  ]<esc>hhhhhhi
+imenu ShellMenu.Test.Value\ is\ less\ than [  -lt  ]<esc>hhhhhhi
+imenu ShellMenu.Test.Value\ is\ less\ equal [  -le  ]<esc>hhhhhhi
+imenu ShellMenu.ParmSub.Substitute\ word\ if\ parm\ not\ set ${:-}<esc>hhi
+imenu ShellMenu.ParmSub.Set\ parm\ to\ word\ if\ not\ set ${:=}<esc>hhi
+imenu ShellMenu.ParmSub.Substitute\ word\ if\ parm\ set\ else\ nothing ${:+}<esc>hhi
+imenu ShellMenu.ParmSub.If\ parm\ not\ set\ print\ word\ and\ exit ${:?}<esc>hhi
+imenu ShellMenu.SpShVars.Number\ of\ positional\ parameters ${#}
+imenu ShellMenu.SpShVars.All\ positional\ parameters\ (quoted\ spaces) ${*}
+imenu ShellMenu.SpShVars.All\ positional\ parameters\ (unquoted\ spaces) ${@}
+imenu ShellMenu.SpShVars.Flags\ set ${-}
+imenu ShellMenu.SpShVars.Return\ code\ of\ last\ command ${?}
+imenu ShellMenu.SpShVars.Process\ number\ of\ this\ shell ${$}
+imenu ShellMenu.SpShVars.Process\ number\ of\ last\ background\ command ${!}
+imenu ShellMenu.Environ.HOME ${HOME}
+imenu ShellMenu.Environ.PATH ${PATH}
+imenu ShellMenu.Environ.CDPATH ${CDPATH}
+imenu ShellMenu.Environ.MAIL ${MAIL}
+imenu ShellMenu.Environ.MAILCHECK ${MAILCHECK}
+imenu ShellMenu.Environ.PS1 ${PS1}
+imenu ShellMenu.Environ.PS2 ${PS2}
+imenu ShellMenu.Environ.IFS ${IFS}
+imenu ShellMenu.Environ.SHACCT ${SHACCT}
+imenu ShellMenu.Environ.SHELL ${SHELL}
+imenu ShellMenu.Environ.LC_CTYPE ${LC_CTYPE}
+imenu ShellMenu.Environ.LC_MESSAGES ${LC_MESSAGES}
+imenu ShellMenu.Builtins.cd cd
+imenu ShellMenu.Builtins.echo echo
+imenu ShellMenu.Builtins.eval eval
+imenu ShellMenu.Builtins.exec exec
+imenu ShellMenu.Builtins.export export
+imenu ShellMenu.Builtins.getopts getopts
+imenu ShellMenu.Builtins.hash hash
+imenu ShellMenu.Builtins.newgrp newgrp
+imenu ShellMenu.Builtins.pwd pwd
+imenu ShellMenu.Builtins.read read
+imenu ShellMenu.Builtins.readonly readonly
+imenu ShellMenu.Builtins.return return
+imenu ShellMenu.Builtins.times times
+imenu ShellMenu.Builtins.type type
+imenu ShellMenu.Builtins.umask umask
+imenu ShellMenu.Builtins.wait wait
+imenu ShellMenu.Set.set set
+imenu ShellMenu.Set.unset unset
+imenu ShellMenu.Set.Mark\ created\ or\ modified\ variables\ for\ export set -a
+imenu ShellMenu.Set.Exit\ when\ command\ returns\ non-zero\ status set -e
+imenu ShellMenu.Set.Disable\ file\ name\ expansion set -f
+imenu ShellMenu.Set.Locate\ and\ remember\ commands\ when\ being\ looked\ up set -h
+imenu ShellMenu.Set.All\ assignment\ statements\ are\ placed\ in\ the\ environment\ for\ a\ command set -k
+imenu ShellMenu.Set.Read\ commands\ but\ do\ not\ execute\ them set -n
+imenu ShellMenu.Set.Exit\ after\ reading\ and\ executing\ one\ command set -t
+imenu ShellMenu.Set.Treat\ unset\ variables\ as\ an\ error\ when\ substituting set -u
+imenu ShellMenu.Set.Print\ shell\ input\ lines\ as\ they\ are\ read set -v
+imenu ShellMenu.Set.Print\ commands\ and\ their\ arguments\ as\ they\ are\ executed set -x

 " Restore the previous value of 'cpoptions'.
 let &cpo = s:cpo_save
--- a/runtime/spell/sr/README_sr.txt
+++ b/runtime/spell/sr/README_sr.txt
@@ -40,6 +40,20 @@ continues monotonically after the last flag number in cyrillic .aff file.
 A couple of words in cyrillic dict used a latin codepoints for 'a' and 'e',
 that was also corrected.

+You should be able to reproduce this with these steps:
+  * Save the existing sr.aff and sr.dic files, if you have them, they will be
+    overwritten.
+  * Create a subfolder "new".
+  * Put 4 files downloaded from LibreOffice dictionaries GitHub repository in
+    it: sr.aff, sr-Latn.aff, sr.dic and sr-Latn.dic
+  * Open Vim and cd into "new"
+  * Execute:  :so ../convert.vim
+  * The resulting sr.aff and sr.dic are created in the parent spell folder
+    (here).
+  * Now one can generate spl file as usual using the merged dic and aff
+    files:
+        env LANG=sr_RS.UTF-8 vim -u NONE -e -c "set enc=utf-8" -c "mkspell! ../sr sr" -c q
+

 Ivan Pešić
 28.06.2022.
--- a/runtime/spell/sr/convert.vim
+++ b/runtime/spell/sr/convert.vim
@@ -0,0 +1,30 @@
+:e sr.aff
+:normal gg
+:normal wgu$
+:3d
+:4d
+:normal G
+:normal o
+:r sr-Latn.aff
+:%s#^\(SFX\|PFX\).*[а-џa-ž]\zs$# .#g
+:normal G
+?SET
+:.,+5d
+:.,$s#^\(SFX\|PFX\) \zs\(\d\+\)#\= eval(submatch(2) .. ' + 1903')#
+:w ../sr.aff
+:bd!
+:e sr.dic
+:%s#a#а#g
+:%s#e#е#g
+:normal G
+:normal o
+:r sr-Latn.dic
+:normal 201dd
+:.,$s#/\zs\(\d\+\)\(,\(\d\+\)\)\?$#\=(submatch(2) == '') ? eval(submatch(1) + '1903') : eval(submatch(1) + '1903') .. ',' .. eval(submatch(3) + '1903')#
+:normal {
+:normal dd
+:normal gg
+:normal C502898
+:w ../sr.dic
+:bd!
+:q!
--- a/runtime/synmenu.vim
+++ b/runtime/synmenu.vim
@@ -13,6 +13,10 @@ def SetSyn(name: string)
    g:use_fvwm_2 = name == "fvwm2"
    filetype = "fvwm"
  endif
+  if name == "whitespace"
+    " do not replace the filetype but add whitespace on top
+    filetype = &ft .. ".whitespace"
+  endif
  if !exists("s:syntax_menu_synonly")
    exe "set ft=" .. filetype
    if exists("g:syntax_manual")
--- a/runtime/syntax/autohotkey.vim
+++ b/runtime/syntax/autohotkey.vim
@@ -2,7 +2,7 @@
 " Language:         AutoHotkey script file
 " Maintainer:       Michael Wong
 "                   https://github.com/mmikeww/autohotkey.vim
-" Latest Revision:  2017-04-03
+" Latest Revision:  2022-07-25
 " Previous Maintainers:       SungHyun Nam <goweol@gmail.com>
 "                             Nikolai Weibull <now@bitwi.se>

@@ -31,7 +31,7 @@ syn region autohotkeyString
      \ matchgroup=autohotkeyStringDelimiter
      \ start=+"+
      \ end=+"+
-      \ contains=autohotkeyEscape
+      \ contains=autohotkeyEscape,autohotkeyMatchClass

 syn match autohotkeyVariable
      \ display
@@ -49,9 +49,9 @@ syn keyword autohotkeyBuiltinVariable
      \ A_Sec A_MSec A_Now A_NowUTC A_TickCount
      \ A_IsSuspended A_IsPaused A_IsCritical A_BatchLines A_TitleMatchMode A_TitleMatchModeSpeed
      \ A_DetectHiddenWindows A_DetectHiddenText A_AutoTrim A_StringCaseSense
-      \ A_FileEncoding A_FormatInteger A_FormatFloat A_KeyDelay A_WinDelay A_ControlDelay
-      \ A_SendMode A_SendLevel A_StoreCapsLockMode A_KeyDelay A_KeyDelayDuration
-      \ A_KeyDelayPlay A_KeyDelayPlayDuration A_MouseDelayPlay
+      \ A_FileEncoding A_FormatInteger A_FormatFloat A_WinDelay A_ControlDelay
+      \ A_SendMode A_SendLevel A_StoreCapsLockMode A_KeyDelay A_KeyDuration
+      \ A_KeyDelayPlay A_KeyDurationPlay A_MouseDelayPlay
      \ A_MouseDelay A_DefaultMouseSpeed A_RegView A_IconHidden A_IconTip A_IconFile
      \ A_CoordModeToolTip A_CoordModePixel A_CoordModeMouse A_CoordModeCaret A_CoordModeMenu
      \ A_IconNumber
@@ -73,6 +73,7 @@ syn keyword autohotkeyBuiltinVariable
      \ A_LoopFileShortName A_LoopFileDir A_LoopFileTimeModified A_LoopFileTimeCreated
      \ A_LoopFileTimeAccessed A_LoopFileAttrib A_LoopFileSize A_LoopFileSizeKB A_LoopFileSizeMB
      \ A_LoopRegType A_LoopRegKey A_LoopRegSubKey A_LoopRegTimeModified
+      \ A_TimeIdleKeyboard A_TimeIdleMouse A_ListLines A_ComSpec A_LoopFilePath A_Args

 syn match   autohotkeyBuiltinVariable
      \ contained
@@ -118,6 +119,7 @@ syn keyword autohotkeyCommand
      \ WinMinimizeAll WinMinimizeAllUndo WinMove WinRestore WinSet
      \ WinSetTitle WinShow WinWait WinWaitActive WinWaitNotActive WinWaitClose
      \ SetCapsLockState SetNumLockState SetScrollLockState
+      \ Hotstring LoadPicture MenuGetHandle MenuGetName OnError OnClipboardChange

 syn keyword autohotkeyFunction
      \ InStr RegExMatch RegExReplace StrLen SubStr Asc Chr Func
@@ -127,7 +129,7 @@ syn keyword autohotkeyFunction
      \ IsFunc Trim LTrim RTrim IsObject Object Array FileOpen
      \ ComObjActive ComObjArray ComObjConnect ComObjCreate ComObjGet
      \ ComObjError ComObjFlags ComObjQuery ComObjType ComObjValue ComObject
-      \ Format Exception
+      \ Format Exception Ord InputHook

 syn keyword autohotkeyStatement
      \ Break Continue Exit ExitApp Gosub Goto OnExit Pause Return
@@ -140,7 +142,8 @@ syn keyword autohotkeyConditional
      \ IfExist IfNotExist If IfEqual IfLess IfGreater Else
      \ IfWinExist IfWinNotExist IfWinActive IfWinNotActive
      \ IfNotEqual IfLessOrEqual IfGreaterOrEqual
-      \ while until for in try catch finally
+      \ while until for in try catch finally not
+      \ switch case default

 syn match   autohotkeyPreProcStart
      \ nextgroup=
--- a/runtime/syntax/basic.vim
+++ b/runtime/syntax/basic.vim
@@ -3,7 +3,7 @@
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainer:	Allan Kelly <allan@fruitloaf.co.uk>
 " Contributors:		Thilo Six
-" Last Change:		2021 Aug 08
+" Last Change:		2022 Jun 22

 " First version based on Micro$soft QBASIC circa 1989, as documented in
 " 'Learn BASIC Now' by Halvorson&Rygmyr. Microsoft Press 1989.
@@ -344,7 +344,7 @@ 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 basicFunction	    Function
 hi def link basicKeyword	    Keyword
 hi def link basicLineIdentifier	    LineNr
 hi def link basicLineContinuation   Special
--- a/runtime/syntax/bitbake.vim
+++ b/runtime/syntax/bitbake.vim
@@ -0,0 +1,126 @@
+" Vim syntax file
+" Language:     BitBake bb/bbclasses/inc
+" Author:       Chris Larson <kergoth@handhelds.org>
+"               Ricardo Salveti <rsalveti@rsalveti.net>
+" Copyright:    Copyright (C) 2004  Chris Larson <kergoth@handhelds.org>
+"               Copyright (C) 2008  Ricardo Salveti <rsalveti@rsalveti.net>
+"
+" This file is licensed under the MIT license, see COPYING.MIT in
+" this source distribution for the terms.
+"
+" Syntax highlighting for bb, bbclasses and inc files.
+"
+" It's an entirely new type, just has specific syntax in shell and python code
+
+if v:version < 600
+    finish
+endif
+if exists("b:current_syntax")
+    finish
+endif
+
+syn include @python syntax/python.vim
+unlet! b:current_syntax
+
+" BitBake syntax
+
+" Matching case
+syn case match
+
+" Indicates the error when nothing is matched
+syn match bbUnmatched           "."
+
+" Comments
+syn cluster bbCommentGroup      contains=bbTodo,@Spell
+syn keyword bbTodo              COMBAK FIXME TODO XXX contained
+syn match bbComment             "#.*$" contains=@bbCommentGroup
+
+" String helpers
+syn match bbQuote               +['"]+ contained 
+syn match bbDelimiter           "[(){}=]" contained
+syn match bbArrayBrackets       "[\[\]]" contained
+
+" BitBake strings
+syn match bbContinue            "\\$"
+syn region bbString             matchgroup=bbQuote start=+"+ skip=+\\$+ end=+"+ contained contains=bbTodo,bbContinue,bbVarDeref,bbVarPyValue,@Spell
+syn region bbString             matchgroup=bbQuote start=+'+ skip=+\\$+ end=+'+ contained contains=bbTodo,bbContinue,bbVarDeref,bbVarPyValue,@Spell
+
+" Vars definition
+syn match bbExport            "^export" nextgroup=bbIdentifier skipwhite
+syn keyword bbExportFlag        export contained nextgroup=bbIdentifier skipwhite
+syn match bbIdentifier          "[a-zA-Z0-9\-_\.\/\+]\+" display contained
+syn match bbVarDeref            "${[a-zA-Z0-9\-_:\.\/\+]\+}" contained
+syn match bbVarEq               "\(:=\|+=\|=+\|\.=\|=\.\|?=\|??=\|=\)" contained nextgroup=bbVarValue
+syn match bbVarDef              "^\(export\s*\)\?\([a-zA-Z0-9\-_\.\/\+][${}a-zA-Z0-9\-_:\.\/\+]*\)\s*\(:=\|+=\|=+\|\.=\|=\.\|?=\|??=\|=\)\@=" contains=bbExportFlag,bbIdentifier,bbOverrideOperator,bbVarDeref nextgroup=bbVarEq
+syn match bbVarValue            ".*$" contained contains=bbString,bbVarDeref,bbVarPyValue
+syn region bbVarPyValue         start=+${@+ skip=+\\$+ end=+}+ contained contains=@python
+
+" Vars metadata flags
+syn match bbVarFlagDef          "^\([a-zA-Z0-9\-_\.]\+\)\(\[[a-zA-Z0-9\-_\.+]\+\]\)\@=" contains=bbIdentifier nextgroup=bbVarFlagFlag
+syn region bbVarFlagFlag        matchgroup=bbArrayBrackets start="\[" end="\]\s*\(:=\|=\|.=\|=.|+=\|=+\|?=\)\@=" contained contains=bbIdentifier nextgroup=bbVarEq
+
+" Includes and requires
+syn keyword bbInclude           inherit include require contained 
+syn match bbIncludeRest         ".*$" contained contains=bbString,bbVarDeref
+syn match bbIncludeLine         "^\(inherit\|include\|require\)\s\+" contains=bbInclude nextgroup=bbIncludeRest
+
+" Add taks and similar
+syn keyword bbStatement         addtask deltask addhandler after before EXPORT_FUNCTIONS contained
+syn match bbStatementRest       ".*$" skipwhite contained contains=bbStatement
+syn match bbStatementLine       "^\(addtask\|deltask\|addhandler\|after\|before\|EXPORT_FUNCTIONS\)\s\+" contains=bbStatement nextgroup=bbStatementRest
+
+" OE Important Functions
+syn keyword bbOEFunctions       do_fetch do_unpack do_patch do_configure do_compile do_stage do_install do_package contained
+
+" Generic Functions
+syn match bbFunction            "\h[0-9A-Za-z_\-\.]*" display contained contains=bbOEFunctions
+
+syn keyword bbOverrideOperator  append prepend remove contained
+
+" BitBake shell metadata
+syn include @shell syntax/sh.vim
+unlet! b:current_syntax
+
+syn keyword bbShFakeRootFlag    fakeroot contained
+syn match bbShFuncDef           "^\(fakeroot\s*\)\?\([\.0-9A-Za-z_:${}\-\.]\+\)\(python\)\@<!\(\s*()\s*\)\({\)\@=" contains=bbShFakeRootFlag,bbFunction,bbOverrideOperator,bbVarDeref,bbDelimiter nextgroup=bbShFuncRegion skipwhite
+syn region bbShFuncRegion       matchgroup=bbDelimiter start="{\s*$" end="^}\s*$" contained contains=@shell
+
+" Python value inside shell functions
+syn region shDeref         start=+${@+ skip=+\\$+ excludenl end=+}+ contained contains=@python
+
+" BitBake python metadata
+syn keyword bbPyFlag            python contained
+syn match bbPyFuncDef           "^\(fakeroot\s*\)\?\(python\)\(\s\+[0-9A-Za-z_:${}\-\.]\+\)\?\(\s*()\s*\)\({\)\@=" contains=bbShFakeRootFlag,bbPyFlag,bbFunction,bbOverrideOperator,bbVarDeref,bbDelimiter nextgroup=bbPyFuncRegion skipwhite
+syn region bbPyFuncRegion       matchgroup=bbDelimiter start="{\s*$" end="^}\s*$" contained contains=@python
+
+" BitBake 'def'd python functions
+syn keyword bbPyDef             def contained
+syn region bbPyDefRegion        start='^\(def\s\+\)\([0-9A-Za-z_-]\+\)\(\s*(.*)\s*\):\s*$' end='^\(\s\|$\)\@!' contains=@python
+
+" Highlighting Definitions
+hi def link bbUnmatched         Error
+hi def link bbInclude           Include
+hi def link bbTodo              Todo
+hi def link bbComment           Comment
+hi def link bbQuote             String
+hi def link bbString            String
+hi def link bbDelimiter         Keyword
+hi def link bbArrayBrackets     Statement
+hi def link bbContinue          Special
+hi def link bbExport            Type
+hi def link bbExportFlag        Type
+hi def link bbIdentifier	    Identifier
+hi def link bbVarDeref          PreProc
+hi def link bbVarDef            Identifier
+hi def link bbVarValue          String
+hi def link bbShFakeRootFlag    Type
+hi def link bbFunction          Function
+hi def link bbPyFlag            Type
+hi def link bbPyDef             Statement
+hi def link bbStatement         Statement
+hi def link bbStatementRest     Identifier
+hi def link bbOEFunctions       Special
+hi def link bbVarPyValue        PreProc
+hi def link bbOverrideOperator  Operator
+
+let b:current_syntax = "bitbake"
--- a/runtime/syntax/debchangelog.vim
+++ b/runtime/syntax/debchangelog.vim
@@ -3,7 +3,7 @@
 " Maintainer:  Debian Vim Maintainers
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2022 May 01
+" Last Change: 2022 Jul 25
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debchangelog.vim

 " Standard syntax initialization
@@ -20,22 +20,22 @@ let s:binNMU='binary-only=yes'
 let s:cpo = &cpo
 set cpo-=C
 let s:supported = [
-      \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental',
-      \ 'jessie', 'stretch', 'buster', 'bullseye', 'bookworm',
-      \ 'trixie', 'sid', 'rc-buggy',
+      \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental', 'sid', 'rc-buggy',
+      \ 'buster', 'bullseye', 'bookworm', 'trixie',
      \
-      \ 'trusty', 'xenial', 'bionic', 'focal', 'impish', 'jammy', 'kinetic',
+      \ 'trusty', 'xenial', 'bionic', 'focal', 'jammy', 'kinetic',
      \ 'devel'
      \ ]
 let s:unsupported = [
      \ 'frozen', 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
      \ 'woody', 'sarge', 'etch', 'lenny', 'squeeze', 'wheezy',
+      \ 'jessie', 'stretch',
      \
      \ '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', 'eoan', 'hirsute', 'groovy'
+      \ 'disco', 'eoan', 'hirsute', 'impish', 'groovy'
      \ ]
 let &cpo=s:cpo

--- a/runtime/syntax/debsources.vim
+++ b/runtime/syntax/debsources.vim
@@ -2,7 +2,7 @@
 " Language:     Debian sources.list
 " Maintainer:   Debian Vim Maintainers
 " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
-" Last Change: 2022 May 01
+" Last Change: 2022 Jul 25
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debsources.vim

 " Standard syntax initialization
@@ -22,22 +22,22 @@ syn match debsourcesComment        /#.*/  contains=@Spell
 let s:cpo = &cpo
 set cpo-=C
 let s:supported = [
-      \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental',
-      \ 'jessie', 'stretch', 'buster', 'bullseye', 'bookworm',
-      \ 'trixie', 'sid', 'rc-buggy',
+      \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental', 'sid', 'rc-buggy',
+      \ 'buster', 'bullseye', 'bookworm', 'trixie',
      \
-      \ 'trusty', 'xenial', 'bionic', 'focal', 'impish', 'jammy', 'kinetic',
+      \ 'trusty', 'xenial', 'bionic', 'focal', 'jammy', 'kinetic',
      \ 'devel'
      \ ]
 let s:unsupported = [
      \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
      \ 'woody', 'sarge', 'etch', 'lenny', 'squeeze', 'wheezy',
+      \ 'jessie', 'stretch',
      \
      \ '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', 'eoan', 'hirsute', 'groovy'
+      \ 'disco', 'eoan', 'hirsute', 'impish', 'groovy'
      \ ]
 let &cpo=s:cpo

--- a/runtime/syntax/fetchmail.vim
+++ b/runtime/syntax/fetchmail.vim
@@ -1,7 +1,10 @@
 " Vim syntax file
-" Language:             fetchmail(1) RC File
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2006-04-19
+" Language:		fetchmail(1) RC File
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
+" Latest Revision:	2022 Jul 02
+
+" Version 6.4.3

 if exists("b:current_syntax")
  finish
@@ -10,64 +13,69 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim

-syn keyword fetchmailTodo       contained FIXME TODO XXX NOTE
+syn keyword fetchmailTodo	contained FIXME TODO XXX NOTE

-syn region  fetchmailComment    start='#' end='$' contains=fetchmailTodo,@Spell
+syn region  fetchmailComment	start='#' end='$' contains=fetchmailTodo,@Spell

-syn match   fetchmailNumber     display '\<\d\+\>'
+syn match   fetchmailNumber	display '\<\d\+\>'

-syn region  fetchmailString     start=+"+ skip=+\\\\\|\\"+ end=+"+
-                                \ contains=fetchmailStringEsc
-syn region  fetchmailString     start=+'+ skip=+\\\\\|\\'+ end=+'+
-                                \ contains=fetchmailStringEsc
+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 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 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
+				\ service auth[enticate] timeout envelope
+				\ qvirtual aka interface monitor plugin plugout
+				\ dns checkalias uidl interval tracepolls
+				\ principal esmtpname esmtppassword
+" removed in 6.3.0
+syn keyword fetchmailServerOpts contained netsec
+syn match   fetchmailServerOpts contained '\<bad-header\>'
 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 fetchmailUserOpts	contained user[name] is to pass[word] ssl
+				\ sslcert sslcertck sslcertfile sslcertpath
+				\ sslfingerprint sslkey sslproto folder
+				\ smtphost fetchdomains smtpaddress smtpname
+				\ antispam mda bsmtp preconnect postconnect
+				\ keep flush limitflush fetchall rewrite
+				\ stripcr forcecr pass8bits dropstatus
+				\ dropdelivered mimedecode idle limit warnings
+				\ batchlimit fetchlimit fetchsizelimit
+				\ fastuidl expunge properties
+				\ sslcommonname
+syn match   fetchmailUserOpts	contained '\<no\_s\+\(sslcertck\|keep\|flush\|fetchall\|rewrite\|stripcr\|forcecr\|pass8bits\|dropstatus\|dropdelivered\|mimedecode\|idle\)'

-syn keyword fetchmailSpecial    contained here there
+syn keyword fetchmailSpecial	contained here there

-syn keyword fetchmailNoise      and with has wants options
-syn match   fetchmailNoise      display '[:;,]'
+syn keyword fetchmailNoise	and with has wants options
+syn match   fetchmailNoise	display '[:;,]'

-syn keyword fetchmailSet        nextgroup=fetchmailOptions skipwhite skipnl set
+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\)'
+syn keyword fetchmailOptions	daemon postmaster bouncemail spambounce
+				\ softbounce logfile pidfile idfile syslog properties
+syn match   fetchmailOptions	'\<no\_s\+\(bouncemail\|spambounce\|softbounce\|syslog\)'

-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 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
+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"

--- a/runtime/syntax/freebasic.vim
+++ b/runtime/syntax/freebasic.vim
@@ -1,14 +1,14 @@
 " Vim syntax file
-" Language:    FreeBasic
-" Maintainer:  Mark Manning <markem@sim1.us>
-" Updated:     10/9/2019
-" Version:		7.0b
+" Language:		FreeBASIC
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Mark Manning <markem@sim1.us>
+" Last Change:		2022 Jun 26
 "
 " 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
+"	Applied FreeBASIC support to the already excellent support
 "	for standard basic syntax (like QB).
 "
 "	First version based on Micro$soft QBASIC circa
@@ -17,215 +17,595 @@
 "	not a complete implementation yet.  Send suggestions to
 "	the maintainer.
 "
+"	TODO: split this into separate dialect-based files, possibly with a common base
+"
 "	Quit when a (custom) syntax file was already loaded (Taken from c.vim)
 "
 if exists("b:current_syntax")
  finish
 endif
 "
+"	Dialect detection
+"
+let s:lang = freebasic#GetDialect()
+"
+"	Whitespace Errors
+"
+if exists("freebasic_space_errors")
+  if !exists("freebasic_no_trail_space_error")
+    syn match freebasicSpaceError display excludenl "\s\+$"
+  endif
+  if !exists("freebasic_no_tab_space_error")
+    syn match freebasicSpaceError display " \+\t"me=e-1
+  endif
+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
+if s:lang =~# '\<\%(qb\|fblite\)\>'
+  syn iskeyword @,48-57,_,192-255,.
+  syn match	freebasicIdentifier		"\<\h\%(\w\|\.\)*\>"
+  syn match	freebasicGenericFunction	"\<\h\%(\w\|\.\)*\>\ze\s*("
+else
+  syn iskeyword @,48-57,_,192-255
+  syn match	freebasicIdentifier		"\<\h\w*\>"
+  syn match	freebasicGenericFunction	"\<\h\w*\>\ze\s*("
+endif
 "
-"	Function list
+"	This list of keywords is taken directly from the FreeBASIC
+"	user's guide as presented by the FreeBASIC online site.
 "
-syn keyword	freebasicTodo		contained TODO
+syn keyword	freebasicArrays			ERASE LBOUND PRESERVE REDIM UBOUND
+
+" array.bi
+syn keyword	freebasicArrays			ARRAYLEN ARRAYSIZE
+if s:lang == "fb"
+  syn keyword	freebasicArrays			ArrayConstDescriptorPtr ArrayDescriptorPtr FBARRAY
+endif
+
+if s:lang == "qb"
+  syn keyword	freebasicAsm			__ASM
+  syn match	freebasicAsm			"\<end\s\+__asm\>"
+else
+  syn keyword	freebasicAsm			ASM
+  syn match	freebasicAsm			"\<end\s\+asm\>"
+endif
+
+if s:lang == "qb"
+  syn keyword	freebasicBitManipulation	__BIT __BITRESET __BITSET __HIBYTE __HIWORD __LOBYTE __LOWORD
+else
+  syn keyword	freebasicBitManipulation	BIT BITRESET BITSET HIBYTE HIWORD LOBYTE LOWORD
+endif
+
+if s:lang != "fb"
+  syn keyword	freebasicCompilerSwitches	DEFDBL DEFINT DEFLNG DEFSNG DEFSTR
+endif
+if s:lang == "qb"
+  syn keyword	freebasicCompilerSwitches	__DEFBYTE __DEFLONGINT __DEFSHORT __DEFUBYTE __DEFUINT __DEFULONGINT __DEFUSHORT
+elseif s:lang == "fblite" || s:lang == "deprecated"
+  syn keyword	freebasicCompilerSwitches	DEFBYTE DEFLONGINT DEFSHORT DEFUBYTE DEFUINT DEFUILONGINT DEFUSHORT
+endif
+
+syn match	freebasicCompilerSwitches	"\<option\s\+\%(BASE\|BYVAL\|DYNAMIC\|ESCAPE\|EXPLICIT\|GOSUB\|NOGOSUB\)\>"
+syn match	freebasicCompilerSwitches	"\<option\s\+\%(NOKEYWORD\|PRIVATE\|STATIC\)\>"
+
+syn keyword	freebasicData			DATA READ RESTORE
+
+syn keyword	freebasicProgramFlow		EXIT GOTO RETURN SLEEP
+syn match	freebasicProgramFlow		"\<end\>"
+if s:lang == "qb"
+  syn keyword	freebasicProgramFlow		__SLEEP
+endif
+if s:lang == "fblite" || s:lang == "qb"
+  syn keyword	freebasicProgramFlow		GOSUB
+endif
+if s:lang == "fb" || s:lang == "deprecated"
+  syn keyword	freebasicProgramFlow		SCOPE
+  syn match	freebasicProgramFlow		"\<end\s\+scope\>"
+endif
+
+if s:lang == "fblite" || s:lang == "qb"
+  syn region	freebasicConditional		matchgroup=freebasicConditional start="\<on\>" end="\<gosub\>" transparent
+  syn region	freebasicConditional		matchgroup=freebasicConditional start="\<on\>" end="\<goto\>"  transparent
+endif
+syn keyword	freebasicConditional		IF THEN ELSE ELSEIF
+if s:lang == "qb"
+  syn keyword	freebasicConditional		__IIF __WITH
+  syn match	freebasicConditional		"\<end\s\+__with\>"
+else
+  syn keyword	freebasicConditional		IIF WITH
+  syn match	freebasicConditional		"\<end\s\+with\>"
+endif
+syn match	freebasicConditional		"\<end\s\+if\>"
+syn match	freebasicConditional		"\<select\s\+case\>"
+syn match	freebasicConditional		"\<case\>"
+syn match	freebasicConditional		"\<case\s\+is\>"
+syn match	freebasicConditional		"\<end\s\+select\>"
+
+syn keyword	freebasicConsole		BEEP CLS CSRLIN LOCATE PRINT POS SPC TAB USING VIEW WIDTH
+syn match	freebasicConsole		"?"
+
+syn keyword	freebasicDataTypes		SINGLE DOUBLE INTEGER LONG
+syn match	freebasicDataTypes		"\<string\>"
+syn keyword	freebasicDataTypes		AS DIM CONST ENUM SHARED TYPE
+syn match	freebasicDataTypes		"\<end\s\+enum\>"
+syn match	freebasicDataTypes		"\<end\s\+type\>"
+if s:lang == "qb"
+  syn keyword	freebasicDataTypes		__BOOLEAN __BYTE __LONGINT __SHORT __UBYTE __UINTEGER __ULONG __ULONGINT __UNSIGNED __USHORT __ZSTRING
+  syn match	freebasicDataTypes		"\<__WSTRING\>"
+  syn keyword	freebasicDataTypes		__EXPLICIT __EXTENDS __IMPLEMENTS __OBJECT __POINTER __PTR __SIZEOF __TYPEOF
+  syn keyword	freebasicDataTypes		__UNION
+  syn match	freebasicDataTypes		"\<end\s\+__union\>"
+else
+  syn keyword	freebasicDataTypes		BOOLEAN BYTE LONGINT SHORT UBYTE UINTEGER ULONG ULONGINT UNSIGNED USHORT ZSTRING
+  syn match	freebasicDataTypes		"\<WSTRING\>"
+  syn keyword	freebasicDataTypes		EXPLICIT EXTENDS IMPLEMENTS OBJECT POINTER PTR SIZEOF TYPEOF
+  syn keyword	freebasicDataTypes		UNION
+  syn match	freebasicDataTypes		"\<end\s\+union\>"
+endif
+if s:lang == "fb"
+  syn keyword	freebasicDataTypes		BASE CLASS THIS VAR
+endif
+
+if s:lang == "qb"
+  syn match	freebasicDateTime		"\<\%(date\|time\)\$"
+elseif s:lang == "fblite" || s:lang == "deprecated"
+  syn match	freebasicDateTime		"\<\%(date\|time\)\>\$\="
+else " fb
+  syn keyword	freebasicDateTime		DATE TIME
+endif
+syn keyword	freebasicDateTime		SETDATE SETTIME
+
+" datetime.bi
+syn keyword	freebasicDateTime		DATEADD DATEDIFF DATEPART DATESERIAL DATEVALUE DAY HOUR ISDATE MINUTE
+syn keyword	freebasicDateTime		MONTH MONTHNAME NOW SECOND TIMESERIAL TIMEVALUE
+syn keyword	freebasicDateTime		TIMER YEAR WEEKDAY WEEKDAYNAME
+
+syn keyword	freebasicDebug			STOP
+if s:lang == "qb"
+  syn keyword	freebasicDebug			__ASSERT __ASSERTWARN
+else
+  syn keyword	freebasicDebug			ASSERT ASSERTWARN
+endif
+
+syn keyword	freebasicErrorHandling		ERR ERL ERROR
+if s:lang == "qb"
+  syn keyword	freebasicErrorHandling		__ERFN __ERMN
+  syn match	freebasicErrorHandling		"\<on\s\+error\>"
+else
+  syn keyword	freebasicErrorHandling		ERFN ERMN
+  syn match	freebasicErrorHandling		"\<on\s\+\%(local\s\+\)\=error\>"
+endif
+if s:lang != "fb"
+  syn match	freebasicErrorHandling		"\<resume\%(\s\+next\)\=\>"
+endif
+
+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 CLOSE EOF FREEFILE INPUT LOC
+syn keyword	freebasicFiles			LOCK LOF OUTPUT RANDOM RESET SEEK UNLOCK WRITE
+syn match	freebasicFiles			"\<open\>"
+if s:lang == "qb"
+  syn keyword	freebasicFiles			__ENCODING
+else
+  syn keyword	freebasicFiles			ENCODING WINPUT
+  syn match	freebasicFiles			"\<open\s\+\%(cons\|err\|pipe\|scrn\)\>"
+endif
+
+" file.bi
+syn keyword	freebasicFiles			FILEATTR FILECOPY FILEDATETIME FILEEXISTS FILEFLUSH FILELEN FILESETEOF
+
+syn keyword	freebasicFunctions		ALIAS BYREF BYVAL CDECL DECLARE LIB NAKED PASCAL STATIC STDCALL
+syn match	freebasicFunctions		"\<option\ze\s*("
+
+if s:lang == "qb"
+  syn keyword	freebasicFunctions		__CVA_ARG __CVA_COPY __CVA_END __CVA_LIST __CVA_START
+  syn keyword	freebasicFunctions		__VA_ARG __VA_FIRST __VA_NEXT
+else
+  syn keyword	freebasicFunctions		CVA_ARG CVA_COPY CVA_END CVA_LIST CVA_START
+  syn keyword	freebasicFunctions		VA_ARG VA_FIRST VA_NEXT
+  syn keyword	freebasicFunctions		ANY OVERLOAD
+endif
+
+syn keyword	freebasicFunctions		FUNCTION SUB
+syn match	freebasicFunctions		"\<end\s\+function\>"
+syn match	freebasicFunctions		"\<end\s\+sub\>"
+
+if s:lang == "fb"
+  syn keyword	freebasicFunctions		ABSTRACT OVERRIDE VIRTUAL __THISCALL
+  syn keyword	freebasicFunctions		CONSTRUCTOR DESTRUCTOR OPERATOR PROPERTY
+  syn match	freebasicFunctions		"\<end\s\+constructor\>"
+  syn match	freebasicFunctions		"\<end\s\+destructor\>"
+  syn match	freebasicFunctions		"\<end\s\+operator\>"
+  syn match	freebasicFunctions		"\<end\s\+property\>"
+else
+  syn keyword	freebasicFunctions		CALL
+endif
+
+syn match	freebasicGraphics		"\<palette\s\+get\>"
+syn keyword	freebasicGraphics		ADD ALPHA BLOAD BSAVE CIRCLE CLS COLOR DRAW GET
+syn keyword	freebasicGraphics		LINE PAINT PALETTE PCOPY PMAP POINT
+syn keyword	freebasicGraphics		PRESET PSET PUT SCREEN
+syn keyword	freebasicGraphics		TRANS WINDOW
+if s:lang == "qb"
+  syn keyword	freebasicGraphics		__FLIP __IMAGECONVERTROW __IMAGECREATE __IMAGEDESTROY __IMAGEINFO __POINTCOORD
+  syn keyword	freebasicGraphics		__RGB __RGBA __SCREENCOPY __SCREENCONTROL __SCREENEVENT __SCREENGLPROC __SCREENINFO
+  syn keyword	freebasicGraphics		__SCREENLIST __SCREENLOCK __SCREENPTR __SCREENRES __SCREENSET __SCREENSYNC
+  syn keyword	freebasicGraphics		__SCREENUNLOCK __WINDOWTITLE
+else
+  syn keyword	freebasicGraphics		CUSTOM
+  syn keyword	freebasicGraphics		FLIP IMAGECONVERTROW IMAGECREATE IMAGEDESTROY IMAGEINFO POINTCOORD
+  syn keyword	freebasicGraphics		RGB RGBA SCREENCOPY SCREENCONTROL SCREENEVENT SCREENGLPROC SCREENINFO
+  syn keyword	freebasicGraphics		SCREENLIST SCREENLOCK SCREENPTR SCREENRES SCREENSET SCREENSYNC
+  syn keyword	freebasicGraphics		SCREENUNLOCK WINDOWTITLE
+endif
+
+if s:lang != "qb"
+  syn match	freebasicHardware		"\<open\s\+\%(com\|lpt\)\>"
+endif
+syn keyword	freebasicHardware		INP OUT WAIT LPOS LPRINT
+
+syn keyword	freebasicMath			ABS ATN COS EXP FIX FRAC INT LOG MOD RANDOMIZE RND SGN SIN SQR TAN
+
+if s:lang == "qb"
+  syn keyword	freebasicMath			__ACOS __ASIN __ATAN2
+else
+  syn keyword	freebasicMath			ACOS ASIN ATAN2
+endif
+
+if s:lang == "qb"
+  syn keyword	freebasicMemory			__ALLOCATE __CALLOCATE __DEALLOCATE __REALLOCATE
+else
+  syn keyword	freebasicMemory			ALLOCATE CALLOCATE DEALLOCATE REALLOCATE
+  syn keyword	freebasicMemory			PEEK POKE CLEAR FB_MEMCOPY FB_MEMCOPYCLEAR FB_MEMMOVE SWAP SADD
+  syn keyword	freebasicMemory			FIELD FRE
+endif
+
+syn keyword	freebasicMisc			LET TO
+if s:lang == "qb"
+  syn keyword freebasicMisc			__OFFSETOF
+else
+  syn keyword freebasicMisc			OFFSETOF
+endif
+
+syn keyword	freebasicModularizing		CHAIN COMMON
+if s:lang == "fb"
+  syn keyword	freebasicModularizing		EXTERN
+  syn match	freebasicModularizing		"\<end\s\+extern\>"
+  syn keyword	freebasicModularizing		PROTECTED
+endif
+if s:lang == "qb"
+  syn keyword	freebasicModularizing		__EXPORT __IMPORT __DYLIBFREE __DYLIBLOAD __DYLIBSYMBOL
+else
+  syn keyword	freebasicModularizing		EXPORT IMPORT DYLIBFREE DYLIBLOAD DYLIBSYMBOL
+  syn keyword	freebasicModularizing		PRIVATE PUBLIC
+  syn keyword	freebasicModularizing		NAMESPACE
+  syn match	freebasicModularizing		"\<end\s\+namespace\>"
+endif
+
+if s:lang != "qb"
+  syn keyword	freebasicMultithreading		MUTEXCREATE MUTEXDESTROY MUTEXLOCK MUTEXUNLOCK THREADCREATE THREADWAIT
+  syn keyword	freebasicMultithreading		CONDBROADCAST CONDCREATE CONDDESTROY CONDSIGNAL CONDWAIT
+  syn keyword	freebasicMultithreading		THREADCALL THREADDETACH THREADSELF
+endif
+
+syn keyword	freebasicShell			CHDIR KILL NAME MKDIR RMDIR RUN SETENVIRON
+if s:lang == "qb"
+  syn keyword	freebasicShell			__CURDIR __DIR __EXEC __EXEPATH
+  syn match	freebasicString			"\<\%(command\|environ\)\$"
+else
+  " fbio.bi
+  syn keyword	freebasicShell			ISREDIRECTED
+  syn keyword	freebasicShell			CURDIR DIR EXEC EXEPATH
+  syn match	freebasicString			"\<\%(command\|environ\)\>\$\="
+endif
+
+syn keyword	freebasicEnviron		SHELL SYSTEM
+
+syn keyword	freebasicLoops			FOR LOOP WHILE WEND DO STEP UNTIL NEXT
+if s:lang == "qb"
+  syn keyword	freebasicLoops			__CONTINUE
+else
+  syn keyword	freebasicLoops			CONTINUE
+endif
+"
+"	File numbers
+"
+syn match	freebasicFilenumber		"#\d\+"
+syn match	freebasicFilenumber		"#\a[[:alpha:].]*[%&!#]\="
+
+syn match	freebasicMetacommand		"$\s*\%(dynamic\|static\)"
+syn match	freebasicMetacommand		"$\s*include\s*\%(once\)\=\s*:\s*'[^']\+'"
+syn match	freebasicMetacommand		'$\s*include\s*\%(once\)\=\s*:\s*"[^"]\+"'
+syn match	freebasicMetacommand		'$\s*lang\s*:\s*"[^"]\+"'
+"
+"	Intrinsic defines
+"
+syn keyword	freebasicPredefined		__DATE__ __DATE_ISO__
+syn keyword	freebasicPredefined		__FB_64BIT__ __FB_ARGC__ __FB_ARG_COUNT__ __FB_ARG_EXTRACT__ __FB_ARG_LEFTOF__
+syn keyword	freebasicPredefined		__FB_ARG_RIGHTOF__ __FB_ARGV__ __FB_ARM__ __FB_ASM__ __FB_BACKEND__
+syn keyword	freebasicPredefined		__FB_BIGENDIAN__ __FB_BUILD_DATE__ __FB_BUILD_DATE_ISO__ __FB_BUILD_SHA1__
+syn keyword	freebasicPredefined		__FB_CYGWIN__ __FB_DARWIN__ __FB_DEBUG__ __FB_DOS__ __FB_ERR__ __FB_EVAL__
+syn keyword	freebasicPredefined		__FB_FPMODE__ __FB_FPU__ __FB_FREEBSD__ __FB_GCC__ __FB_GUI__ __FB_JOIN__
+syn keyword	freebasicPredefined		__FB_LANG__ __FB_LINUX__ __FB_MAIN__ __FB_MIN_VERSION__ __FB_MT__ __FB_NETBSD__
+syn keyword	freebasicPredefined		__FB_OPENBSD__ __FB_OPTIMIZE__ __FB_OPTION_BYVAL__ __FB_OPTION_DYNAMIC__
+syn keyword	freebasicPredefined		__FB_OPTION_ESCAPE__ __FB_OPTION_EXPLICIT__ __FB_OPTION_GOSUB__
+syn keyword	freebasicPredefined		__FB_OPTION_PRIVATE__ __FB_OUT_DLL__ __FB_OUT_EXE__ __FB_OUT_LIB__ __FB_OUT_OBJ__
+syn keyword	freebasicPredefined		__FB_PCOS__ __FB_PPC__ __FB_QUOTE__ __FB_SIGNATURE__ __FB_SSE__ __FB_UNIQUEID__
+syn keyword	freebasicPredefined		__FB_UNIQUEID_POP__ __FB_UNIQUEID_PUSH__ __FB_UNIX__ __FB_UNQUOTE__
+syn keyword	freebasicPredefined		__FB_VECTORIZE__ __FB_VER_MAJOR__ __FB_VER_MINOR__ __FB_VER_PATCH__ __FB_VERSION__
+syn keyword	freebasicPredefined		__FB_WIN32__ __FB_X86__ __FB_XBOX__
+syn keyword	freebasicPredefined		__FILE__ __FILE_NQ__ __FUNCTION__ __FUNCTION_NQ__
+syn keyword	freebasicPredefined		__LINE__ __PATH__ __TIME__
+"
+"	Preprocessor directives
+"
+syn match	freebasicInclude		"#\s*\%(inclib\|include\%(\s\+once\)\=\|libpath\)\>"
+
+syn match	freebasicPreProcessor		"#\s*assert\>"
+syn match	freebasicPreProcessor		"#\s*cmdline\>"
+syn match	freebasicPreProcessor		"#\s*\%(define\|undef\)\>"
+syn match	freebasicPreProcessor		"#\s*\%(if\|ifdef\|ifndef\|else\|elseif\|endif\)\>"
+syn match	freebasicPreProcessor		"#\s*\%(macro\|endmacro\)\>"
+syn match	freebasicPreProcessor		"#\s*error\>"
+syn match	freebasicPreProcessor		"#\s*lang\>"
+syn match	freebasicPreProcessor		"#\s*line\>"
+syn match	freebasicPreProcessor		"#\s*pragma\%(\s\+reserve\)\=\>"
+syn match	freebasicPreProcessor		"#\s*\%(print\|dynamic\|static\)\>"
+syn keyword	freebasicPreProcessor		DEFINED
+
+syn keyword	freebasicString			LEN
+syn keyword	freebasicString			ASC
+" string.bi
+syn keyword	freebasicString			FORMAT
+syn keyword	freebasicString			VAL
+syn keyword	freebasicString			CVD CVI CVL CVS
+syn keyword	freebasicString			INSTR
+syn keyword	freebasicString			LSET RSET
+
+if s:lang == "qb"
+  syn match	freebasicString			"\<string\$\ze\s*("
+  syn match	freebasicString			"\<__wstring\ze\s*("
+  syn match	freebasicString			"\<space\$"
+  syn keyword	freebasicString			__WSPACE
+  syn match	freebasicString			"\<chr\$"
+  syn keyword	freebasicString			__WCHR
+  syn keyword	freebasicString			__WBIN __WHEX __WOCT __WSTR
+  syn match	freebasicString			"\<\%(bin\|hex\|oct\|str\)\$"
+  syn keyword	freebasicString			__VALLNG __VALINT __VALUINT __VALULNG
+  syn match	freebasicString			"\<\%(mkd\|mki\|mkl\|mks\)\$"
+  syn keyword	freebasicString			__MKLONGINT __MKSHORT
+  syn keyword	freebasicString			__CVLONGINT __CVSHORT
+  syn match	freebasicString			"\<\%(left\|mid\|right\|lcase\|ucase\|ltrim\|rtrim\)\$"
+  syn keyword	freebasicString			__TRIM
+  syn keyword	freebasicString			__INSTRREV
+else
+  syn match	freebasicString			"\<string\$\=\ze\s*("
+  syn match	freebasicString			"\<wstring\ze\s*("
+  syn match	freebasicString			"\<space\>\$\="
+  syn keyword	freebasicString			WSPACE
+  syn match	freebasicString			"\<chr\>\$\="
+  syn keyword	freebasicString			WCHR
+  syn keyword	freebasicString			WBIN WHEX WOCT WSTR
+  syn match	freebasicString			"\<\%(bin\|hex\|oct\|str\)\>\$\="
+  syn keyword	freebasicString			VALLNG VALINT VALUINT VALULNG
+  syn match	freebasicString			"\<\%(mkd\|mki\|mkl\|mks\)\>\$\="
+  syn match	freebasicString			"\<\%(mklongint\|mkshort\)\>\$\="
+  syn keyword	freebasicString			CVLONGINT CVSHORT
+  syn match	freebasicString			"\<\%(left\|mid\|right\|lcase\|ucase\|ltrim\|rtrim\)\>\$\="
+  syn match	freebasicString			"\<trim\>\$\="
+  syn keyword	freebasicString			INSTRREV
+endif
+
+syn keyword	freebasicTypeCasting		CDBL CINT CLNG CSNG
+if s:lang == "qb"
+  syn keyword	freebasicTypeCasting		__CAST __CBOOL __CBYTE __CLNGINT __CPTR __CSHORT __CSIGN __CYBTE __CUINT __CULNG
+  syn keyword	freebasicTypeCasting		__CULNGINT __CUNSG __CUSHORT
+else
+  syn keyword	freebasicTypeCasting		CAST CBOOL CBYTE CLNGINT CPTR CSHORT CSIGN CUBYTE CUINT CULNG CULNGINT CUNSG CUSHORT
+endif
+
+syn match	freebasicUserInput		"\<line\s\+input\>"
+syn keyword	freebasicUserInput		INKEY INPUT
+if s:lang == "qb"
+  syn keyword	freebasicUserInput		__GETJOYSTICK __GETKEY __GETMOUSE __MULTIKEY __SETMOUSE STICK STRIG
+else
+  syn keyword	freebasicUserInput		GETJOYSTICK GETKEY GETMOUSE MULTIKEY SETMOUSE
+endif
+"
+"	Operators
+"
+" TODO: make these context sensitive to remove the overlap of common operators
+"     : alpha operators should probably always be highlighted
+"     -- DJK 20/11/19
+if s:lang == "qb"
+  syn match	freebasicArithmeticOperator	"\<\%(MOD\|__SHL\|__SHR\)\>"
+else
+  syn match	freebasicArithmeticOperator	"\<\%(MOD\|SHL\|SHR\)\>"
+endif
+syn match	freebasicBitwiseOperator	"\<\%(AND\|EQV\|IMP\|NOT\|OR\|XOR\)\>" " freebaseLogical?
+if s:lang == "qb"
+  syn match	freebasicAssignmentOperator	"\<\%(MOD\|AND\|EQV\|IMP\|OR\|XOR\|__SHL\|__SHR\)=\@=" " exclude trailing '='
+else
+  syn match	freebasicAssignmentOperator	"\<\%(MOD\|AND\|EQV\|IMP\|OR\|XOR\|SHL\|SHR\)=\@="
+endif
+syn match	freebasicShortcircuitOperator	"\<\%(ANDALSO\|ORELSE\)\>"
+if s:lang == "fb"
+  syn match	freebasicMemoryOperator		'\<\%(new\|delete\)\>'
+endif
+syn keyword	freebasicPointerOperator	STRPTR VARPTR
+if s:lang == "qb"
+  syn keyword	freebasicPointerOperator	__PROCPTR
+else
+  syn keyword	freebasicPointerOperator	PROCPTR
+endif
+syn match	freebasicTypeOperator		'\<is\>'
+syn match	freebasicTypeOperator		'\.' nextgroup=freebasicIdentifier skipwhite
+if s:lang == "fb"
+  syn match	freebasicTypeOperator		'->' nextgroup=freebasicIdentifier skipwhite
+endif
+
+if exists("freebasic_operators")
+  syn match	freebasicAssignmentOperator	"=>\=\|[-+&/\\*^]="
+  if s:lang == "qb"
+    syn match	freebasicAssignmentOperator	"\<\%(MOD\|AND\|EQV\|IMP\|OR\|XOR\|__SHL\|__SHR\)=" " include trailing '='
+  else
+    syn match	freebasicAssignmentOperator	"\<\%(MOD\|AND\|EQV\|IMP\|OR\|XOR\|SHL\|SHR\)="
+  endif
+  syn match	freebasicArithmeticOperator	"[-+&/\\*^]"
+  " syn match	freebasicIndexingOperator	"[[\]()]" " FIXME
+  syn match	freebasicRelationalOperator	"=\|<>\|<=\|<\|>=\|>"
+  syn match	freebasicPreprocessorOperator	'\%(^\s*\)\@<!\%(##\|#\)\|[$!]"\@='
+  syn match	freebasicPointerOperator	'[@*]'
+  syn match	freebasicTypeOperator		'\.' nextgroup=freebasicIdentifier skipwhite
+  if s:lang == "fb"
+    syn match	freebasicTypeOperator		'->' nextgroup=freebasicIdentifier skipwhite
+  endif
+endif
+
+syn cluster	freebasicOperator		contains=freebasic.*Operator
 "
 "	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
+" 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".
+"	Integer number
 "
-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\)\>"
+syn match	freebasicHexError	"&h\w*\>"
+syn match	freebasicOctalError	"&o\w*\>"
+syn match	freebasicBinaryError	"&b\w*\>"
+syn match	freebasicHex		"&h\x\+\%([%L&U]\|UL\|LL\|ULL\)\=\>"
+syn match	freebasicOctal		"&o\o\+\%([%L&U]\|UL\|LL\|ULL\)\=\>"
+syn match	freebasicBinary		"&b[10]\+\%([%L&U]\|UL\|LL\|ULL\)\=\>"
+syn match	freebasicInteger	"\<\d\+\%([%L&U]\|UL\|LL\|ULL\)\=\>"
 "
-"	Floating point number, with dot, optional exponent
+"	Floating point
+"	See: https://www.freebasic.net/forum/viewtopic.php?t=20323
 "
-syn match	freebasicFloat		"\<\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\=\>"
+"	Floating point number, with dot, optional exponent, optional suffix
 "
-"	Floating point number, starting with a dot, optional exponent
+syn match	freebasicFloat		"\<\d\+\.\d*\%([de][-+]\=\d*\)\=[f!#]\="
 "
-syn match	freebasicFloat		"\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>"
+"	Floating point number, starting with a dot, optional exponent, optional suffix
 "
-"	Floating point number, without dot, with exponent
+syn match	freebasicFloat		"\.\d\+\%([de][-+]\=\d*\)\=[f!#]\="
 "
-syn match	freebasicFloat		"\<\d\+e[-+]\=\d\+[fl]\=\>"
+"	Floating point number, without dot, with optional exponent, optional suffix
 "
-"	Octal number
+syn match	freebasicFloat		"\<\d\+\%([de][-+]\=\d*\)[f!#]\="
 "
-syn case match
-syn match	freebasicOctal2			"\<0\o*\>"
-syn match	freebasicOctal2Error	"\<0\o*[89a-zA-Z]"
+"	Floating point number, without dot, without exponent, with suffix
 "
-"	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"
+syn match	freebasicFloat		"\<\d\+[f!#]"
 "
 "	Create the clusters
 "
-syn cluster	freebasicNumber		contains=freebasicHex,freebasicOctal,freebasicOctal2,freebasicBinary,freebasicInteger,freebasicFloat
-syn cluster	freebasicError		contains=freebasicHexError,freebasicOctalError,freebasicOctal2,freebasicBinary
+syn cluster	freebasicNumber		contains=freebasicHex,freebasicOctal,freebasicBinary,freebasicInteger,freebasicFloat
+syn cluster	freebasicNumberError	contains=freebasicHexError,freebasicOctalError,freebasicBinaryError
 "
-"	Used with OPEN statement
+"	Booleans
 "
-syn match	freebasicFilenumber		"#\d\+"
-syn match	freebasicMathOperator	"[\+\-\=\|\*\/\>\<\%\()[\]]" contains=freebasicParen
+if s:lang != "qb"
+  syn keyword	freebasicBoolean	TRUE FALSE
+endif
+"
+"
+"	String and escape sequences
+"
+syn match	freebasicSpecial	contained "\\."
+syn match	freebasicSpecial	contained "\\\d\{1,3}"
+syn match	freebasicSpecial	contained "\\&h\x\{1,2}"
+syn match	freebasicSpecial	contained "\\&o\o\{1,3}"
+syn match	freebasicSpecial	contained "\\&b[01]\{1,8}"
+syn match	freebasicSpecial	contained "\\u\x\{1,4}"
+syn region	freebasicString		start='"'     end='"' " TODO: Toggle contains on Option Escape in fblite and qb? -- DJK 20/11/19
+syn region	freebasicString		start='!\zs"' end='"' contains=freebasicSpecial
+syn region	freebasicString		start='$\zs"' end='"'
+"
+"	Line labels
+"
+if s:lang =~# '\<\%(qb\|fblite\)\>'
+  syn match	freebasicLineLabel	"^\s*\zs\h\%(\w\|\.\)*\ze\s*:"
+else
+  syn match	freebasicLineLabel	"^\s*\zs\h\w*\ze\s*:"
+endif
+syn match	freebasicLineNumber	"^\s*\zs\d\+"
+"
+"	Line continuations
+"
+" syn match	freebasicLineContinuation	"\<_\>"	nextgroup=freebasicComment,freebasicPostLineContinuation skipwhite
+syn keyword	freebasicLineContinuation	_	nextgroup=freebasicComment,freebasicPostLineContinuation skipwhite
+syn match	freebasicPostLineContinuation	".*"	contained
+"
+"
+" Type suffixes
+if exists("freebasic_type_suffixes") && s:lang =~# '\<\%(qb\|fblite\)\>'
+  syn match freebasicTypeSuffix "\h\%(\w\|.\)*\zs[$%&!#]"
+endif
+"
+"	Comments
+"
+syn keyword	freebasicTodo			TODO FIXME XXX NOTE      contained
+syn region	freebasicComment		start="\<rem\>" end="$"  contains=freebasicTodo,@Spell,freebasicMetacommand
+syn region	freebasicComment		start="'"	end="$"  contains=freebasicTodo,@Spell,freebasicMetacommand
+syn region	freebasicDoubleComment		start="''"	end="$"  contains=freebasicTodo,@Spell
+
+if !exists("freebasic_no_comment_fold")
+  syn region	freebasicMultilineComment	start="/'"	end="'/" contains=freebasicTodo,@Spell,freeBasicMultilineComment fold keepend extend
+  syn region	freebasicMultilineComment2	start="^\s*'.*\n\%(\s*'\)\@=" end="^\s*'.*\n\%(\s*'\)\@!" contains=freebasicComment,freebasicDoubleComment keepend fold
+else
+  syn region	freebasicMultilineComment	start="/'"	end="'/" contains=freebasicTodo,@Spell,freeBasicMultilineComment
+endif
+
+syn case match
+
+syn sync linebreaks=1
+
 "
 "	The default methods for highlighting.  Can be overridden later
 "
 hi def link freebasicArrays		StorageClass
+hi def link freebasicAsm		Special
 hi def link freebasicBitManipulation	Operator
-hi def link freebasicCompilerSwitches	PreCondit
+hi def link freebasicBoolean		Boolean
+if s:lang == "fb"
+  hi def link freebasicCompilerSwitches	freebasicUnsupportedError
+else
+  hi def link freebasicCompilerSwitches	PreCondit
+endif
 hi def link freebasicConsole		Special
+hi def link freebasicData		Special
 hi def link freebasicDataTypes		Type
 hi def link freebasicDateTime		Type
 hi def link freebasicDebug		Special
 hi def link freebasicErrorHandling	Special
+hi def link freebasicFilenumber		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 freebasicLoops		Repeat
 hi def link freebasicMath		Function
+if s:lang == "fb"
+  hi def link freebasicMetacommand	freebasicUnsupportedError
+else
+  hi def link freebasicMetacommand	SpecialComment
+endif
 hi def link freebasicMemory		Function
 hi def link freebasicMisc		Special
 hi def link freebasicModularizing	Special
@@ -240,18 +620,55 @@ hi def link freebasicString		String
 hi def link freebasicTypeCasting	Type
 hi def link freebasicUserInput		Statement
 hi def link freebasicComment		Comment
+hi def link freebasicDoubleComment	Comment
+hi def link freebasicMultilineComment	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 freebasicLineContinuation	Special
+hi def link freebasicLineLabel		LineNr
+if s:lang == "fb"
+  hi def link freebasicLineNumber	freebasicUnsupportedError
+else
+  hi def link freebasicLineNumber	LineNr
+endif
 hi def link freebasicMathOperator	Operator
-hi def link freebasicNumber		Number
+
+hi def link freebasicHex		Number
+hi def link freebasicOctal		Number
+hi def link freebasicBinary		Number
+hi def link freebasicInteger		Number
+hi def link freebasicFloat		Float
+
+hi def link freebasicHexError		Error
+hi def link freebasicOctalError		Error
+hi def link freebasicBinaryError	Error
+
+hi def link freebasicAssignmentOperator		Operator
+hi def link freebasicArithmeticOperator		Operator
+hi def link freebasicIndexingOperator		Operator
+hi def link freebasicRelationalOperator		Operator
+hi def link freebasicBitwiseOperator		Operator
+hi def link freebasicShortcircuitOperator	Operator
+hi def link freebasicPreprocessorOperator	Operator
+hi def link freebasicPointerOperator		Operator
+if exists("freebasic_operators")
+  hi def link freebasicTypeOperator		Operator
+endif
+hi def link freebasicMemoryOperator		Operator
+
+hi def link freebasicSpaceError			Error
+
 hi def link freebasicSpecial		Special
 hi def link freebasicTodo		Todo

+hi def link freebasicUnsupported	freebasicUnsupportedError
+hi def link freebasicUnsupportedError	Error
+
+unlet s:lang
+
 let b:current_syntax = "freebasic"

-" vim: ts=8
+" vim: ts=8 tw=132 fdm=marker
--- a/runtime/syntax/html.vim
+++ b/runtime/syntax/html.vim
@@ -1,12 +1,9 @@
 " 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
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainers: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
+"			Claudio Fleiner <claudio@fleiner.com>
+" Last Change:		2022 Jul 20

 " Please check :help html.vim for some comments and a description of the options

@@ -23,6 +20,9 @@ set cpo&vim

 syntax spell toplevel

+syn include @htmlXml syntax/xml.vim
+unlet b:current_syntax
+
 syn case ignore

 " mark illegal characters
@@ -30,13 +30,13 @@ 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 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


@@ -47,13 +47,13 @@ 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 select small strike 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\)\>"
+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 abbr acronym bdo button col colgroup
+syn keyword htmlTagName contained del fieldset iframe ins label legend
 syn keyword htmlTagName contained object optgroup q s tbody tfoot thead

 " new html 5 tags
@@ -65,6 +65,15 @@ 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

+" svg and math tags
+syn keyword htmlMathTagName contained math
+syn keyword htmlSvgTagName  contained svg
+
+syn region  htmlMath start="<math>" end="</math>" contains=@htmlXml transparent keepend
+syn region  htmlSvg  start="<svg>"  end="</svg>"  contains=@htmlXml transparent keepend
+
+syn cluster xmlTagHook	add=htmlMathTagName,htmlSvgTagName
+
 " legal arg names
 syn keyword htmlArg contained action
 syn keyword htmlArg contained align alink alt archive background bgcolor
@@ -77,7 +86,7 @@ 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
+syn match   htmlArg contained "\<\%(http-equiv\|href\|title\)="me=e-1

 " aria attributes
 exe 'syn match htmlArg contained "\<aria-\%(' . join([
@@ -95,15 +104,15 @@ 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\>"
+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 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
@@ -113,51 +122,57 @@ 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
+syn keyword htmlArg contained allow autocapitalize as blocking decoding
+syn keyword htmlArg contained enterkeyhint imagesizes imagesrcset inert
+syn keyword htmlArg contained integrity is itemid itemprop itemref itemscope
+syn keyword htmlArg contained itemtype loading nomodule ping playsinline
+syn keyword htmlArg contained referrerpolicy slot allowfullscreen async
+syn keyword htmlArg contained autocomplete autofocus autoplay challenge
+syn keyword htmlArg contained contenteditable contextmenu controls crossorigin
+syn keyword htmlArg contained default dirname download draggable dropzone form
+syn keyword htmlArg contained formaction formenctype formmethod formnovalidate
+syn keyword htmlArg contained formtarget hidden high icon inputmode keytype
+syn keyword htmlArg contained kind list loop low max min minlength muted nonce
+syn keyword htmlArg contained novalidate open optimum pattern placeholder
+syn keyword htmlArg contained poster preload radiogroup required reversed
+syn keyword htmlArg contained sandbox spellcheck sizes srcset srcdoc srclang
+syn keyword htmlArg contained step title translate typemustmatch
+syn match   htmlArg contained "\<data-\h\%(\w\|[-.]\)*\%(\_s*=\)\@="

 " 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
+  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
+  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
+  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
+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 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
+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="<s\>" end="</s\_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
@@ -200,26 +215,26 @@ if !exists("html_no_rendering")
  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
+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
+  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
+    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 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 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
+  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

@@ -234,15 +249,15 @@ if main_syntax != 'java' || exists("java_vb")
  syn region  javaScript start=+<script \_[^>]*language *=\_[^>]*vbscript\_[^>]*>+ keepend end=+</script\_[^>]*>+me=s-1 contains=@htmlVbScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc
 endif

-syn cluster htmlJavaScript      add=@htmlPreproc
+syn cluster htmlJavaScript	add=@htmlPreproc

 if main_syntax != 'java' || exists("java_css")
  " embedded style sheets
-  syn keyword htmlArg           contained media
+  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 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
@@ -258,68 +273,70 @@ if main_syntax == "html"
 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
+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 htmlMathTagName		htmlTagName
+hi def link htmlSvgTagName		htmlTagName
+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
+  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 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
+    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
+	hi def htmlStrike	       term=strikethrough cterm=strikethrough gui=strikethrough
    else
-        hi def htmlStrike              term=underline cterm=underline gui=underline
+	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 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 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 javaScript		   Special
 hi def link javaScriptExpression   javaScript
 hi def link htmlCssStyleComment    Comment
-hi def link htmlCssDefinition      Special
+hi def link htmlCssDefinition	   Special

 let b:current_syntax = "html"

--- a/runtime/syntax/i3config.vim
+++ b/runtime/syntax/i3config.vim
@@ -17,6 +17,9 @@ endif

 scriptencoding utf-8

+" Error
+syn match i3ConfigError /.*/
+
 " Todo
 syn keyword i3ConfigTodo TODO FIXME XXX contained

@@ -54,8 +57,8 @@ syn match i3ConfigInclude /^\s*include\s\+.*$/ contains=i3ConfigIncludeKeyword,i
 " 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 i3ConfigSmartGapKeyword on inverse_outer off contained
+syn match i3ConfigSmartGap /^\s*smart_gaps\s\+\(on\|inverse_outer\|off\)\s\?$/ contains=i3ConfigSmartGapKeyword
 syn keyword i3ConfigSmartBorderKeyword on no_gaps contained
 syn match i3ConfigSmartBorder /^\s*smart_borders\s\+\(on\|no_gaps\)\s\?$/ contains=i3ConfigSmartBorderKeyword

@@ -74,7 +77,7 @@ syn match i3ConfigBind /^\s*\(bindsym\|bindcode\)\s\+.*$/ contains=i3ConfigVaria
 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 i3ConfigFloatingModifier /^\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
@@ -183,6 +186,7 @@ syn region i3ConfigBlock start=+^\s*[^#]*s\?{$+ end=+^\s*[^#]*}$+ contains=i3Con
 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
@@ -213,6 +217,7 @@ hi def link i3ConfigTimeUnit                        Constant
 hi def link i3ConfigModifier                        Constant
 hi def link i3ConfigString                          Constant
 hi def link i3ConfigNegativeSize                    Constant
+hi def link i3ConfigInclude                         Constant
 hi def link i3ConfigFontSeparator                   Special
 hi def link i3ConfigVariableModifier                Special
 hi def link i3ConfigSizeSpecial                     Special
@@ -233,6 +238,7 @@ hi def link i3ConfigLayout                          Identifier
 hi def link i3ConfigBorderStyle                     Identifier
 hi def link i3ConfigEdge                            Identifier
 hi def link i3ConfigFloating                        Identifier
+hi def link i3ConfigFloatingModifier                Identifier
 hi def link i3ConfigCommandKeyword                  Identifier
 hi def link i3ConfigNoFocusKeyword                  Identifier
 hi def link i3ConfigInitializeKeyword               Identifier
--- a/Show More
+++ b/Show More