patch 9.0.0801: the modifyOtherKeys flag is set when it should not

Problem: The modifyOtherKeys flag is set when it should not. Solution: Do not handle special key codes with a modifer value above 16 as a modifyOtherKeys value. (issue #11403)
patch 9.0.0800: compiler complains about repeated typedef
2022-10-19 20:07:09 +01:00 · 2022-10-19 19:24:48 +01:00 · 2022-10-19 18:04:49 +01:00 · 2022-10-19 15:39:49 +01:00 · 2022-10-19 15:12:54 +01:00 · 2022-10-19 14:48:14 +01:00
1156 changed files with 87533 additions and 55228 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -7,7 +7,6 @@ environment:
    - FEATURE: HUGE
 # disabled
 #    - FEATURE: TINY
-#    - FEATURE: SMALL
 #    - FEATURE: NORMAL
 #    - FEATURE: BIG

@@ -15,9 +14,8 @@ matrix:
  fast_finish: true

 before_build:
-  # Use Windows SDK 7.1 (= MSVC 2010)
-  - '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /release'
-  - 'set INCLUDE=%INCLUDE%C:\Program Files (x86)\Windows Kits\8.1\Include\um'
+  # Use Visual Studio 2015 compiler tools (default is 2012)
+  - '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64'

 build_script:
  - ci/appveyor.bat
@@ -26,9 +24,9 @@ test_script:
  - cd src/testdir
    # Testing with MSVC gvim
  - path C:\Python35-x64;%PATH%
-  - nmake -f Make_dos.mak VIMPROG=..\gvim
-  - nmake -f Make_dos.mak clean
+  - nmake -f Make_mvc.mak VIMPROG=..\gvim
+  - nmake -f Make_mvc.mak clean
    # Testing with MSVC console version
-  - nmake -f Make_dos.mak VIMPROG=..\vim
+  - nmake -f Make_mvc.mak VIMPROG=..\vim

 # vim: sw=2 sts=2 et ts=8 sr
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -11,7 +11,6 @@ freebsd_task:
    - name: FreeBSD 12.3
      freebsd_instance:
        image_family: freebsd-12-3
-  only_if: $CIRRUS_TAG == ''
  timeout_in: 20m
  install_script:
    - pkg update -f
@@ -26,3 +25,22 @@ freebsd_task:
    - pw useradd cirrus -m
    - chown -R cirrus:cirrus .
    - sudo -u cirrus make test
+
+macos_task:
+  name: macOS m1
+  macos_instance:
+    image: ghcr.io/cirruslabs/macos-ventura-xcode:latest
+  env:
+    # only run with clang, gcc is not real, it is a link to clang
+    CC: clang
+  timeout_in: 20m
+  install_script:
+    - brew update
+    - brew install gettext libtool
+  build_script:
+    - NPROC=$(getconf _NPROCESSORS_ONLN)
+    - ./configure --with-features=${FEATURES}
+    - make -j${NPROC}
+  test_script:
+    - src/vim --version
+    - make test
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -11,9 +11,12 @@

 runtime/autoload/freebasic.vim		@dkearns
 runtime/autoload/getscript.vim		@cecamp
+runtime/autoload/haskell.vim		@alx741
+runtime/autoload/javascript.vim		@jsit
 runtime/autoload/netrw.vim		@cecamp
 runtime/autoload/netrwFileHandlers.vim	@cecamp
 runtime/autoload/netrwSettings.vim	@cecamp
+runtime/autoload/php.vim		@david-szabo97
 runtime/autoload/rubycomplete.vim	@segfault @dkearns
 runtime/autoload/tar.vim		@cecamp
 runtime/autoload/vimball.vim		@cecamp
@@ -52,7 +55,9 @@ runtime/compiler/eruby.vim		@dkearns
 runtime/compiler/fbc.vim		@dkearns
 runtime/compiler/gawk.vim		@dkearns
 runtime/compiler/gjs.vim		@dkearns
+runtime/compiler/go.vim			@dbarnett
 runtime/compiler/haml.vim		@tpope
+runtime/compiler/hare.vim		@rsaihe
 runtime/compiler/icon.vim		@dkearns
 runtime/compiler/javac.vim		@dkearns
 runtime/compiler/jest.vim		@dkearns
@@ -65,6 +70,10 @@ runtime/compiler/perlcritic.vim		@petdance @dkearns
 runtime/compiler/php.vim		@dkearns
 runtime/compiler/podchecker.vim		@petdance @dkearns
 runtime/compiler/powershell.vim		@heaths
+runtime/compiler/raco.vim		@benknoble
+runtime/compiler/racomake.vim		@benknoble
+runtime/compiler/racosetup.vim		@benknoble
+runtime/compiler/racotest.vim		@benknoble
 runtime/compiler/rake.vim		@tpope @dkearns
 runtime/compiler/rhino.vim		@dkearns
 runtime/compiler/rspec.vim		@tpope @dkearns
@@ -72,6 +81,7 @@ runtime/compiler/rubocop.vim		@dkearns
 runtime/compiler/ruby.vim		@tpope @dkearns
 runtime/compiler/rubyunit.vim		@dkearns
 runtime/compiler/sass.vim		@tpope
+runtime/compiler/sdoc.vim		@gpanders
 runtime/compiler/se.vim			@dkearns
 runtime/compiler/shellcheck.vim		@dkearns
 runtime/compiler/sml.vim		@dkearns
@@ -93,35 +103,59 @@ runtime/doc/pi_tar.txt			@cecamp
 runtime/doc/pi_vimball.txt		@cecamp
 runtime/doc/pi_zip.txt			@cecamp
 runtime/doc/ps1.txt			@heaths
+runtime/ftplugin/abaqus.vim		@costerwi
 runtime/ftplugin/awk.vim		@dkearns
 runtime/ftplugin/basic.vim		@dkearns
 runtime/ftplugin/bst.vim		@tpope
 runtime/ftplugin/cfg.vim		@chrisbra
+runtime/ftplugin/chatito.vim		@ObserverOfTime
 runtime/ftplugin/clojure.vim		@axvr
+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/elixir.vim		@mhanberg
+runtime/ftplugin/erlang.vim		@hcs42
 runtime/ftplugin/eruby.vim		@tpope @dkearns
+runtime/ftplugin/expect.vim		@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/gdscript.vim		@habamax
+runtime/ftplugin/gdshader.vim		@habamax
 runtime/ftplugin/git.vim		@tpope
+runtime/ftplugin/gitattributes.vim	@ObserverOfTime
 runtime/ftplugin/gitcommit.vim		@tpope
 runtime/ftplugin/gitconfig.vim		@tpope
+runtime/ftplugin/gitignore.vim		@ObserverOfTime
 runtime/ftplugin/gitrebase.vim		@tpope
 runtime/ftplugin/gitsendemail.vim	@tpope
+runtime/ftplugin/gyp.vim		@ObserverOfTime
+runtime/ftplugin/go.vim			@dbarnett
 runtime/ftplugin/gprof.vim		@dpelle
 runtime/ftplugin/haml.vim		@tpope
+runtime/ftplugin/hare.vim		@rsaihe
 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
+runtime/ftplugin/j.vim			@glts
 runtime/ftplugin/javascript.vim		@dkearns
 runtime/ftplugin/javascriptreact.vim	@dkearns
+runtime/ftplugin/jsonc.vim		@izhakjakov
+runtime/ftplugin/julia.vim		@carlobaldassi
 runtime/ftplugin/kconfig.vim		@chrisbra
+runtime/ftplugin/less.vim		@genoma
 runtime/ftplugin/liquid.vim		@tpope
 runtime/ftplugin/lua.vim		@dkearns
+runtime/ftplugin/lynx.vim		@dkearns
 runtime/ftplugin/m3build.vim		@dkearns
 runtime/ftplugin/m3quake.vim		@dkearns
 runtime/ftplugin/markdown.vim		@tpope
@@ -134,19 +168,33 @@ runtime/ftplugin/nsis.vim		@k-takata
 runtime/ftplugin/octave.vim		@dkearns
 runtime/ftplugin/pascal.vim		@dkearns
 runtime/ftplugin/pbtxt.vim		@lakshayg
-runtime/ftplugin/perl.vim		@petdance @dkearns
 runtime/ftplugin/pdf.vim		@tpope
+runtime/ftplugin/perl.vim		@petdance @dkearns
 runtime/ftplugin/pod.vim		@petdance @dkearns
+runtime/ftplugin/poefilter.vim		@ObserverOfTime
 runtime/ftplugin/postscr.vim		@mrdubya
 runtime/ftplugin/ps1.vim		@heaths
 runtime/ftplugin/ps1xml.vim		@heaths
+runtime/ftplugin/python.vim		@tpict
 runtime/ftplugin/qb64.vim		@dkearns
+runtime/ftplugin/r.vim			@jalvesaq
+runtime/ftplugin/racket.vim		@benknoble
+runtime/ftplugin/rhelp.vim		@jalvesaq
+runtime/ftplugin/rmd.vim		@jalvesaq
+runtime/ftplugin/rnoweb.vim		@jalvesaq
 runtime/ftplugin/routeros.vim		@zainin
+runtime/ftplugin/rrst.vim		@jalvesaq
+runtime/ftplugin/rst.vim		@marshallward
 runtime/ftplugin/ruby.vim		@tpope @dkearns
 runtime/ftplugin/sass.vim		@tpope
+runtime/ftplugin/scala.vim		@derekwyatt
 runtime/ftplugin/scss.vim		@tpope
+runtime/ftplugin/sdoc.vim		@gpanders
+runtime/ftplugin/sh.vim			@dkearns
 runtime/ftplugin/solution.vim		@dkearns
 runtime/ftplugin/spec.vim		@ignatenkobrain
+runtime/ftplugin/ssa.vim		@ObserverOfTime
+runtime/ftplugin/swayconfig.vim		@jamespeapen
 runtime/ftplugin/systemverilog.vim	@Kocha
 runtime/ftplugin/tap.vim		@petdance
 runtime/ftplugin/tcsh.vim		@dkearns
@@ -156,6 +204,8 @@ runtime/ftplugin/toml.vim		@averms
 runtime/ftplugin/tt2html.vim		@petdance
 runtime/ftplugin/typescript.vim		@dkearns
 runtime/ftplugin/typescriptreact.vim	@dkearns
+runtime/ftplugin/vdf.vim		@ObserverOfTime
+runtime/ftplugin/wast.vim		@rhysd
 runtime/ftplugin/wget.vim		@dkearns
 runtime/ftplugin/wget2.vim		@dkearns
 runtime/ftplugin/xml.vim		@chrisbra
@@ -164,23 +214,40 @@ runtime/ftplugin/zsh.vim		@chrisbra
 runtime/indent/basic.vim		@dkearns
 runtime/indent/bst.vim			@tpope
 runtime/indent/cdl.vim			@dkearns
+runtime/indent/chatito.vim		@ObserverOfTime
 runtime/indent/clojure.vim		@axvr
 runtime/indent/config.vim		@dkearns
+runtime/indent/cs.vim			@nickspoons
 runtime/indent/css.vim			@dkearns
 runtime/indent/cucumber.vim		@tpope
 runtime/indent/d.vim			@dkearns
 runtime/indent/dosbatch.vim		@k-takata
 runtime/indent/dtd.vim			@dkearns
 runtime/indent/dylan.vim		@dkearns
+runtime/indent/eiffel.vim		@jocelyn
 runtime/indent/elm.vim			@andys8
+runtime/indent/erlang.vim		@hcs42
 runtime/indent/eruby.vim		@tpope @dkearns
 runtime/indent/eterm.vim		@dkearns
+runtime/indent/falcon.vim		@steveno
 runtime/indent/framescript.vim		@dkearns
 runtime/indent/freebasic.vim		@dkearns
+runtime/indent/gdscript.vim		@habamax
 runtime/indent/gitconfig.vim		@tpope
+runtime/indent/gitolite.vim		@sitaramc
+runtime/indent/go.vim			@dbarnett
+runtime/indent/gyp.vim			@ObserverOfTime
 runtime/indent/haml.vim			@tpope
+runtime/indent/hare.vim			@rsaihe
 runtime/indent/idlang.vim		@dkearns
+runtime/indent/j.vim			@glts
+runtime/indent/java.vim			@xuhdev
+runtime/indent/javascript.vim		@bounceme
+runtime/indent/json.vim			@elzr
+runtime/indent/jsonc.vim		@izhakjakov
+runtime/indent/julia.vim		@carlobaldassi
 runtime/indent/ld.vim			@dkearns
+runtime/indent/less.vim			@genoma
 runtime/indent/liquid.vim		@tpope
 runtime/indent/make.vim			@dkearns
 runtime/indent/meson.vim		@Liambeguin
@@ -189,21 +256,34 @@ runtime/indent/nginx.vim		@chr4
 runtime/indent/nsis.vim			@k-takata
 runtime/indent/occam.vim		@dkearns
 runtime/indent/perl.vim			@petdance
+runtime/indent/php.vim			@2072
 runtime/indent/postscr.vim		@mrdubya
 runtime/indent/prolog.vim		@dkearns
 runtime/indent/ps1.vim			@heaths
 runtime/indent/qb64.vim			@dkearns
+runtime/indent/r.vim			@jalvesaq
+runtime/indent/racket.vim		@benknoble
 runtime/indent/readline.vim		@dkearns
+runtime/indent/rhelp.vim		@jalvesaq
+runtime/indent/rmd.vim			@jalvesaq
+runtime/indent/rnoweb.vim		@jalvesaq
+runtime/indent/rrst.vim			@jalvesaq
 runtime/indent/ruby.vim			@AndrewRadev @dkearns
 runtime/indent/sass.vim			@tpope
+runtime/indent/scala.vim		@derekwyatt
 runtime/indent/scss.vim			@tpope
 runtime/indent/sh.vim			@chrisbra
 runtime/indent/systemverilog.vim	@Kocha
 runtime/indent/tcl.vim			@dkearns
 runtime/indent/tcsh.vim			@dkearns
 runtime/indent/teraterm.vim		@k-takata
+runtime/indent/typescript.vim		@HerringtonDarkholme
+runtime/indent/vroom.vim		@dbarnett
+runtime/indent/wast.vim			@rhysd
 runtime/indent/xml.vim			@chrisbra
 runtime/indent/zsh.vim			@chrisbra
+runtime/keymap/armenian-eastern_utf-8.vim	@blinskey
+runtime/keymap/armenian-western_utf-8.vim	@blinskey
 runtime/keymap/tamil_tscii.vim		@yegappan
 runtime/lang/menu_en_gb.latin1.vim	@mrdubya
 runtime/pack/dist/opt/cfilter/plugin/cfilter.vim	@yegappan
@@ -214,63 +294,102 @@ runtime/plugin/netrwPlugin.vim		@cecamp
 runtime/plugin/tarPlugin.vim		@cecamp
 runtime/plugin/vimballPlugin.vim	@cecamp
 runtime/plugin/zipPlugin.vim		@cecamp
+runtime/syntax/abaqus.vim		@costerwi
 runtime/syntax/aidl.vim			@dpelle
 runtime/syntax/amiga.vim		@cecamp
 runtime/syntax/arduino.vim		@johshoff
+runtime/syntax/asciidoc.vim		@aerostitch
 runtime/syntax/asm.vim			@dkearns
 runtime/syntax/asmh8300.vim		@dkearns
 runtime/syntax/asterisk.vim		@jaunis
+runtime/syntax/autohotkey.vim		@mmikeww
 runtime/syntax/awk.vim			@dkearns
 runtime/syntax/basic.vim		@dkearns
 runtime/syntax/bst.vim			@tpope
+runtime/syntax/bzl.vim			@dbarnett
+runtime/syntax/bzr.vim			@hdima
 runtime/syntax/cabal.vim		@coot
 runtime/syntax/cabalconfig.vim		@coot
 runtime/syntax/cabalproject.vim		@coot
+runtime/syntax/cf.vim			@ernstvanderlinden
+runtime/syntax/chatito.vim		@ObserverOfTime
 runtime/syntax/clojure.vim		@axvr
 runtime/syntax/cs.vim			@nickspoons
 runtime/syntax/csh.vim			@cecamp
 runtime/syntax/cucumber.vim		@tpope
+runtime/syntax/d.vim			@JesseKPhillips
+runtime/syntax/dart.vim			@pr3d4t0r
 runtime/syntax/datascript.vim		@dpelle
 runtime/syntax/dcl.vim			@cecamp
 runtime/syntax/desktop.vim		@e-kwsm
 runtime/syntax/dosbatch.vim		@mrdubya
+runtime/syntax/dosini.vim		@xuhdev
 runtime/syntax/dot.vim			@mmottl
 runtime/syntax/doxygen.vim		@frogonwheels
 runtime/syntax/dtd.vim			@chrisbra
 runtime/syntax/dts.vim			@zonque
+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/gdresource.vim		@habamax
+runtime/syntax/gdscript.vim		@habamax
+runtime/syntax/gdshader.vim		@habamax
 runtime/syntax/git.vim			@tpope
+runtime/syntax/gitattributes.vim	@ObserverOfTime
 runtime/syntax/gitcommit.vim		@tpope
 runtime/syntax/gitconfig.vim		@tpope
+runtime/syntax/gitignore.vim		@ObserverOfTime
+runtime/syntax/gitolite.vim		@sitaramc
 runtime/syntax/gitrebase.vim		@tpope
+runtime/syntax/go.vim			@bhcleek
+runtime/syntax/godoc.vim		@dbarnett
 runtime/syntax/gprof.vim		@dpelle
 runtime/syntax/groff.vim		@jmarshall
+runtime/syntax/gyp.vim			@ObserverOfTime
 runtime/syntax/haml.vim			@tpope
+runtime/syntax/hare.vim			@rsaihe
 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
+runtime/syntax/j.vim			@glts
+runtime/syntax/jargon.vim		@h3xx
+runtime/syntax/java.vim			@fleiner
+runtime/syntax/jsonc.vim		@izhakjakov
+runtime/syntax/julia.vim		@carlobaldassi
 runtime/syntax/kconfig.vim		@chrisbra
 runtime/syntax/less.vim			@genoma
 runtime/syntax/lex.vim			@cecamp
 runtime/syntax/liquid.vim		@tpope
 runtime/syntax/lisp.vim			@cecamp
+runtime/syntax/lyrics.vim		@ObserverOfTime
 runtime/syntax/lynx.vim			@dkearns
 runtime/syntax/m3build.vim		@dkearns
 runtime/syntax/m3quake.vim		@dkearns
 runtime/syntax/mailcap.vim		@dkearns
 runtime/syntax/make.vim			@rohieb
+runtime/syntax/mallard.vim		@jhradilek
 runtime/syntax/maple.vim		@cecamp
 runtime/syntax/markdown.vim		@tpope
 runtime/syntax/mason.vim		@petdance
 runtime/syntax/meson.vim		@Liambeguin
 runtime/syntax/modula3.vim		@dkearns
+runtime/syntax/n1ql.vim			@pr3d4t0r
 runtime/syntax/netrw.vim		@cecamp
 runtime/syntax/nginx.vim		@chr4
+runtime/syntax/ninja.vim		@nico
 runtime/syntax/nroff.vim		@jmarshall
 runtime/syntax/nsis.vim			@k-takata
 runtime/syntax/pascal.vim		@dkearns
@@ -278,7 +397,9 @@ runtime/syntax/pbtxt.vim		@lakshayg
 runtime/syntax/pdf.vim			@tpope
 runtime/syntax/perl.vim			@petdance
 runtime/syntax/php.vim			@TysonAndre
+runtime/syntax/plsql.vim		@lee-lindley
 runtime/syntax/pod.vim			@petdance
+runtime/syntax/poefilter.vim		@ObserverOfTime
 runtime/syntax/postscr.vim		@mrdubya
 runtime/syntax/privoxy.vim		@dkearns
 runtime/syntax/prolog.vim		@XVilka
@@ -286,20 +407,39 @@ runtime/syntax/ps1.vim			@heaths
 runtime/syntax/ps1xml.vim		@heaths
 runtime/syntax/psl.vim			@danielkho
 runtime/syntax/qb64.vim			@dkearns
+runtime/syntax/r.vim			@jalvesaq
+runtime/syntax/racket.vim		@benknoble
+runtime/syntax/raml.vim			@in3d
+runtime/syntax/ratpoison.vim		@trapd00r
 runtime/syntax/rc.vim			@chrisbra
+runtime/syntax/rcs.vim			@hdima
 runtime/syntax/rebol.vim		@mrdubya
+runtime/syntax/rego.vim			@zenmatic
+runtime/syntax/resolv.vim		@rid9
+runtime/syntax/rmd.vim			@jalvesaq
+runtime/syntax/rng.vim			@jhradilek
 runtime/syntax/routeros.vim		@zainin
 runtime/syntax/rpcgen.vim		@cecamp
+runtime/syntax/rrst.vim			@jalvesaq
+runtime/syntax/rst.vim			@marshallward
 runtime/syntax/ruby.vim			@dkearns
 runtime/syntax/sass.vim			@tpope
+runtime/syntax/scala.vim		@derekwyatt
 runtime/syntax/scss.vim			@tpope
+runtime/syntax/sdoc.vim			@gpanders
+runtime/syntax/sed.vim			@dkearns
 runtime/syntax/sh.vim			@cecamp
 runtime/syntax/sm.vim			@cecamp
 runtime/syntax/spec.vim			@ignatenkobrain
 runtime/syntax/sqloracle.vim		@chrisbra
+runtime/syntax/squirrel.vim		@zenmatic
+runtime/syntax/srt.vim			@ObserverOfTime
+runtime/syntax/ssa.vim			@ObserverOfTime
 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
@@ -312,7 +452,13 @@ runtime/syntax/toml.vim			@averms
 runtime/syntax/tt2.vim			@petdance
 runtime/syntax/tt2html.vim		@petdance
 runtime/syntax/tt2js.vim		@petdance
+runtime/syntax/typescript.vim		@HerringtonDarkholme
+runtime/syntax/typescriptcommon.vim	@HerringtonDarkholme
+runtime/syntax/typescriptreact.vim	@HerringtonDarkholme
+runtime/syntax/vdf.vim			@ObserverOfTime
 runtime/syntax/vim.vim			@cecamp
+runtime/syntax/vroom.vim		@dbarnett
+runtime/syntax/wast.vim			@rhysd
 runtime/syntax/wget.vim			@dkearns
 runtime/syntax/wget2.vim		@dkearns
 runtime/syntax/xbl.vim			@dkearns
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,16 +12,19 @@ concurrency:
  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
  cancel-in-progress: true

+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
  linux:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04

    env:
      CC: ${{ matrix.compiler }}
      TEST: test
      SRCDIR: ./src
      LEAK_CFLAGS: -DEXITFREE
-      CFLAGS: -Wno-error=deprecated-declarations
+      CFLAGS: -Wno-deprecated-declarations
      LOG_DIR: ${{ github.workspace }}/logs
      TERM: xterm
      DISPLAY: ':99'
@@ -30,7 +33,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        features: [tiny, small, normal, huge]
+        features: [tiny, normal, huge]
        compiler: [clang, gcc]
        extra: [none]
        include:
@@ -98,17 +101,17 @@ jobs:
          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100
          sudo update-alternatives --set gcc /usr/bin/gcc-11

-      - name: Install clang-14
+      - name: Install clang-15
        if: matrix.compiler == 'clang'
        run: |
          wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
          . /etc/lsb-release
-          sudo add-apt-repository -y "deb http://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME}-14 main"
-          sudo apt install -y clang-14 llvm-14
-          sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 100
-          sudo update-alternatives --set clang /usr/bin/clang-14
-          sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-14 100
-          sudo update-alternatives --install /usr/bin/asan_symbolize asan_symbolize /usr/bin/asan_symbolize-14 100
+          sudo add-apt-repository -y "deb http://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME}-15 main"
+          sudo apt install -y clang-15 llvm-15
+          sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-15 100
+          sudo update-alternatives --set clang /usr/bin/clang-15
+          sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-15 100
+          sudo update-alternatives --install /usr/bin/asan_symbolize asan_symbolize /usr/bin/asan_symbolize-15 100

      - name: Set up environment
        run: |
@@ -122,7 +125,7 @@ jobs:
          echo "TMPDIR=${{ runner.temp }}"

          case "${{ matrix.features }}" in
-          tiny|small)
+          tiny)
            echo "TEST=testtiny"
            if ${{ contains(matrix.extra, 'nogui') }}; then
              echo "CONFOPT=--disable-gui"
@@ -167,11 +170,6 @@ jobs:
            # Use llvm-cov instead of gcov when compiler is clang.
            ln -fs /usr/bin/llvm-cov ${HOME}/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
          sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=0
          sudo usermod -a -G audio "${USER}"
          sudo bash ci/setup-xvfb.sh
@@ -255,7 +253,7 @@ jobs:

      - name: Codecov
        if: matrix.coverage
-        uses: codecov/codecov-action@v3.1.0
+        uses: codecov/codecov-action@v3.1.1
        with:
          flags: linux,${{ matrix.features }}-${{ matrix.compiler }}-${{ matrix.extra }}

@@ -268,7 +266,7 @@ jobs:
          done

  # coveralls:
-  #   runs-on: ubuntu-18.04
+  #   runs-on: ubuntu-20.04
  #
  #   needs: linux
  #   if: always() && github.event_name != 'pull_request'
@@ -306,6 +304,7 @@ jobs:
        run: |
          brew install lua
          echo "LUA_PREFIX=/usr/local" >> $GITHUB_ENV
+          brew uninstall perl

      - name: Set up environment
        run: |
@@ -387,35 +386,15 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        toolchain: [msvc, mingw]
-        arch: [x64, x86]
-        features: [HUGE, NORMAL]
        include:
-          - arch: x64
-            vcarch: amd64
-            warch: x64
-            bits: 64
-            msystem: MINGW64
-            cygreg: registry
-            pyreg: ""
-          - arch: x86
-            vcarch: x86
-            warch: ia32
-            bits: 32
-            msystem: MINGW32
-            cygreg: registry32
-            pyreg: "-32"
-          - toolchain: mingw
-            arch: x64
-            features: HUGE
-            coverage: yes
-        exclude:
-          - toolchain: msvc
-            arch: x64
-            features: NORMAL
-          - toolchain: mingw
-            arch: x86
-            features: NORMAL
+          - { features: HUGE,   toolchain: msvc,  VIMDLL: no,  GUI: no,  arch: x64 }
+          - { features: HUGE,   toolchain: mingw, VIMDLL: yes, GUI: yes, arch: x86, coverage: yes }
+          - { features: HUGE,   toolchain: msvc,  VIMDLL: no,  GUI: yes, arch: x86 }
+          - { features: HUGE,   toolchain: mingw, VIMDLL: yes, GUI: no,  arch: x64, coverage: yes }
+          - { features: NORMAL, toolchain: msvc,  VIMDLL: yes, GUI: no,  arch: x86 }
+          - { features: NORMAL, toolchain: mingw, VIMDLL: no,  GUI: yes, arch: x64 }
+          - { features: TINY,   toolchain: msvc,  VIMDLL: yes, GUI: yes, arch: x64 }
+          - { features: TINY,   toolchain: mingw, VIMDLL: no,  GUI: no,  arch: x86 }

    steps:
      - name: Initialize
@@ -423,13 +402,32 @@ jobs:
        shell: bash
        run: |
          git config --global core.autocrlf input
-          echo "VCVARSALL=$(vswhere -products \* -latest -property installationPath)\\VC\\Auxiliary\\Build\\vcvarsall.bat" >> $GITHUB_ENV
-          if [ "${{ matrix.arch }}" = "x86" ]; then
-            choco install python2 --forcex86
+
+          if [ "${{ matrix.arch }}" = "x64" ]; then
+            cygreg=registry
+            pyreg=
+            echo "VCARCH=amd64" >> $GITHUB_ENV
+            echo "WARCH=x64" >> $GITHUB_ENV
+            echo "BITS=64" >> $GITHUB_ENV
+            echo "MSYSTEM=MINGW64" >> $GITHUB_ENV
          else
-            choco install python2
+            cygreg=registry32
+            pyreg=-32
+            echo "VCARCH=x86" >> $GITHUB_ENV
+            echo "WARCH=ia32" >> $GITHUB_ENV
+            echo "BITS=32" >> $GITHUB_ENV
+            echo "MSYSTEM=MINGW32" >> $GITHUB_ENV
          fi
-          python3_dir=$(cat "/proc/${{ matrix.cygreg }}/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON3_VER_DOT}${{ matrix.pyreg }}/InstallPath/@")
+
+          echo "VCVARSALL=$(vswhere -products \* -latest -property installationPath)\\VC\\Auxiliary\\Build\\vcvarsall.bat" >> $GITHUB_ENV
+          if [ "${{ matrix.features }}" != "TINY" ]; then
+            if [ "${{ matrix.arch }}" = "x86" ]; then
+              choco install python2 --forcex86
+            else
+              choco install python2
+            fi
+          fi
+          python3_dir=$(cat "/proc/$cygreg/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON3_VER_DOT}$pyreg/InstallPath/@")
          echo "PYTHON3_DIR=$python3_dir" >> $GITHUB_ENV

      - uses: msys2/setup-msys2@v2
@@ -439,7 +437,7 @@ jobs:
          install: tar
          pacboy: >-
            make:p gcc:p
-          msystem: ${{ matrix.msystem }}
+          msystem: ${{ env.MSYSTEM }}
          release: false

      - name: Checkout repository from github
@@ -456,7 +454,7 @@ jobs:
        uses: actions/cache@v3
        with:
          path: downloads
-          key: ${{ runner.os }}-${{ matrix.bits }}-${{ hashFiles('urls.txt') }}
+          key: ${{ runner.os }}-${{ matrix.arch }}-${{ hashFiles('urls.txt') }}

      - name: Download dependencies
        shell: cmd
@@ -465,14 +463,14 @@ jobs:
          if not exist downloads mkdir downloads

          echo %COL_GREEN%Download Lua%COL_RESET%
-          call :downloadfile %LUA${{ matrix.bits }}_URL% downloads\lua.zip
+          call :downloadfile %LUA${{ env.BITS }}_URL% downloads\lua.zip
          7z x downloads\lua.zip -o%LUA_DIR% > nul || exit 1

          echo %COL_GREEN%Download winpty%COL_RESET%
          call :downloadfile %WINPTY_URL% downloads\winpty.zip
          7z x -y downloads\winpty.zip -oD:\winpty > nul || exit 1
-          copy /Y D:\winpty\${{ matrix.warch }}\bin\winpty.dll        src\winpty${{ matrix.bits }}.dll
-          copy /Y D:\winpty\${{ matrix.warch }}\bin\winpty-agent.exe  src\
+          copy /Y D:\winpty\%WARCH%\bin\winpty.dll        src\winpty%BITS%.dll
+          copy /Y D:\winpty\%WARCH%\bin\winpty-agent.exe  src\

          goto :eof

@@ -487,31 +485,28 @@ jobs:
          )
          goto :eof

-      - name: Copy src directory to src2
-        shell: cmd
-        run: xcopy src src2\ /E > nul
-
      - name: Build (MSVC)
        if: matrix.toolchain == 'msvc'
        shell: cmd
        run: |
-          call "%VCVARSALL%" ${{ matrix.vcarch }}
+          call "%VCVARSALL%" %VCARCH%
          cd src
+          if "${{ matrix.VIMDLL }}"=="yes" (
+            set GUI=yes
+          ) else (
+            set GUI=${{ matrix.GUI }}
+          )
          if "${{ matrix.features }}"=="HUGE" (
            nmake -nologo -f Make_mvc.mak ^
              FEATURES=${{ matrix.features }} ^
-              GUI=yes IME=yes ICONV=yes VIMDLL=yes ^
+              GUI=%GUI% IME=yes ICONV=yes VIMDLL=${{ matrix.VIMDLL }} ^
              DYNAMIC_LUA=yes LUA=%LUA_DIR% ^
              DYNAMIC_PYTHON=yes PYTHON=%PYTHON_DIR% ^
              DYNAMIC_PYTHON3=yes PYTHON3=%PYTHON3_DIR%
          ) else (
            nmake -nologo -f Make_mvc.mak ^
              FEATURES=${{ matrix.features }} ^
-              GUI=yes IME=yes ICONV=yes VIMDLL=yes
-          )
-          if not exist vim${{ matrix.bits }}.dll (
-            echo %COL_RED%Build failure.%COL_RESET%
-            exit 1
+              GUI=%GUI% IME=yes ICONV=yes VIMDLL=${{ matrix.VIMDLL }}
          )

      - name: Build (MinGW)
@@ -519,10 +514,15 @@ jobs:
        shell: msys2 {0}
        run: |
          cd src
+          if [ "${{ matrix.VIMDLL }}" = "yes" ]; then
+            GUI=yes
+          else
+            GUI=${{ matrix.GUI }}
+          fi
          if [ "${{ matrix.features }}" = "HUGE" ]; then
            mingw32-make -f Make_ming.mak -j2 \
              FEATURES=${{ matrix.features }} \
-              GUI=yes IME=yes ICONV=yes VIMDLL=yes \
+              GUI=$GUI IME=yes ICONV=yes VIMDLL=${{ matrix.VIMDLL }} \
              DYNAMIC_LUA=yes LUA=${LUA_DIR_SLASH} \
              DYNAMIC_PYTHON=yes PYTHON=${PYTHON_DIR} \
              DYNAMIC_PYTHON3=yes PYTHON3=${PYTHON3_DIR} \
@@ -530,17 +530,27 @@ jobs:
          else
            mingw32-make -f Make_ming.mak -j2 \
              FEATURES=${{ matrix.features }} \
-              GUI=yes IME=yes ICONV=yes VIMDLL=yes \
+              GUI=$GUI IME=yes ICONV=yes VIMDLL=${{ matrix.VIMDLL }} \
              STATIC_STDCPLUS=yes
          fi

      - name: Check version
        shell: cmd
        run: |
-          PATH %LUA_DIR%;C:\msys64\${{ matrix.msystem }}\bin;%PATH%;%PYTHON3_DIR%
-          src\vim --version || exit 1
-          src\vim -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-1.vim -c quit
-          src\vim -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-2.vim -c quit
+          PATH %LUA_DIR%;C:\msys64\%MSYSTEM%\bin;%PATH%;%PYTHON3_DIR%
+          if "${{ matrix.GUI }}"=="yes" (
+            start /wait src\gvim -u NONE -i NONE -c "redir > version.txt | ver | q" || exit 1
+            type version.txt
+            echo.
+            start /wait src\gvim -u NONE -i NONE -c "redir! > version.txt | so ci\if_ver-1.vim | q"
+            start /wait src\gvim -u NONE -i NONE -c "redir >> version.txt | so ci\if_ver-2.vim | q"
+            type version.txt
+            del version.txt
+          ) else (
+            src\vim --version || exit 1
+            src\vim -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-1.vim -c quit
+            src\vim -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-2.vim -c quit
+          )

      #- name: Prepare Artifact
      #  shell: cmd
@@ -555,51 +565,39 @@ jobs:
      #    name: vim${{ matrix.bits }}-${{ matrix.toolchain }}
      #    path: ./artifacts

-      - name: Copy gcov data files to src2
-        if: matrix.coverage
-        shell: msys2 {0}
-        run: find src -name '*.gcno' | tar -c -T - | tar -x -C src2 --strip-components 1
-
      - name: Test and show the result of testing gVim
+        if: matrix.GUI == 'yes' || matrix.VIMDLL == 'yes'
        shell: cmd
-        timeout-minutes: 20
+        timeout-minutes: 15
        run: |
-          PATH %LUA_DIR%;C:\msys64\${{ matrix.msystem }}\bin;%PATH%;%PYTHON3_DIR%
-          call "%VCVARSALL%" ${{ matrix.vcarch }}
-
-          echo %COL_GREEN%Start testing Vim in background.%COL_RESET%
-          start cmd /c "cd src2\testdir & nmake -nologo -f Make_dos.mak VIMPROG=..\..\src\vim > nul & echo done>done.txt"
+          PATH %LUA_DIR%;C:\msys64\%MSYSTEM%\bin;%PATH%;%PYTHON3_DIR%
+          call "%VCVARSALL%" %VCARCH%

          echo %COL_GREEN%Test gVim:%COL_RESET%
          cd src\testdir
-          nmake -nologo -f Make_dos.mak VIMPROG=..\gvim || exit 1
-
-      - name: Show the result of testing Vim
-        shell: cmd
-        timeout-minutes: 20
-        run: |
-          PATH %LUA_DIR%;C:\msys64\${{ matrix.msystem }}\bin;%PATH%;%PYTHON3_DIR%
-          call "%VCVARSALL%" ${{ matrix.vcarch }}
-
-          echo %COL_GREEN%Wait for Vim tests to finish.%COL_RESET%
-          cd src2\testdir
-          :: Wait about 10 minutes.
-          for /L %%i in (1,1,60) do (
-            if exist done.txt goto exitloop
-            timeout 10 > NUL 2>&1
-            if ERRORLEVEL 1 ping -n 11 localhost > NUL
+          if "${{ matrix.GUI }}"=="yes" (
+            nmake -nologo -f Make_mvc.mak VIMPROG=..\gvim || exit 1
+          ) else (
+            @rem Run only tiny tests.
+            nmake -nologo -f Make_mvc.mak tiny VIMPROG=..\gvim  || exit 1
          )
-          set timeout=1
-          :exitloop

-          echo %COL_GREEN%The result of testing Vim:%COL_RESET%
-          cd src2\testdir
-          if exist messages type messages
-          nmake -nologo -f Make_dos.mak report VIMPROG=..\..\src\vim || exit 1
+      - name: Test and show the result of testing Vim
+        if: matrix.GUI == 'no' || matrix.VIMDLL == 'yes'
+        shell: cmd
+        timeout-minutes: 15
+        run: |
+          PATH %LUA_DIR%;C:\msys64\%MSYSTEM%\bin;%PATH%;%PYTHON3_DIR%
+          call "%VCVARSALL%" %VCARCH%

-          if "%timeout%"=="1" (
-            echo %COL_RED%Timed out.%COL_RESET%
-            exit 1
+          echo %COL_GREEN%Test Vim:%COL_RESET%
+          cd src\testdir
+          nmake -nologo -f Make_mvc.mak clean
+          if "${{ matrix.GUI }}"=="no" (
+            nmake -nologo -f Make_mvc.mak VIMPROG=..\vim || exit 1
+          ) else (
+            @rem Run only tiny tests.
+            nmake -nologo -f Make_mvc.mak tiny VIMPROG=..\vim  || exit 1
          )

      - name: Generate gcov files
@@ -608,19 +606,10 @@ jobs:
        run: |
          cd src
          find . -type f -name '*.gcno' -exec gcov -pb {} + || true
-          cd ../src2
-          find . -type f -name '*.gcno' -exec gcov -pb {} + || true

-      - name: Codecov (gVim)
+      - name: Codecov
        if: matrix.coverage
-        uses: codecov/codecov-action@v3.1.0
+        uses: codecov/codecov-action@v3.1.1
        with:
          directory: src
-          flags: windows,${{ matrix.toolchain }}-${{ matrix.arch }}-${{ matrix.features }}-gui
-
-      - name: Codecov (Vim)
-        if: matrix.coverage
-        uses: codecov/codecov-action@v3.1.0
-        with:
-          directory: src2
          flags: windows,${{ matrix.toolchain }}-${{ matrix.arch }}-${{ matrix.features }}
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -21,8 +21,15 @@ concurrency:
  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
  cancel-in-progress: true

+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
  analyze:
+    permissions:
+      contents: read # to fetch code (actions/checkout)
+      security-events: write #  (github/codeql-action/autobuild)
+
    name: Analyze
    runs-on: ubuntu-latest

--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -4,12 +4,16 @@ on:
    - cron: '42 0 * * *'  # Run once per day, to avoid Coverity's submission limits
  workflow_dispatch:

+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
  scan:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04

    env:
      CC: gcc
+      CFLAGS: -Wno-deprecated-declarations
      DEBIAN_FRONTEND: noninteractive

    steps:
@@ -50,12 +54,6 @@ jobs:
          echo "CONFOPT=--enable-perlinterp --enable-pythoninterp --enable-python3interp --enable-rubyinterp --enable-luainterp --enable-tclinterp"
          ) >> $GITHUB_ENV

-      - name: Set up system
-        run: |
-          # Setup lua5.3 manually since its package doesn't provide alternative.
-          # https://bugs.launchpad.net/ubuntu/+source/lua5.3/+bug/1707212
-          sudo update-alternatives --install /usr/bin/lua lua /usr/bin/lua5.3 10
-
      - name: Configure
        run: |
          ./configure --with-features=huge ${CONFOPT} --enable-fail-if-missing
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,8 @@ gvimext.lib
 gvim.lib
 runtime/doc/uganda.nsis.txt
 nsis/icons/*
+/vim90/
+.vscode/

 # NetBeans
 nbproject/*
@@ -82,6 +84,8 @@ src/testdir/dostmp/*
 src/testdir/messages
 src/testdir/viminfo
 src/testdir/opt_test.vim
+src/testdir/failed
+src/testdir/starttime
 runtime/indent/testdir/*.out
 runtime/indent/testdir/*.fail
 src/memfile_test
--- 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/48
+++ b/48
@@ -15,7 +15,6 @@ SRC_ALL =	\
 		.gitignore \
 		.hgignore \
 		.lgtm.yml \
-		.travis.yml \
 		.appveyor.yml \
 		.codecov.yml \
 		ci/appveyor.bat \
@@ -172,7 +171,6 @@ SRC_ALL =	\
 		src/viminfo.c \
 		src/winclip.c \
 		src/window.c \
-		src/tee/tee.c \
 		src/xxd/xxd.c \
 		src/testdir/gen_opt_test.vim \
 		src/testdir/README.txt \
@@ -211,6 +209,7 @@ SRC_ALL =	\
 		src/testdir/python_before/*.py \
 		src/testdir/pyxfile/*.py \
 		src/testdir/dumps/*.dump \
+		src/testdir/dumps/*.vim \
 		src/testdir/samples/*.txt \
 		src/testdir/samples/test000 \
 		src/testdir/color_ramp.vim \
@@ -488,7 +487,6 @@ SRC_UNIX =	\
 		src/vimtutor \
 		src/gvimtutor \
 		src/which.sh \
-		src/tee/Makefile \
 		src/xxd/Makefile \

 # source files for both DOS and Unix
@@ -517,7 +515,7 @@ SRC_DOS_UNIX =	\
 		src/proto/if_tcl.pro \
 		src/typemap \

-# source files for DOS (also in the extra archive)
+# source files for MS-Windows (also in the extra archive)
 SRC_DOS =	\
 		src/GvimExt/*.mak \
 		src/GvimExt/GvimExt.reg \
@@ -541,9 +539,11 @@ SRC_DOS =	\
 		tools/rename.bat \
 		src/bigvim.bat \
 		src/bigvim64.bat \
-		src/msvc2008.bat \
-		src/msvc2010.bat \
+		src/msvc-latest.bat \
 		src/msvc2015.bat \
+		src/msvc2017.bat \
+		src/msvc2019.bat \
+		src/msvc2022.bat \
 		src/msys32.bat \
 		src/msys64.bat \
 		src/dlldata.c \
@@ -556,7 +556,6 @@ SRC_DOS =	\
 		src/if_ole.cpp \
 		src/if_ole.h \
 		src/if_ole.idl \
-		src/if_perl_msvc/stdbool.h \
 		src/iscygpty.c \
 		src/iscygpty.h \
 		src/iid_ole.c \
@@ -571,6 +570,7 @@ SRC_DOS =	\
 		src/proto/os_win32.pro \
 		src/proto/os_mswin.pro \
 		src/testdir/Make_dos.mak \
+		src/testdir/Make_mvc.mak \
 		src/testdir/Make_ming.mak \
 		src/testdir/dos.vim \
 		src/uninstall.c \
@@ -579,7 +579,10 @@ SRC_DOS =	\
 		src/vimrun.c \
 		src/xpm_w32.c \
 		src/xpm_w32.h \
+		src/tee/Make_ming.mak \
 		src/tee/Make_mvc.mak \
+		src/tee/Makefile \
+		src/tee/tee.c \
 		src/xxd/Make_ming.mak \
 		src/xxd/Make_mvc.mak \
 		nsis/gvim.nsi \
@@ -587,30 +590,9 @@ SRC_DOS =	\
 		nsis/README.txt \
 		nsis/lang/*.nsi \
 		uninstall.txt \
-		src/VisVim/Commands.cpp \
-		src/VisVim/Commands.h \
-		src/VisVim/DSAddIn.cpp \
-		src/VisVim/DSAddIn.h \
-		src/VisVim/OleAut.cpp \
-		src/VisVim/OleAut.h \
-		src/VisVim/README_VisVim.txt \
-		src/VisVim/Reg.cpp \
-		src/VisVim/Register.bat \
-		src/VisVim/Resource.h \
-		src/VisVim/StdAfx.cpp \
-		src/VisVim/StdAfx.h \
-		src/VisVim/UnRegist.bat \
-		src/VisVim/VisVim.cpp \
-		src/VisVim/VisVim.def \
-		src/VisVim/VisVim.mak \
-		src/VisVim/VisVim.h \
-		src/VisVim/VisVim.odl \
-		src/VisVim/VisVim.rc \
-		src/VisVim/VsReadMe.txt \

 # source files for DOS without CR/LF translation (also in the extra archive)
 SRC_DOS_BIN =	\
-		src/VisVim/Res/*.bmp \
 		src/tearoff.bmp \
 		src/tools.bmp \
 		src/vim*.ico \
@@ -621,10 +603,8 @@ SRC_DOS_BIN =	\
 		src/xpm/include/*.h \
 		src/xpm/x64/lib-vc14/libXpm.lib \
 		src/xpm/x64/lib/libXpm.a \
-		src/xpm/x64/lib/libXpm.lib \
 		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 \

@@ -815,6 +795,8 @@ RT_SCRIPTS =	\
 		runtime/plugin/README.txt \
 		runtime/syntax/*.vim \
 		runtime/syntax/README.txt \
+		runtime/syntax/shared/*.vim \
+		runtime/syntax/shared/README.txt \

 # Unix runtime
 RT_UNIX =	\
@@ -942,11 +924,7 @@ EXTRA =		\
 		$(RT_EXTRA) \
 		$(SRC_EXTRA) \
 		README_extra.txt \
-		src/VisVim/VisVim.dll \
 		runtime/vimlogo.xpm \
-		src/tee/Makefile \
-		src/tee/Make_mvc.mak \
-		src/tee/tee.c \

 # files in READMEdir that are included from the top dir
 IN_README_DIR = \
@@ -1017,6 +995,8 @@ LANG_GEN = \
 		runtime/spell/README.txt \
 		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/18
+++ b/18
@@ -84,8 +84,8 @@ indenttest:
 #    To do all this you need the Unix archive and compiled binaries.
 #    Before creating an archive first delete all backup files, *.orig, etc.

-MAJOR = 8
-MINOR = 2
+MAJOR = 9
+MINOR = 0

 # CHECKLIST for creating a new version:
 #
@@ -110,7 +110,7 @@ MINOR = 2
 # - Check for missing entries in runtime/makemenu.vim (with checkmenu script).
 # - Check for missing options in runtime/optwin.vim et al. (with check.vim).
 # - Do "make menu" to update the runtime/synmenu.vim file.
-# - Add remarks for changes to runtime/doc/version8.txt.
+# - Add remarks for changes to runtime/doc/version9.txt.
 # - Check that runtime/doc/help.txt doesn't contain entries in "LOCAL
 #   ADDITIONS".
 # - In runtime/doc run "make" and "make html" to check for errors.
@@ -144,7 +144,7 @@ MINOR = 2
 # - > make dossrc
 #   > make dosrt
 #   Unpack dist/vim##rt.zip and dist/vim##src.zip on an MS-Windows PC.
-#   This creates the directory vim/vim82 and puts all files in there.
+#   This creates the directory vim/vim90 and puts all files in there.
 # Win32 console version build:
 # - See src/INSTALLpc.txt for installing the compiler and SDK.
 # - Set environment for Visual C++ 2015:
@@ -198,11 +198,9 @@ MINOR = 2
 # - copy these files (get them from a binary archive or build them):
 #	gvimext.dll in src/GvimExt
 #	gvimext64.dll in src/GvimExt
-#	VisVim.dll in src/VisVim
-#   Note: VisVim needs to be build with MSVC 5, newer versions don't work.
 #   gvimext64.dll can be obtained from:
 #   https://github.com/vim/vim-win32-installer/releases
-#	It is part of gvim_8.2.*_x64.zip as vim/vim82/GvimExt/gvimext64.dll.
+#	It is part of gvim_9.0.*_x64.zip as vim/vim90/GvimExt/gvimext64.dll.
 # - Make sure there is a diff.exe two levels up (get it from a previous Vim
 #   version).  Also put winpty32.dll and winpty-agent.exe there.
 # - go to ../nsis and do:
@@ -414,6 +412,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 +422,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
@@ -556,8 +552,6 @@ dosbin_ole: dist no_title.vim dist/$(COMMENT_OLE)
 	cp uninstallw32.exe dist/vim/$(VIMRTDIR)/uninstall.exe
 	cp gvimext.dll dist/vim/$(VIMRTDIR)/gvimext.dll
 	cp README_ole.txt dist/vim/$(VIMRTDIR)
-	cp src/VisVim/VisVim.dll dist/vim/$(VIMRTDIR)/VisVim.dll
-	cp src/VisVim/README_VisVim.txt dist/vim/$(VIMRTDIR)
 	cd dist && zip -9 -rD -z gvim$(VERSION)ole.zip vim <$(COMMENT_OLE)
 	cp gvim_ole.pdb dist/gvim$(VERSION)ole.pdb

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

@@ -28,10 +28,10 @@ All commands are given with normal keyboard characters, so those who can type
 with ten fingers can work very fast.  Additionally, function keys can be
 mapped to commands by the user, and the mouse can be used.

-Vim runs under MS-Windows (XP, Vista, 7, 8, 10), macOS, Haiku, VMS and almost
-all flavours of UNIX.  Porting to other systems should not be very difficult.
-Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me/NT/2000, Amiga DOS,
-Atari MiNT, BeOS, RISC OS and OS/2.  These are no longer maintained.
+Vim runs under MS-Windows (7, 8, 10, 11), macOS, Haiku, VMS and almost all
+flavours of UNIX.  Porting to other systems should not be very difficult.
+Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me/NT/2000/XP/Vista,
+Amiga DOS, Atari MiNT, BeOS, RISC OS and OS/2.  These are no longer maintained.

 For Vim9 script see [README_VIM9](README_VIM9.md).

@@ -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/

@@ -149,9 +151,4 @@ Send any other comments, patches, flowers and suggestions to:
 	Bram Moolenaar <Bram@vim.org>


-This is `README.md` for version 8.2 of Vim: Vi IMproved.
-
-
-## Translations of this README ##
-
-[Korean](https://github.com/cjw1359/opensource/blob/master/Vim/README_ko.md)
+This is `README.md` for version 9.0 of Vim: Vi IMproved.
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-README.txt for version 8.2 of Vim: Vi IMproved.
+README.txt for version 9.0 of Vim: Vi IMproved.


 WHAT IS VIM?
@@ -16,10 +16,10 @@ All commands are given with normal keyboard characters, so those who can type
 with ten fingers can work very fast.  Additionally, function keys can be
 mapped to commands by the user, and the mouse can be used.

-Vim runs under MS-Windows (XP, Vista, 7, 8, 10), macOS, VMS and almost all
+Vim runs under MS-Windows (7, 8, 10, 11), macOS, Haiku, VMS and almost all
 flavours of UNIX.  Porting to other systems should not be very difficult.
-Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me/NT/2000, Amiga DOS,
-Atari MiNT, BeOS, RISC OS and OS/2.  These are no longer maintained.
+Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me/NT/2000/XP/Vista,
+Amiga DOS, Atari MiNT, BeOS, RISC OS and OS/2.  These are no longer maintained.


 DISTRIBUTION
--- a/READMEdir/Contents
+++ b/READMEdir/Contents
@@ -9,15 +9,15 @@ Vim		Vi IMproved.  A clone of the UNIX text editor Vi.  Very useful
 		messages, shows current file name in window title, on-line
 		help, rectangular cut/paste, etc., etc., etc...

-		Version 8.2.  Also runs under UNIX, MS-Windows, Mac, etc.
-		vim82rt.tgz  contains the documentation and syntax files.
-		vim82bin.tgz contains the binaries.
-		vim82src.tgz contains the sources.
+		Version 9.0.  Also runs under UNIX, MS-Windows, Mac, etc.
+		vim90rt.tgz  contains the documentation and syntax files.
+		vim90bin.tgz contains the binaries.
+		vim90src.tgz contains the sources.
 		Author: Bram Moolenaar et al.


 Xxd		Hex dumper and reader.  Can be used to view files as hex, edit
 		them and write them back.  Can also be used to patch files.

-		Version 1.10 (1997 May 22)
+		Version 2022 Jan 14
 		Author: Juergen Weigert
--- a/READMEdir/README_ami.txt
+++ b/READMEdir/README_ami.txt
@@ -1,4 +1,4 @@
-README_ami.txt for version 8.2 of Vim: Vi IMproved.
+README_ami.txt for version 9.0 of Vim: Vi IMproved.

 This file explains the installation of Vim on Amiga systems.
 See README.txt for general information about Vim.
@@ -16,8 +16,8 @@ easily upgrade to a new version.  For example:
 You would then unpack the archives like this:

  cd dh0:editors
-  tar xf t:vim82bin.tar
-  tar xf t:vim82rt.tar
+  tar xf t:vim90bin.tar
+  tar xf t:vim90rt.tar

 Set the $VIM environment variable to point to the top directory of your Vim
 files.  For the above example:
--- a/READMEdir/README_amibin.txt
+++ b/READMEdir/README_amibin.txt
@@ -1,8 +1,8 @@
-README_amibin.txt for version 8.2 of Vim: Vi IMproved.
+README_amibin.txt for version 9.0 of Vim: Vi IMproved.

 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.
-These files are in the runtime archive (vim82rt.tgz).
+These files are in the runtime archive (vim90rt.tgz).


 The Amiga "bin" archive contains the Vim executable for the Amiga.  It was
--- a/READMEdir/README_amisrc.txt
+++ b/READMEdir/README_amisrc.txt
@@ -1,8 +1,8 @@
-README_amisrc.txt for version 8.2 of Vim: Vi IMproved.
+README_amisrc.txt for version 9.0 of Vim: Vi IMproved.

 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.
-These files are in the runtime archive (vim82rt.tgz).
+These files are in the runtime archive (vim90rt.tgz).


 The Amiga source archive contains the files needed to compile Vim on the
--- a/READMEdir/README_bindos.txt
+++ b/READMEdir/README_bindos.txt
@@ -1,16 +1,16 @@
-README_bindos.txt for version 8.2 of Vim: Vi IMproved.
+README_bindos.txt for version 9.0 of Vim: Vi IMproved.

 See "README.txt" for general information about Vim.
 See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.
-These files are in the runtime archive (vim82rt.zip).
+These files are in the runtime archive (vim90rt.zip).


 There are several binary distributions of Vim for the PC.  You would normally
 pick only one of them, but it's also possible to install several.
 These ones are available (the version number may differ):
-	vim82w32.zip	Windows 95/98/NT/etc. console version
-	gvim82.zip	Windows 95/98/NT/etc. GUI version
-	gvim82ole.zip	Windows 95/98/NT/etc. GUI version with OLE
+	vim90w32.zip	Windows 95/98/NT/etc. console version
+	gvim90.zip	Windows 95/98/NT/etc. GUI version
+	gvim90ole.zip	Windows 95/98/NT/etc. GUI version with OLE

-You MUST also get the runtime archive (vim82rt.zip).
-The sources are also available (vim82src.zip).
+You MUST also get the runtime archive (vim90rt.zip).
+The sources are also available (vim90src.zip).
--- a/READMEdir/README_dos.txt
+++ b/READMEdir/README_dos.txt
@@ -1,4 +1,4 @@
-README_dos.txt for version 8.2 of Vim: Vi IMproved.
+README_dos.txt for version 9.0 of Vim: Vi IMproved.

 This file explains the installation of Vim on MS-Windows systems.
 See "README.txt" for general information about Vim.
@@ -41,19 +41,19 @@ These are the normal steps to install Vim from the .zip archives:
   located.  Check the $VIM setting to see where it points to:
 	set VIM
   For example, if you have
-	C:\vim\vim82
+	C:\vim\vim90
   do
 	cd C:\
   Binary and runtime Vim archives are normally unpacked in the same location,
   on top of each other.

-2. Unpack the zip archives.  This will create a new directory "vim\vim82",
+2. Unpack the zip archives.  This will create a new directory "vim\vim90",
   in which all the distributed Vim files are placed.  Since the directory
   name includes the version number, it is unlikely that you overwrite
   existing files.
   Examples:
-	pkunzip -d gvim82.zip
-	unzip vim82w32.zip
+	pkunzip -d gvim90.zip
+	unzip vim90w32.zip

   You need to unpack the runtime archive and at least one of the binary
   archives.  When using more than one binary version, be careful not to
@@ -65,7 +65,7 @@ These are the normal steps to install Vim from the .zip archives:
   won't move or copy the runtime files.

 3. Change to the new directory:
-	cd vim\vim82
+	cd vim\vim90
   Run the "install.exe" program.  It will ask you a number of questions about
   how you would like to have your Vim setup.  Among these are:
   - You can tell it to write a "_vimrc" file with your preferences in the
@@ -76,8 +76,8 @@ These are the normal steps to install Vim from the .zip archives:
     console or in a shell.  You can select one of the directories in your
     $PATH.  If you skip this, you can add Vim to the search path manually:
     The simplest is to add a line to your autoexec.bat.  Examples:
-	set path=%path%;C:\vim\vim82
-	set path=%path%;D:\editors\vim\vim82
+	set path=%path%;C:\vim\vim90
+	set path=%path%;D:\editors\vim\vim90
   - Create entries for Vim on the desktop and in the Start menu.

 That's it!
@@ -89,8 +89,8 @@ Remarks:
  won't show a menubar.  Then you need to set the $VIM environment variable to
  point to the top directory of your Vim files.  Example:
    set VIM=C:\editors\vim
-  Vim version 8.2 will look for your vimrc file in $VIM, and for the runtime
-  files in $VIM/vim82.  See ":help $VIM" for more information.
+  Vim version 9.0 will look for your vimrc file in $VIM, and for the runtime
+  files in $VIM/vim90.  See ":help $VIM" for more information.

 - To avoid confusion between distributed files of different versions and your
  own modified vim scripts, it is recommended to use this directory layout:
@@ -101,14 +101,14 @@ Remarks:
 	C:\vim\vimfiles\ftplugin\*.vim	Filetype plugins
 	C:\vim\...			Other files you made.
  Distributed files:
-	C:\vim\vim82\vim.exe		The Vim version 8.2 executable.
-	C:\vim\vim82\doc\*.txt		The version 8.2 documentation files.
-	C:\vim\vim82\bugreport.vim	A Vim version 8.2 script.
-	C:\vim\vim82\...		Other version 8.2 distributed files.
+	C:\vim\vim90\vim.exe		The Vim version 9.0 executable.
+	C:\vim\vim90\doc\*.txt		The version 9.0 documentation files.
+	C:\vim\vim90\bugreport.vim	A Vim version 9.0 script.
+	C:\vim\vim90\...		Other version 9.0 distributed files.
  In this case the $VIM environment variable would be set like this:
 	set VIM=C:\vim
-  Then $VIMRUNTIME will automatically be set to "$VIM\vim82".  Don't add
-  "vim82" to $VIM, that won't work.
+  Then $VIMRUNTIME will automatically be set to "$VIM\vim90".  Don't add
+  "vim90" to $VIM, that won't work.

 - You can put your Vim executable anywhere else.  If the executable is not
  with the other Vim files, you should set $VIM. The simplest is to add a line
@@ -132,8 +132,8 @@ Remarks:
     Select Properties.
  5. In the Program tab, change the "Cmdline" to add "/c" and the name of the
     Vim executable.  Examples:
-	C:\command.com /c C:\vim\vim82\vim.exe
-	C:\command.com /c D:\editors\vim\vim82\vim.exe
+	C:\command.com /c C:\vim\vim90\vim.exe
+	C:\command.com /c D:\editors\vim\vim90\vim.exe
  6. Select the font, window size, etc. that you like.  If this isn't
     possible, select "Advanced" in the Program tab, and deselect "MS-DOS
     mode".
--- a/READMEdir/README_extra.txt
+++ b/READMEdir/README_extra.txt
@@ -1,4 +1,4 @@
-README_extra.txt for version 8.2 of Vim: Vi IMproved.
+README_extra.txt for version 9.0 of Vim: Vi IMproved.

 These extra files of Vim are for special purposes.  This README explains what
 the files are for.  For general information about Vim, see the "README.txt"
@@ -29,9 +29,6 @@ src/Make_mvc.mak	MS Visual C++ makefile for the Win32 GUI.

 src/if_ole.*		OLE automation interface, for MS Windows 95 and NT.

-src/VisVim/*		Integration of Win32 GUI with MS Visual Developer
-			Studio.
-
 src/GvimExt/*		DLL for the "Edit with Vim" context menu entry

 nsis/*			NSIS script to build the self-installing MS-Windows exe
--- a/READMEdir/README_haiku.txt
+++ b/READMEdir/README_haiku.txt
@@ -1,4 +1,4 @@
-README_haiku.txt for version 8.2 of Vim: Vi IMproved.
+README_haiku.txt for version 9.0 of Vim: Vi IMproved.

 This file explains the installation of Vim on Haiku operating system.
 See "README.txt" for general information about Vim.
--- a/READMEdir/README_mac.txt
+++ b/READMEdir/README_mac.txt
@@ -1,4 +1,4 @@
-README_mac.txt for version 8.2 of Vim: Vi IMproved.
+README_mac.txt for version 9.0 of Vim: Vi IMproved.

 This file explains the installation of Vim on MacOS systems.
 See "README.txt" for general information about Vim.
--- a/READMEdir/README_ole.txt
+++ b/READMEdir/README_ole.txt
@@ -1,6 +1,6 @@
-README_ole.txt for version 8.2 of Vim: Vi IMproved.
+README_ole.txt for version 9.0 of Vim: Vi IMproved.

-This archive contains gvim.exe with OLE interface and VisVim.
+This archive contains gvim.exe with OLE interface.
 This version of gvim.exe can also load a number of interface dynamically (you
 can optionally install the .dll files for each interface).
 It is only for MS-Windows 95/98/ME/NT/2000/XP.
@@ -15,6 +15,3 @@ Win32 with OLE - "MS-Windows 32 bit GUI version with OLE support"

 For further information, type this inside Vim:
 	:help if_ole
-
-Furthermore, this archive contains VISVIM.DLL.  It can be used to integrate
-the OLE gvim with Microsoft Visual Developer Studio.  See VisVim/README.txt.
--- a/READMEdir/README_os2.txt
+++ b/READMEdir/README_os2.txt
@@ -1,4 +1,4 @@
-README_os2.txt for version 8.2 of Vim: Vi IMproved.
+README_os2.txt for version 9.0 of Vim: Vi IMproved.

 This file used to explain the installation of Vim on OS/2 systems.
 However, support for OS/2 has been removed in patch 7.4.1008.
--- a/READMEdir/README_os390.txt
+++ b/READMEdir/README_os390.txt
@@ -1,4 +1,4 @@
-README_os390.txt for version 8.2 of Vim: Vi IMproved.
+README_os390.txt for version 9.0 of Vim: Vi IMproved.

 This readme explains how to build Vim on z/OS.  Formerly called OS/390.
 See "README.txt" for general information about Vim.
--- a/READMEdir/README_src.txt
+++ b/READMEdir/README_src.txt
@@ -1,8 +1,8 @@
-README_src.txt for version 8.2 of Vim: Vi IMproved.
+README_src.txt for version 9.0 of Vim: Vi IMproved.

 The source archive contains the files needed to compile Vim on Unix systems.
 It is packed for Unix systems (NL line separator).

 For more information, see the README.txt file that comes with the runtime
-archive (vim-8.2-rt.tar.gz).  To be able to run Vim you MUST get the runtime
+archive (vim-9.0-rt.tar.gz).  To be able to run Vim you MUST get the runtime
 archive too!
--- a/READMEdir/README_srcdos.txt
+++ b/READMEdir/README_srcdos.txt
@@ -1,12 +1,11 @@
-README_srcdos.txt for version 8.2 of Vim: Vi IMproved.
+README_srcdos.txt for version 9.0 of Vim: Vi IMproved.

 See "README.txt" for general information about Vim.
 See "README_dos.txt" for installation instructions for MS-Windows.
-These files are in the runtime archive (vim82rt.zip).
+These files are in the runtime archive (vim90rt.zip).


 The DOS source archive contains the files needed to compile Vim on MS-Windows.
-It is packed for MS-Windows systems, with CR-LF.  It also includes the VisVim
-sources.
+It is packed for MS-Windows systems, with CR-LF.

 See "src/INSTALLpc.txt" for instructions on how to compile Vim on the PC.
--- a/READMEdir/README_unix.txt
+++ b/READMEdir/README_unix.txt
@@ -1,4 +1,4 @@
-README_unix.txt for version 8.2 of Vim: Vi IMproved.
+README_unix.txt for version 9.0 of Vim: Vi IMproved.

 This file explains the installation of Vim on Unix systems.
 See "README.txt" for general information about Vim.
--- a/READMEdir/README_vms.txt
+++ b/READMEdir/README_vms.txt
@@ -1,4 +1,4 @@
-README_vms.txt for version 8.2 of Vim: Vi IMproved.
+README_vms.txt for version 9.0 of Vim: Vi IMproved.

 This file explains the installation of Vim on VMS systems.
 See "README.txt" in the runtime archive for information about Vim.
--- a/READMEdir/README_w32s.txt
+++ b/READMEdir/README_w32s.txt
@@ -1,4 +1,4 @@
-README_w32s.txt for version 8.2 of Vim: Vi IMproved.
+README_w32s.txt for version 9.0 of Vim: Vi IMproved.

 This file used to explain the installation of Vim on MS-Windows 3.1 and 3.11
 systems.  However, support for MS-Windows 3.1 and 3.11 has been removed in
--- a/nsis/README.txt
+++ b/nsis/README.txt
@@ -27,23 +27,20 @@ To build the installable .exe:
 	64-bit: src/GvimExt/gvimext64.dll
 	32-bit: src/GvimExt/gvimext.dll

-4.  Go to the VisVim directory and build VisVim.dll (or get it from a binary
-    archive).
-
-5.  Get a "diff.exe" program.  If you skip this the built-in diff will always
+4.  Get a "diff.exe" program.  If you skip this the built-in diff will always
    be used (which is fine for most users).  If you do have your own
    "diff.exe" put it in the "../.." directory (above the "vim82" directory,
    it's the same for all Vim versions).
    You can find one in previous Vim versions or in this archive:
 		http://www.mossbayeng.com/~ron/vim/diffutils.tar.gz

-6   Also put winpty32.dll and winpty-agent.exe in "../.." (above the "vim82"
+5   Also put winpty32.dll and winpty-agent.exe in "../.." (above the "vim82"
    directory).  This is required for the terminal window.

-7.  Do "make uganda.nsis.txt" in runtime/doc.  This requires sed, you may have
+6.  Do "make uganda.nsis.txt" in runtime/doc.  This requires sed, you may have
    to do this on Unix.  Make sure the file is in DOS file format!

-8.  Get gettext and iconv DLLs from the following site:
+7.  Get gettext and iconv DLLs from the following site:
 	https://github.com/mlocati/gettext-iconv-windows/releases
    Both 64- and 32-bit versions are needed.
    Download the files gettextX.X.X.X-iconvX.XX-shared-{32,64}.zip, extract
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -36,9 +36,6 @@ Unicode true
 # Comment the next line if you do not want to add Native Language Support
 !define HAVE_NLS

-# Uncomment the next line if you want to include VisVim extension:
-#!define HAVE_VIS_VIM
-
 # Comment the following line to create an English-only installer:
 !define HAVE_MULTI_LANG

@@ -55,9 +52,6 @@ Unicode true
 # ----------- No configurable settings below this line -----------

 !include "Library.nsh"		# For DLL install
-!ifdef HAVE_VIS_VIM
-  !include "UpgradeDLL.nsh"	# for VisVim.dll
-!endif
 !include "LogicLib.nsh"
 !include "MUI2.nsh"
 !include "nsDialogs.nsh"
@@ -366,11 +360,7 @@ Section "$(str_section_exe)" id_section_exe
 	File ${VIMTOOLS}\winpty-agent.exe

 	SetOutPath $0\colors
-	File ${VIMRT}\colors\*.*
-	SetOutPath $0\colors\tools
-	File ${VIMRT}\colors\tools\*.*
-	SetOutPath $0\colors\lists
-	File ${VIMRT}\colors\lists\*.*
+	File /r ${VIMRT}\colors\*.*

 	SetOutPath $0\compiler
 	File ${VIMRT}\compiler\*.*
@@ -395,13 +385,7 @@ Section "$(str_section_exe)" id_section_exe
 	File ${VIMRT}\plugin\*.*

 	SetOutPath $0\autoload
-	File ${VIMRT}\autoload\*.*
-
-	SetOutPath $0\autoload\dist
-	File ${VIMRT}\autoload\dist\*.*
-
-	SetOutPath $0\autoload\xml
-	File ${VIMRT}\autoload\xml\*.*
+	File /r ${VIMRT}\autoload\*.*

 	SetOutPath $0\import\dist
 	File ${VIMRT}\import\dist\*.*
@@ -410,7 +394,7 @@ Section "$(str_section_exe)" id_section_exe
 	File ${VIMSRC}\vim.ico

 	SetOutPath $0\syntax
-	File ${VIMRT}\syntax\*.*
+	File /r ${VIMRT}\syntax\*.*

 	SetOutPath $0\spell
 	File ${VIMRT}\spell\*.txt
@@ -546,17 +530,6 @@ SectionGroup $(str_group_plugin) id_group_plugin
 	SectionEnd
 SectionGroupEnd

-##########################################################
-!ifdef HAVE_VIS_VIM
-Section "$(str_section_vis_vim)" id_section_visvim
-	SectionIn 3
-
-	SetOutPath $0
-	!insertmacro UpgradeDLL "${VIMSRC}\VisVim\VisVim.dll" "$0\VisVim.dll" "$0"
-	File ${VIMSRC}\VisVim\README_VisVim.txt
-SectionEnd
-!endif
-
 ##########################################################
 !ifdef HAVE_NLS
 Section "$(str_section_nls)" id_section_nls
@@ -644,12 +617,6 @@ Section -post
 	  SectionGetSize ${id_section_editwith} $4
 	  IntOp $3 $3 + $4
 	${EndIf}
-!ifdef HAVE_VIS_VIM
-	${If} ${SectionIsSelected} ${id_section_visvim}
-	  SectionGetSize ${id_section_visvim} $4
-	  IntOp $3 $3 + $4
-	${EndIf}
-!endif
 !ifdef HAVE_NLS
 	${If} ${SectionIsSelected} ${id_section_nls}
 	  SectionGetSize ${id_section_nls} $4
@@ -680,9 +647,6 @@ Section -post
 	!insertmacro SaveSectionSelection ${id_section_vimrc}      "select_vimrc"
 	!insertmacro SaveSectionSelection ${id_section_pluginhome} "select_pluginhome"
 	!insertmacro SaveSectionSelection ${id_section_pluginvim}  "select_pluginvim"
-!ifdef HAVE_VIS_VIM
-	!insertmacro SaveSectionSelection ${id_section_visvim}     "select_visvim"
-!endif
 !ifdef HAVE_NLS
 	!insertmacro SaveSectionSelection ${id_section_nls}        "select_nls"
 !endif
@@ -754,9 +718,6 @@ Function .onInit
  !insertmacro LoadSectionSelection ${id_section_vimrc}      "select_vimrc"
  !insertmacro LoadSectionSelection ${id_section_pluginhome} "select_pluginhome"
  !insertmacro LoadSectionSelection ${id_section_pluginvim}  "select_pluginvim"
-!ifdef HAVE_VIS_VIM
-  !insertmacro LoadSectionSelection ${id_section_visvim}     "select_visvim"
-!endif
 !ifdef HAVE_NLS
  !insertmacro LoadSectionSelection ${id_section_nls}        "select_nls"
 !endif
@@ -931,9 +892,6 @@ FunctionEnd
    !insertmacro MUI_DESCRIPTION_TEXT ${id_group_plugin}        $(str_desc_plugin)
    !insertmacro MUI_DESCRIPTION_TEXT ${id_section_pluginhome}  $(str_desc_plugin_home)
    !insertmacro MUI_DESCRIPTION_TEXT ${id_section_pluginvim}   $(str_desc_plugin_vim)
-!ifdef HAVE_VIS_VIM
-    !insertmacro MUI_DESCRIPTION_TEXT ${id_section_visvim}      $(str_desc_vis_vim)
-!endif
 !ifdef HAVE_NLS
    !insertmacro MUI_DESCRIPTION_TEXT ${id_section_nls}         $(str_desc_nls)
 !endif
@@ -957,13 +915,6 @@ Section "un.$(str_unsection_register)" id_unsection_register
 	# created.  Thus the "vim61" directory is included in it.
 	StrCpy $0 "$INSTDIR"

-!ifdef HAVE_VIS_VIM
-	# If VisVim was installed, unregister the DLL.
-	${If} ${FileExists} "$0\VisVim.dll"
-	  ExecWait "regsvr32.exe /u /s $0\VisVim.dll"
-	${EndIf}
-!endif
-
 	# delete the context menu entry and batch files
 	DetailPrint "$(str_msg_unregistering)"
 	nsExec::Exec "$0\uninstall.exe -nsis"
@@ -1056,9 +1007,6 @@ Section "un.$(str_unsection_exe)" id_unsection_exe
 	RMDir /r $0\syntax
 	RMDir /r $0\tools
 	RMDir /r $0\tutor
-!ifdef HAVE_VIS_VIM
-	RMDir /r $0\VisVim
-!endif
 	RMDir /r $0\lang
 	RMDir /r $0\keymap
 	Delete $0\*.exe
--- a/nsis/gvim_version.nsh
+++ b/nsis/gvim_version.nsh
@@ -1,6 +1,6 @@
 # Generated from Makefile: define the version numbers
 !ifndef __GVIM_VER__NSH__
 !define __GVIM_VER__NSH__
-!define VER_MAJOR 8
-!define VER_MINOR 2
+!define VER_MAJOR 9
+!define VER_MINOR 0
 !endif
--- a/nsis/lang/danish.nsi
+++ b/nsis/lang/danish.nsi
@@ -79,9 +79,6 @@ LangString str_desc_plugin_home     ${LANG_DANISH}     "Opret plugin-mapper i HO
 LangString str_section_plugin_vim   ${LANG_DANISH}     "Delte"
 LangString str_desc_plugin_vim      ${LANG_DANISH}     "Opret plugin-mapper i Vim-installationsmappe, det bruges af alle på systemet."

-LangString str_section_vis_vim      ${LANG_DANISH}     "VisVim-udvidelser"
-LangString str_desc_vis_vim         ${LANG_DANISH}     "VisVim-udvidelser til integrering i Microsoft Visual Studio."
-
 LangString str_section_nls          ${LANG_DANISH}     "Understøttelse af modersmål"
 LangString str_desc_nls             ${LANG_DANISH}     "Installer filer til understøttelse af modersmål."

--- a/nsis/lang/dutch.nsi
+++ b/nsis/lang/dutch.nsi
@@ -123,11 +123,6 @@ LangString str_desc_plugin_vim      ${LANG_DUTCH} \
    "Creëer plugin mappen in Vim installatie map, deze worden gebruikt \
     voor iedereen op het systeem."

-LangString str_section_vis_vim      ${LANG_DUTCH} \
-    "VisVim extensie"
-LangString str_desc_vis_vim         ${LANG_DUTCH} \
-    "VisVim extensie voor Microsoft Visual Studio integratie."
-
 LangString str_section_nls          ${LANG_DUTCH} \
    "Ondersteuning voor andere talen"
 LangString str_desc_nls             ${LANG_DUTCH} \
--- a/nsis/lang/english.nsi
+++ b/nsis/lang/english.nsi
@@ -121,11 +121,6 @@ LangString str_desc_plugin_vim      ${LANG_ENGLISH} \
    "Create plugin directories in Vim install directory, it is used for \
     everybody on the system."

-LangString str_section_vis_vim      ${LANG_ENGLISH} \
-    "VisVim Extension"
-LangString str_desc_vis_vim         ${LANG_ENGLISH} \
-    "VisVim Extension for Microsoft Visual Studio integration."
-
 LangString str_section_nls          ${LANG_ENGLISH} \
    "Native Language Support"
 LangString str_desc_nls             ${LANG_ENGLISH} \
--- a/nsis/lang/german.nsi
+++ b/nsis/lang/german.nsi
@@ -122,11 +122,6 @@ LangString str_desc_plugin_vim      ${LANG_GERMAN} \
    "Plugin-Verzeichnisse im Vim-Installationsverzeichnis erstellen. Diese werden \
     für alle Benutzer dieses Systems genutzt."

-LangString str_section_vis_vim      ${LANG_GERMAN} \
-    "VisVim-Erweiterung"
-LangString str_desc_vis_vim         ${LANG_GERMAN} \
-    "VisVim-Erweiterung zur Integration in Microsoft Visual Studio."
-
 LangString str_section_nls          ${LANG_GERMAN} \
    "Unterstützung für andere Sprachen"
 LangString str_desc_nls             ${LANG_GERMAN} \
--- a/nsis/lang/italian.nsi
+++ b/nsis/lang/italian.nsi
@@ -123,11 +123,6 @@ LangString str_desc_plugin_vim      ${LANG_ITALIAN} \
    "Crea directory per plugin nella directory di installazione di Vim \
     per uso da parte di tutti gli utenti di questo sistema."

-LangString str_section_vis_vim      ${LANG_ITALIAN} \
-    "Estensione VisVim"
-LangString str_desc_vis_vim         ${LANG_ITALIAN} \
-    "Estensione VisVim per integrazione con Microsoft Visual Studio."
-
 LangString str_section_nls          ${LANG_ITALIAN} \
    "Supporto Multilingue (NLS)"
 LangString str_desc_nls             ${LANG_ITALIAN} \
--- a/nsis/lang/japanese.nsi
+++ b/nsis/lang/japanese.nsi
@@ -128,11 +128,6 @@ LangString str_section_plugin_vim   ${LANG_JAPANESE} \
 LangString str_desc_plugin_vim      ${LANG_JAPANESE} \
    "プラグインディレクトリを Vim のインストールディレクトリに作成します。システムの全員で共有されます。"

-LangString str_section_vis_vim      ${LANG_JAPANESE} \
-    "VisVim 拡張"
-LangString str_desc_vis_vim         ${LANG_JAPANESE} \
-    "Microsoft Visual Studio 統合用の VisVim 拡張。"
-
 LangString str_section_nls          ${LANG_JAPANESE} \
    "多言語サポート"
 LangString str_desc_nls             ${LANG_JAPANESE} \
--- a/nsis/lang/russian.nsi
+++ b/nsis/lang/russian.nsi
@@ -125,11 +125,6 @@ LangString str_desc_plugin_vim      ${LANG_RUSSIAN} \
     Модули в этом каталоге будут доступны для любого пользователя \
     зарегистрировавшегося в системе"

-LangString str_section_vis_vim      ${LANG_RUSSIAN} \
-    "Подключаемый модуль VisVim"
-LangString str_desc_vis_vim         ${LANG_RUSSIAN} \
-    "Подключаемый модуль VisVim используется для интеграции с Microsoft Visual Studio"
-
 LangString str_section_nls          ${LANG_RUSSIAN} \
    "Поддержка региональных языков"
 LangString str_desc_nls             ${LANG_RUSSIAN} \
--- a/nsis/lang/serbian.nsi
+++ b/nsis/lang/serbian.nsi
@@ -121,11 +121,6 @@ LangString str_desc_plugin_vim      ${LANG_SERBIAN} \
    "Креира директоријуме додатака у Vim инсталационом директоријуму, користе их сви \
     на систему."

-LangString str_section_vis_vim      ${LANG_SERBIAN} \
-    "VisVim проширење"
-LangString str_desc_vis_vim         ${LANG_SERBIAN} \
-    "VisVim проширење за Microsoft Visual Studio интеграцију."
-
 LangString str_section_nls          ${LANG_SERBIAN} \
    "Подршка за домаћи језик"
 LangString str_desc_nls             ${LANG_SERBIAN} \
--- a/nsis/lang/simpchinese.nsi
+++ b/nsis/lang/simpchinese.nsi
@@ -120,11 +120,6 @@ LangString str_desc_plugin_vim      ${LANG_SIMPCHINESE} \
    "在 Vim 安装目录下创建(空的)插件目录结构，系统上所有用户都能使用安装在\
     该目录下的扩展插件。"

-LangString str_section_vis_vim      ${LANG_SIMPCHINESE} \
-    "VisVim 插件"
-LangString str_desc_vis_vim         ${LANG_SIMPCHINESE} \
-    "安装与 Visual Studio 集成的 VisVim 插件。"
-
 LangString str_section_nls          ${LANG_SIMPCHINESE} \
    "安装多语言支持"
 LangString str_desc_nls             ${LANG_SIMPCHINESE} \
--- a/nsis/lang/tradchinese.nsi
+++ b/nsis/lang/tradchinese.nsi
@@ -121,11 +121,6 @@ LangString str_desc_plugin_vim      ${LANG_TRADCHINESE} \
    "在 Vim 安裝資料夾下建立(空的)插件資料夾結構，電腦上所有用戶都能使用安裝\
     在該資料夾里的擴展插件。"

-LangString str_section_vis_vim      ${LANG_TRADCHINESE} \
-    "安裝 VisVim 插件"
-LangString str_desc_vis_vim         ${LANG_TRADCHINESE} \
-    "VisVim 是用于與微軟 Microsoft Visual Studio 軟體進行整合的插件。"
-
 LangString str_section_nls          ${LANG_TRADCHINESE} \
    "安裝本地語言支持"
 LangString str_desc_nls             ${LANG_TRADCHINESE} \
--- a/nsis/lang/turkish.nsi
+++ b/nsis/lang/turkish.nsi
@@ -90,11 +90,6 @@ LangString str_desc_plugin_vim      ${LANG_TURKISH} \
    "Eklenti dizinlerini Vim yükleme dizininde oluşturur. Bu eklentilerden \
     bilgisayarın tüm kullanıcıları yararlanabilir."

-LangString str_section_vis_vim      ${LANG_TURKISH} \
-    "VisVim eklentisi"
-LangString str_desc_vis_vim         ${LANG_TURKISH} \
-    "Microsoft Visual Studio entegrasyonu için VisVim eklentisi"
-
 LangString str_section_nls          ${LANG_TURKISH} \
    "Ek dil desteği"
 LangString str_desc_nls             ${LANG_TURKISH} \
--- 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/context.vim
+++ b/runtime/autoload/context.vim
@@ -1,184 +1,100 @@
-" Language:           ConTeXt typesetting engine
-" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Latest Revision:    2016 Oct 21
+vim9script

-let s:keepcpo= &cpo
-set cpo&vim
+# Language:           ConTeXt typesetting engine
+# Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+# Former Maintainers: Nikolai Weibull <now@bitwi.se>
+# Latest Revision:    2022 Sep 19

-" Helper functions {{{
-function! s:context_echo(message, mode)
-  redraw
-  echo "\r"
-  execute 'echohl' a:mode
-  echomsg '[ConTeXt]' a:message
-  echohl None
-endf
+# Typesetting {{{
+import autoload './typeset.vim'

-function! s:sh()
-  return has('win32') || has('win64') || has('win16') || has('win95')
-        \ ? ['cmd.exe', '/C']
-        \ : ['/bin/sh', '-c']
-endfunction
+export def ConTeXtCmd(path: string): list<string>
+  var cmd = ['mtxrun', '--script', 'context', '--nonstopmode', '--autogenerate']
+  if !empty(get(g:, 'context_extra_options', ''))
+    cmd += g:context_extra_options
+  endif
+  cmd->add(path)
+  return cmd
+enddef

-" For backward compatibility
-if exists('*win_getid')
+export def Typeset(bufname: string, env = {}, Cmd = ConTeXtCmd): bool
+  return typeset.TypesetBuffer(bufname, Cmd, env, 'ConTeXt')
+enddef

-  function! s:win_getid()
-    return win_getid()
-  endf
+export def JobStatus()
+  typeset.JobStatus('ConTeXt')
+enddef

-  function! s:win_id2win(winid)
-    return win_id2win(a:winid)
-  endf
+export def StopJobs()
+  typeset.StopJobs('ConTeXt')
+enddef

-else
+export def Log(bufname: string)
+  execute 'edit' typeset.LogPath(bufname)
+enddef
+# }}}

-  function! s:win_getid()
-    return winnr()
-  endf
+# Completion {{{
+def BinarySearch(base: string, keywords: list<string>): list<string>
+  const pat = '^' .. base
+  const len = len(keywords)
+  var res = []
+  var lft = 0
+  var rgt = len

-  function! s:win_id2win(winnr)
-    return a:winnr
-  endf
-
-endif
-" }}}
-
-" ConTeXt jobs {{{
-if has('job')
-
-  let g:context_jobs = []
-
-  " Print the status of ConTeXt jobs
-  function! context#job_status()
-    let l:jobs = filter(g:context_jobs, 'job_status(v:val) == "run"')
-    let l:n = len(l:jobs)
-    call s:context_echo(
-          \ 'There '.(l:n == 1 ? 'is' : 'are').' '.(l:n == 0 ? 'no' : l:n)
-          \ .' job'.(l:n == 1 ? '' : 's').' running'
-          \ .(l:n == 0 ? '.' : ' (' . join(l:jobs, ', ').').'),
-          \ 'ModeMsg')
-  endfunction
-
-  " Stop all ConTeXt jobs
-  function! context#stop_jobs()
-    let l:jobs = filter(g:context_jobs, 'job_status(v:val) == "run"')
-    for job in l:jobs
-      call job_stop(job)
-    endfor
-    sleep 1
-    let l:tmp = []
-    for job in l:jobs
-      if job_status(job) == "run"
-        call add(l:tmp, job)
-      endif
-    endfor
-    let g:context_jobs = l:tmp
-    if empty(g:context_jobs)
-      call s:context_echo('Done. No jobs running.', 'ModeMsg')
+  # Find the leftmost index matching base
+  while lft < rgt
+    var i = (lft + rgt) / 2
+    if keywords[i] < base
+      lft = i + 1
    else
-      call s:context_echo('There are still some jobs running. Please try again.', 'WarningMsg')
+      rgt = i
    endif
-  endfunction
+  endwhile

-  function! context#callback(path, job, status)
-    if index(g:context_jobs, a:job) != -1 && job_status(a:job) != 'run' " just in case
-      call remove(g:context_jobs, index(g:context_jobs, a:job))
+  while lft < len && keywords[lft] =~ pat
+    add(res, keywords[lft])
+    lft += 1
+  endwhile
+
+  return res
+enddef
+
+var isMetaPostBlock = false
+
+var MP_KEYWORDS:  list<string> = []
+var CTX_KEYWORDS: list<string> = []
+
+# Complete only MetaPost keywords in MetaPost blocks, and complete only
+# ConTeXt keywords otherwise.
+export def Complete(findstart: number, base: string): any
+  if findstart == 1
+    if len(synstack(line("."), 1)) > 0 && synIDattr(synstack(line("."), 1)[0], "name") ==# 'contextMPGraphic'
+      isMetaPostBlock = true
+      return match(getline('.'), '\S\+\%' .. col('.') .. 'c')
    endif
-    call s:callback(a:path, a:job, a:status)
-  endfunction

-  function! context#close_cb(channel)
-    call job_status(ch_getjob(a:channel)) " Trigger exit_cb's callback for faster feedback
-  endfunction
-
-  function! s:typeset(path)
-    call add(g:context_jobs,
-          \ job_start(add(s:sh(), context#command() . ' ' . shellescape(fnamemodify(a:path, ":t"))), {
-          \   'close_cb' : 'context#close_cb',
-          \   'exit_cb'  : function(get(b:, 'context_callback', get(g:, 'context_callback', 'context#callback')),
-          \                         [a:path]),
-          \   'in_io'    : 'null'
-          \ }))
-  endfunction
-
-else " No jobs
-
-  function! context#job_status()
-    call s:context_echo('Not implemented', 'WarningMsg')
-  endfunction!
-
-  function! context#stop_jobs()
-    call s:context_echo('Not implemented', 'WarningMsg')
-  endfunction
-
-  function! context#callback(path, job, status)
-    call s:callback(a:path, a:job, a:status)
-  endfunction
-
-  function! s:typeset(path)
-    execute '!' . context#command() . ' ' . shellescape(fnamemodify(a:path, ":t"))
-    call call(get(b:, 'context_callback', get(g:, 'context_callback', 'context#callback')),
-          \ [a:path, 0, v:shell_error])
-  endfunction
-
-endif " has('job')
-
-function! s:callback(path, job, status) abort
-  if a:status < 0 " Assume the job was terminated
-    return
+    # Complete only \commands starting with a backslash
+    isMetaPostBlock = false
+    var pos = match(getline('.'), '\\\zs\S\+\%' .. col('.') .. 'c')
+    return (pos == -1) ? -3 : pos
  endif
-  " Get info about the current window
-  let l:winid = s:win_getid()             " Save window id
-  let l:efm = &l:errorformat              " Save local errorformat
-  let l:cwd = fnamemodify(getcwd(), ":p") " Save local working directory
-  " Set errorformat to parse ConTeXt errors
-  execute 'setl efm=' . escape(b:context_errorformat, ' ')
-  try " Set cwd to expand error file correctly
-    execute 'lcd' fnameescape(fnamemodify(a:path, ':h'))
-  catch /.*/
-    execute 'setl efm=' . escape(l:efm, ' ')
-    throw v:exception
-  endtry
-  try
-    execute 'cgetfile' fnameescape(fnamemodify(a:path, ':r') . '.log')
-    botright cwindow
-  finally " Restore cwd and errorformat
-    execute s:win_id2win(l:winid) . 'wincmd w'
-    execute 'lcd ' . fnameescape(l:cwd)
-    execute 'setl efm=' . escape(l:efm, ' ')
-  endtry
-  if a:status == 0
-    call s:context_echo('Success!', 'ModeMsg')
-  else
-    call s:context_echo('There are errors. ', 'ErrorMsg')
+
+  if isMetaPostBlock
+    if empty(MP_KEYWORDS)
+      MP_KEYWORDS = sort(syntaxcomplete#OmniSyntaxList(['mf\w\+', 'mp\w\+']))
+    endif
+    return BinarySearch(base, MP_KEYWORDS)
  endif
-endfunction

-function! context#command()
-  return get(b:, 'context_mtxrun', get(g:, 'context_mtxrun', 'mtxrun'))
-        \ . ' --script context --autogenerate --nonstopmode'
-        \ . ' --synctex=' . (get(b:, 'context_synctex', get(g:, 'context_synctex', 0)) ? '1' : '0')
-        \ . ' ' . get(b:, 'context_extra_options', get(g:, 'context_extra_options', ''))
-endfunction
+  if empty(CTX_KEYWORDS)
+    CTX_KEYWORDS = sort(syntaxcomplete#OmniSyntaxList([
+      'context\w\+', 'texAleph', 'texEtex', 'texLuatex', 'texOmega',
+      'texPdftex', 'texTex', 'texXeTeX'
+    ]))
+  endif
+  return BinarySearch(base, CTX_KEYWORDS)
+enddef
+# }}}

-" Accepts an optional path (useful for big projects, when the file you are
-" editing is not the project's root document). If no argument is given, uses
-" the path of the current buffer.
-function! context#typeset(...) abort
-  let l:path = fnamemodify(strlen(a:000[0]) > 0 ? a:1 : expand("%"), ":p")
-  let l:cwd = fnamemodify(getcwd(), ":p") " Save local working directory
-  call s:context_echo('Typesetting...',  'ModeMsg')
-  execute 'lcd' fnameescape(fnamemodify(l:path, ":h"))
-  try
-    call s:typeset(l:path)
-  finally " Restore local working directory
-    execute 'lcd ' . fnameescape(l:cwd)
-  endtry
-endfunction!
-"}}}
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
-
-" vim: sw=2 fdm=marker
+# vim: sw=2 fdm=marker
--- 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) =~ '^\v%(\%|\\)'
+    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
@@ -318,7 +348,7 @@ export def FTidl()
  setf idl
 enddef

-# Distinguish between "default" and Cproto prototype file. */
+# Distinguish between "default", Prolog and Cproto prototype file.
 export def ProtoCheck(default: string)
  # Cproto files have a comment in the first line and a function prototype in
  # the second line, it always ends in ";".  Indent files may also have
@@ -328,7 +358,14 @@ export def ProtoCheck(default: string)
  if getline(2) =~ '.;$'
    setf cpp
  else
-    exe 'setf ' .. default
+    # recognize Prolog by specific text in the first non-empty line
+    # require a blank after the '%' because Perl uses "%list" and "%translate"
+    var l = getline(nextnonblank(1))
+    if l =~ '\<prolog\>' || l =~ '^\s*\(%\+\(\s\|$\)\|/\*\)' || l =~ ':-'
+      setf prolog
+    else
+      exe 'setf ' .. default
+    endif
  endif
 enddef

@@ -429,7 +466,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 +526,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 +857,44 @@ 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
+
+# This function checks the first 100 lines of files matching "*.sil" to
+# resolve detection between Swift Intermediate Language and SILE.
+export def FTsil()
+  for lnum in range(1, [line('$'), 100]->min())
+    var line: string = getline(lnum)
+    if line =~ '^\s*[\\%]'
+      setf sile
+      return
+    elseif line =~ '^\s*\S'
+      setf sil
+      return
+    endif
+  endfor
+  # no clue, default to "sil"
+  setf sil
+enddef
+
 export def FTsys()
  if exists("g:filetype_sys")
    exe "setf " .. g:filetype_sys
@@ -1010,5 +1087,18 @@ export def FTdat()
  endif
 enddef

+export def FTlsl()
+  if exists("g:filetype_lsl")
+    exe "setf " .. g:filetype_lsl
+  endif
+
+  var line = getline(nextnonblank(1))
+  if line =~ '^\s*%' || line =~# ':\s*trait\s*$'
+    setf larch
+  else
+    setf lsl
+  endif
+enddef
+
 # Uncomment this line to check for compilation errors early
 # defcompile
--- 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/dist/vimindent.vim
+++ b/runtime/autoload/dist/vimindent.vim
--- 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/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -1791,8 +1791,10 @@ fun! s:NetrwOptionsRestore(vt)
 "  call Decho("settings buf#".bufnr("%")."<".bufname("%").">: ".((&l:ma == 0)? "no" : "")."ma ".((&l:mod == 0)? "no" : "")."mod ".((&l:bl == 0)? "no" : "")."bl ".((&l:ro == 0)? "no" : "")."ro fo=".&l:fo." a:vt=".a:vt,'~'.expand("<slnum>"))
  if !exists("{a:vt}netrw_optionsave")
 "   call Decho("case ".a:vt."netrw_optionsave : doesn't exist",'~'.expand("<slnum>"))
-"   call Decho("..doing filetype detect anyway")
-   filetype detect
+   if !isdirectory(expand('%'))
+"    call Decho("..doing filetype detect anyway")
+     filetype detect
+   endif
 "   call Decho("..settings buf#".bufnr("%")."<".bufname("%").">: ".((&l:ma == 0)? "no" : "")."ma ".((&l:mod == 0)? "no" : "")."mod ".((&l:bl == 0)? "no" : "")."bl ".((&l:ro == 0)? "no" : "")."ro fo=".&l:fo." a:vt=".a:vt,'~'.expand("<slnum>"))
 "   call Decho("..ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap." (filename<".expand("%")."> win#".winnr()." ft<".&ft.">)",'~'.expand("<slnum>"))
 "   call Dret("s:NetrwOptionsRestore : ".a:vt."netrw_optionsave doesn't exist")
@@ -1904,9 +1906,11 @@ fun! s:NetrwOptionsRestore(vt)
  " were having their filetype detect-generated settings overwritten by
  " NetrwOptionRestore.
  if &ft != "netrw"
-"   call Decho("before: filetype detect  (ft=".&ft.")",'~'.expand("<slnum>"))
-   filetype detect
-"   call Decho("after : filetype detect  (ft=".&ft.")",'~'.expand("<slnum>"))
+    if !isdirectory(expand('%'))
+"     call Decho("before: filetype detect  (ft=".&ft.")",'~'.expand("<slnum>"))
+      filetype detect
+"     call Decho("after : filetype detect  (ft=".&ft.")",'~'.expand("<slnum>"))
+    endif
  endif
 "  call Decho("(s:NetrwOptionsRestore) lines=".&lines)
 "  call Decho("settings buf#".bufnr("%")."<".bufname("%").">: ".((&l:ma == 0)? "no" : "")."ma ".((&l:mod == 0)? "no" : "")."mod ".((&l:bl == 0)? "no" : "")."bl ".((&l:ro == 0)? "no" : "")."ro fo=".&l:fo." a:vt=".a:vt,'~'.expand("<slnum>"))
--- a/runtime/autoload/python.vim
+++ b/runtime/autoload/python.vim
@@ -0,0 +1,252 @@
+" Support for Python indenting, see runtime/indent/python.vim
+
+let s:keepcpo= &cpo
+set cpo&vim
+
+" need to inspect some old g:pyindent_* variables to be backward compatible
+let g:python_indent = extend(get(g:, 'python_indent', {}), #{
+  \ closed_paren_align_last_line: v:true,
+  \ open_paren: get(g:, 'pyindent_open_paren', 'shiftwidth() * 2'),
+  \ nested_paren: get(g:, 'pyindent_nested_paren', 'shiftwidth()'),
+  \ continue: get(g:, 'pyindent_continue', 'shiftwidth() * 2'),
+  "\ searchpair() can be slow, limit the time to 150 msec or what is put in
+  "\ g:python_indent.searchpair_timeout
+  \ searchpair_timeout: get(g:, 'pyindent_searchpair_timeout', 150),
+  "\ 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
+  \ disable_parentheses_indenting: get(g:, 'pyindent_disable_parentheses_indenting', v:false),
+  \ }, 'keep')
+
+let s:maxoff = 50       " maximum number of lines to look backwards for ()
+
+function s:SearchBracket(fromlnum, flags)
+  return searchpairpos('[[({]', '', '[])}]', a:flags,
+          \ {-> synstack('.', col('.'))
+          \   ->map({_, id -> id->synIDattr('name')})
+          \   ->match('\%(Comment\|Todo\|String\)$') >= 0},
+          \ [0, a:fromlnum - s:maxoff]->max(), g:python_indent.searchpair_timeout)
+endfunction
+
+" 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
+
+" 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) + get(g:, 'pyindent_continue', g:python_indent.continue)->eval()
+  endif
+
+  " If the start of the line is in a string don't change the indent.
+  if has('syntax_items')
+	\ && synIDattr(synID(a:lnum, 1, 1), "name") =~ "String$"
+    return -1
+  endif
+
+  " Search backwards for the previous non-empty line.
+  let plnum = prevnonblank(v:lnum - 1)
+
+  if plnum == 0
+    " This is the first non-empty line, use zero indent.
+    return 0
+  endif
+
+  if g:python_indent.disable_parentheses_indenting == 1
+    let plindent = indent(plnum)
+    let plnumstart = plnum
+  else
+    " Indent inside parens.
+    " Align with the open paren unless it is at the end of the line.
+    " E.g.
+    "     open_paren_not_at_EOL(100,
+    "                           (200,
+    "                            300),
+    "                           400)
+    "     open_paren_at_EOL(
+    "         100, 200, 300, 400)
+    call cursor(a:lnum, 1)
+    let [parlnum, parcol] = s:SearchBracket(a:lnum, 'nbW')
+    if parlnum > 0
+      if parcol != col([parlnum, '$']) - 1
+        return parcol
+      elseif getline(a:lnum) =~ '^\s*[])}]' && !g:python_indent.closed_paren_align_last_line
+        return indent(parlnum)
+      endif
+    endif
+
+    call cursor(plnum, 1)
+
+    " If the previous line is inside parenthesis, use the indent of the starting
+    " line.
+    let [parlnum, _] = s:SearchBracket(plnum, 'nbW')
+    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, _] = s:SearchBracket(a:lnum, 'bW')
+    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, _] = s:SearchBracket(a:lnum, 'bW')
+          if pp > 0
+            return indent(plnum)
+              \ + get(g:, 'pyindent_nested_paren', g:python_indent.nested_paren)->eval()
+          endif
+          return indent(plnum)
+            \ + get(g:, 'pyindent_open_paren', g:python_indent.open_paren)->eval()
+        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 synstack(plnum, pline_len)
+    \ ->map({_, id -> id->synIDattr('name')})
+    \ ->match('\%(Comment\|Todo\)$') >= 0
+      let min = 1
+      let max = pline_len
+      while min < max
+	let col = (min + max) / 2
+        if synstack(plnum, col)
+        \ ->map({_, id -> id->synIDattr('name')})
+        \ ->match('\%(Comment\|Todo\)$') >= 0
+	  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/autoload/typeset.vim
+++ b/runtime/autoload/typeset.vim
@@ -0,0 +1,233 @@
+vim9script
+
+# Language:           Generic TeX typesetting engine
+# Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+# Latest Revision:    2022 Aug 12
+
+# Constants and helpers {{{
+const SLASH = !exists("+shellslash") || &shellslash ? '/' : '\'
+
+def Echo(msg: string, mode: string, label: string)
+  redraw
+  echo "\r"
+  execute 'echohl' mode
+  echomsg printf('[%s] %s', label, msg)
+  echohl None
+enddef
+
+def EchoMsg(msg: string, label = 'Notice')
+  Echo(msg, 'ModeMsg', label)
+enddef
+
+def EchoWarn(msg: string, label = 'Warning')
+  Echo(msg, 'WarningMsg', label)
+enddef
+
+def EchoErr(msg: string, label = 'Error')
+  Echo(msg, 'ErrorMsg', label)
+enddef
+# }}}
+
+# Track jobs {{{
+var running_jobs = {} # Dictionary of job IDs of jobs currently executing
+
+def AddJob(label: string, j: job)
+  if !has_key(running_jobs, label)
+    running_jobs[label] = []
+  endif
+
+  add(running_jobs[label], j)
+enddef
+
+def RemoveJob(label: string, j: job)
+  if has_key(running_jobs, label) && index(running_jobs[label], j) != -1
+    remove(running_jobs[label], index(running_jobs[label], j))
+  endif
+enddef
+
+def GetRunningJobs(label: string): list<job>
+  return has_key(running_jobs, label) ? running_jobs[label] : []
+enddef
+# }}}
+
+# Callbacks {{{
+def ProcessOutput(qfid: number, wd: string, efm: string, ch: channel, msg: string)
+  # Make sure the quickfix list still exists
+  if getqflist({'id': qfid}).id != qfid
+    EchoErr("Quickfix list not found, stopping the job")
+    call job_stop(ch_getjob(ch))
+    return
+  endif
+
+  # Make sure the working directory is correct
+  silent execute "lcd" wd
+  setqflist([], 'a', {'id': qfid, 'lines': [msg], 'efm': efm})
+  silent lcd -
+enddef
+
+def CloseCb(ch: channel)
+  job_status(ch_getjob(ch)) # Trigger exit_cb's callback
+enddef
+
+def ExitCb(label: string, jobid: job, exitStatus: number)
+  RemoveJob(label, jobid)
+
+  if exitStatus == 0
+    botright cwindow
+    EchoMsg('Success!', label)
+  elseif exitStatus < 0
+    EchoWarn('Job terminated', label)
+  else
+    botright copen
+    wincmd p
+    EchoWarn('There are errors.', label)
+  endif
+enddef
+# }}}
+
+# Create a new empty quickfix list at the end of the stack and return its id {{{
+def NewQuickfixList(path: string): number
+  if setqflist([], ' ', {'nr': '$', 'title': path}) == -1
+    return -1
+  endif
+
+  return getqflist({'nr': '$', 'id': 0}).id
+enddef
+# }}}
+
+# Public interface {{{
+# When a TeX document is split into several source files, each source file
+# may contain a "magic line" specifiying the "root" file, e.g.:
+#
+#   % !TEX root = main.tex
+#
+# Using this line, Vim can know which file to typeset even if the current
+# buffer is different from main.tex.
+#
+# This function searches for the magic line in the first ten lines of the
+# given buffer, and returns the full path of the root document.
+#
+# NOTE: the value of "% !TEX root" *must* be a relative path.
+export def FindRootDocument(bufname: string = bufname("%")): string
+  const bufnr = bufnr(bufname)
+
+  if !bufexists(bufnr)
+    return bufname
+  endif
+
+  var rootpath = fnamemodify(bufname(bufnr), ':p')
+
+  # Search for magic line `% !TEX root = ...` in the first ten lines
+  const header = getbufline(bufnr, 1, 10)
+  const idx = match(header, '^\s*%\s\+!TEX\s\+root\s*=\s*\S')
+  if idx > -1
+    const main = matchstr(header[idx], '!TEX\s\+root\s*=\s*\zs.*$')
+    rootpath = simplify(fnamemodify(rootpath, ":h") .. SLASH .. main)
+  endif
+
+  return rootpath
+enddef
+
+export def LogPath(bufname: string): string
+  const logfile = FindRootDocument(bufname)
+  return fnamemodify(logfile, ":r") .. ".log"
+enddef
+
+# Typeset the specified path
+#
+# Parameters:
+#   label: a descriptive string used in messages to identify the kind of job
+#   Cmd:   a function that takes the path of a document and returns the typesetting command
+#   path:  the path of the document to be typeset. To avoid ambiguities, pass a *full* path.
+#   efm:   the error format string to parse the output of the command.
+#   env:   environment variables for the process (passed to job_start())
+#
+# Returns:
+#   true if the job is started successfully;
+#   false otherwise.
+export def Typeset(
+  label: string,
+  Cmd:   func(string): list<string>,
+  path:  string,
+  efm:   string,
+  env:   dict<string> = {}
+): bool
+  var fp   = fnamemodify(path, ":p")
+  var wd   = fnamemodify(fp, ":h")
+  var qfid = NewQuickfixList(fp)
+
+  if qfid == -1
+    EchoErr('Could not create quickfix list', label)
+    return false
+  endif
+
+  if !filereadable(fp)
+    EchoErr(printf('File not readable: %s', fp), label)
+    return false
+  endif
+
+  var jobid = job_start(Cmd(path), {
+    env: env,
+    cwd: wd,
+    in_io: "null",
+    callback: (c, m) => ProcessOutput(qfid, wd, efm, c, m),
+    close_cb: CloseCb,
+    exit_cb: (j, e) => ExitCb(label, j, e),
+    })
+
+  if job_status(jobid) ==# "fail"
+    EchoErr("Failed to start job", label)
+    return false
+  endif
+
+  AddJob(label, jobid)
+
+  EchoMsg('Typesetting...', label)
+
+  return true
+enddef
+
+export def JobStatus(label: string)
+  EchoMsg('Jobs still running: ' .. string(len(GetRunningJobs(label))), label)
+enddef
+
+export def StopJobs(label: string)
+  for job in GetRunningJobs(label)
+    job_stop(job)
+  endfor
+
+  EchoMsg('Done.', label)
+enddef
+
+# Typeset the specified buffer
+#
+# Parameters:
+#   name:    a buffer's name. this may be empty to indicate the current buffer.
+#   cmd:     a function that takes the path of a document and returns the typesetting command
+#   label:   a descriptive string used in messages to identify the kind of job
+#   env:     environment variables for the process (passed to job_start())
+#
+# Returns:
+#   true if the job is started successfully;
+#   false otherwise.
+export def TypesetBuffer(
+  name: string,
+  Cmd: func(string): list<string>,
+  env = {},
+  label = 'Typeset'
+): bool
+  const bufname = bufname(name)
+
+  if empty(bufname)
+    EchoErr('Please save the buffer first.', label)
+    return false
+  endif
+
+  const efm = getbufvar(bufnr(bufname), "&efm")
+  const rootpath = FindRootDocument(bufname)
+
+  return Typeset('ConTeXt', Cmd, rootpath, efm, env)
+enddef
+# }}}
+
+# vim: sw=2 fdm=marker
--- 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: Fri 02 Sep 2022 09:41:44 MSK

 " Generated by Colortemplate v2.2.0

@@ -13,12 +13,12 @@ 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') && !has('gui_running') ? (&t_Co ?? 0) : -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']
+  let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
 endif
-hi Normal guifg=#ffdf00 guibg=#000087 gui=NONE cterm=NONE
+hi Normal guifg=#ffd700 guibg=#000087 gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#005faf gui=NONE cterm=NONE
 hi Pmenu guifg=#ffffff guibg=#008787 gui=NONE cterm=NONE
 hi PmenuSel guifg=#008787 guibg=#ffffff gui=NONE cterm=NONE
@@ -27,9 +27,9 @@ hi ColorColumn guifg=NONE guibg=#870087 gui=NONE cterm=NONE
 hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi Cursor guifg=#000000 guibg=#00ff00 gui=NONE cterm=NONE
 hi CursorColumn guifg=NONE guibg=#005faf gui=NONE cterm=NONE
-hi CursorIM guifg=#000000 guibg=#ffdf00 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#ffdf00 guibg=#005faf gui=bold cterm=NONE
-hi EndOfBuffer guifg=#ffdf00 guibg=#000087 gui=NONE cterm=NONE
+hi CursorIM guifg=#000000 guibg=#ffd700 gui=NONE cterm=NONE
+hi CursorLineNr guifg=#ffd700 guibg=#005faf gui=bold cterm=NONE
+hi EndOfBuffer guifg=#ffd700 guibg=#000087 gui=NONE cterm=NONE
 hi Error guifg=#ff7f50 guibg=#000087 gui=reverse cterm=reverse
 hi ErrorMsg guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
 hi FoldColumn guifg=#008787 guibg=NONE gui=NONE cterm=NONE
@@ -43,7 +43,7 @@ hi NonText guifg=#d787d7 guibg=NONE gui=NONE cterm=NONE
 hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi PmenuThumb guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
 hi Question guifg=#00ff00 guibg=NONE gui=NONE cterm=NONE
-hi Search guifg=#ffdf00 guibg=#000000 gui=reverse cterm=reverse
+hi Search guifg=#ffd700 guibg=#000000 gui=reverse cterm=reverse
 hi SignColumn guifg=#008787 guibg=NONE gui=NONE cterm=NONE
 hi SpecialKey guifg=#5fffff guibg=NONE gui=NONE cterm=NONE
 hi SpellBad guifg=#d70000 guibg=NONE guisp=#d70000 gui=undercurl cterm=underline
@@ -57,8 +57,8 @@ hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NO
 hi VertSplit guifg=#008787 guibg=NONE gui=NONE cterm=NONE
 hi Visual guifg=#ffffff guibg=#008787 gui=NONE cterm=NONE
 hi VisualNOS guifg=#008787 guibg=#ffffff gui=NONE cterm=NONE
-hi WarningMsg guifg=#d70000 guibg=NONE gui=NONE cterm=NONE
-hi WildMenu guifg=#000087 guibg=#ffdf00 gui=NONE cterm=NONE
+hi WarningMsg guifg=#d787d7 guibg=NONE gui=NONE cterm=NONE
+hi WildMenu guifg=#000087 guibg=#ffd700 gui=NONE cterm=NONE
 hi debugBreakpoint guifg=#00ff00 guibg=#000087 gui=reverse cterm=reverse
 hi debugPC guifg=#5fffff guibg=#000087 gui=reverse cterm=reverse
 hi Directory guifg=#5fffff guibg=NONE gui=NONE cterm=NONE
@@ -73,7 +73,7 @@ hi Statement guifg=#ffffff guibg=NONE gui=NONE cterm=NONE
 hi Todo guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
 hi Type guifg=#ffa500 guibg=NONE gui=bold cterm=NONE
 hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
-hi Label guifg=#ffdf00 guibg=NONE gui=NONE cterm=NONE
+hi Label guifg=#ffd700 guibg=NONE gui=NONE cterm=NONE
 hi! link Terminal Normal
 hi! link Debug Special
 hi! link diffAdded String
@@ -120,6 +120,8 @@ hi! link Structure Type
 hi! link Tag Special
 hi! link Typedef Type
 hi! link Terminal Normal
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
 hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
 hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
 hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
@@ -165,7 +167,7 @@ if s:t_Co >= 256
  hi VertSplit ctermfg=30 ctermbg=NONE cterm=NONE
  hi Visual ctermfg=231 ctermbg=30 cterm=NONE
  hi VisualNOS ctermfg=30 ctermbg=231 cterm=NONE
-  hi WarningMsg ctermfg=160 ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=176 ctermbg=NONE cterm=NONE
  hi WildMenu ctermfg=18 ctermbg=220 cterm=NONE
  hi debugBreakpoint ctermfg=46 ctermbg=18 cterm=reverse
  hi debugPC ctermfg=87 ctermbg=18 cterm=reverse
@@ -228,6 +230,8 @@ if s:t_Co >= 256
  hi! link Tag Special
  hi! link Typedef Type
  hi! link Terminal Normal
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
@@ -276,7 +280,7 @@ if s:t_Co >= 16
  hi VertSplit ctermfg=darkcyan ctermbg=NONE cterm=NONE
  hi Visual ctermfg=white ctermbg=darkcyan cterm=NONE
  hi VisualNOS ctermfg=darkcyan ctermbg=white cterm=NONE
-  hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=magenta ctermbg=NONE cterm=NONE
  hi WildMenu ctermfg=darkblue ctermbg=yellow cterm=NONE
  hi debugBreakpoint ctermfg=green ctermbg=darkblue cterm=reverse
  hi debugPC ctermfg=cyan ctermbg=darkblue cterm=reverse
@@ -339,6 +343,8 @@ if s:t_Co >= 16
  hi! link Tag Special
  hi! link Typedef Type
  hi! link Terminal Normal
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
@@ -449,6 +455,8 @@ if s:t_Co >= 8
  hi! link Tag Special
  hi! link Typedef Type
  hi! link Terminal Normal
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
  hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
@@ -526,6 +534,22 @@ if s:t_Co >= 0
 endif

 " Background: dark
+" Color: x_black       #000000           16                black
+" Color: x_darkred     #cd0000           160               darkred
+" Color: x_darkgreen   #00cd00           40                darkgreen
+" Color: x_darkyellow  #cdcd00           184               darkyellow
+" Color: x_darkblue    #0000ee           21                darkblue
+" Color: x_darkmagenta #cd00cd           164               darkmagenta
+" Color: x_darkcyan    #00cdcd           44                darkcyan
+" Color: x_gray        #e5e5e5           254               gray
+" Color: x_darkgray    #7f7f7f           244               darkgray
+" Color: x_red         #ff0000           196               red
+" Color: x_green       #00ff00           46                green
+" Color: x_yellow      #ffff00           226               yellow
+" Color: x_blue        #5c5cff           63                blue
+" Color: x_magenta     #ff00ff           201               magenta
+" Color: x_cyan        #00ffff           51                cyan
+" Color: x_white       #ffffff           231               white
 " Color: black         #000000           16                black
 " Color: darkred       #870000           88                darkred
 " Color: darkyellow    #878700           100               darkyellow
@@ -537,7 +561,7 @@ endif
 " Color: darkgray      #878787           102               darkgray
 " Color: red           #d70000           160               red
 " Color: green         #00ff00           46                green
-" Color: yellow        #ffdf00           220               yellow
+" Color: yellow        #ffd700           220               yellow
 " Color: blue          #005faf           25                blue
 " Color: magenta       #d787d7           176               magenta
 " Color: cyan          #5fffff           87                cyan
@@ -549,8 +573,8 @@ endif
 " Color: coral         #ff7f50           209               red
 " Color: olivedrab     #6b8e23           64                green
 " Color: slateblue     #6a5acd           62                darkmagenta
-" Term colors: black darkred darkgreen darkyellow darkblue darkmagenta darkcyan gray
-" Term colors: darkgray red green yellow xtermblue magenta cyan white
+" Term colors: x_black x_darkred x_darkgreen x_darkyellow x_darkblue x_darkmagenta x_darkcyan x_gray
+" Term colors: x_darkgray x_red x_green x_yellow x_blue x_magenta x_cyan x_white
 " Color: bgDiffA     #5F875F        65             darkgreen
 " Color: bgDiffC     #5F87AF        67             blue
 " Color: bgDiffD     #AF5FAF        133            magenta
--- 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: Fri 02 Sep 2022 09:40:36 MSK

 " 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') && !has('gui_running') ? (&t_Co ?? 0) : -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']
@@ -65,6 +65,8 @@ hi! link diffCommon WarningMsg
 hi! link diffBDiffer WarningMsg
 hi! link lCursor Cursor
 hi! link CurSearch Search
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
 hi Normal guifg=#c0c0c0 guibg=#000040 gui=NONE cterm=NONE
 hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi ColorColumn guifg=#c0c0c0 guibg=#8b0000 gui=NONE cterm=NONE
@@ -171,6 +173,8 @@ if s:t_Co >= 256
  hi! link diffBDiffer WarningMsg
  hi! link lCursor Cursor
  hi! link CurSearch Search
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi Normal ctermfg=252 ctermbg=17 cterm=NONE
  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
  hi ColorColumn ctermfg=252 ctermbg=88 cterm=NONE
--- 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: Sun 04 Sep 2022 09:31:26 MSK

 " 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') && !has('gui_running') ? (&t_Co ?? 0) : -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']
@@ -25,6 +25,8 @@ hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
 hi! link ErrorMsg Error
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
 hi Normal guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
 hi EndOfBuffer guifg=#bcbcbc guibg=NONE gui=NONE cterm=NONE
 hi StatusLine guifg=#ffff00 guibg=#00008b gui=bold cterm=bold
@@ -57,7 +59,7 @@ hi Error guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
 hi WarningMsg guifg=#cd00cd guibg=#ffffff gui=NONE cterm=NONE
 hi MoreMsg guifg=#000000 guibg=#ffffff gui=bold cterm=bold
 hi ModeMsg guifg=#000000 guibg=#ffffff gui=bold cterm=bold
-hi Question guifg=#00cd00 guibg=NONE gui=bold cterm=bold
+hi Question guifg=#008700 guibg=NONE gui=bold cterm=bold
 hi Todo guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
 hi MatchParen guifg=#ffffff guibg=#ff1493 gui=NONE cterm=NONE
 hi Search guifg=#ffffff guibg=#cd00cd gui=NONE cterm=NONE
@@ -97,6 +99,8 @@ if s:t_Co >= 256
  hi! link CursorLineFold CursorLine
  hi! link CursorLineSign CursorLine
  hi! link ErrorMsg Error
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi Normal ctermfg=16 ctermbg=231 cterm=NONE
  hi EndOfBuffer ctermfg=250 ctermbg=NONE cterm=NONE
  hi StatusLine ctermfg=226 ctermbg=18 cterm=bold
@@ -129,7 +133,7 @@ if s:t_Co >= 256
  hi WarningMsg ctermfg=164 ctermbg=231 cterm=NONE
  hi MoreMsg ctermfg=16 ctermbg=231 cterm=bold
  hi ModeMsg ctermfg=16 ctermbg=231 cterm=bold
-  hi Question ctermfg=40 ctermbg=NONE cterm=bold
+  hi Question ctermfg=28 ctermbg=NONE cterm=bold
  hi Todo ctermfg=16 ctermbg=226 cterm=NONE
  hi MatchParen ctermfg=231 ctermbg=198 cterm=NONE
  hi Search ctermfg=231 ctermbg=164 cterm=NONE
--- 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: Fri 02 Sep 2022 09:39:21 MSK

 " 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') && !has('gui_running') ? (&t_Co ?? 0) : -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']
@@ -25,6 +25,8 @@ hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
 hi! link EndOfBuffer NonText
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
 hi Normal guifg=#ffffff guibg=#333333 gui=NONE cterm=NONE
 hi StatusLine guifg=#333333 guibg=#c2bfa5 gui=NONE cterm=NONE
 hi StatusLineNC guifg=#7f7f8c guibg=#c2bfa5 gui=NONE cterm=NONE
@@ -40,7 +42,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
@@ -97,6 +99,8 @@ if s:t_Co >= 256
  hi! link CursorLineFold CursorLine
  hi! link CursorLineSign CursorLine
  hi! link EndOfBuffer NonText
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi Normal ctermfg=231 ctermbg=236 cterm=NONE
  hi StatusLine ctermfg=236 ctermbg=144 cterm=NONE
  hi StatusLineNC ctermfg=242 ctermbg=144 cterm=NONE
@@ -112,7 +116,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: Fri 02 Sep 2022 09:44:22 MSK

 " 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') && !has('gui_running') ? (&t_Co ?? 0) : -1

 hi! link Terminal Normal
 hi! link Boolean Constant
@@ -43,6 +43,8 @@ hi! link lCursor Cursor
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo

 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/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: Sun 04 Sep 2022 09:48:34 MSK

 " Generated by Colortemplate v2.2.0

@@ -13,10 +13,10 @@ 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') && !has('gui_running') ? (&t_Co ?? 0) : -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']
+  let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0087ff', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
 endif
 hi! link VertSplit StatusLineNC
 hi! link StatusLineTerm StatusLine
@@ -64,6 +64,8 @@ hi! link String Constant
 hi! link Structure Type
 hi! link Tag Special
 hi! link Typedef Type
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
 hi Normal guifg=#ffffff guibg=#333333 gui=NONE cterm=NONE
 hi ColorColumn guifg=NONE guibg=#8b0000 gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#666666 gui=NONE cterm=NONE
@@ -98,7 +100,7 @@ hi ToolbarButton guifg=NONE guibg=#999999 gui=bold cterm=bold
 hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi Visual guifg=#ffffff guibg=#999999 gui=NONE cterm=NONE
 hi VisualNOS guifg=NONE guibg=NONE gui=bold,underline ctermfg=NONE ctermbg=NONE cterm=bold,underline
-hi WarningMsg guifg=#8b0000 guibg=NONE gui=NONE cterm=NONE
+hi WarningMsg guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
 hi WildMenu guifg=#000000 guibg=#ffff00 gui=bold cterm=bold
 hi debugBreakpoint guifg=#00008b guibg=#ff0000 gui=NONE cterm=NONE
 hi debugPC guifg=#00008b guibg=#0000ff gui=NONE cterm=NONE
@@ -170,6 +172,8 @@ if s:t_Co >= 256
  hi! link Structure Type
  hi! link Tag Special
  hi! link Typedef Type
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi Normal ctermfg=231 ctermbg=236 cterm=NONE
  hi ColorColumn ctermfg=NONE ctermbg=88 cterm=NONE
  hi CursorLine ctermfg=NONE ctermbg=241 cterm=NONE
@@ -204,7 +208,7 @@ if s:t_Co >= 256
  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
  hi Visual ctermfg=231 ctermbg=246 cterm=NONE
  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=bold,underline
-  hi WarningMsg ctermfg=88 ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=196 ctermbg=NONE cterm=NONE
  hi WildMenu ctermfg=16 ctermbg=226 cterm=bold
  hi debugBreakpoint ctermfg=18 ctermbg=196 cterm=NONE
  hi debugPC ctermfg=18 ctermbg=21 cterm=NONE
@@ -279,6 +283,8 @@ if s:t_Co >= 16
  hi! link Structure Type
  hi! link Tag Special
  hi! link Typedef Type
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi Normal ctermfg=white ctermbg=black cterm=NONE
  hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
@@ -313,7 +319,7 @@ if s:t_Co >= 16
  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
  hi Visual ctermfg=white ctermbg=darkgray cterm=NONE
  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=bold,underline
-  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=bold
  hi debugBreakpoint ctermfg=darkblue ctermbg=red cterm=NONE
  hi debugPC ctermfg=darkblue ctermbg=blue cterm=NONE
@@ -494,13 +500,26 @@ endif
 " Color: grey30        #4d4d4d           239               darkgray
 " Color: grey40        #666666           241               darkgray
 " Color: grey60        #999999           246               darkgray
-" Color: xtermblue     #0087ff           33                blue
-" Color: xtermdarkblue #006faf           25                darkblue
-" Color: xtermred      #ff5f5f           203               red
 " Color: comment       #80a0ff           111               lightblue
 " Color: darkred       #8b0000           88                darkred
-" Term colors: black orange seagreen yellow xtermdarkblue darkmagenta darkcyan grey
-" Term colors: grey30 xtermred green lightyellow xtermblue magenta cyan white
+" Color: x_black       #000000           16                black
+" Color: x_darkred     #cd0000           160               darkred
+" Color: x_darkgreen   #00cd00           40                darkgreen
+" Color: x_darkyellow  #cdcd00           184               darkyellow
+" Color: x_darkblue_m  #0087ff           33                darkblue
+" Color: x_darkmagenta #cd00cd           164               darkmagenta
+" Color: x_darkcyan    #00cdcd           44                darkcyan
+" Color: x_gray        #e5e5e5           254               gray
+" Color: x_darkgray    #7f7f7f           244               darkgray
+" Color: x_red         #ff0000           196               red
+" Color: x_green       #00ff00           46                green
+" Color: x_yellow      #ffff00           226               yellow
+" Color: x_blue        #5c5cff           63                blue
+" Color: x_magenta     #ff00ff           201               magenta
+" Color: x_cyan        #00ffff           51                cyan
+" Color: x_white       #ffffff           231               white
+" Term colors: x_black x_darkred x_darkgreen x_darkyellow x_darkblue_m x_darkmagenta x_darkcyan x_gray
+" Term colors: x_darkgray x_red x_green x_yellow x_blue x_magenta x_cyan x_white
 " Color: bgDiffA     #5F875F        65             darkgreen
 " Color: bgDiffC     #5F87AF        67             blue
 " Color: bgDiffD     #AF5FAF        133            magenta
--- a/runtime/colors/habamax.vim
+++ b/runtime/colors/habamax.vim
@@ -0,0 +1,523 @@
+" 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: Fri 02 Sep 2022 09:45:11 MSK
+
+" Generated by Colortemplate v2.2.0
+
+set background=dark
+
+hi clear
+let g:colors_name = 'habamax'
+
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1
+
+if (has('termguicolors') && &termguicolors) || has('gui_running')
+  let g:terminal_ansi_colors = ['#1c1c1c', '#d75f5f', '#87af87', '#afaf87', '#5f87af', '#af87af', '#5f8787', '#9e9e9e', '#767676', '#d7875f', '#afd7af', '#d7d787', '#87afd7', '#d7afd7', '#87afaf', '#bcbcbc']
+endif
+hi! link Terminal Normal
+hi! link StatuslineTerm Statusline
+hi! link StatuslineTermNC StatuslineNC
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
+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=#d7d787 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=#d7d787 guibg=NONE gui=NONE cterm=NONE
+hi ALEVirtualTextInfo guifg=#d7d787 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=#d7d787 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=#d7875f guibg=NONE gui=NONE cterm=NONE
+hi Todo guifg=#d7d787 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=#d7d787 gui=NONE cterm=NONE
+hi debugPC guifg=#1c1c1c guibg=#5f87af gui=NONE cterm=NONE
+hi debugBreakpoint guifg=#1c1c1c guibg=#d7875f 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=#d7afd7 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
+hi Comment guifg=#767676 guibg=NONE gui=NONE cterm=NONE
+hi Constant guifg=#d7875f 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=#d7d787 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=#d7d7d7 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 MessageWindow Pmenu
+  hi! link PopupNotification Todo
+  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=188 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          #D7875F        173            red
+" Color: color02          #87AF87        108            darkgreen
+" Color: color10          #AFD7AF        151            green
+" Color: color03          #AFAF87        144            darkyellow
+" Color: color11          #D7D787        186            yellow
+" Color: color04          #5F87AF        67             blue
+" Color: color12          #87AFD7        110            blue
+" Color: color05          #AF87AF        139            darkmagenta
+" Color: color13          #D7AFD7        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        82             green
+" Color: colorV           #1F3F5F        109            cyan
+" Color: diffAdd          #87AF87        108            darkgreen
+" Color: diffDelete       #af875f        137            darkyellow
+" Color: diffChange       #AFAFAF        145            darkgray
+" Color: diffText         #D7D7D7        188            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: Sun 04 Sep 2022 09:50:04 MSK

 " 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') && !has('gui_running') ? (&t_Co ?? 0) : -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']
@@ -51,7 +51,7 @@ hi Underlined guifg=#87afff guibg=NONE gui=underline cterm=underline
 hi Error guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
 hi ErrorMsg guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
 hi ModeMsg guifg=#ffffff guibg=NONE gui=bold cterm=bold
-hi WarningMsg guifg=#870000 guibg=NONE gui=bold cterm=bold
+hi WarningMsg guifg=#ff0000 guibg=NONE gui=bold cterm=bold
 hi MoreMsg guifg=#5fd75f guibg=NONE gui=bold cterm=bold
 hi Question guifg=#00ff00 guibg=NONE gui=bold cterm=bold
 hi Todo guifg=#005fff guibg=#ffff00 gui=NONE cterm=NONE
@@ -84,6 +84,8 @@ hi! link LineNrBelow LineNr
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
 hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
 hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
 hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
@@ -123,7 +125,7 @@ if s:t_Co >= 256
  hi Error ctermfg=231 ctermbg=196 cterm=NONE
  hi ErrorMsg ctermfg=231 ctermbg=196 cterm=NONE
  hi ModeMsg ctermfg=231 ctermbg=NONE cterm=bold
-  hi WarningMsg ctermfg=88 ctermbg=NONE cterm=bold
+  hi WarningMsg ctermfg=196 ctermbg=NONE cterm=bold
  hi MoreMsg ctermfg=77 ctermbg=NONE cterm=bold
  hi Question ctermfg=46 ctermbg=NONE cterm=bold
  hi Todo ctermfg=27 ctermbg=226 cterm=NONE
@@ -156,6 +158,8 @@ if s:t_Co >= 256
  hi! link CurSearch Search
  hi! link CursorLineFold CursorLine
  hi! link CursorLineSign CursorLine
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
  hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
  hi DiffText ctermfg=16 ctermbg=251 cterm=NONE
@@ -198,7 +202,7 @@ if s:t_Co >= 16
  hi Error ctermfg=white ctermbg=red cterm=NONE
  hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
  hi ModeMsg ctermfg=white ctermbg=NONE cterm=bold
-  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=bold
+  hi WarningMsg ctermfg=red ctermbg=NONE cterm=bold
  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
  hi Question ctermfg=green ctermbg=NONE cterm=bold
  hi Todo ctermfg=blue ctermbg=yellow cterm=NONE
@@ -231,6 +235,8 @@ if s:t_Co >= 16
  hi! link CurSearch Search
  hi! link CursorLineFold CursorLine
  hi! link CursorLineSign CursorLine
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
--- 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: Fri 02 Sep 2022 09:23:56 MSK

 " 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') && !has('gui_running') ? (&t_Co ?? 0) : -1

 hi! link Terminal Normal
 hi! link Boolean Constant
@@ -49,6 +49,8 @@ hi! link lCursor Cursor
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo

 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/lunaperche.vim
+++ b/runtime/colors/lunaperche.vim
--- 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: Fri 02 Sep 2022 09:46:24 MSK

 " 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') && !has('gui_running') ? (&t_Co ?? 0) : -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']
@@ -26,6 +26,8 @@ hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
 hi! link StatuslineTerm Statusline
 hi! link StatuslineTermNC StatuslineNC
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
 hi Normal guifg=#000000 guibg=#e4e4e4 gui=NONE cterm=NONE
 hi EndOfBuffer guifg=#0000ff guibg=#cccccc gui=bold cterm=bold
 hi Folded guifg=#00008b guibg=#d3d3d3 gui=NONE cterm=NONE
@@ -96,6 +98,8 @@ if s:t_Co >= 256
  hi! link CursorLineSign CursorLine
  hi! link StatuslineTerm Statusline
  hi! link StatuslineTermNC StatuslineNC
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi Normal ctermfg=16 ctermbg=254 cterm=NONE
  hi EndOfBuffer ctermfg=21 ctermbg=252 cterm=bold
  hi Folded ctermfg=18 ctermbg=252 cterm=NONE
--- 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: Fri 02 Sep 2022 09:47:20 MSK

 " 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') && !has('gui_running') ? (&t_Co ?? 0) : -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']
@@ -26,6 +26,8 @@ hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
 hi! link StatusLineTerm StatusLine
 hi! link StatusLineTermNC StatusLineNC
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
 hi Normal guifg=#87ff87 guibg=#000000 gui=NONE cterm=NONE
 hi EndOfBuffer guifg=#0000ff guibg=#000000 gui=NONE cterm=NONE
 hi StatusLine guifg=#ffffff guibg=#00008b gui=NONE cterm=NONE
@@ -96,6 +98,8 @@ if s:t_Co >= 256
  hi! link CursorLineSign CursorLine
  hi! link StatusLineTerm StatusLine
  hi! link StatusLineTermNC StatusLineNC
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi Normal ctermfg=120 ctermbg=16 cterm=NONE
  hi EndOfBuffer ctermfg=21 ctermbg=16 cterm=NONE
  hi StatusLine ctermfg=231 ctermbg=18 cterm=NONE
--- 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: Wed 14 Sep 2022 19:05:27 MSK

 " Generated by Colortemplate v2.2.0

@@ -12,18 +12,20 @@ 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') && !has('gui_running') ? (&t_Co ?? 0) : -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']
 endif
-hi Normal guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE
 hi! link Terminal Normal
 hi! link StatusLineTerm StatusLine
 hi! link StatusLineTermNC StatusLineNC
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
+hi Normal guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE
 hi Comment guifg=#808080 guibg=NONE gui=NONE cterm=NONE
 hi Constant guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
 hi Identifier guifg=#00c0c0 guibg=NONE gui=NONE cterm=NONE
@@ -88,13 +90,15 @@ hi DiffText guifg=#000000 guibg=#c6c6c6 gui=NONE cterm=NONE
 hi DiffDelete guifg=#ffffff guibg=#af5faf gui=NONE cterm=NONE

 if s:t_Co >= 256
-  hi Normal ctermfg=231 ctermbg=16 cterm=NONE
  hi! link Terminal Normal
  hi! link StatusLineTerm StatusLine
  hi! link StatusLineTermNC StatusLineNC
  hi! link CurSearch Search
  hi! link CursorLineFold CursorLine
  hi! link CursorLineSign CursorLine
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
+  hi Normal ctermfg=231 ctermbg=16 cterm=NONE
  hi Comment ctermfg=244 ctermbg=NONE cterm=NONE
  hi Constant ctermfg=51 ctermbg=NONE cterm=NONE
  hi Identifier ctermfg=37 ctermbg=NONE cterm=NONE
@@ -117,7 +121,7 @@ if s:t_Co >= 256
  hi NonText ctermfg=63 ctermbg=NONE cterm=bold
  hi EndOfBuffer ctermfg=63 ctermbg=NONE cterm=bold
  hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE
-  hi WarningMsg ctermfg=224 ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=196 ctermbg=NONE cterm=NONE
  hi SignColumn ctermfg=51 ctermbg=248 cterm=NONE
  hi ColorColumn ctermfg=NONE ctermbg=239 cterm=NONE
  hi FoldColumn ctermfg=102 ctermbg=236 cterm=NONE
@@ -163,12 +167,6 @@ endif

 if s:t_Co >= 16
  hi Normal ctermfg=white ctermbg=black cterm=NONE
-  hi! link Terminal Normal
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
-  hi! link CurSearch Search
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineSign CursorLine
  hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
  hi Constant ctermfg=cyan ctermbg=NONE cterm=NONE
  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
@@ -191,7 +189,7 @@ if s:t_Co >= 16
  hi NonText ctermfg=blue ctermbg=NONE cterm=bold
  hi EndOfBuffer ctermfg=blue ctermbg=NONE cterm=bold
  hi ErrorMsg ctermfg=white ctermbg=darkred cterm=NONE
-  hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
  hi SignColumn ctermfg=cyan ctermbg=black cterm=NONE
  hi ColorColumn ctermfg=white ctermbg=darkgrey cterm=NONE
  hi FoldColumn ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -282,7 +280,6 @@ if s:t_Co >= 8
  hi SpellLocal ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
  hi SpellRare ctermfg=darkgreen ctermbg=NONE cterm=reverse
  hi Comment ctermfg=grey ctermbg=NONE cterm=bold
-  hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
  hi Constant ctermfg=darkcyan ctermbg=NONE cterm=bold
  hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
  hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold
@@ -405,7 +402,7 @@ endif
 " Color: SpecialKey     #00ffff     81             cyan
 " Color: StatusLineTerm #90ee90     121            darkgreen
 " Color: Title          #ff00ff     225            magenta
-" Color: WarningMsg     #ff0000     224            darkred
+" Color: WarningMsg     #ff0000     196            red
 " Color: ToolbarLine    #7f7f7f     242            darkgrey
 " Color: ToolbarButton  #d3d3d3     254            grey
 " Color: Underlined     #80a0ff     111            darkgreen
--- 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: Fri 02 Sep 2022 09:50:02 MSK

 " 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') && !has('gui_running') ? (&t_Co ?? 0) : -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']
@@ -24,6 +24,8 @@ hi! link LineNrBelow LineNr
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
 hi Normal guifg=#000000 guibg=#ffdab9 gui=NONE cterm=NONE
 hi Folded guifg=#000000 guibg=#e3c1a5 gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#f5c195 gui=NONE cterm=NONE
@@ -94,6 +96,8 @@ if s:t_Co >= 256
  hi! link CurSearch Search
  hi! link CursorLineFold CursorLine
  hi! link CursorLineSign CursorLine
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi Normal ctermfg=16 ctermbg=223 cterm=NONE
  hi Folded ctermfg=16 ctermbg=252 cterm=NONE
  hi CursorLine ctermfg=NONE ctermbg=180 cterm=NONE
--- a/runtime/colors/quiet.vim
+++ b/runtime/colors/quiet.vim
@@ -0,0 +1,702 @@
+" 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: Fri 16 Sep 2022 09:52:50 MSK
+
+" Generated by Colortemplate v2.2.0
+
+hi clear
+let g:colors_name = 'quiet'
+
+let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1
+
+hi! link Terminal Normal
+hi! link StatusLineTerm StatusLine
+hi! link StatusLineTermNC StatusLineNC
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
+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 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=NONE gui=NONE cterm=NONE
+  hi EndOfBuffer guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi ErrorMsg guifg=#dadada guibg=#080808 gui=reverse cterm=reverse
+  hi FoldColumn guifg=#707070 guibg=NONE 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=NONE gui=NONE cterm=NONE
+  hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold
+  hi ModeMsg guifg=#dadada guibg=NONE gui=bold cterm=bold
+  hi MoreMsg guifg=#dadada guibg=NONE 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=NONE 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=NONE gui=NONE cterm=NONE
+  hi SpecialKey guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi SpellBad guifg=#d7005f guibg=NONE guisp=#d7005f gui=undercurl cterm=underline
+  hi SpellCap guifg=#0087d7 guibg=NONE guisp=#0087d7 gui=undercurl cterm=underline
+  hi SpellLocal guifg=#d787d7 guibg=NONE guisp=#d787d7 gui=undercurl cterm=underline
+  hi SpellRare guifg=#00afaf guibg=NONE guisp=#00afaf gui=undercurl cterm=underline
+  hi StatusLine guifg=#080808 guibg=#dadada gui=bold cterm=bold
+  hi StatusLineNC guifg=#707070 guibg=#080808 gui=reverse cterm=reverse
+  hi TabLine guifg=#707070 guibg=#080808 gui=reverse cterm=reverse
+  hi TabLineFill guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi TabLineSel guifg=#080808 guibg=#dadada gui=bold cterm=bold
+  hi Title guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi VertSplit guifg=#707070 guibg=#080808 gui=NONE cterm=NONE
+  hi Visual guifg=#ffaf00 guibg=#080808 gui=reverse cterm=reverse
+  hi VisualNOS guifg=NONE guibg=#303030 gui=NONE cterm=NONE
+  hi WarningMsg guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi WildMenu guifg=#00afff guibg=#080808 gui=bold cterm=bold
+  hi Comment guifg=#707070 guibg=NONE 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 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=NONE gui=NONE cterm=NONE
+  hi EndOfBuffer guifg=#080808 guibg=NONE gui=NONE cterm=NONE
+  hi ErrorMsg guifg=#080808 guibg=#d7d7d7 gui=reverse cterm=reverse
+  hi FoldColumn guifg=#626262 guibg=NONE 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=NONE gui=NONE cterm=NONE
+  hi MatchParen guifg=#ff00af guibg=#d7d7d7 gui=bold cterm=bold
+  hi ModeMsg guifg=#080808 guibg=NONE gui=bold cterm=bold
+  hi MoreMsg guifg=#080808 guibg=NONE 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=NONE 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=NONE gui=NONE cterm=NONE
+  hi SpecialKey guifg=#080808 guibg=NONE 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=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi VertSplit guifg=#626262 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi Visual guifg=#ffaf00 guibg=#080808 gui=reverse cterm=reverse
+  hi VisualNOS guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
+  hi WarningMsg guifg=#080808 guibg=NONE gui=NONE cterm=NONE
+  hi WildMenu guifg=#080808 guibg=#eeeeee gui=bold cterm=bold
+  hi Comment guifg=#080808 guibg=NONE 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 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=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=253 ctermbg=NONE cterm=NONE
+    hi ErrorMsg ctermfg=253 ctermbg=232 cterm=reverse
+    hi FoldColumn ctermfg=242 ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=242 ctermbg=232 cterm=NONE
+    hi IncSearch ctermfg=214 ctermbg=232 cterm=reverse
+    hi LineNr ctermfg=238 ctermbg=NONE cterm=NONE
+    hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold
+    hi ModeMsg ctermfg=253 ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=253 ctermbg=NONE 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=NONE cterm=NONE
+    hi QuickFixLine ctermfg=176 ctermbg=232 cterm=reverse
+    hi Search ctermfg=39 ctermbg=232 cterm=reverse
+    hi SignColumn ctermfg=253 ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=253 ctermbg=NONE cterm=NONE
+    hi SpellBad ctermfg=161 ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=32 ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=176 ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=37 ctermbg=NONE cterm=underline
+    hi StatusLine ctermfg=232 ctermbg=253 cterm=bold
+    hi StatusLineNC ctermfg=242 ctermbg=232 cterm=reverse
+    hi TabLine ctermfg=242 ctermbg=232 cterm=reverse
+    hi TabLineFill ctermfg=253 ctermbg=NONE cterm=NONE
+    hi TabLineSel ctermfg=232 ctermbg=253 cterm=bold
+    hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi VertSplit ctermfg=242 ctermbg=232 cterm=NONE
+    hi Visual ctermfg=214 ctermbg=232 cterm=reverse
+    hi VisualNOS ctermfg=NONE ctermbg=236 cterm=NONE
+    hi WarningMsg ctermfg=253 ctermbg=NONE cterm=NONE
+    hi WildMenu ctermfg=39 ctermbg=232 cterm=bold
+    hi Comment ctermfg=242 ctermbg=NONE 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 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=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=232 ctermbg=NONE cterm=NONE
+    hi ErrorMsg ctermfg=232 ctermbg=188 cterm=reverse
+    hi FoldColumn ctermfg=241 ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=241 ctermbg=188 cterm=NONE
+    hi IncSearch ctermfg=214 ctermbg=232 cterm=reverse
+    hi LineNr ctermfg=248 ctermbg=NONE cterm=NONE
+    hi MatchParen ctermfg=199 ctermbg=188 cterm=bold
+    hi ModeMsg ctermfg=232 ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=232 ctermbg=NONE 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=NONE cterm=NONE
+    hi QuickFixLine ctermfg=176 ctermbg=232 cterm=reverse
+    hi Search ctermfg=39 ctermbg=232 cterm=reverse
+    hi SignColumn ctermfg=232 ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=232 ctermbg=NONE 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=NONE ctermbg=NONE cterm=NONE
+    hi VertSplit ctermfg=241 ctermbg=188 cterm=NONE
+    hi Visual ctermfg=214 ctermbg=232 cterm=reverse
+    hi VisualNOS ctermfg=NONE ctermbg=255 cterm=NONE
+    hi WarningMsg ctermfg=232 ctermbg=NONE cterm=NONE
+    hi WildMenu ctermfg=232 ctermbg=255 cterm=bold
+    hi Comment ctermfg=232 ctermbg=NONE 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 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=darkgreen ctermbg=black cterm=reverse
+    hi DiffChange ctermfg=darkblue ctermbg=black cterm=reverse
+    hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
+    hi DiffText ctermfg=darkmagenta ctermbg=black 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=darkyellow ctermbg=black 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=darkmagenta ctermbg=black cterm=reverse
+    hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
+    hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=darkcyan 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=darkyellow ctermbg=black 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 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=darkgreen ctermbg=black cterm=reverse
+    hi DiffChange ctermfg=darkblue ctermbg=black cterm=reverse
+    hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
+    hi DiffText ctermfg=darkmagenta ctermbg=black 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=darkyellow ctermbg=black 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=darkmagenta ctermbg=black cterm=reverse
+    hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
+    hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=darkcyan 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=darkyellow ctermbg=black 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 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=darkgreen ctermbg=black cterm=reverse
+    hi DiffChange ctermfg=darkblue ctermbg=black cterm=reverse
+    hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
+    hi DiffText ctermfg=darkmagenta ctermbg=black 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=darkyellow ctermbg=black 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=darkmagenta ctermbg=black cterm=reverse
+    hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
+    hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=darkcyan 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=darkyellow ctermbg=black 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 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=darkgreen ctermbg=black cterm=reverse
+    hi DiffChange ctermfg=darkblue ctermbg=black cterm=reverse
+    hi DiffDelete ctermfg=darkred ctermbg=black cterm=reverse
+    hi DiffText ctermfg=darkmagenta ctermbg=black 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=darkyellow ctermbg=black 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=darkmagenta ctermbg=black cterm=reverse
+    hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
+    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
+    hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=darkcyan 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=darkyellow ctermbg=black 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           232               black
+" Color: dark1         #d7005f           161               darkred
+" Color: dark2         #00af5f           35                darkgreen
+" Color: dark3         #d78700           172               darkyellow
+" Color: dark4         #0087d7           32                darkblue
+" Color: dark5         #d787d7           176               darkmagenta
+" Color: dark6         #00afaf           37                darkcyan
+" Color: dark7         #dadada           253               grey
+" Color: dark8         #707070           242               darkgrey
+" Color: dark9         #ff005f           197               red
+" Color: dark10        #00d75f           41                green
+" Color: dark11        #ffaf00           214               yellow
+" Color: dark12        #5fafff           75                blue
+" Color: dark13        #ff87ff           213               magenta
+" Color: dark14        #00d7d7           44                cyan
+" Color: dark15        #ffffff           231               white
+" Color: diffred       #d75f5f           167               darkred
+" Color: diffgreen     #00af00           34                darkgreen
+" Color: diffblue      #87afd7           110               darkblue
+" Color: diffpink      #d787d7           176               darkmagenta
+" Color: uipink        #ff00af           199               magenta
+" Color: uilime        #afff00           154               green
+" Color: uiteal        #00ffaf           49                green
+" Color: uiblue        #00afff           39                blue
+" Color: uipurple      #af00ff           129               darkmagenta
+" Color: uiamber       #ffaf00           214               darkyellow
+" Color: uiblack       #303030           236               darkgrey
+" Color: yasogrey      #1c1c1c           234               black
+" Color: linenrblack   #444444           238               darkgrey
+" Color: errorred      #ff005f           197               red
+" 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           255               grey
+" Color: light0        #080808           232               black
+" Color: light1        #af0000           124               darkred
+" Color: light2        #005f00           22                darkgreen
+" Color: light3        #af5f00           130               darkyellow
+" Color: light4        #005faf           25                darkblue
+" Color: light5        #870087           90                darkmagenta
+" Color: light6        #008787           30                darkcyan
+" Color: light7        #d7d7d7           188               grey
+" Color: light8        #626262           241               darkgrey
+" Color: light9        #d70000           160               red
+" Color: light10       #008700           28                green
+" Color: light11       #d78700           172               yellow
+" Color: light12       #0087d7           32                blue
+" Color: light13       #af00af           127               magenta
+" Color: light14       #00afaf           37                cyan
+" Color: light15       #ffffff           231               white
+" Color: diffred       #d78787           174               red
+" Color: diffgreen     #87d787           114               green
+" Color: diffblue      #afafd7           146               blue
+" Color: diffpink      #d787d7           176               magenta
+" Color: uipink        #ff00af           199               magenta
+" Color: uilime        #afff00           154               green
+" Color: uiteal        #00ffaf           49                cyan
+" Color: uiblue        #00afff           39                blue
+" Color: uipurple      #af00ff           129               darkmagenta
+" Color: uiamber       #ffaf00           214               yellow
+" Color: invisigrey    #a8a8a8           248               darkgrey
+" Color: yasogrey      #e4e4e4           254               grey
+" Color: errorred      #ff005f           197               red
+" 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: Fri 02 Sep 2022 09:50:56 MSK

 " 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') && !has('gui_running') ? (&t_Co ?? 0) : -1

 hi! link Terminal Normal
 hi! link Boolean Constant
@@ -46,6 +46,8 @@ hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
 hi! link LineNrAbove LineNr
 hi! link LineNrBelow LineNr
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo

 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/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: Fri 02 Sep 2022 09:51:42 MSK

 " 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') && !has('gui_running') ? (&t_Co ?? 0) : -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']
@@ -28,6 +28,8 @@ hi! link EndOfBuffer NonText
 hi! link ErrorMsg Error
 hi! link Tag Special
 hi! link Operator Statement
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
 hi Normal guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
 hi Folded guifg=#00008b guibg=#dadada gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#dadada gui=NONE cterm=NONE
@@ -104,6 +106,8 @@ if s:t_Co >= 256
  hi! link ErrorMsg Error
  hi! link Tag Special
  hi! link Operator Statement
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi Normal ctermfg=16 ctermbg=231 cterm=NONE
  hi Folded ctermfg=18 ctermbg=253 cterm=NONE
  hi CursorLine ctermfg=NONE ctermbg=253 cterm=NONE
--- 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: Fri 02 Sep 2022 09:52:25 MSK

 " Generated by Colortemplate v2.2.0

@@ -13,10 +13,10 @@ 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') && !has('gui_running') ? (&t_Co ?? 0) : -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']
+  let g:terminal_ansi_colors = ['#000000', '#cd0000', '#00cd00', '#cdcd00', '#0000ee', '#cd00cd', '#00cdcd', '#e5e5e5', '#7f7f7f', '#ff0000', '#00ff00', '#ffff00', '#5c5cff', '#ff00ff', '#00ffff', '#ffffff']
 endif
 hi! link Terminal Normal
 hi! link LineNrAbove LineNr
@@ -24,6 +24,8 @@ hi! link LineNrBelow LineNr
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
 hi Normal guifg=#ffffff guibg=#262626 gui=NONE cterm=NONE
 hi EndOfBuffer guifg=#5f87d7 guibg=NONE gui=NONE cterm=NONE
 hi StatusLine guifg=#000000 guibg=#afaf87 gui=NONE cterm=NONE
@@ -53,18 +55,18 @@ hi Visual guifg=#d7d787 guibg=#5f8700 gui=NONE cterm=NONE
 hi SignColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE
 hi VisualNOS guifg=#d7d787 guibg=#5f8700 gui=NONE cterm=NONE
 hi LineNr guifg=#666666 guibg=NONE gui=NONE cterm=NONE
-hi Underlined guifg=#5f87d7 guibg=NONE gui=underline cterm=underline
 hi Error guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
 hi ErrorMsg guifg=#ff0000 guibg=#000000 gui=reverse cterm=reverse
 hi ModeMsg guifg=#262626 guibg=#ffd700 gui=NONE cterm=NONE
 hi WarningMsg guifg=#ff8787 guibg=NONE gui=NONE cterm=NONE
 hi MoreMsg guifg=#00875f guibg=NONE gui=NONE cterm=NONE
 hi Question guifg=#ffd700 guibg=NONE gui=NONE cterm=NONE
-hi Todo guifg=#ff0000 guibg=#ffff00 gui=NONE cterm=NONE
 hi MatchParen guifg=#000000 guibg=#ffd700 gui=NONE cterm=NONE
 hi Search guifg=#000000 guibg=#d7875f gui=NONE cterm=NONE
 hi IncSearch guifg=#000000 guibg=#00ff00 gui=NONE cterm=NONE
+hi Todo guifg=#ff0000 guibg=#ffff00 gui=NONE cterm=NONE
 hi WildMenu guifg=#262626 guibg=#d7d787 gui=NONE cterm=NONE
+hi Underlined guifg=#5f87d7 guibg=NONE gui=underline cterm=underline
 hi Cursor guifg=#333333 guibg=#d7d787 gui=NONE cterm=NONE
 hi lCursor guifg=#262626 guibg=#ffafaf gui=NONE cterm=NONE
 hi SpellBad guifg=#ff0000 guibg=NONE guisp=#ff0000 gui=undercurl cterm=underline
@@ -99,6 +101,8 @@ if s:t_Co >= 256
  hi! link CurSearch Search
  hi! link CursorLineFold CursorLine
  hi! link CursorLineSign CursorLine
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi Normal ctermfg=231 ctermbg=235 cterm=NONE
  hi EndOfBuffer ctermfg=68 ctermbg=NONE cterm=NONE
  hi StatusLine ctermfg=16 ctermbg=144 cterm=NONE
@@ -128,18 +132,18 @@ if s:t_Co >= 256
  hi SignColumn ctermfg=NONE ctermbg=235 cterm=NONE
  hi VisualNOS ctermfg=186 ctermbg=64 cterm=NONE
  hi LineNr ctermfg=241 ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=68 ctermbg=NONE cterm=underline
  hi Error ctermfg=196 ctermbg=231 cterm=reverse
  hi ErrorMsg ctermfg=196 ctermbg=16 cterm=reverse
  hi ModeMsg ctermfg=235 ctermbg=220 cterm=NONE
  hi WarningMsg ctermfg=210 ctermbg=NONE cterm=NONE
  hi MoreMsg ctermfg=29 ctermbg=NONE cterm=NONE
  hi Question ctermfg=220 ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=196 ctermbg=226 cterm=NONE
  hi MatchParen ctermfg=16 ctermbg=220 cterm=NONE
  hi Search ctermfg=16 ctermbg=173 cterm=NONE
  hi IncSearch ctermfg=16 ctermbg=46 cterm=NONE
+  hi Todo ctermfg=196 ctermbg=226 cterm=NONE
  hi WildMenu ctermfg=235 ctermbg=186 cterm=NONE
+  hi Underlined ctermfg=68 ctermbg=NONE cterm=underline
  hi SpellBad ctermfg=196 ctermbg=NONE cterm=underline
  hi SpellCap ctermfg=226 ctermbg=NONE cterm=underline
  hi SpellLocal ctermfg=217 ctermbg=NONE cterm=underline
@@ -169,12 +173,12 @@ if s:t_Co >= 256
 endif

 if s:t_Co >= 16
-  hi Normal ctermfg=white ctermbg=black cterm=NONE
-  hi EndOfBuffer ctermfg=blue ctermbg=NONE cterm=NONE
-  hi StatusLine ctermfg=black ctermbg=grey cterm=NONE
-  hi StatusLineNC ctermfg=darkgrey ctermbg=grey cterm=NONE
-  hi StatusLineTerm ctermfg=black ctermbg=grey cterm=NONE
-  hi StatusLineTermNC ctermfg=darkgrey ctermbg=grey cterm=NONE
+  hi Normal ctermfg=grey ctermbg=black cterm=NONE
+  hi EndOfBuffer ctermfg=darkblue ctermbg=NONE cterm=bold
+  hi StatusLine ctermfg=white ctermbg=black cterm=bold,reverse
+  hi StatusLineNC ctermfg=black ctermbg=grey cterm=NONE
+  hi StatusLineTerm ctermfg=white ctermbg=black cterm=bold,reverse
+  hi StatusLineTermNC ctermfg=black ctermbg=grey cterm=NONE
  hi VertSplit ctermfg=darkgrey ctermbg=grey cterm=NONE
  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
  hi Pmenu ctermfg=NONE ctermbg=darkgrey cterm=NONE
@@ -198,38 +202,38 @@ if s:t_Co >= 16
  hi SignColumn ctermfg=NONE ctermbg=black cterm=NONE
  hi VisualNOS ctermfg=darkmagenta ctermbg=darkgreen cterm=NONE
  hi LineNr ctermfg=grey ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
  hi Error ctermfg=darkred ctermbg=white cterm=reverse
  hi ErrorMsg ctermfg=darkred ctermbg=black cterm=reverse
  hi ModeMsg ctermfg=black ctermbg=yellow cterm=NONE
  hi WarningMsg ctermfg=cyan ctermbg=NONE cterm=NONE
  hi MoreMsg ctermfg=green ctermbg=NONE cterm=NONE
  hi Question ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=darkred ctermbg=darkyellow cterm=NONE
  hi MatchParen ctermfg=black ctermbg=yellow cterm=NONE
  hi Search ctermfg=black ctermbg=darkmagenta cterm=NONE
  hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi Todo ctermfg=black ctermbg=yellow cterm=NONE
  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
  hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
  hi SpellCap ctermfg=darkyellow ctermbg=NONE cterm=underline
  hi SpellLocal ctermfg=red ctermbg=NONE cterm=underline
  hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
-  hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi String ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Function ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
  hi Statement ctermfg=blue ctermbg=NONE cterm=bold
-  hi Constant ctermfg=red ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=red ctermbg=NONE cterm=bold
+  hi Comment ctermfg=darkgray ctermbg=NONE cterm=NONE
+  hi Operator ctermfg=red ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=red ctermbg=NONE cterm=NONE
+  hi Structure ctermfg=green ctermbg=NONE cterm=NONE
+  hi Function ctermfg=yellow ctermbg=NONE cterm=NONE
  hi Type ctermfg=blue ctermbg=NONE cterm=bold
-  hi Operator ctermfg=darkmagenta ctermbg=NONE cterm=NONE
  hi Define ctermfg=yellow ctermbg=NONE cterm=bold
-  hi Structure ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Directory ctermfg=green ctermbg=NONE cterm=bold
+  hi Constant ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi String ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Directory ctermfg=darkgreen ctermbg=NONE cterm=bold
  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Title ctermfg=yellow ctermbg=NONE cterm=bold
+  hi Title ctermfg=darkyellow ctermbg=NONE cterm=bold
  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
  hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
  hi DiffText ctermfg=black ctermbg=grey cterm=NONE
@@ -274,27 +278,28 @@ if s:t_Co >= 8
  hi WarningMsg ctermfg=darkcyan ctermbg=NONE cterm=NONE
  hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
  hi Question ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=darkred ctermbg=darkyellow cterm=NONE
  hi MatchParen ctermfg=black ctermbg=darkyellow cterm=NONE
  hi Search ctermfg=black ctermbg=darkmagenta cterm=NONE
  hi IncSearch ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi Todo ctermfg=black ctermbg=yellow cterm=NONE
  hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi Underlined ctermfg=blue ctermbg=NONE cterm=underline
  hi SpellBad ctermfg=darkred ctermbg=darkyellow cterm=reverse
  hi SpellCap ctermfg=darkyellow ctermbg=NONE cterm=reverse
  hi SpellLocal ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
  hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=reverse
-  hi Comment ctermfg=grey ctermbg=NONE cterm=bold
-  hi String ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Function ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
  hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi Constant ctermfg=darkred ctermbg=NONE cterm=bold
-  hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+  hi Identifier ctermfg=darkred ctermbg=NONE cterm=bold
+  hi Comment ctermfg=darkgray ctermbg=NONE cterm=bold
+  hi Operator ctermfg=darkred ctermbg=NONE cterm=bold
+  hi PreProc ctermfg=darkred ctermbg=NONE cterm=bold
+  hi Structure ctermfg=darkgreen ctermbg=NONE cterm=bold
+  hi Function ctermfg=darkyellow ctermbg=NONE cterm=bold
  hi Type ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi Operator ctermfg=darkmagenta ctermbg=NONE cterm=NONE
  hi Define ctermfg=darkyellow ctermbg=NONE cterm=bold
-  hi Structure ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi String ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Special ctermfg=darkyellow ctermbg=NONE cterm=NONE
  hi Directory ctermfg=darkgreen ctermbg=NONE cterm=bold
  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -376,29 +381,45 @@ if s:t_Co >= 0
 endif

 " Background: dark
-" Color: foreground  #FFFFFF        231            white
-" Color: background  #262626        235            black
-" Color: color00     #000000        16             black
-" Color: color08     #333333        236            darkgrey
-" Color: color01     #FF0000        196            darkred
-" Color: color09     #FFAFAF        217            red
-" Color: color02     #5F8700        64             darkgreen
-" Color: color10     #00875F        29             green
-" Color: color03     #ffff00        226            darkyellow
-" Color: color11     #FFD700        220            yellow
-" Color: color04     #87d7FF        117            darkblue
-" Color: color12     #5F87D7        68             blue
-" Color: color05     #d7d787        186            darkmagenta
-" Color: color13     #AFAF87        144            magenta
-" Color: color06     #FFD7AF        223            darkcyan
-" Color: color14     #FF8787        210            cyan
-" Color: color07     #666666        241            grey
-" Color: color15     #FFFFFF        231            white
-" Color: color16     #D7875F        173            darkmagenta
-" Color: color17     #00FF00        46             darkgreen
-" Color: Pmenu       #4A4A4A        239            darkgrey
-" Term colors: color00 color01 color02 color03 color04 color05 color06 color07
-" Term colors: color08 color09 color10 color11 color12 color13 color14 color15
+" Color: x_black       #000000           16                black
+" Color: x_darkred     #cd0000           160               darkred
+" Color: x_darkgreen   #00cd00           40                darkgreen
+" Color: x_darkyellow  #cdcd00           184               darkyellow
+" Color: x_darkblue    #0000ee           21                darkblue
+" Color: x_darkmagenta #cd00cd           164               darkmagenta
+" Color: x_darkcyan    #00cdcd           44                darkcyan
+" Color: x_gray        #e5e5e5           254               gray
+" Color: x_darkgray    #7f7f7f           244               darkgray
+" Color: x_red         #ff0000           196               red
+" Color: x_green       #00ff00           46                green
+" Color: x_yellow      #ffff00           226               yellow
+" Color: x_blue        #5c5cff           63                blue
+" Color: x_magenta     #ff00ff           201               magenta
+" Color: x_cyan        #00ffff           51                cyan
+" Color: x_white       #ffffff           231               white
+" Color: foreground    #FFFFFF           231               white
+" Color: background    #262626           235               black
+" Color: color00       #000000           16                black
+" Color: color08       #333333           236               darkgrey
+" Color: color01       #FF0000           196               darkred
+" Color: color09       #FFAFAF           217               red
+" Color: color02       #5F8700           64                darkgreen
+" Color: color10       #00875F           29                green
+" Color: color03       #ffff00           226               darkyellow
+" Color: color11       #FFD700           220               yellow
+" Color: color04       #87d7FF           117               darkblue
+" Color: color12       #5F87D7           68                blue
+" Color: color05       #d7d787           186               darkmagenta
+" Color: color13       #AFAF87           144               magenta
+" Color: color06       #FFD7AF           223               darkcyan
+" Color: color14       #FF8787           210               cyan
+" Color: color07       #666666           241               grey
+" Color: color15       #FFFFFF           231               white
+" Color: color16       #D7875F           173               darkmagenta
+" Color: color17       #00FF00           46                darkgreen
+" Color: Pmenu         #4A4A4A           239               darkgrey
+" Term colors: x_black    x_darkred x_darkgreen x_darkyellow x_darkblue x_darkmagenta x_darkcyan x_gray
+" Term colors: x_darkgray x_red     x_green     x_yellow     x_blue     x_magenta     x_cyan     x_white
 " Color: bgDiffA     #5F875F        65             darkgreen
 " Color: bgDiffC     #5F87AF        67             blue
 " Color: bgDiffD     #AF5FAF        133            magenta
--- a/runtime/colors/tools/check_colors.vim
+++ b/runtime/colors/tools/check_colors.vim
@@ -6,10 +6,23 @@ vim9script
 def Test_check_colors()
    const savedview = winsaveview()
    cursor(1, 1)
-    var err = {}
+
+    # err is
+    # {
+    #    colors_name: "message",
+    #    init: "message",
+    #    background: "message",
+    #    ....etc
+    #    highlight: {
+    #       'Normal': "Missing ...",
+    #       'Conceal': "Missing ..."
+    #       ....etc
+    #    }
+    # }
+    var err: dict<any> = {}

    # 1) Check g:colors_name is existing
-    if !search('\<\%(g:\)\?colors_name\>', 'cnW')
+    if search('\<\%(g:\)\?colors_name\>', 'cnW') == 0
        err['colors_name'] = 'g:colors_name not set'
    else
        err['colors_name'] = 'OK'
@@ -180,11 +193,12 @@ def Test_check_colors()
    Result(err)
 enddef

-def Result(err: any)
+
+def Result(err: dict<any>)
    var do_groups: bool = v:false
    echohl Title | echomsg "---------------" | echohl Normal
    for key in sort(keys(err))
-        if key is 'highlight'
+        if key == 'highlight'
            do_groups = !empty(err[key])
            continue
        else
--- 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: Fri 02 Sep 2022 09:53:21 MSK

 " 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') && !has('gui_running') ? (&t_Co ?? 0) : -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']
@@ -26,6 +26,8 @@ hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
 hi! link StatusLineTerm StatusLine
 hi! link StatusLineTermNC StatusLineNC
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
 hi Normal guifg=#cccccc guibg=#000000 gui=NONE cterm=NONE
 hi Comment guifg=#80a0ff guibg=NONE gui=NONE cterm=NONE
 hi Constant guifg=#ffa0a0 guibg=NONE gui=NONE cterm=NONE
@@ -97,6 +99,8 @@ if s:t_Co >= 256
  hi! link CursorLineSign CursorLine
  hi! link StatusLineTerm StatusLine
  hi! link StatusLineTermNC StatusLineNC
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi Normal ctermfg=251 ctermbg=16 cterm=NONE
  hi Comment ctermfg=111 ctermbg=NONE cterm=NONE
  hi Constant ctermfg=217 ctermbg=NONE cterm=NONE
--- 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: Fri 02 Sep 2022 09:54:15 MSK

 " 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') && !has('gui_running') ? (&t_Co ?? 0) : -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']
@@ -24,6 +24,8 @@ hi! link LineNrBelow LineNr
 hi! link CurSearch Search
 hi! link CursorLineFold CursorLine
 hi! link CursorLineSign CursorLine
+hi! link MessageWindow Pmenu
+hi! link PopupNotification Todo
 hi Normal guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
 hi Folded guifg=#00008b guibg=#d3d3d3 gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#e5e5e5 gui=NONE cterm=NONE
@@ -95,6 +97,8 @@ if s:t_Co >= 256
  hi! link CurSearch Search
  hi! link CursorLineFold CursorLine
  hi! link CursorLineSign CursorLine
+  hi! link MessageWindow Pmenu
+  hi! link PopupNotification Todo
  hi Normal ctermfg=16 ctermbg=231 cterm=NONE
  hi Folded ctermfg=18 ctermbg=252 cterm=NONE
  hi CursorLine ctermfg=NONE ctermbg=254 cterm=NONE
--- a/runtime/compiler/context.vim
+++ b/runtime/compiler/context.vim
@@ -1,54 +1,48 @@
-" Vim compiler file
-" Compiler:     ConTeXt typesetting engine
-" Maintainer:   Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Last Change:  2016 Oct 21
+vim9script

-if exists("current_compiler")
+# Language:           ConTeXt typesetting engine
+# Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+# Former Maintainers: Nikolai Weibull <now@bitwi.se>
+# Latest Revision:    2022 Aug 12
+
+if exists("g:current_compiler")
  finish
 endif
-let s:keepcpo= &cpo
-set cpo&vim

-if exists(":CompilerSet") != 2    " older Vim always used :setlocal
+import autoload '../autoload/context.vim'
+
+if exists(":CompilerSet") != 2 # Older Vim always used :setlocal
  command -nargs=* CompilerSet setlocal <args>
 endif

-" If makefile exists and we are not asked to ignore it, we use standard make
-" (do not redefine makeprg)
+g:current_compiler = 'context'
+
 if get(b:, 'context_ignore_makefile', get(g:, 'context_ignore_makefile', 0)) ||
-      \ (!filereadable('Makefile') && !filereadable('makefile'))
-  let current_compiler = 'context'
-  " The following assumes that the current working directory is set to the
-  " directory of the file to be typeset
-  let &l:makeprg = get(b:, 'context_mtxrun', get(g:, 'context_mtxrun', 'mtxrun'))
-        \ . ' --script context --autogenerate --nonstopmode --synctex='
-        \ . (get(b:, 'context_synctex', get(g:, 'context_synctex', 0)) ? '1' : '0')
-        \ . ' ' . get(b:, 'context_extra_options', get(g:, 'context_extra_options', ''))
-        \ . ' ' . shellescape(expand('%:p:t'))
+  (!filereadable('Makefile') && !filereadable('makefile'))
+  &l:makeprg =  join(context.ConTeXtCmd(shellescape(expand('%:p:t'))), ' ')
 else
-  let current_compiler = 'make'
+  g:current_compiler = 'make'
 endif

-let b:context_errorformat = ''
-      \ . '%-Popen source%.%#> %f,'
-      \ . '%-Qclose source%.%#> %f,'
-      \ . "%-Popen source%.%#name '%f',"
-      \ . "%-Qclose source%.%#name '%f',"
-      \ . '%Etex %trror%.%#mp error on line %l in file %f:%.%#,'
-      \ . 'tex %trror%.%#error on line %l in file %f: %m,'
-      \ . '%Elua %trror%.%#error on line %l in file %f:,'
-      \ . '%+Emetapost %#> error: %#,'
-      \ . '! error: %#%m,'
-      \ . '%-C %#,'
-      \ . '%C! %m,'
-      \ . '%Z[ctxlua]%m,'
-      \ . '%+C<*> %.%#,'
-      \ . '%-C%.%#,'
-      \ . '%Z...%m,'
-      \ . '%-Zno-error,'
-      \ . '%-G%.%#' " Skip remaining lines
+const context_errorformat = join([
+  "%-Popen source%.%#> %f",
+  "%-Qclose source%.%#> %f",
+  "%-Popen source%.%#name '%f'",
+  "%-Qclose source%.%#name '%f'",
+  "tex %trror%.%#error on line %l in file %f: %m",
+  "%Elua %trror%.%#error on line %l in file %f:",
+  "%+Emetapost %#> error: %#",
+  "%Emetafun%.%#error: %m",
+  "! error: %#%m",
+  "%-C %#",
+  "%C! %m",
+  "%Z[ctxlua]%m",
+  "%+C<*> %.%#",
+  "%-C%.%#",
+  "%Z...%m",
+  "%-Zno-error",
+  "%-G%.%#"], ",")

-execute 'CompilerSet errorformat=' . escape(b:context_errorformat, ' ')
+execute 'CompilerSet errorformat=' .. escape(context_errorformat, ' ')

-let &cpo = s:keepcpo
-unlet s:keepcpo
+# vim: sw=2 fdm=marker
--- a/runtime/compiler/hare.vim
+++ b/runtime/compiler/hare.vim
@@ -0,0 +1,31 @@
+" Vim compiler file
+" Compiler: Hare Compiler
+" Maintainer: Amelia Clarke <me@rsaihe.dev>
+" Last Change: 2022-09-21
+
+if exists("g:current_compiler")
+  finish
+endif
+let g:current_compiler = "hare"
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+if exists(':CompilerSet') != 2
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+if filereadable("Makefile") || filereadable("makefile")
+  CompilerSet makeprg=make
+else
+  CompilerSet makeprg=hare\ build
+endif
+
+CompilerSet errorformat=
+  \Error\ %f:%l:%c:\ %m,
+  \Syntax\ error:\ %.%#\ at\ %f:%l:%c\\,\ %m,
+  \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim: tabstop=2 shiftwidth=2 expandtab
--- a/runtime/compiler/raco.vim
+++ b/runtime/compiler/raco.vim
@@ -0,0 +1,14 @@
+" Vim compiler file
+" Compiler:     raco (Racket command-line tools)
+" Maintainer:   D. Ben Knoble <ben.knoble+github@gmail.com>
+" URL:          https://github.com/benknoble/vim-racket
+" Last Change: 2022 Aug 12
+
+let current_compiler = 'raco'
+
+if exists(":CompilerSet") != 2
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+CompilerSet makeprg=raco
+CompilerSet errorformat=%f:%l:%c:%m
--- a/runtime/compiler/racomake.vim
+++ b/runtime/compiler/racomake.vim
@@ -0,0 +1,14 @@
+" Vim compiler file
+" Compiler:     raco make (Racket command-line tools)
+" Maintainer:   D. Ben Knoble <ben.knoble+github@gmail.com>
+" URL:          https://github.com/benknoble/vim-racket
+" Last Change: 2022 Aug 12
+
+let current_compiler = 'racomake'
+
+if exists(":CompilerSet") != 2
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+CompilerSet makeprg=raco\ make\ --\ %
+CompilerSet errorformat=%f:%l:%c:%m
--- a/runtime/compiler/racosetup.vim
+++ b/runtime/compiler/racosetup.vim
@@ -0,0 +1,14 @@
+" Vim compiler file
+" Compiler:     raco setup (Racket command-line tools)
+" Maintainer:   D. Ben Knoble <ben.knoble+github@gmail.com>
+" URL:          https://github.com/benknoble/vim-racket
+" Last Change: 2022 Aug 12
+
+let current_compiler = 'racosetup'
+
+if exists(":CompilerSet") != 2
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+CompilerSet makeprg=raco\ setup
+CompilerSet errorformat=%f:%l:%c:%m
--- a/runtime/compiler/racotest.vim
+++ b/runtime/compiler/racotest.vim
@@ -0,0 +1,14 @@
+" Vim compiler file
+" Compiler:     raco test (Racket command-line tools)
+" Maintainer:   D. Ben Knoble <ben.knoble+github@gmail.com>
+" URL:          https://github.com/benknoble/vim-racket
+" Last Change: 2022 Aug 12
+
+let current_compiler = 'racotest'
+
+if exists(":CompilerSet") != 2
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+CompilerSet makeprg=raco\ test\ %
+CompilerSet errorformat=location:%f:%l:%c
--- 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/Makefile
+++ b/runtime/doc/Makefile
@@ -31,6 +31,8 @@ DOCS = \
 	filetype.txt \
 	fold.txt \
 	ft_ada.txt \
+	ft_context.txt \
+	ft_mp.txt \
 	ft_ps1.txt \
 	ft_raku.txt \
 	ft_rust.txt \
@@ -113,6 +115,7 @@ DOCS = \
 	todo.txt \
 	uganda.txt \
 	undo.txt \
+	userfunc.txt \
 	usr_01.txt \
 	usr_02.txt \
 	usr_03.txt \
@@ -180,6 +183,8 @@ HTMLS = \
 	filetype.html \
 	fold.html \
 	ft_ada.html \
+	ft_context.html \
+	ft_mp.html \
 	ft_ps1.html \
 	ft_raku.html \
 	ft_rust.html \
@@ -261,6 +266,7 @@ HTMLS = \
 	todo.html \
 	uganda.html \
 	undo.html \
+	userfunc.html \
 	usr_01.html \
 	usr_02.html \
 	usr_03.html \
--- a/runtime/doc/arabic.txt
+++ b/runtime/doc/arabic.txt
@@ -1,4 +1,4 @@
-*arabic.txt*	For Vim version 8.2.  Last change: 2021 Jun 22
+*arabic.txt*	For Vim version 9.0.  Last change: 2021 Jun 22


 		  VIM REFERENCE MANUAL	  by Nadim Shaikli
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 8.2.  Last change: 2022 May 24
+*autocmd.txt*   For Vim version 9.0.  Last change: 2022 May 24


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -409,6 +409,7 @@ Name			triggered by ~
 			when popup menu is not visible
 |TextChangedP|		after a change was made to the text in Insert mode
 			when popup menu visible
+|TextChangedT|		after a change was made to the text in Terminal mode
 |TextYankPost|		after text has been yanked or deleted

 |SafeState|		nothing pending, going to wait for the user to type a
@@ -640,6 +641,8 @@ CmdwinLeave			Before leaving the command-line window.
 				|cmdwin-char|
 							*ColorScheme*
 ColorScheme			After loading a color scheme. |:colorscheme|
+				Not triggered if the color scheme is not
+				found.
 				The pattern is matched against the
 				colorscheme name. <afile> can be used for the
 				name of the actual file where this option was
@@ -1235,6 +1238,10 @@ TextChangedP			After a change was made to the text in the
 				current buffer in Insert mode, only when the
 				popup menu is visible.  Otherwise the same as
 				TextChanged.
+							*TextChangedT*
+TextChangedT			After a change was made to the text in the
+				current buffer in Terminal mode.
+				Otherwise the same as TextChanged.
 							*TextYankPost*
 TextYankPost			After text has been yanked or deleted in the
 				current buffer.  The following values of
@@ -1275,7 +1282,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
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 8.2.  Last change: 2022 May 26
+*change.txt*    For Vim version 9.0.  Last change: 2022 Sep 13


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -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,
@@ -1186,11 +1188,20 @@ used.  If you do need it you can use |p| with another register.  E.g., yank
 the text to copy, Visually select the text to replace and use "0p .  You can
 repeat this as many times as you like, and the unnamed register will be
 changed each time.
-
-When you use a blockwise Visual mode command and yank only a single line into
-a register, a paste on a visual selected area will paste that single line on
-each of the selected lines (thus replacing the blockwise selected region by a
-block of the pasted line).
+							*blockwise-put*
+When a register contains text from one line (characterwise), using a
+blockwise Visual selection, putting that register will paste that text
+repeatedly in each of the selected lines, thus replacing the blockwise
+selected region by multiple copies of the register text.  For example:
+	- yank the word "TEXT" into a register with `yw`
+	- select a visual block, marked with "v" in this text:
+	    aaavvaaa
+	    bbbvvbbb
+	    cccvvccc
+	- press `p`, results in:
+	    aaaTEXTaaa
+	    bbbTEXTbbb
+	    cccTEXTccc

 							*blockwise-register*
 If you use a blockwise Visual mode command to get the text into the register,
--- a/runtime/doc/channel.txt
+++ b/runtime/doc/channel.txt
@@ -1,4 +1,4 @@
-*channel.txt*      For Vim version 8.2.  Last change: 2022 Jun 04
+*channel.txt*      For Vim version 9.0.  Last change: 2022 Jun 23


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -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}
@@ -464,8 +465,10 @@ a close callback to the channel.

 To read all normal output from a RAW channel that is available: >
 	let output = ch_readraw(channel)
-To read the error output: >
+To read all error output from a RAW channel that is available:: >
 	let output = ch_readraw(channel, {"part": "err"})
+Note that if the channel is in NL mode, ch_readraw() will only return one line
+for each call.

 ch_read() and ch_readraw() use the channel timeout.  When there is nothing to
 read within that time an empty string is returned.  To specify a different
@@ -1552,36 +1555,5 @@ The "params" field is optional: >
 	"params": <list|dict>
    }

-Depending on the use case, you can use the ch_evalexpr(), ch_sendexpr() and
-ch_sendraw() functions on the same channel.
-
-A LSP request message has the following format (expressed as a Vim Dict).  The
-"params" field is optional: >
-
-    {
-	"jsonrpc": "2.0",
-	"id": <number>,
-	"method": <string>,
-	"params": <list|dict>
-    }
-
-A LSP response message has the following format (expressed as a Vim Dict).  The
-"result" and "error" fields are optional: >
-
-    {
-	"jsonrpc": "2.0",
-	"id": <number>,
-	"result": <vim type>
-	"error": <dict>
-    }
-
-A LSP notification message has the following format (expressed as a Vim Dict).
-The "params" field is optional: >
-
-    {
-	"jsonrpc": "2.0",
-	"method": <string>,
-	"params": <list|dict>
-    }
-
+<
 vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 8.2.  Last change: 2022 Jun 16
+*cmdline.txt*   For Vim version 9.0.  Last change: 2022 Sep 26


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -199,9 +199,6 @@ CTRL-R CTRL-L				*c_CTRL-R_CTRL-L* *c_<C-R>_<C-L>*
 		currently displayed match is used.  With CTRL-W the part of
 		the word that was already typed is not inserted again.

-		CTRL-F and CTRL-P: {only when |+file_in_path| feature is
-		included}
-
 					*c_CTRL-R_CTRL-R* *c_<C-R>_<C-R>*
 					*c_CTRL-R_CTRL-O* *c_<C-R>_<C-O>*
 CTRL-R CTRL-R {register CTRL-F CTRL-P CTRL-W CTRL-A CTRL-L}
@@ -809,7 +806,7 @@ Count and Range						*N:*

 When giving a count before entering ":", this is translated into:
 		:.,.+(count - 1)
-In words: The 'count' lines at and after the cursor.  Example: To delete
+In words: The "count" lines at and after the cursor.  Example: To delete
 three lines: >
 		3:d<CR>		is translated into: .,.+2d<CR>
 <
@@ -936,7 +933,7 @@ Note: these are typed literally, they are not special keys!
 		   When the match is with a file name, it is expanded to the
 		   full path.
 							*:<sfile>* *<sfile>*
-	<sfile>    When executing a ":source" command, is replaced with the
+	<sfile>    When executing a `:source` command, is replaced with the
 		   file name of the sourced file.  *E498*
 		   When executing a legacy function, is replaced with the call
 		   stack, as with <stack> (this is for backwards
@@ -959,7 +956,7 @@ Note: these are typed literally, they are not special keys!
 		   defined.
 		   If the file name cannot be determined you get error *E1274* .
 							*:<slnum>* *<slnum>*
-	<slnum>	   When executing a ":source" command, is replaced with the
+	<slnum>	   When executing a `:source` command, is replaced with the
 		   line number.  *E842*
 		   When executing a function it's the line number relative to
 		   the start of the function.
@@ -1127,7 +1124,6 @@ Also see |`=|.
 In the command-line window the command line can be edited just like editing
 text in any window.  It is a special kind of window, because you cannot leave
 it in a normal way.
-{not available when compiled without the |+cmdwin| feature}


 OPEN						*c_CTRL-F* *q:* *q/* *q?*
@@ -1147,6 +1143,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/debug.txt
+++ b/runtime/doc/debug.txt
@@ -1,4 +1,4 @@
-*debug.txt*     For Vim version 8.2.  Last change: 2019 May 07
+*debug.txt*     For Vim version 9.0.  Last change: 2019 May 07


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/debugger.txt
+++ b/runtime/doc/debugger.txt
@@ -1,4 +1,4 @@
-*debugger.txt*  For Vim version 8.2.  Last change: 2019 Dec 21
+*debugger.txt*  For Vim version 9.0.  Last change: 2019 Dec 21


 		  VIM REFERENCE MANUAL    by Gordon Prieur
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -1,4 +1,4 @@
-*develop.txt*   For Vim version 8.2.  Last change: 2020 Aug 15
+*develop.txt*   For Vim version 9.0.  Last change: 2022 Sep 20


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -188,8 +188,8 @@ C COMPILER				*style-compiler* *ANSI-C* *C89* *C99*

 The minimal C compiler version supported is C89, also known as ANSI C.
 Later standards, such as C99, are not widely supported, or at least not 100%
-supported.  Therefore we use only some of the C99 features and disallow some
-(at least for now).
+supported.  Therefore we use only some of the C99 features and explicitly
+disallow some (this will gradually be adjusted over time).

 Please don't make changes everywhere to use the C99 features, it causes merge
 problems for existing patches.  Only use them for new and changed code.
@@ -215,12 +215,21 @@ Types ~
 "long long" is allowed and can be expected to be 64 bits.  Use %lld in printf
 formats.  Also "long long unsigned" with %llu.

+Declarations ~
+
+Now that the minimal supported compiler is MSVC 2015 declarations do not need
+to be at the start of a block.  However, it is often a good idea to do this
+anyway.
+
+Declaration of the for loop variable inside the loop is recommended:
+	for (int i = 0; i < len; ++i)
+Since this is clearly an advantage we'll use this more often.
+
+
 Not to be used ~

 These C99 features are not to be used, because not enough compilers support
 them:
- Declaration after Statements (MSVC 2012 does not support it).  All
-  declarations need to be at the start of the block.
 - Variable length arrays (even in C11 this is an optional feature).
 - _Bool and _Complex types.
 - "inline" (it's hardly ever needed, let the optimizer do its work)
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 8.2.  Last change: 2022 Jan 22
+*diff.txt*      For Vim version 9.0.  Last change: 2022 Oct 01


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -376,6 +376,9 @@ Additionally, 'diffexpr' should take care of "icase" and "iwhite" in the
 'diffopt' option.  'diffexpr' cannot change the value of 'lines' and
 'columns'.

+The advantage of using a function call without arguments is that it is faster,
+see |expr-option-function|.
+
 Example (this does almost the same as 'diffexpr' being empty): >

 	set diffexpr=MyDiff()
@@ -441,6 +444,9 @@ will have the same effect.  These variables are set to the file names used:
 	v:fname_diff		patch file
 	v:fname_out		resulting patched file

+The advantage of using a function call without arguments is that it is faster,
+see |expr-option-function|.
+
 Example (this does the same as 'patchexpr' being empty): >

 	set patchexpr=MyPatch()
--- a/runtime/doc/digraph.txt
+++ b/runtime/doc/digraph.txt
@@ -1,4 +1,4 @@
-*digraph.txt*   For Vim version 8.2.  Last change: 2021 Jul 19
+*digraph.txt*   For Vim version 9.0.  Last change: 2021 Jul 19


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- 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/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 8.2.  Last change: 2022 Apr 16
+*editing.txt*   For Vim version 9.0.  Last change: 2022 Apr 16


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -247,8 +247,6 @@ If you want to keep the changed buffer without saving it, switch on the
 							*:fin* *:find*
 :fin[d][!] [++opt] [+cmd] {file}
 			Find {file} in 'path' and then |:edit| it.
-			{not available when the |+file_in_path| feature was
-			disabled at compile time}

 :{count}fin[d][!] [++opt] [+cmd] {file}
 			Just like ":find", but use the {count} match in
@@ -322,8 +320,6 @@ CTRL-^			Edit the alternate file.  Mostly the alternate file is
 			For Unix the '~' character is expanded, like in
 			"~user/file".  Environment variables are expanded too
 			|expand-env|.
-			{not available when the |+file_in_path| feature was
-			disabled at compile time}

 							*v_gf*
 {Visual}[count]gf	Same as "gf", but the highlighted text is used as the
@@ -1225,7 +1221,7 @@ Examples: >

 If you want to always use ":confirm", set the 'confirm' option.

-			*:browse* *:bro* *E338*
+							*:browse* *:bro* *E338*
 :bro[wse] {command}	Open a file selection dialog for an argument to
 			{command}.  At present this works for |:e|, |:w|,
 			|:wall|, |:wq|, |:wqall|, |:x|, |:xall|, |:exit|,
@@ -1707,8 +1703,6 @@ problem goes away the next day.
 ==============================================================================
 11. File Searching					*file-searching*

-{not available when compiled without the |+path_extra| feature}
-
 The file searching is currently used for the 'path', 'cdpath' and 'tags'
 options, for |finddir()| and |findfile()|.  Other commands use |wildcards|
 which is slightly different.
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 8.2.  Last change: 2022 Jun 17
+*eval.txt*	For Vim version 9.0.  Last change: 2022 Oct 07


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -54,7 +54,6 @@ Number		A 32 or 64 bit signed number.  |expr-number|
 		Examples:  -123  0x10  0177  0o177 0b1011

 Float		A floating point number. |floating-point-format| *Float*
-		{only when compiled with the |+float| feature} *E1076*
 		Examples: 123.456  1.15e-6  -1.1e3

 String		A NUL terminated string of 8-bit unsigned characters (bytes).
@@ -181,7 +180,7 @@ You will not get an error if you try to change the type of a variable.


 1.2 Function references ~
-				*Funcref* *E695* *E718* *E1192*
+					*Funcref* *E695* *E718* *E1192*
 A Funcref variable is obtained with the |function()| function, the |funcref()|
 function, (in |Vim9| script) the name of a function, or created with the
 lambda expression |expr-lambda|.  It can be used in an expression in the place
@@ -1098,6 +1097,7 @@ a different type means the values are different: >
 	echo 0 is []
 	0
 "is#"/"isnot#" and "is?"/"isnot?" can be used to match and ignore case.
+In |Vim9| script this doesn't work, two strings are never identical.

 In legacy script, when comparing a String with a Number, the String is
 converted to a Number, and the comparison is done on Numbers.  This means
@@ -1289,7 +1289,7 @@ Generally, if a |List| index is equal to or higher than the length of the
 error.


-expr10[expr1a : expr1b]	substring or sublist		*expr-[:]*
+expr10[expr1a : expr1b]	substring or |sublist|		*expr-[:]* *substring*

 If expr10 is a String this results in the substring with the bytes or
 characters from expr1a to and including expr1b.  expr10 is used as a String,
@@ -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
@@ -1440,7 +1440,6 @@ digits are ignored.
 {exp} is the exponent, power of 10.
 Only a decimal point is accepted, not a comma.  No matter what the current
 locale is.
-{only when compiled with the |+float| feature}

 Examples:
 	123.456
@@ -1549,7 +1548,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 +1558,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.
@@ -1717,6 +1716,9 @@ Recommendation: don't do this.
 Notice how execute() is used to execute an Ex command.  That's ugly though.
 In Vim9 script you can use a command block, see |inline-function|.

+Although you can use the loop variable of a `for` command, it must still exist
+when the closure is called, otherwise you get an error.  *E1302*
+
 Lambda expressions have internal names like '<lambda>42'.  If you get an error
 for a lambda expression, you can find what it is with the following command: >
 	:function <lambda>42
@@ -2005,6 +2007,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
@@ -2626,447 +2630,12 @@ help file: |builtin-functions|.
 5. Defining functions					*user-functions*

 New functions can be defined.  These can be called just like builtin
-functions.  The function executes a sequence of Ex commands.  Normal mode
-commands can be executed with the |:normal| command.
+functions.  The function takes arguments, executes a sequence of Ex commands
+and can return a value.

-This section is about the legacy functions. For the Vim9 functions, which
-execute much faster, support type checking and more, see |vim9.txt|.
-
-The function name must start with an uppercase letter, to avoid confusion with
-builtin functions.  To prevent from using the same name in different scripts
-avoid obvious, short names.  A good habit is to start the function name with
-the name of the script, e.g., "HTMLcolor()".
-
-In legacy script it is also possible to use curly braces, see
-|curly-braces-names|.
-The |autoload| facility is useful to define a function only when it's called.
-
-							*local-function*
-A function local to a legacy script must start with "s:".  A local script
-function can only be called from within the script and from functions, user
-commands and autocommands defined in the script.  It is also possible to call
-the function from a mapping defined in the script, but then |<SID>| must be
-used instead of "s:" when the mapping is expanded outside of the script.
-There are only script-local functions, no buffer-local or window-local
-functions.
-
-In |Vim9| script functions are local to the script by default, prefix "g:" to
-define a global function.
-
-				*:fu* *:function* *E128* *E129* *E123* *E454*
-:fu[nction]		List all functions and their arguments.
-
-:fu[nction] {name}	List function {name}.
-			{name} can also be a |Dictionary| entry that is a
-			|Funcref|: >
-				:function dict.init
-
-:fu[nction] /{pattern}	List functions with a name matching {pattern}.
-			Example that lists all functions ending with "File": >
-				:function /File$
-<
-							*:function-verbose*
-When 'verbose' is non-zero, listing a function will also display where it was
-last defined. Example: >
-
-    :verbose function SetFileTypeSH
-	function SetFileTypeSH(name)
-	    Last set from /usr/share/vim/vim-7.0/filetype.vim
-<
-See |:verbose-cmd| for more information.
-
-						*E124* *E125* *E853* *E884*
-:fu[nction][!] {name}([arguments]) [range] [abort] [dict] [closure]
-			Define a new function by the name {name}.  The body of
-			the function follows in the next lines, until the
-			matching |:endfunction|.
-
-			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.
-			(since patch 7.4.260 E884 is given if the function
-			name has a colon in the name, e.g. for "foo:bar()".
-			Before that patch no error was given).
-
-			{name} can also be a |Dictionary| entry that is a
-			|Funcref|: >
-				:function dict.init(arg)
-<			"dict" must be an existing dictionary.  The entry
-			"init" is added if it didn't exist yet.  Otherwise [!]
-			is required to overwrite an existing function.  The
-			result is a |Funcref| to a numbered function.  The
-			function can only be used with a |Funcref| and will be
-			deleted if there are no more references to it.
-								*E127* *E122*
-			When a function by this name already exists and [!] is
-			not used an error message is given.  There is one
-			exception: When sourcing a script again, a function
-			that was previously defined in that script will be
-			silently replaced.
-			When [!] is used, an existing function is silently
-			replaced.  Unless it is currently being executed, that
-			is an error.
-			NOTE: Use ! wisely.  If used without care it can cause
-			an existing function to be replaced unexpectedly,
-			which is hard to debug.
-			NOTE: In Vim9 script script-local functions cannot be
-			deleted or redefined.
-
-			For the {arguments} see |function-argument|.
-
-					*:func-range* *a:firstline* *a:lastline*
-			When the [range] argument is added, the function is
-			expected to take care of a range itself.  The range is
-			passed as "a:firstline" and "a:lastline".  If [range]
-			is excluded, ":{range}call" will call the function for
-			each line in the range, with the cursor on the start
-			of each line.  See |function-range-example|.
-			The cursor is still moved to the first line of the
-			range, as is the case with all Ex commands.
-								*:func-abort*
-			When the [abort] argument is added, the function will
-			abort as soon as an error is detected.
-								*:func-dict*
-			When the [dict] argument is added, the function must
-			be invoked through an entry in a |Dictionary|.  The
-			local variable "self" will then be set to the
-			dictionary.  See |Dictionary-function|.
-						*:func-closure* *E932*
-			When the [closure] argument is added, the function
-			can access variables and arguments from the outer
-			scope.  This is usually called a closure.  In this
-			example Bar() uses "x" from the scope of Foo().  It
-			remains referenced even after Foo() returns: >
-				:function! Foo()
-				:  let x = 0
-				:  function! Bar() closure
-				:    let x += 1
-				:    return x
-				:  endfunction
-				:  return funcref('Bar')
-				:endfunction
-
-				:let F = Foo()
-				:echo F()
-<				1 >
-				:echo F()
-<				2 >
-				:echo F()
-<				3
-
-						*function-search-undo*
-			The last used search pattern and the redo command "."
-			will not be changed by the function.  This also
-			implies that the effect of |:nohlsearch| is undone
-			when the function returns.
-
-			*:endf* *:endfunction* *E126* *E193* *W22* *E1151*
-:endf[unction] [argument]
-			The end of a function definition.  Best is to put it
-			on a line by its own, without [argument].
-
-			[argument] can be:
-				| command	command to execute next
-				\n command	command to execute next
-				" comment	always ignored
-				anything else	ignored, warning given when
-						'verbose' is non-zero
-			The support for a following command was added in Vim
-			8.0.0654, before that any argument was silently
-			ignored.
-
-			To be able to define a function inside an `:execute`
-			command, use line breaks instead of |:bar|: >
-				:exe "func Foo()\necho 'foo'\nendfunc"
-<
-				*:delf* *:delfunction* *E131* *E933* *E1084*
-:delf[unction][!] {name}
-			Delete function {name}.
-			{name} can also be a |Dictionary| entry that is a
-			|Funcref|: >
-				:delfunc dict.init
-<			This will remove the "init" entry from "dict".  The
-			function is deleted if there are no more references to
-			it.
-			With the ! there is no error if the function does not
-			exist.
-							*:retu* *:return* *E133*
-:retu[rn] [expr]	Return from a function.  When "[expr]" is given, it is
-			evaluated and returned as the result of the function.
-			If "[expr]" is not given, the number 0 is returned.
-			When a function ends without an explicit ":return",
-			the number 0 is returned.
-			In a :def function *E1095* is given if unreachable
-			code follows after the `:return`.
-			In legacy script there is no check for unreachable
-			lines, thus there is no warning if commands follow
-			`:return`.
-
-			If the ":return" is used after a |:try| but before the
-			matching |:finally| (if present), the commands
-			following the ":finally" up to the matching |:endtry|
-			are executed first.  This process applies to all
-			nested ":try"s inside the function.  The function
-			returns at the outermost ":endtry".
-
-						*function-argument* *a:var*
-An argument can be defined by giving its name.  In the function this can then
-be used as "a:name" ("a:" for argument).
-					*a:0* *a:1* *a:000* *E740* *...*
-Up to 20 arguments can be given, separated by commas.  After the named
-arguments an argument "..." can be specified, which means that more arguments
-may optionally be following.  In the function the extra arguments can be used
-as "a:1", "a:2", etc.  "a:0" is set to the number of extra arguments (which
-can be 0).  "a:000" is set to a |List| that contains these arguments.  Note
-that "a:1" is the same as "a:000[0]".
-							*E742* *E1090*
-The a: scope and the variables in it cannot be changed, they are fixed.
-However, if a composite type is used, such as |List| or |Dictionary| , you can
-change their contents.  Thus you can pass a |List| to a function and have the
-function add an item to it.  If you want to make sure the function cannot
-change a |List| or |Dictionary| use |:lockvar|.
-
-It is also possible to define a function without any arguments.  You must
-still supply the () then.
-
-It is allowed to define another function inside a function body.
-
-						*optional-function-argument*
-You can provide default values for positional named arguments.  This makes
-them optional for function calls.  When a positional argument is not
-specified at a call, the default expression is used to initialize it.
-This only works for functions declared with `:function` or `:def`, not for
-lambda expressions |expr-lambda|.
-
-Example: >
-  function Something(key, value = 10)
-     echo a:key .. ": " .. a:value
-  endfunction
-  call Something('empty')	"empty: 10"
-  call Something('key', 20)	"key: 20"
-
-The argument default expressions are evaluated at the time of the function
-call, not definition.  Thus it is possible to use an expression which is
-invalid the moment the function is defined.  The expressions are also only
-evaluated when arguments are not specified during a call.
-						*none-function_argument*
-You can pass |v:none| to use the default expression.  Note that this means you
-cannot pass v:none as an ordinary value when an argument has a default
-expression.
-
-Example: >
-  function Something(a = 10, b = 20, c = 30)
-  endfunction
-  call Something(1, v:none, 3)	    " b = 20
-<
-								*E989*
-Optional arguments with default expressions must occur after any mandatory
-arguments.  You can use "..." after all optional named arguments.
-
-It is possible for later argument defaults to refer to prior arguments,
-but not the other way around.  They must be prefixed with "a:", as with all
-arguments.
-
-Example that works: >
-  :function Okay(mandatory, optional = a:mandatory)
-  :endfunction
-Example that does NOT work: >
-  :function NoGood(first = a:second, second = 10)
-  :endfunction
-<
-When not using "...", the number of arguments in a function call must be at
-least equal to the number of mandatory named arguments.  When using "...", the
-number of arguments may be larger than the total of mandatory and optional
-arguments.
-
-							*local-variables*
-Inside a function local variables can be used.  These will disappear when the
-function returns.  Global variables need to be accessed with "g:".
-
-Example: >
-  :function Table(title, ...)
-  :  echohl Title
-  :  echo a:title
-  :  echohl None
-  :  echo a:0 .. " items:"
-  :  for s in a:000
-  :    echon ' ' .. s
-  :  endfor
-  :endfunction
-
-This function can then be called with: >
-  call Table("Table", "line1", "line2")
-  call Table("Empty Table")
-
-To return more than one value, return a |List|: >
-  :function Compute(n1, n2)
-  :  if a:n2 == 0
-  :    return ["fail", 0]
-  :  endif
-  :  return ["ok", a:n1 / a:n2]
-  :endfunction
-
-This function can then be called with: >
-  :let [success, div] = Compute(102, 6)
-  :if success == "ok"
-  :  echo div
-  :endif
-<
-						*:cal* *:call* *E107*
-:[range]cal[l] {name}([arguments])
-		Call a function.  The name of the function and its arguments
-		are as specified with `:function`.  Up to 20 arguments can be
-		used.  The returned value is discarded.
-		In |Vim9| script using `:call` is optional, these two lines do
-		the same thing: >
-			call SomeFunc(arg)
-			SomeFunc(arg)
-<		Without a range and for functions that accept a range, the
-		function is called once.  When a range is given the cursor is
-		positioned at the start of the first line before executing the
-		function.
-		When a range is given and the function doesn't handle it
-		itself, the function is executed for each line in the range,
-		with the cursor in the first column of that line.  The cursor
-		is left at the last line (possibly moved by the last function
-		call).  The arguments are re-evaluated for each line.  Thus
-		this works:
-						*function-range-example*  >
-	:function Mynumber(arg)
-	:  echo line(".") .. " " .. a:arg
-	:endfunction
-	:1,5call Mynumber(getline("."))
-<
-		The "a:firstline" and "a:lastline" are defined anyway, they
-		can be used to do something different at the start or end of
-		the range.
-
-		Example of a function that handles the range itself: >
-
-	:function Cont() range
-	:  execute (a:firstline + 1) .. "," .. a:lastline .. 's/^/\t\\ '
-	:endfunction
-	:4,8call Cont()
-<
-		This function inserts the continuation character "\" in front
-		of all the lines in the range, except the first one.
-
-		When the function returns a composite value it can be further
-		dereferenced, but the range will not be used then.  Example: >
-	:4,8call GetDict().method()
-<		Here GetDict() gets the range but method() does not.
-
-								*E117*
-When a function cannot be found the error "E117: Unknown function" will be
-given.  If the function was using an autoload path or an autoload import and
-the script is a |Vim9| script, this may also be caused by the function not
-being exported.
-
-								*E132*
-The recursiveness of user functions is restricted with the |'maxfuncdepth'|
-option.
-
-It is also possible to use `:eval`.  It does not support a range, but does
-allow for method chaining, e.g.: >
-	eval GetList()->Filter()->append('$')
-
-A function can also be called as part of evaluating an expression or when it
-is used as a method: >
-	let x = GetList()
-	let y = GetList()->Filter()
-
-
-AUTOMATICALLY LOADING FUNCTIONS ~
-							*autoload-functions*
-When using many or large functions, it's possible to automatically define them
-only when they are used.  There are two methods: with an autocommand and with
-the "autoload" directory in 'runtimepath'.
-
-
-Using an autocommand ~
-
-This is introduced in the user manual, section |51.4|.
-
-The autocommand is useful if you have a plugin that is a long Vim script file.
-You can define the autocommand and quickly quit the script with `:finish`.
-That makes Vim startup faster.  The autocommand should then load the same file
-again, setting a variable to skip the `:finish` command.
-
-Use the FuncUndefined autocommand event with a pattern that matches the
-function(s) to be defined.  Example: >
-
-	:au FuncUndefined BufNet* source ~/vim/bufnetfuncs.vim
-
-The file "~/vim/bufnetfuncs.vim" should then define functions that start with
-"BufNet".  Also see |FuncUndefined|.
-
-
-Using an autoload script ~
-							*autoload* *E746*
-This is introduced in the user manual, section |52.2|.
-
-Using a script in the "autoload" directory is simpler, but requires using
-exactly the right file name.  A function that can be autoloaded has a name
-like this: >
-
-	:call filename#funcname()
-
-These functions are always global, in Vim9 script "g:" needs to be used: >
-	:call g:filename#funcname()
-
-When such a function is called, and it is not defined yet, Vim will search the
-"autoload" directories in 'runtimepath' for a script file called
-"filename.vim".  For example "~/.vim/autoload/filename.vim".  That file should
-then define the function like this: >
-
-	function filename#funcname()
-	   echo "Done!"
-	endfunction
-
-The file name and the name used before the # in the function must match
-exactly, and the defined function must have the name exactly as it will be
-called.  In Vim9 script the "g:" prefix must be used: >
-	function g:filename#funcname()
-
-or for a compiled function: >
-	def g:filename#funcname()
-
-It is possible to use subdirectories.  Every # in the function name works like
-a path separator.  Thus when calling a function: >
-
-	:call foo#bar#func()
-
-Vim will look for the file "autoload/foo/bar.vim" in 'runtimepath'.
-
-This also works when reading a variable that has not been set yet: >
-
-	:let l = foo#bar#lvar
-
-However, when the autoload script was already loaded it won't be loaded again
-for an unknown variable.
-
-When assigning a value to such a variable nothing special happens.  This can
-be used to pass settings to the autoload script before it's loaded: >
-
-	:let foo#bar#toggle = 1
-	:call foo#bar#func()
-
-Note that when you make a mistake and call a function that is supposed to be
-defined in an autoload script, but the script doesn't actually define the
-function, you will get an error message for the missing function.  If you fix
-the autoload script it won't be automatically loaded again.  Either restart
-Vim or manually source the script.
-
-Also note that if you have two script files, and one calls a function in the
-other and vice versa, before the used function is defined, it won't work.
-Avoid using the autoload functionality at the toplevel.
-
-In |Vim9| script you will get error *E1263* if you define a function with
-a "#" character in the name.  You should use a name without "#" and use
-`:export`.
-
-Hint: If you distribute a bunch of scripts you can pack them together with the
-|vimball| utility.  Also read the user manual |distribute-script|.
+You can find most information about defining functions in |userfunc.txt|.
+For Vim9 functions, which execute much faster, support type checking and more,
+see |vim9.txt|.

 ==============================================================================
 6. Curly braces names					*curly-braces-names*
@@ -3287,7 +2856,7 @@ text...

 			If "eval" is not specified, then each line of text is
 			used as a |literal-string|, except that single quotes
-			doe not need to be doubled.
+			does not need to be doubled.
 			If "eval" is specified, then any Vim expression in the
 			form {expr} is evaluated and the result replaces the
 			expression, like with |interp-string|.
@@ -3605,6 +3174,9 @@ text...
 			iterate over.  Unlike with |List|, modifying the
 			|Blob| does not affect the iteration.

+			When {object} is a |String| each item is a string with
+			one character, plus any combining characters.
+
 			In |Vim9| script `:endfor` cannot be shortened, to
 			improve script readability.

@@ -3818,6 +3390,22 @@ text...
 		:echomsg "It's a Zizzer Zazzer Zuzz, as you can plainly see."
 <			See |:echo-redraw| to avoid the message disappearing
 			when the screen is redrawn.
+
+					*:echow* *:echowin* *:echowindow*
+:[N]echow[indow] {expr1} ..
+			Like |:echomsg| but when the messages popup window is
+			available the message is displayed there.  This means
+			it will show for three seconds and avoid a
+			|hit-enter| prompt.  If you want to hide it before
+			that, press Esc in Normal mode (when it would
+			otherwise beep).  If it disappears too soon you can
+			use `:messages` to see the text.
+			When [N] is given then the window will show up for
+			this number of seconds.  The last `:echowindow` with a
+			count matters, it is used once only.
+			The message window is available when Vim was compiled
+			with the +timer and the +popupwin features.
+
 							*:echoe* *:echoerr*
 :echoe[rr] {expr1} ..	Echo the expression(s) as an error message, saving the
 			message in the |message-history|.  When used in a
--- a/runtime/doc/farsi.txt
+++ b/runtime/doc/farsi.txt
@@ -1,4 +1,4 @@
-*farsi.txt*     For Vim version 8.2.  Last change: 2019 May 05
+*farsi.txt*     For Vim version 9.0.  Last change: 2019 May 05


 		  VIM REFERENCE MANUAL    by Mortaza Ghassab Shiran
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -1,4 +1,4 @@
-*filetype.txt*  For Vim version 8.2.  Last change: 2022 Apr 09
+*filetype.txt*  For Vim version 9.0.  Last change: 2022 Apr 09


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -143,12 +143,14 @@ 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
-	*.csh		g:filetype_csh  |ft-csh-syntax|
+	*.cls		g:filetype_cls
+	*.csh		g:filetype_csh	|ft-csh-syntax|
 	*.dat		g:filetype_dat
 	*.frm		g:filetype_frm	|ft-form-syntax|
 	*.fs		g:filetype_fs	|ft-forth-syntax|
 	*.i		g:filetype_i	|ft-progress-syntax|
 	*.inc		g:filetype_inc
+	*.lsl		g:filetype_lsl
 	*.m		g:filetype_m	|ft-mathematica-syntax|
 	*.mod		g:filetype_mod
 	*.p		g:filetype_p	|ft-pascal-syntax|
@@ -156,6 +158,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 +557,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 +590,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/fold.txt
+++ b/runtime/doc/fold.txt
@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 8.2.  Last change: 2022 Jan 22
+*fold.txt*      For Vim version 9.0.  Last change: 2022 Oct 01


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -74,8 +74,6 @@ method.  The value of the 'foldexpr' option is evaluated to get the foldlevel
 of a line.  Examples:
 This will create a fold for all consecutive lines that start with a tab: >
 	:set foldexpr=getline(v:lnum)[0]==\"\\t\"
-This will call a function to compute the fold level: >
-	:set foldexpr=MyFoldLevel(v:lnum)
 This will make a fold out of paragraphs separated by blank lines: >
 	:set foldexpr=getline(v:lnum)=~'^\\s*$'&&getline(v:lnum+1)=~'\\S'?'<1':1
 This does the same: >
@@ -84,6 +82,10 @@ This does the same: >
 Note that backslashes must be used to escape characters that ":set" handles
 differently (space, backslash, double quote, etc., see |option-backslash|).

+The most efficient is to call a compiled function without arguments: >
+	:set foldexpr=MyFoldLevel()
+The function must use v:lnum.  See |expr-option-function|.
+
 These are the conditions with which the expression is evaluated:
 - The current buffer and window are set for the line.
 - The variable "v:lnum" is set to the line number.
@@ -501,7 +503,7 @@ is evaluated to obtain the text displayed for a closed fold.  Example: >

 This shows the first line of the fold, with "/*", "*/" and "{{{" removed.
 Note the use of backslashes to avoid some characters to be interpreted by the
-":set" command.  It's simpler to define a function and call that: >
+":set" command.  It is much simpler to define a function and call it: >

    :set foldtext=MyFoldText()
    :function MyFoldText()
@@ -510,6 +512,9 @@ Note the use of backslashes to avoid some characters to be interpreted by the
    :  return v:folddashes .. sub
    :endfunction

+The advantage of using a function call without arguments is that it is faster,
+see |expr-option-function|.
+
 Evaluating 'foldtext' is done in the |sandbox|.  The current window is set to
 the window that displays the line.  The context is set to the script where the
 option was last set.
--- a/Show More
+++ b/Show More