MacVim Release 175

Updated to Vim 9.0.1276 Features ==================== Dictionary lookup -------------------- You can now use Force Touch or Cmd-Ctrl-D to look up definitions of word under the cursor (or selected text in visual mode). This will also preview URLs, and support data types such as phone numbers and addresses. #1312 #1313 This feature can also be invoked programmatically from VimScript (see `:h macvim-lookup`). #1315 Tool bar / Touch Bar / menu icons -------------------- You can now use SF Symbols for Tool bar and Touch Bar icons, including using different symbol styles such as "palette" or "multicolor". Menu items can now also use the `icon=` syntax to specify icons as well. See `:help macvim-toolbar-icon` for details. #1329 The default tool bar also has updated icons to look similar to SF Symbols used by newer macOS versions. #1214 by @sfsam Window management actions -------------------- There are new `macaction`'s for managing the MacVim window. The new `zoomLeft`/`zoomRight` actions allow you to pin the window to the left/right of the screen, and there are also new actions for interacting with Stage Manager (requires macOS 13+). See `:h macvim-actions` for details. #1330 Pre-release updates / Sparkle 2 -------------------- MacVim now supports pre-release software builds. It's sometimes hard for us to release frequent updates due to the desire to pick a stable upstream Vim version, needing to test the release on multiple OS versions, making sure there aren't half-complete or buggy features, and other reasons. This new feature now allows us to push pre-release beta builds out in a more frequent fashion, which could be useful if there are particular features or fixes that you would like to try out before the next official release. Pre-release builds will be released depending on bug fixes and features instead of a fixed cadence. Do note that these pre-release builds may not be as well-validated and may have half-baked features. If you are using the built-in auto-updater to update MacVim, you can turn this on by going to Advanced settings pane, and enable "Enable pre-release software updates". This feature is only available for macOS 10.13 or above. The auto-updater has also been updated from Sparkle 1.27.1 to 2.3.0 for 10.13+ builds. Legacy (10.9-10.12) builds are still using Sparkle 1. See #1332. New Vim features -------------------- New `smoothscroll` option allows you to scroll through a long wrapped line (using Ctrl-E or mouse wheel) without immediately jumping to the next line. (v9.0.0640) `splitscroll` option has been renamed `splitkeep`, with more flexibility than before. (v9.0.0647) Sound playback on macOS is now supported. You can use `has('sound')` to check. See `help sound` for details. (v9.0.0694) Terminals now support `:confirm` for `:q`, etc, which also means MacVim's Cmd-W will work properly for terminal windows. (v9.0.0710) Virtual text had numerous bugs fixed. General ==================== Legacy build for 10.9 - 10.12 -------------------- Per a previous announcement (#1271), the default MacVim binary will now require macOS 10.13 or above. Users of macOS 10.9 - 10.12 can use a separate "legacy" build which will still be supported. The legacy binary will still have the latest versions of Vim and be supported, but may not have all the latest features (e.g. pre-release builds). If you are using the auto-updater (Sparkle) to update MacVim, it should "just work" and find the best version for you. If you are downloading MacVim from the website, there is also a link to download the legacy version marked for 10.9+ as well. If you download the normal binary marked for 10.13+ from the website, it won't work on these older macOS versions. See #1331. Fixes ==================== CoreText Renderer clipping and rendering bugs -------------------- Unicode characters with multiple composing characters (e.g. "x⃗") will now render correctly. #1172 Texts (e.g. Tibetan, Zalgo texts) that are taller than the line height will no longer be clipped inappropriately. You can use a new setting `MMRendererClipToRow` to re-enable clipping if the tall texts are distracting. #995 / #1356 Tab crash -------------------- Fixed a crash when opening new tabs that seems to only occur in macOS 13 Ventura. #1333 Other bugs -------------------- - Fixed non-native full screen not working well with the notch on newer MacBook's when set to not show menu bar. You can also use `MMNonNativeFullScreenSafeAreaBehavior` to force MacVim to use the notch area as well if you don't mind some content being obscured. Note that the previous release also claimed it fixed this, but because the binary was built against an old macOS SDK (Big Sur), the fix did not work in the binary release. #1261 - Allow "Open untitled window: never" and "After last window closes: Quit MacVim" to be set together again. Added safeguards to make sure doing so won't immediately close the app. #1338 - Edit.Cut / Copy menu items will now be properly disabled when there isn't selected text. #1308 - Fixed potential `:emenu` crash when the menu is associated with an action in a non-valid mode. #1305 - Fixed bug where just bringing up the right-click (or the MacVim→Services) menu would somehow copy the selected texts to the system clipboard. #1300 - Fixed a Japanese input method bug where using left/right arrow to move to a different section of the input text would previously result in the candidate list not showing up at the correct position. #1312 - Fix non-CoreText renderer not handling text styles like strikethrough correctly (note: this renderer has been deprecated for a while and you should not use it). #1296 - This release uses an older sh/bash syntax file because the latest one in Vim has a bug. #1358 Misc ==================== New settings: - "No drop shadows" (Appearance). #1301 - "Treat Ctrl-click as right-click" (Input) (#1326). This was previously configurable via command-line, but now also possible in the settings pane under the new "Input" category. "About MacVim" now reports the version number in a clearer way with clearly specified release number vs Vim version. Known Issues ==================== Printing -------------------- Printing using File→Print or `:hardcopy` is currently not working under macOS 13 Ventura due to its removal of PostScript support in the Preview app. This will be fixed in a later release. See the issue for workarounds. #1347 Scripting ==================== - Scripting languages versions: - Perl is now built against 5.30, up from 5.18. - Ruby is now built against 3.2, up from 3.1. Compatibility ==================== Requires macOS 10.9 or above. (10.9 - 10.12 requires downloading a separate legacy build) Script interfaces have compatibility with these versions: - Lua 5.4 - Perl 5.30 - Python2 2.7 - Python3 3.10 - Ruby 3.2
2026-06-02 11:19:22 +02:00 · 2023-02-06 23:01:52 -08:00
1323 changed files with 27184 additions and 73536 deletions
@@ -5,14 +5,15 @@ env:
 freebsd_task:
  name: FreeBSD
  matrix:
-    - name: FreeBSD 14.0
-      freebsd_instance:
-        image_family: freebsd-14-0
-    - name: FreeBSD 13.1 
+    - name: FreeBSD 13.1
      freebsd_instance:
        image_family: freebsd-13-1
+    - name: FreeBSD 12.4
+      freebsd_instance:
+        image_family: freebsd-12-4
  timeout_in: 20m
  install_script:
+    - pkg update -f
    - pkg install -y gettext
  build_script:
    - NPROC=$(getconf _NPROCESSORS_ONLN)
@@ -35,7 +36,7 @@ macos_task:
  timeout_in: 20m
  install_script:
    - brew update
-    - brew install gettext libtool diffutils
+    - brew install gettext libtool
  build_script:
    - NPROC=$(getconf _NPROCESSORS_ONLN)
    - ./configure --with-features=${FEATURES}
@@ -0,0 +1 @@
+service_name: github-actions
@@ -18,7 +18,6 @@ runtime/autoload/netrwFileHandlers.vim	@cecamp
 runtime/autoload/netrwSettings.vim	@cecamp
 runtime/autoload/php.vim		@david-szabo97
 runtime/autoload/rubycomplete.vim	@segfault @dkearns
-runtime/autoload/rust.vim		@lilyball
 runtime/autoload/tar.vim		@cecamp
 runtime/autoload/vimball.vim		@cecamp
 runtime/autoload/xmlformat.vim		@chrisbra
@@ -30,24 +29,17 @@ runtime/colors/delek.vim		@habamax @romainl @neutaaaaan
 runtime/colors/desert.vim		@habamax @romainl @neutaaaaan
 runtime/colors/elflord.vim		@habamax @romainl @neutaaaaan
 runtime/colors/evening.vim		@habamax @romainl @neutaaaaan
-runtime/colors/habamax.vim		@habamax @romainl @neutaaaaan
 runtime/colors/industry.vim		@habamax @romainl @neutaaaaan
 runtime/colors/koehler.vim		@habamax @romainl @neutaaaaan
-runtime/colors/lunaperche.vim		@habamax @romainl @neutaaaaan
 runtime/colors/morning.vim		@habamax @romainl @neutaaaaan
 runtime/colors/murphy.vim		@habamax @romainl @neutaaaaan
 runtime/colors/pablo.vim		@habamax @romainl @neutaaaaan
 runtime/colors/peachpuff.vim		@habamax @romainl @neutaaaaan
-runtime/colors/quiet.vim		@habamax @romainl @neutaaaaan
-runtime/colors/retrobox.vim		@habamax @romainl @neutaaaaan
 runtime/colors/ron.vim			@habamax @romainl @neutaaaaan
 runtime/colors/shine.vim		@habamax @romainl @neutaaaaan
 runtime/colors/slate.vim		@habamax @romainl @neutaaaaan
-runtime/colors/sorbet.vim		@habamax @romainl @neutaaaaan
 runtime/colors/tools			@habamax @romainl @neutaaaaan
 runtime/colors/torte.vim		@habamax @romainl @neutaaaaan
-runtime/colors/wildcharm.vim		@habamax @romainl @neutaaaaan
-runtime/colors/zaibatsu.vim		@habamax @romainl @neutaaaaan
 runtime/colors/zellner.vim		@habamax @romainl @neutaaaaan
 runtime/compiler/checkstyle.vim		@dkearns
 runtime/compiler/cm3.vim		@dkearns
@@ -133,7 +125,6 @@ runtime/ftplugin/eruby.vim		@tpope @dkearns
 runtime/ftplugin/expect.vim		@dkearns
 runtime/ftplugin/fennel.vim		@gpanders
 runtime/ftplugin/fetchmail.vim		@dkearns
-runtime/ftplugin/forth.vim		@jkotlinski
 runtime/ftplugin/fpcmake.vim		@dkearns
 runtime/ftplugin/freebasic.vim		@dkearns
 runtime/ftplugin/fstab.vim		@rid9
@@ -152,14 +143,11 @@ runtime/ftplugin/go.vim			@dbarnett
 runtime/ftplugin/gprof.vim		@dpelle
 runtime/ftplugin/haml.vim		@tpope
 runtime/ftplugin/hare.vim		@rsaihe
-runtime/ftplugin/heex.vim		@cvincent
 runtime/ftplugin/hgcommit.vim		@k-takata
-runtime/ftplugin/hog.vim		@wtfbbqhax
 runtime/ftplugin/html.vim		@dkearns
 runtime/ftplugin/i3config.vim		@hiqua
 runtime/ftplugin/icon.vim		@dkearns
 runtime/ftplugin/indent.vim		@dkearns
-runtime/ftplugin/ishd.vim		@dkearns
 runtime/ftplugin/j.vim			@glts
 runtime/ftplugin/javascript.vim		@dkearns
 runtime/ftplugin/javascriptreact.vim	@dkearns
@@ -185,16 +173,13 @@ runtime/ftplugin/pascal.vim		@dkearns
 runtime/ftplugin/pbtxt.vim		@lakshayg
 runtime/ftplugin/pdf.vim		@tpope
 runtime/ftplugin/perl.vim		@petdance @dkearns
-runtime/ftplugin/php.vim		@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/pymanifest.vim		@ObserverOfTime
 runtime/ftplugin/python.vim		@tpict
 runtime/ftplugin/qb64.vim		@dkearns
-runtime/ftplugin/qml.vim        @ChaseKnowlden
 runtime/ftplugin/r.vim			@jalvesaq
 runtime/ftplugin/racket.vim		@benknoble
 runtime/ftplugin/readline.vim		@dkearns
@@ -205,14 +190,11 @@ runtime/ftplugin/routeros.vim		@zainin
 runtime/ftplugin/rrst.vim		@jalvesaq
 runtime/ftplugin/rst.vim		@marshallward
 runtime/ftplugin/ruby.vim		@tpope @dkearns
-runtime/ftplugin/rust.vim		@lilyball
 runtime/ftplugin/sass.vim		@tpope
 runtime/ftplugin/scala.vim		@derekwyatt
 runtime/ftplugin/scss.vim		@tpope
 runtime/ftplugin/sdoc.vim		@gpanders
-runtime/ftplugin/sed.vim		@dkearns
 runtime/ftplugin/sh.vim			@dkearns
-runtime/ftplugin/solidity.vim		@cothi
 runtime/ftplugin/solution.vim		@dkearns
 runtime/ftplugin/spec.vim		@ignatenkobrain
 runtime/ftplugin/ssa.vim		@ObserverOfTime
@@ -226,7 +208,6 @@ runtime/ftplugin/toml.vim		@averms
 runtime/ftplugin/tt2html.vim		@petdance
 runtime/ftplugin/typescript.vim		@dkearns
 runtime/ftplugin/typescriptreact.vim	@dkearns
-runtime/ftplugin/unison.vim		@chuwy
 runtime/ftplugin/vdf.vim		@ObserverOfTime
 runtime/ftplugin/wast.vim		@rhysd
 runtime/ftplugin/wget.vim		@dkearns
@@ -234,7 +215,6 @@ runtime/ftplugin/wget2.vim		@dkearns
 runtime/ftplugin/xml.vim		@chrisbra
 runtime/ftplugin/xs.vim			@petdance
 runtime/ftplugin/zsh.vim		@chrisbra
-runtime/import/dist/vimhighlight.vim	@lacygoill
 runtime/indent/basic.vim		@dkearns
 runtime/indent/bst.vim			@tpope
 runtime/indent/cdl.vim			@dkearns
@@ -263,7 +243,6 @@ runtime/indent/go.vim			@dbarnett
 runtime/indent/gyp.vim			@ObserverOfTime
 runtime/indent/haml.vim			@tpope
 runtime/indent/hare.vim			@rsaihe
-runtime/indent/hog.vim			@wtfbbqhax
 runtime/indent/idlang.vim		@dkearns
 runtime/indent/j.vim			@glts
 runtime/indent/java.vim			@xuhdev
@@ -271,11 +250,9 @@ runtime/indent/javascript.vim		@bounceme
 runtime/indent/json.vim			@elzr
 runtime/indent/jsonc.vim		@izhakjakov
 runtime/indent/julia.vim		@carlobaldassi
-runtime/indent/krl.vim			@KnoP-01
 runtime/indent/ld.vim			@dkearns
 runtime/indent/less.vim			@genoma
 runtime/indent/liquid.vim		@tpope
-runtime/indent/lua.vim			@marcuscf
 runtime/indent/make.vim			@dkearns
 runtime/indent/meson.vim		@Liambeguin
 runtime/indent/mma.vim			@dkearns
@@ -288,10 +265,8 @@ runtime/indent/postscr.vim		@mrdubya
 runtime/indent/prolog.vim		@dkearns
 runtime/indent/ps1.vim			@heaths
 runtime/indent/qb64.vim			@dkearns
-runtime/indent/qml.vim          @ChaseKnowlden
 runtime/indent/r.vim			@jalvesaq
 runtime/indent/racket.vim		@benknoble
-runtime/indent/rapid.vim		@KnoP-01
 runtime/indent/readline.vim		@dkearns
 runtime/indent/rhelp.vim		@jalvesaq
 runtime/indent/rmd.vim			@jalvesaq
@@ -302,7 +277,6 @@ runtime/indent/sass.vim			@tpope
 runtime/indent/scala.vim		@derekwyatt
 runtime/indent/scss.vim			@tpope
 runtime/indent/sh.vim			@chrisbra
-runtime/indent/solidity.vim		@cothi
 runtime/indent/systemverilog.vim	@Kocha
 runtime/indent/tcl.vim			@dkearns
 runtime/indent/tcsh.vim			@dkearns
@@ -386,7 +360,6 @@ runtime/syntax/gitolite.vim		@sitaramc
 runtime/syntax/gitrebase.vim		@tpope
 runtime/syntax/go.vim			@bhcleek
 runtime/syntax/godoc.vim		@dbarnett
-runtime/syntax/gp.vim			@KBelabas
 runtime/syntax/gprof.vim		@dpelle
 runtime/syntax/groff.vim		@jmarshall
 runtime/syntax/gyp.vim			@ObserverOfTime
@@ -394,8 +367,6 @@ runtime/syntax/haml.vim			@tpope
 runtime/syntax/hare.vim			@rsaihe
 runtime/syntax/haskell.vim		@coot
 runtime/syntax/hgcommit.vim		@k-takata
-runtime/syntax/hitest.vim		@lacygoill
-runtime/syntax/hog.vim			@wtfbbqhax
 runtime/syntax/hollywood.vim		@sodero
 runtime/syntax/html.vim			@dkearns
 runtime/syntax/i3config.vim		@hiqua
@@ -408,12 +379,10 @@ runtime/syntax/javascript.vim		@fleiner
 runtime/syntax/jsonc.vim		@izhakjakov
 runtime/syntax/julia.vim		@carlobaldassi
 runtime/syntax/kconfig.vim		@chrisbra
-runtime/syntax/krl.vim			@KnoP-01
 runtime/syntax/less.vim			@genoma
 runtime/syntax/lex.vim			@cecamp
 runtime/syntax/liquid.vim		@tpope
 runtime/syntax/lisp.vim			@cecamp
-runtime/syntax/lua.vim			@marcuscf
 runtime/syntax/lyrics.vim		@ObserverOfTime
 runtime/syntax/lynx.vim			@dkearns
 runtime/syntax/m3build.vim		@dkearns
@@ -448,13 +417,10 @@ runtime/syntax/prolog.vim		@XVilka
 runtime/syntax/ps1.vim			@heaths
 runtime/syntax/ps1xml.vim		@heaths
 runtime/syntax/psl.vim			@danielkho
-runtime/syntax/pymanifest.vim		@ObserverOfTime
 runtime/syntax/qb64.vim			@dkearns
-runtime/syntax/qml.vim          @ChaseKnowlden
 runtime/syntax/r.vim			@jalvesaq
 runtime/syntax/racket.vim		@benknoble
 runtime/syntax/raml.vim			@in3d
-runtime/syntax/rapid.vim		@KnoP-01
 runtime/syntax/ratpoison.vim		@trapd00r
 runtime/syntax/rc.vim			@chrisbra
 runtime/syntax/rcs.vim			@hdima
@@ -475,7 +441,6 @@ runtime/syntax/sdoc.vim			@gpanders
 runtime/syntax/sed.vim			@dkearns
 runtime/syntax/sh.vim			@cecamp
 runtime/syntax/sm.vim			@cecamp
-runtime/syntax/solidity.vim		@cothi
 runtime/syntax/spec.vim			@ignatenkobrain
 runtime/syntax/sqloracle.vim		@chrisbra
 runtime/syntax/squirrel.vim		@zenmatic
@@ -501,7 +466,6 @@ runtime/syntax/tt2js.vim		@petdance
 runtime/syntax/typescript.vim		@HerringtonDarkholme
 runtime/syntax/typescriptcommon.vim	@HerringtonDarkholme
 runtime/syntax/typescriptreact.vim	@HerringtonDarkholme
-runtime/syntax/unison.vim		@chuwy
 runtime/syntax/vdf.vim			@ObserverOfTime
 runtime/syntax/vim.vim			@cecamp
 runtime/syntax/vroom.vim		@dbarnett
@@ -516,7 +480,6 @@ runtime/syntax/xs.vim			@petdance
 runtime/syntax/xslt.vim			@Boobies
 runtime/syntax/xxd.vim			@cecamp
 runtime/syntax/yacc.vim			@cecamp
-runtime/syntax/zserio.vim		@dpelle
 runtime/syntax/zsh.vim			@chrisbra
 runtime/tutor/tutor.eo			@dpelle
 runtime/tutor/tutor.eo.utf-8		@dpelle
@@ -1,5 +0,0 @@
-# Security Policy
-
-**Please do not report security vulnerabilities through public GitHub issues.**
-
-To report a security vulnerability for MacVim, please either email security@macvim.org, or visit https://github.com/macvim-dev/macvim/security/advisories/new.
@@ -11,7 +11,6 @@ runs:
  using: 'composite'
  steps:
    - name: Set up formula
-      id: setup-formula
      shell: bash
      run: |
        echo '::group::Set up formula'
@@ -24,11 +23,6 @@ runs:

        # Uninstall the already installed formula because we want to build our own
        brew uninstall --ignore-dependencies ${formula} || true
-
-        # Extract Xcode version to serve as part of the key for caching
-        xcode_version=$(xcodebuild -version | tail -1 | sed -E 's/Build version (.*)/\1/')
-        echo "xcode_version=$xcode_version" >> $GITHUB_OUTPUT
-
        echo '::endgroup::'

    - name: Cache keg
@@ -36,10 +30,12 @@ runs:
      uses: actions/cache@v3
      with:
        path: /usr/local/Cellar/${{ inputs.formula }}
-        key: ${{ inputs.formula }}-homebrew-cache-patched-unified-xcode${{ steps.setup-formula.outputs.xcode_version }}-${{ hashFiles(format('{0}.rb', inputs.formula)) }}
+        key: ${{ inputs.formula }}-homebrew-cache-patched-unified-${{ hashFiles(format('{0}.rb', inputs.formula)) }}

    - name: Install formula
      shell: bash
+      env:
+        HOMEBREW_NO_AUTO_UPDATE: '1'
      run: |
        echo '::group::Install formula'
        formula=${{ inputs.formula }}
@@ -1,60 +0,0 @@
-# list of labels and minimatch globs to match to apply the label.
-
-CI:
- any: ['.cirrus.yml']
- any: ['.github/dependabot.yml']
- any: ['.github/labeler.yml']
- any: ['.github/workflows/*']
- any: ['.appveyor.yml']
- any: ['.codecov.yml']
-
-translation:
- any: ['src/po/*.po']
-
-if_lua:
- any: ['src/if_lua.c']
- any: ['src/proto/if_lua.pro']
- any: ['runtime/doc/if_lua.txt']
-
-if_mzscheme:
- any: ['src/if_mzsch.c']
- any: ['src/if_mzsch.h']
- any: ['src/proto/if_mzsch.pro']
- any: ['runtime/doc/if_mzsch.txt']
-
-if_perl:
- any: ['src/if_perl.xs']
- any: ['src/if_perlsfio.c']
- any: ['src/proto/if_perl.pro']
- any: ['src/proto/if_perlsfio.pro']
- any: ['runtime/doc/if_perl.txt']
-
-if_python:
- any: ['src/if_py_both.h']
- any: ['runtime/doc/if_pyth.txt']
- any: ['src/if_python.c']
- any: ['src/if_python3.c']
- any: ['src/proto/if_python.pro']
- any: ['src/proto/if_python3.pro']
-
-if_ruby:
- any: ['src/if_ruby.c']
- any: ['src/proto/if_ruby.pro']
- any: ['runtime/doc/if_ruby.txt']
-
-if_tcl:
- any: ['src/if_tcl.c']
- any: ['src/proto/if_tcl.pro']
- any: ['runtime/doc/if_tcl.txt']
-
-runtime:
- any: ['runtime/ftplugin']
- any: ['runtime/syntax']
- any: ['runtime/indent']
- any: ['runtime/pack/dist/opt/termdebug/plugin/termdebug.vim']
-
-termdebug: runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
-
-netrw:
- any: ['runtime/plugin/netrwPlugin.vim']
- any: ['runtime/autoload/netrw*']
@@ -20,21 +20,20 @@ env:

  CC: clang

-  VERSIONER_PERL_VERSION: '5.30'  # macOS default Perl installation uses this to determine which one to use
-
+  VERSIONER_PERL_VERSION: '5.30'
+  VERSIONER_PYTHON_VERSION: '2.7'
  vi_cv_path_python: /usr/local/bin/python
  vi_cv_path_python3: /usr/local/bin/python3
  vi_cv_path_plain_lua: /usr/local/bin/lua
  vi_cv_path_ruby: /usr/local/opt/ruby/bin/ruby
-  vi_cv_dll_name_perl: /System/Library/Perl/%s/darwin-thread-multi-2level/CORE/libperl.dylib
+  vi_cv_dll_name_perl: /System/Library/Perl/5.30/darwin-thread-multi-2level/CORE/libperl.dylib
  vi_cv_dll_name_python: /usr/local/Frameworks/Python.framework/Versions/2.7/Python
-  vi_cv_dll_name_python3: /usr/local/Frameworks/Python.framework/Versions/Current/Python
-  vi_cv_dll_name_python3_arm64: /opt/homebrew/Frameworks/Python.framework/Versions/Current/Python
+  vi_cv_dll_name_python3: /usr/local/Frameworks/Python.framework/Versions/3.10/Python # Make sure to keep src/MacVim/vimrc synced with the Python version here for the Python DLL detection logic.
+  vi_cv_dll_name_python3_arm64: /opt/homebrew/Frameworks/Python.framework/Versions/3.10/Python
  vi_cv_dll_name_ruby: /usr/local/opt/ruby/lib/libruby.dylib
  vi_cv_dll_name_ruby_arm64: /opt/homebrew/opt/ruby/lib/libruby.dylib
  vi_cv_dll_name_lua_arm64: /opt/homebrew/lib/liblua.dylib

-  MACVIM_APP: src/MacVim/build/Release/MacVim.app
  VIM_BIN: src/MacVim/build/Release/MacVim.app/Contents/MacOS/Vim
  MACVIM_BIN: src/MacVim/build/Release/MacVim.app/Contents/MacOS/MacVim

@@ -53,7 +52,6 @@ jobs:
          # Oldest version of Xcode supported on GitHub Action to test source code backwards compatibility
          - os: macos-11
            xcode: '11.7'
-            extra: [vimtags]

          # Older version of Xcode, and used to publish legacy builds (for macOS 10.9 - 10.12)
          - os: macos-12
@@ -64,14 +62,14 @@ jobs:

          # Most up to date OS and Xcode. Used to publish release for the main build.
          - os: macos-12
-            xcode: '14.2'
+            xcode: '14.1'
            publish: true

    runs-on: ${{ matrix.os }}

    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3

      - name: Set up legacy build
        if: matrix.legacy
@@ -84,13 +82,6 @@ jobs:
          # Later, we pass the --enable-sparkle_1 flag to configure to set the corresponding ifdef.
          ln -fhs Sparkle_1.framework src/MacVim/Sparkle.framework

-      - name: Set up Xcode
-        if: matrix.xcode != ''
-        run: |
-          sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
-          xcode-select -p
-          xcodebuild -version
-
      # Set up, install, and cache gettext library for localization.
      #
      # Instead of using the default binary installed by Homebrew, need to build our own because gettext is statically
@@ -124,6 +115,8 @@ jobs:

      - name: Install packages
        if: matrix.publish
+        env:
+          HOMEBREW_NO_AUTO_UPDATE: 1
        run: |
          brew install python3
          brew install ruby
@@ -140,8 +133,11 @@ jobs:
            brew unlink perl
          fi

-          # With Perl, we need to manually specify the version number because the dylib path depends on it.
-          echo "vi_cv_dll_name_perl=$(printf $vi_cv_dll_name_perl $VERSIONER_PERL_VERSION)" >> $GITHUB_ENV
+      - name: Set up Xcode
+        if: matrix.xcode != ''
+        run: |
+          sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
+          xcode-select -p

      # All set up steps are done. Build and test MacVim below.

@@ -162,7 +158,6 @@ jobs:
              --enable-perlinterp=dynamic
              --enable-pythoninterp=dynamic
              --enable-python3interp=dynamic
-              --with-python3-stable-abi=3.9 # macOS and Xcode currently ships 3.9, so we don't want go higher than that.
              --enable-rubyinterp=dynamic
              --enable-luainterp=dynamic
              --with-lua-prefix=/usr/local
@@ -209,7 +204,27 @@ jobs:
          cat src/auto/config.mk
          cat src/auto/config.h

-      - name: Build
+      # Build Vim first, separately from MacVim, so that we can use it to run
+      # vimtags afterwards to get the most correct help tags before we copy
+      # that into the MacVim bundle.
+      - name: Build Vim
+        env:
+          LC_ALL: C
+        run: |
+          set -o verbose
+
+          NPROC=$(getconf _NPROCESSORS_ONLN)
+          echo "Building Vim with ${NPROC} cores"
+
+          make -C src -j${NPROC} Vim
+
+      # Re-generate Vim help tags, because sometimes the Vim's runtime is not
+      # updated to have the latest tags.
+      - name: Update Vim help tags
+        if: matrix.publish
+        run: make -C runtime/doc vimtags VIMEXE=../../src/vim
+
+      - name: Build MacVim
        env:
          LC_ALL: C
        run: |
@@ -223,37 +238,10 @@ jobs:
      - name: Check version
        run: |
          ${VIM_BIN} --version
-          ${VIM_BIN} -u NONE -i NONE --not-a-term -esNX -V1 -c 'echo "\nprof_nsec:" .. has("prof_nsec") .. "\n"' -c quit
          ${VIM_BIN} -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-1.vim -c quit
          ${VIM_BIN} -u NONE -i NONE --not-a-term -esNX -V1 -S ci/if_ver-2.vim -c quit

      - name: Smoketest
-        run: |
-          set -o verbose
-
-          # Make sure there isn't any dynamic linkage to third-party dependencies in the built binary, as we should only use
-          # static linkage to avoid dependency hell. Test that all those dylib's are in /usr/lib which is bundled with macOS and not third-party.
-          if otool -L ${VIM_BIN} | grep '\.dylib\s' | grep -v '^\s*/usr/lib/'; then
-            echo 'Found external dynamic linkage!'; false
-          fi
-
-          # Make sure that --disable-sparkle flag will properly exclude all references to Sparkle symbols. This is
-          # necessary because we still use weak linking to Sparkle when that flag is set and so references to Sparkle
-          # wouldn't fail the build (we just remove Sparkle.framework from the built app after the fact).
-          if ${{ matrix.publish == false }}; then
-            # Currently we pass --disable-sparkle flag when publish==false
-            if objdump -t ${MACVIM_BIN} | grep "_SPU\|_SUUpdate"; then
-              echo 'Found references to Sparkle even when using --disable-sparkle'; false
-            fi
-          fi
-
-          # Make sure man pages were bundled
-          man -M `pwd`/${MACVIM_APP}/Contents/man -w mvim
-
-          # Make sure xxd was bundled
-          echo "AB" | ${MACVIM_APP}/Contents/bin/xxd | grep "4142"
-
-      - name: Smoketest (publish)
        if: matrix.publish
        run: |
          set -o verbose
@@ -275,6 +263,12 @@ jobs:
          # Check that libsodium is working
          macvim_excmd -c 'set cryptmethod=xchacha20'

+          # Make sure there isn't any dynamic linkage to third-party dependencies in the built binary, as we should only use
+          # static linkage to avoid dependency hell. Test that all those dylib's are in /usr/lib which is bundled with macOS and not third-party.
+          if otool -L ${VIM_BIN} | grep '\.dylib\s' | grep -v '^\s*/usr/lib/'; then
+            echo 'Found external dynamic linkage!'; false
+          fi
+
          # Make sure we are building universal x86_64 / arm64 builds and didn't accidentally create a thin app.
          check_arch() {
            local archs=($(lipo -archs "$1"))
@@ -287,13 +281,6 @@ jobs:
          check_arch "${VIM_BIN}"
          check_arch "${MACVIM_BIN}"

-      - name: Check Vim help tags
-        if: contains(matrix.extra, 'vimtags')
-        run: |
-          # Confirm that we can build the help tags, and they match what's in source.
-          make -C runtime/doc vimtags VIMEXE=../../${VIM_BIN}
-          git diff --exit-code -- runtime/doc/tags
-
      - name: Test
        timeout-minutes: 20
        run: make test
@@ -312,11 +299,7 @@ jobs:
        run: |
          # Use the --skip-jenkins flag to skip the prettify osascript calls which could fail due to permission issues in
          # CI environment.
-          if ${{ matrix.legacy == true }}; then
-            make -C src macvim-dmg-legacy CREATEDMG_FLAGS=--skip-jenkins
-          else
-            make -C src macvim-dmg CREATEDMG_FLAGS=--skip-jenkins
-          fi
+          make -C src macvim-dmg CREATEDMG_FLAGS=--skip-jenkins

          if ${{ matrix.publish_postfix != '' }}; then
            mv src/MacVim/build/Release/MacVim.dmg src/MacVim/build/Release/MacVim${{ matrix.publish_postfix }}.dmg
@@ -44,7 +44,7 @@ jobs:

    steps:
    - name: Checkout repository from github
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
@@ -9,17 +9,18 @@ permissions:

 jobs:
  scan:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04

    env:
      CC: gcc
+      CFLAGS: -Wno-deprecated-declarations
      DEBIAN_FRONTEND: noninteractive
      TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}

    steps:
      - name: Checkout repository from github
        if: env.TOKEN
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3

      - name: Download Coverity
        if: env.TOKEN
@@ -31,15 +32,15 @@ jobs:
      - name: Install packages
        if: env.TOKEN
        run: |
-          sudo apt-get update && sudo apt-get install -y \
+          sudo apt update && sudo apt install -y \
            autoconf \
            gettext \
            libcanberra-dev \
            libperl-dev \
-            python2-dev \
+            python-dev \
            python3-dev \
-            liblua5.4-dev \
-            lua5.4 \
+            liblua5.3-dev \
+            lua5.3 \
            ruby-dev \
            tcl-dev \
            libgtk2.0-dev \
@@ -1,24 +0,0 @@
-# This workflow will triage pull requests and apply a label based on the
-# paths that are modified in the pull request.
-#
-# To use this workflow, you will need to set up a .github/labeler.yml
-# file with configuration.  For more information, see:
-# https://github.com/actions/labeler
-
-name: Labeler
-on: [pull_request_target]
-
-jobs:
-  label:
-
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: write
-
-    steps:
-    - uses: actions/labeler@v4
-      with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"
-        configuration-path: .github/labeler.yml
-        sync-labels: ''
@@ -10,7 +10,7 @@ jobs:
      issues: write
      pull-requests: write
    steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v7
        with:
          any-of-labels: "Response Needed"
          days-before-stale: 45
@@ -68,7 +68,6 @@ src/tags
 /GPATH
 /GTAGS
 /GRTAGS
-nsis/tags

 # Generated by "make test"
 src/po/*.ck
@@ -7,9 +7,9 @@ src/xxd/xxd
 src/auto/if_perl.c
 src/auto/gui_gtk_gresources.c
 src/auto/gui_gtk_gresources.h
-src/auto/os_haiku.rdef
 src/objects/.dirstamp
 src/objects
+src/tags
 src/types.vim

 # We do need src/auto/configure.
@@ -46,15 +46,12 @@ gvimext.lib
 gvim.lib
 runtime/doc/uganda.nsis.txt
 nsis/icons/*
-/vim90/
-.vscode/

 # NetBeans
 nbproject/*

 # Mac OSX
 src/xxd/xxd.dSYM
-.DS_Store

 # All platforms
 *.rej
@@ -65,12 +62,6 @@ src/xxd/xxd.dSYM
 *.pyc
 *.log
 src/po/vim.pot
-src/tags
-/tags
-/GPATH
-/GTAGS
-/GRTAGS
-nsis/tags

 # Generated by "make test"
 src/po/*.ck
@@ -87,16 +78,14 @@ 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
 src/json_test
 src/message_test
 src/kword_test

 # Generated by "make install"
+runtime/doc/tags
 runtime/doc/doctags

 # Generated by "make shadow".  The directory names could be anything but we
@@ -106,10 +95,5 @@ src/shadow-*
 src/runtime
 src/pixmaps

-# other files possibly created by tools
+# other possible files build by tools
 src/cscope.out
-
-# Linter/language server files
-/.cache/clangd/
-/.ccls-cache/
-/compile_commands.json
@@ -18,8 +18,10 @@ SRC_ALL =	\
 		.appveyor.yml \
 		.codecov.yml \
 		ci/appveyor.bat \
+		ci/build-snd-dummy.sh \
 		ci/config.mk*.sed \
 		ci/if_ver*.vim \
+		ci/load-snd-dummy.sh \
 		ci/setup-xvfb.sh \
 		src/Make_all.mak \
 		src/README.md \
@@ -217,7 +219,6 @@ SRC_ALL =	\
 		src/testdir/color_ramp.vim \
 		src/testdir/silent.wav \
 		src/testdir/popupbounce.vim \
-		src/testdir/crash/* \
 		src/proto.h \
 		src/protodef.h \
 		src/proto/alloc.pro \
@@ -709,7 +710,6 @@ RT_ALL =	\
 		runtime/ftoff.vim \
 		runtime/gvimrc_example.vim \
 		runtime/import/dist/vimhelp.vim \
-		runtime/import/dist/vimhighlight.vim \
 		runtime/macros/README.txt \
 		runtime/macros/editexisting.vim \
 		runtime/macros/hanoi/click.me \
@@ -806,11 +806,6 @@ RT_SCRIPTS =	\
 		runtime/syntax/README.txt \
 		runtime/syntax/shared/*.vim \
 		runtime/syntax/shared/README.txt \
-		runtime/syntax/Makefile \
-		runtime/syntax/testdir/README.txt \
-		runtime/syntax/testdir/runtest.vim \
-		runtime/syntax/testdir/input/*.* \
-		runtime/syntax/testdir/dumps/*.dump \

 # Unix runtime
 RT_UNIX =	\
@@ -21,8 +21,8 @@ II) It is allowed to distribute a modified (or extended) version of Vim,
          maintainer will do with your changes and under what license they
          will be distributed is negotiable.  If there has been no negotiation
          then this license, or a later version, also applies to your changes.
-          The current maintainers are listed here: https://github.com/orgs/vim/people.
-          If this changes it will be announced in appropriate places (most likely
+          The current maintainer is Bram Moolenaar <Bram@vim.org>.  If this
+          changes it will be announced in appropriate places (most likely
          vim.sf.net, www.vim.org and/or comp.editors). When it is completely
          impossible to contact the maintainer, the obligation to send him
          your changes ceases.  Once the maintainer has confirmed that he has
@@ -39,15 +39,14 @@ all install uninstall tools config configure reconfig proto depend lint tags typ
 	@echo "Starting make in the src directory."
 	@echo "If there are problems, cd to the src directory and run make there"
 	cd src && $(MAKE) $@
-	@# When the target is "test" also run the indent and syntax tests.
+	@# When the target is "test" also run the indent tests.
 	@if test "$@" = "test"; then \
 		$(MAKE) indenttest; \
-		$(MAKE) syntaxtest; \
 	fi
-	@# When the target is "clean" also clean for the indent and syntax tests.
+	@# When the target is "clean" also clean for the indent tests.
 	@if test "$@" = "clean" -o "$@" = "distclean" -o "$@" = "testclean"; then \
-		(cd runtime/indent && $(MAKE) clean); \
-		(cd runtime/syntax && $(MAKE) clean); \
+		cd runtime/indent && \
+			$(MAKE) clean; \
 	fi

 # Executable used for running the indent tests.
@@ -58,14 +57,6 @@ indenttest:
 		$(MAKE) clean && \
 		$(MAKE) test VIM="$(VIM_FOR_INDENTTEST)"

-# Executable used for running the syntax tests.
-VIM_FOR_SYNTAXTEST = ../../src/vim
-
-syntaxtest:
-	cd runtime/syntax && \
-		$(MAKE) clean && \
-		$(MAKE) test VIMPROG="$(VIM_FOR_SYNTAXTEST)"
-

 #########################################################################
 # 2. Creating the various distribution files.
@@ -122,14 +122,12 @@ If you still have problems or any other questions, use one of the mailing
 lists to discuss them with Vim users and developers:
 	https://www.vim.org/maillist.php

-If nothing else works, report bugs directly to the vim-dev mailing list:
-	<vim-dev@vim.org>
+If nothing else works, report bugs directly:
+	Bram Moolenaar <Bram@vim.org>


 MAIN AUTHOR

-Most of Vim was created by Bram Moolenaar <Bram@vim.org> |Bram-Moolenaar|
+Send any other comments, patches, flowers and suggestions to:

-Send any other comments, patches, flowers and suggestions to the vim-dev mailing list:
-
-	<vim-dev@vim.org>
+	Bram Moolenaar		E-mail:	Bram@vim.org
@@ -1,21 +1,17 @@
-# [![Vim The editor](https://github.com/vim/vim/raw/master/runtime/vimlogo.gif)](https://www.vim.org)
+[![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)
-[![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)
-[![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) [![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>

 If you find a bug or want to discuss the best way to add a new feature, please
-[open an issue](https://github.com/vim/vim/issues/new/choose).
+open an [issue](https://github.com/vim/vim/issues).
 If you have a question or want to discuss the best way to do something with
 Vim, you can use [StackExchange](https://vi.stackexchange.com/)
 or one of the [Maillists](https://www.vim.org/community.php).

-## What is Vim?
+
+## What is Vim? ##

 Vim is a greatly improved version of the good old UNIX editor
 [Vi](https://en.wikipedia.org/wiki/Vi).  Many new
@@ -39,7 +35,7 @@ Amiga DOS, Atari MiNT, BeOS, RISC OS and OS/2.  These are no longer maintained.

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

-## Distribution
+## Distribution ##

 You can often use your favorite package manager to install Vim.  On Mac and
 Linux a small version of Vim is pre-installed, you still need to install Vim
@@ -59,45 +55,48 @@ Some popular places to get the latest Vim:
 * Get a Windows executable from the
 [vim-win32-installer](https://github.com/vim/vim-win32-installer/releases) repository.

-## Compiling
+
+
+## Compiling ##

 If you obtained a binary distribution you don't need to compile Vim.  If you
 obtained a source distribution, all the stuff for compiling Vim is in the
-[`src`](./src/) directory.  See [`src/INSTALL`](./src/INSTALL) for instructions.
+[`src`](/src) directory.  See [`src/INSTALL`](src/INSTALL) for instructions.

-## Installation
+
+## Installation ##

 See one of these files for system-specific instructions.  Either in the
 [READMEdir directory](./READMEdir/) (in the repository) or
 the top directory (if you unpack an archive):

-```
-README_ami.txt		Amiga
-README_unix.txt		Unix
-README_dos.txt		MS-DOS and MS-Windows
-README_mac.txt		Macintosh
-README_haiku.txt	Haiku
-README_vms.txt		VMS
-```
+	README_ami.txt		Amiga
+	README_unix.txt		Unix
+	README_dos.txt		MS-DOS and MS-Windows
+	README_mac.txt		Macintosh
+	README_haiku.txt	Haiku
+	README_vms.txt		VMS

 There are other `README_*.txt` files, depending on the distribution you used.

-## Documentation
+
+## Documentation ##

 The Vim tutor is a one hour training course for beginners.  Often it can be
 started as `vimtutor`.  See `:help tutor` for more information.

 The best is to use `:help` in Vim.  If you don't have an executable yet, read
-[`runtime/doc/help.txt`](./runtime/doc/help.txt).
+[`runtime/doc/help.txt`](/runtime/doc/help.txt).
 It contains pointers to the other documentation files.
 The User Manual reads like a book and is recommended to learn to use
 Vim.  See `:help user-manual`.

-## Copying
+
+## Copying ##

 Vim is Charityware.  You can use and copy it as much as you like, but you are
 encouraged to make a donation to help orphans in Uganda.  Please read the file
-[`runtime/doc/uganda.txt`](./runtime/doc/uganda.txt)
+[`runtime/doc/uganda.txt`](runtime/doc/uganda.txt)
 for details (do `:help uganda` inside Vim).

 Summary of the license: There are no restrictions on using or distributing an
@@ -106,25 +105,28 @@ text must always be included.  For modified versions, a few restrictions apply.
 The license is GPL compatible, you may compile Vim with GPL libraries and
 distribute it.

-## Sponsoring
+
+## Sponsoring ##

 Fixing bugs and adding new features takes a lot of time and effort.  To show
 your appreciation for the work and motivate Bram and others to continue
 working on Vim please send a donation.

 Since Bram is back to a paid job the money will now be used to help children
-in Uganda.  See [`runtime/doc/uganda.txt`](./runtime/doc/uganda.txt).  But
+in Uganda.  See [`runtime/doc/uganda.txt`](runtime/doc/uganda.txt).  But
 at the same time donations increase Bram's motivation to keep working on Vim!

 For the most recent information about sponsoring look on the Vim web site:
 	https://www.vim.org/sponsor/

-## Contributing
+
+## Contributing ##

 If you would like to help make Vim better, see the
-[CONTRIBUTING.md](./CONTRIBUTING.md) file.
+[CONTRIBUTING.md](/CONTRIBUTING.md) file.

-## Information
+
+## Information ##

 If you are on macOS, you can use [Macvim](https://macvim-dev.github.io/macvim/).

@@ -139,15 +141,14 @@ If you still have problems or any other questions, use one of the mailing
 lists to discuss them with Vim users and developers:
 	https://www.vim.org/maillist.php

-If nothing else works, report bugs directly to the vim-dev mailing list:
-	`<vim-dev@vim.org>`
+If nothing else works, report bugs directly:
+	Bram Moolenaar <Bram@vim.org>

-## Main author

-Most of Vim was created by Bram Moolenaar `<Bram@vim.org>`
-[Bram-Moolenaar](https://vimhelp.org/version9.txt.html#Bram-Moolenaar)
+## Main author ##
+
+Send any other comments, patches, flowers and suggestions to:
+	Bram Moolenaar <Bram@vim.org>

-Send any other comments, patches, flowers and suggestions to the vim-dev mailing list:
-	`<vim-dev@vim.org>`

 This is `README.md` for version 9.0 of Vim: Vi IMproved.
@@ -1,8 +0,0 @@
-# Security Policy
-
-## Reporting a vulnerability
-
-If you want to report a security issue, please use [huntr.dev](https://huntr.dev/bounties/disclose?target=https%3A%2F%2Fgithub.com%2Fvim%2Fvim) to privately disclose the issue to us.
-They also have rewards in the form of money, swag and CVEs.
-
-**Please don't publicly disclose the issue until it has been addressed by us.**
@@ -0,0 +1,19 @@
+#!/bin/bash
+set -eu
+
+LINUX_VERSION=$(uname -r | cut -d. -f1-2)
+LINUX_ARCHIVE_FILE=v${LINUX_VERSION}.tar.gz
+LINUX_SOURCE_DIR=linux-${LINUX_VERSION}
+
+mkdir -p "${TMPDIR}"
+cd "${TMPDIR}"
+
+wget -q "https://github.com/torvalds/linux/archive/${LINUX_ARCHIVE_FILE}"
+
+tar -xf "${LINUX_ARCHIVE_FILE}" "${LINUX_SOURCE_DIR}/sound"
+cd "${LINUX_SOURCE_DIR}/sound"
+
+CC=gcc make -C "/lib/modules/$(uname -r)/build" M="${PWD}" CONFIG_SOUND=m CONFIG_SND=m CONFIG_SND_PCM=m CONFIG_SND_DUMMY=m modules
+
+mkdir -p "${SND_DUMMY_DIR}"
+cp soundcore.ko core/snd.ko core/snd-pcm.ko drivers/snd-dummy.ko "${SND_DUMMY_DIR}"
@@ -1,3 +1,3 @@
-/^CFLAGS[[:blank:]]*=/s/$/ -Wall -Wextra -Wshadow -Werror -Wno-deprecated-declarations/
-/^PERL_CFLAGS_EXTRA[[:blank:]]*=/s/$/ -Wno-error=unused-function -Wno-shadow/
+/^CFLAGS[[:blank:]]*=/s/$/ -Wall -Wextra -Wshadow -Werror/
+/^PERL_CFLAGS_EXTRA[[:blank:]]*=/s/$/ -Wno-error=unused-function/
 /^RUBY_CFLAGS_EXTRA[[:blank:]]*=/s/$/ -Wno-error=unused-parameter/
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+if ! modprobe snd-dummy; then
+    # snd-dummy is contained in linux-modules-extra (if exists)
+    apt-get install -yq --no-install-suggests --no-install-recommends "linux-modules-extra-$(uname -r)"
+    modprobe snd-dummy
+fi
@@ -228,28 +228,6 @@ FunctionEnd
 !insertmacro GetParent ""
 !insertmacro GetParent "un."

-# Get home directory
-!macro GetHomeDir un
-Function ${un}GetHomeDir
-  Push $0
-  Push $1
-  ReadEnvStr $0 "HOME"
-  ${If} $0 == ""
-    ReadEnvStr $0 "HOMEDRIVE"
-    ReadEnvStr $1 "HOMEPATH"
-    StrCpy $0 "$0$1"
-    ${If} $0 == ""
-      ReadEnvStr $0 "USERPROFILE"
-    ${EndIf}
-  ${EndIf}
-  Pop $1
-  Exch $0  # put $0 on top of stack, restore $0 to original value
-FunctionEnd
-!macroend
-
-!insertmacro GetHomeDir ""
-!insertmacro GetHomeDir "un."
-
 # Check if Vim is already installed.
 # return: Installed directory. If not found, it will be empty.
 Function CheckOldVim
@@ -542,8 +520,7 @@ SectionGroup $(str_group_plugin) id_group_plugin
 	Section "$(str_section_plugin_home)" id_section_pluginhome
 		SectionIn 1 3

-		# use ShellExecAsUser below instead
-		# StrCpy $1 "$1 -create-directories home"
+		StrCpy $1 "$1 -create-directories home"
 	SectionEnd

 	Section "$(str_section_plugin_vim)" id_section_pluginvim
@@ -617,13 +594,6 @@ Section -call_install_exe
 	DetailPrint "$(str_msg_registering)"
 	nsExec::Exec "$0\install.exe $1"
 	Pop $3
-
-	${If} ${SectionIsSelected} ${id_section_pluginhome}
-	  ReadEnvStr $3 "COMSPEC"
-	  Call GetHomeDir
-	  Pop $4
-	  ShellExecAsUser::ShellExecAsUser "" "$3" '/c "cd /d "$4" & mkdir vimfiles & cd vimfiles & mkdir colors compiler doc ftdetect ftplugin indent keymap plugin syntax"' SW_HIDE
-	${EndIf}
 SectionEnd

 ##########################################################
@@ -1072,8 +1042,15 @@ SectionEnd
 SectionGroup "un.$(str_ungroup_plugin)" id_ungroup_plugin
 	Section /o "un.$(str_unsection_plugin_home)" id_unsection_plugin_home
 		# get the home dir
-		Call un.GetHomeDir
-		Pop $0
+		ReadEnvStr $0 "HOME"
+		${If} $0 == ""
+		  ReadEnvStr $0 "HOMEDRIVE"
+		  ReadEnvStr $1 "HOMEPATH"
+		  StrCpy $0 "$0$1"
+		  ${If} $0 == ""
+		    ReadEnvStr $0 "USERPROFILE"
+		  ${EndIf}
+		${EndIf}

 		${If} $0 != ""
 		  !insertmacro RemoveVimfiles $0
@@ -3,8 +3,9 @@
 # italian.nsi : Italian language strings for gvim NSIS installer.
 #
 # Locale ID    : 1040
+# Locale Name  : it
 # fileencoding : UTF-8
-# Author       : Antonio Colombo, bovirus - revision: 12.05.2023
+# Author       : Antonio Colombo

 !insertmacro MUI_LANGUAGE "Italian"

@@ -21,10 +22,10 @@ LangString ^UninstallCaption ${LANG_ITALIAN} \
 ##############################################################################

 #LangString str_dest_folder          ${LANG_ITALIAN} \
-#    "Cartella installazione (il percorso deve finire con $\"vim$\")"
+#    "Cartella d'installazione (il nome deve finire con $\"vim$\")"

 LangString str_show_readme          ${LANG_ITALIAN} \
-    "Visualizza file README a fine installazione"
+    "Visualizza README al termine dell'installazione"

 # Install types:
 LangString str_type_typical         ${LANG_ITALIAN} \
@@ -42,119 +43,120 @@ LangString str_type_full            ${LANG_ITALIAN} \
 ##############################################################################

 LangString str_section_old_ver      ${LANG_ITALIAN} \
-    "Disinstalla versioni esistenti"
+    "Disinstalla versione/i esistente/i"
 LangString str_desc_old_ver         ${LANG_ITALIAN} \
-    "Disinstalla versioni esistenti di Vim."
+    "Disinstalla versione/i esistente/i di Vim dal vostro sistema."

 LangString str_section_exe          ${LANG_ITALIAN} \
-    "GUI e file supporto Vim"
+    "Vim GUI e file di supporto"
 LangString str_desc_exe             ${LANG_ITALIAN} \
-    "GUI programmi e file di supporto Vim.  Questa componente è indispensabile."
+    "Vim GUI programmi e file di supporto.  Questa componente è indispensabile."

 LangString str_section_console      ${LANG_ITALIAN} \
-    "Console Vim (vim.exe per MS-DOS)"
+    "Vim console (vim.exe per MS-DOS)"
 LangString str_desc_console         ${LANG_ITALIAN} \
    "Versione console di Vim (vim.exe)."

 LangString str_section_batch        ${LANG_ITALIAN} \
    "Crea file .bat"
 LangString str_desc_batch           ${LANG_ITALIAN} \
-    "Crea file .bat per varianti di Vim nella cartella \
+    "Crea file .bat per varianti di Vim nella directory \
     di Windows, per utilizzo da riga di comando."

 LangString str_group_icons          ${LANG_ITALIAN} \
-    "Crea icone Vim"
+    "Crea icone per Vim"
 LangString str_desc_icons           ${LANG_ITALIAN} \
-    "Crea icone Vim per rendere facile l'accesso."
+    "Crea icone per Vim in vari posti, per rendere facile l'accesso."

 LangString str_section_desktop      ${LANG_ITALIAN} \
-    "Icone sul Desktop"
+    "Sul Desktop"
 LangString str_desc_desktop         ${LANG_ITALIAN} \
-    "Crea icone programma gVim sul desktop."
+    "Crea icone per programma gVim sul desktop."

 LangString str_section_start_menu   ${LANG_ITALIAN} \
-    "Gruppo programmi menù START"
+    "Nella cartella del menù START"
 LangString str_desc_start_menu      ${LANG_ITALIAN} \
-    "Aggiunge gruppo programmi al menù START."
+    "Aggiungi Vim alle cartelle del menù START."

 #LangString str_section_quick_launch ${LANG_ITALIAN} \
-#    "Barra avvio veloce"
+#    "Nella barra di Avvio Veloce"
 #LangString str_desc_quick_launch    ${LANG_ITALIAN} \
-#    "Aggiunge un collegamento a Vim nella barra di avvio veloce."
+#    "Aggiungi un puntatore a Vim nella barra di Avvio Veloce."

 LangString str_section_edit_with    ${LANG_ITALIAN} \
-    "Aggiungi Vim al menù contestuale"
+    "Aggiungi Vim al Menù Contestuale"
 LangString str_desc_edit_with       ${LANG_ITALIAN} \
-    "Aggiunge Vim al menu contestuale $\"Apri con...$\"."
+    "Aggiungi Vim alla lista contestuale $\"Apri con...$\"."

 #LangString str_section_edit_with32  ${LANG_ITALIAN} \
-#    "Versione a 32 bit"
+#    "Versione a 32-bit"
 #LangString str_desc_edit_with32     ${LANG_ITALIAN} \
-#    "Aggiungi Vim al menu contestuale $\"Apri con...$\" \
-#     per applicazioni a 32 bit."
+#    "Aggiungi Vim alla lista contestuale $\"Apri con...$\" \
+#     per applicazioni a 32-bit."

 #LangString str_section_edit_with64  ${LANG_ITALIAN} \
-#    "Versione a 64 bit"
+#    "Versione a 64-bit"
 #LangString str_desc_edit_with64     ${LANG_ITALIAN} \
-#    "Aggiunge Vim al menu contestuale $\"Apri con...$\" \
-#     per applicazioni a 64 bit."
+#    "Aggiungi Vim alla lista contestuale $\"Apri con...$\" \
+#     per applicazioni a 64-bit."

 LangString str_section_vim_rc       ${LANG_ITALIAN} \
-    "Crea configurazione predefinita"
+    "Crea configurazione di default"
 LangString str_desc_vim_rc          ${LANG_ITALIAN} \
-    "Crea, se non ne esiste già uno, un file configurazione predefinito (_vimrc) ."
+    "Crea un file configurazione di default (_vimrc) se non \
+     ne esiste già uno."

 LangString str_group_plugin         ${LANG_ITALIAN} \
-    "Crea cartella plugin"
+    "Crea directory per plugin"
 LangString str_desc_plugin          ${LANG_ITALIAN} \
-    "Crea cartella plugin.  I plugin consentono di aggiungere funzionalità \
-     a Vim copiando i relativi file in una di queste cartelle."
+    "Crea directory per plugin.  Consentono di aggiungere funzionalità \
+     a Vim mettendo file in una di queste directory."

 LangString str_section_plugin_home  ${LANG_ITALIAN} \
-    "Privata"
+    "Private"
 LangString str_desc_plugin_home     ${LANG_ITALIAN} \
-    "Crea cartella plugin nella cartella HOME."
+    "Crea directory per plugin nella directory HOME."

 LangString str_section_plugin_vim   ${LANG_ITALIAN} \
-    "Condivisa"
+    "Condivise"
 LangString str_desc_plugin_vim      ${LANG_ITALIAN} \
-    "Crea cartella plugin nella cartella di installazione di Vim \
+    "Crea directory per plugin nella directory di installazione di Vim \
     per uso da parte di tutti gli utenti di questo sistema."

 LangString str_section_nls          ${LANG_ITALIAN} \
-    "Supporto nativo lingua (NLS)"
+    "Supporto Multilingue (NLS)"
 LangString str_desc_nls             ${LANG_ITALIAN} \
-    "Installa i file per il supporto nativo multilingua."
+    "Installa file per supportare messaggi in diverse lingue."

 LangString str_unsection_register   ${LANG_ITALIAN} \
-    "Rimuovi Vim dal registro"
+    "Togli Vim dal Registry"
 LangString str_desc_unregister      ${LANG_ITALIAN} \
-    "Rimuove Vim dal registro di configurazione sistema."
+    "Togli Vim dal Registry di configurazione sistema."

 LangString str_unsection_exe        ${LANG_ITALIAN} \
-    "Elimina programmi/file di supporto Vim"
+    "Cancella programmi/file di supporto Vim"
 LangString str_desc_rm_exe          ${LANG_ITALIAN} \
-    "Elimina tutti i programmi/file di supporto di Vim."
+    "Cancella tutti i programmi/file di supporto di Vim."

 LangString str_ungroup_plugin       ${LANG_ITALIAN} \
-    "Elimina cartelle plugin"
+    "Cancella le directory per plugin"
 LangString str_desc_rm_plugin       ${LANG_ITALIAN} \
-    "Elimina le cartelle plugin se sono vuote."
+    "Cancella le directory per plugin se sono vuote."

 LangString str_unsection_plugin_home ${LANG_ITALIAN} \
    "Private"
 LangString str_desc_rm_plugin_home  ${LANG_ITALIAN} \
-    "Elimina cartelle plugin nella cartella HOME."
+    "Cancella le directory per plugin dalla directory HOME."

 LangString str_unsection_plugin_vim ${LANG_ITALIAN} \
    "Condivise"
 LangString str_desc_rm_plugin_vim   ${LANG_ITALIAN} \
-    "Elimina cartelle plugin nella cartella di installazione di Vim."
+    "Cancella le directory per plugin dalla directory di installazione di Vim."

 LangString str_unsection_rootdir    ${LANG_ITALIAN} \
-    "Elimina la cartella di installazione di Vim"
+    "Cancella la directory di installazione di Vim"
 LangString str_desc_rm_rootdir      ${LANG_ITALIAN} \
-    "Elimina la cartella di installazione di Vim. Contiene i file di configurazione!"
+    "Cancella la directory di installazione di Vim. Contiene i vostri file di configurazione!"


 ##############################################################################
@@ -162,74 +164,75 @@ LangString str_desc_rm_rootdir      ${LANG_ITALIAN} \
 ##############################################################################

 #LangString str_msg_too_many_ver  ${LANG_ITALIAN} \
-#    "Rilevate nel sistema $vim_old_ver_count versioni di Vim.$\r$\n\
+#    "Trovate $vim_old_ver_count versioni di Vim sul vostro sistema.$\r$\n\
 #     Questo programma di installazione può gestire solo \
 #     ${VIM_MAX_OLD_VER} versioni.$\r$\n\
-#     Disinstalla qualche versione precedente e ricomincia."
+#     Disinstallate qualche versione precedente e ricominciate."

 #LangString str_msg_invalid_root  ${LANG_ITALIAN} \
-#    "Nome cartella di installazione non valida: $vim_install_root!$\r$\n\
+#    "Nome di directory di installazione non valida: $vim_install_root!$\r$\n\
 #     Dovrebbe terminare con $\"vim$\"."

 #LangString str_msg_bin_mismatch  ${LANG_ITALIAN} \
-#    "Conflitto nella cartella di installazione!$\r$\n$\r$\n\
-#     La cartella di installazione dev'essere $\"$vim_bin_path$\",$\r$\n\
-#     ma il sistema indica che il percorso è $\"$INSTDIR$\"."
+#    "Conflitto nella directory di installazione!$\r$\n$\r$\n\
+#     Cartella di installazione dev'essere $\"$vim_bin_path$\",$\r$\n\
+#     ma il sistema segnala invece $\"$INSTDIR$\"."

 #LangString str_msg_vim_running   ${LANG_ITALIAN} \
-#    "Vim è ancora in esecuzione nel sistema.$\r$\n\
-#     Per continuare chiudi tutte le sessioni attive di Vim."
+#    "Vim ancora in esecuzione sul vostro sistema.$\r$\n\
+#     Chiudete tutte le sessioni attive di Vim per continuare."

 #LangString str_msg_register_ole  ${LANG_ITALIAN} \
 #    "Tentativo di registrazione di Vim con OLE. \
-#     Non ci sono messaggi che indicano se l'operazione è riuscita."
+#     Non c'è messaggio che indica se è riuscito o no."

 #LangString str_msg_unreg_ole     ${LANG_ITALIAN} \
-#    "Tentativo di rimozione di VIM dal registro via OLE. \
-#     Non ci sono messaggi che indicano se l'operazione è riuscita."
+#    "Tentativo di togliere dal Registry Vim con OLE. \
+#     Non c'è messaggio che indica se è riuscito o no."

 #LangString str_msg_rm_start      ${LANG_ITALIAN} \
-#    "Disinstallazione della versione:"
+#    "Disinstallazione della seguente versione:"

 #LangString str_msg_rm_fail       ${LANG_ITALIAN} \
-#    "Disinstallazione non riuscita per la versione:"
+#    "Disinstallazione non riuscita per la seguente versione:"

 #LangString str_msg_no_rm_key     ${LANG_ITALIAN} \
-#    "Impossibile trovare chiave disinstallazione nel registro."
+#    "Non riesco a trovare chiave di disinstallazione nel Registry."

 #LangString str_msg_no_rm_reg     ${LANG_ITALIAN} \
-#    "Impossibile trovare programma disinstallazione nel registro."
+#    "Non riesco a trovare programma disinstallazione nel Registry."

 #LangString str_msg_no_rm_exe     ${LANG_ITALIAN} \
-#    "Impossibile trovare programma disinstallazione."
+#    "Non riesco a trovare programma disinstallazione."

 #LangString str_msg_rm_copy_fail  ${LANG_ITALIAN} \
-#    "Impossibile copiare il programma disinstallazione in una cartella temporanea."
+#    "Non riesco a copiare programma disinstallazione a una \
+#     directory temporanea."

 #LangString str_msg_rm_run_fail   ${LANG_ITALIAN} \
-#    "Impossibile eseguire programma disinstallazione."
+#    "Non riesco a eseguire programma disinstallazione."

 #LangString str_msg_abort_install ${LANG_ITALIAN} \
-#    "Il programma di disinstallazione verrà chiuso senza aver eseguito nessuna modifica."
+#    "Il programma di disinstallazione verrà chiuso senza aver fatto nulla."

 LangString str_msg_install_fail  ${LANG_ITALIAN} \
-    "Installazione non riuscita."
+    "Installazione non riuscita. Miglior fortuna alla prossima!"

 LangString str_msg_rm_exe_fail   ${LANG_ITALIAN} \
-    "Alcuni file in $0 non sono stati eliminati!$\r$\n\
-     I file vanno rimossi manualmente."
+    "Alcuni file in $0 non sono stati cancellati!$\r$\n\
+     Dovreste cancellarli voi stessi."

 #LangString str_msg_rm_root_fail  ${LANG_ITALIAN} \
-#    "AVVISO: impossibile eliminare $\"$vim_install_root$\", non è vuota!"
+#    "AVVISO: Non posso cancellare $\"$vim_install_root$\", non è vuota!"

 LangString str_msg_uninstalling  ${LANG_ITALIAN} \
-    "Disinstallazione vecchia versione Vim..."
+    "Sto disinstallando la vecchia versione..."

 LangString str_msg_registering   ${LANG_ITALIAN} \
-    "Aggiunta di Vim al registro..."
+    "Sto aggiungendo Vim al Registry..."

 LangString str_msg_unregistering ${LANG_ITALIAN} \
-    "Rimozione di Vim dal registro..."
+    "Sto togliendo Vim dal Registry..."


 ##############################################################################
@@ -239,37 +242,37 @@ LangString str_msg_unregistering ${LANG_ITALIAN} \
 LangString str_vimrc_page_title    ${LANG_ITALIAN} \
    "Scelta impostazioni _vimrc"
 LangString str_vimrc_page_subtitle ${LANG_ITALIAN} \
-    "Scelta impostazioni funzionalità aggiuntive, tastiera e mouse."
+    "Scelta impostazioni per funzionalità ulteriori, tastiera e mouse."

 LangString str_msg_compat_title    ${LANG_ITALIAN} \
-    " Comportamento come Vi / Vim "
+    " comportamento come Vi / Vim "
 LangString str_msg_compat_desc     ${LANG_ITALIAN} \
-    "&Compatibilità e funzionalità"
+    "&Compatibilità e funzionalità ulteriori"
 LangString str_msg_compat_vi       ${LANG_ITALIAN} \
-    "Compatibile Vi"
+    "Compatibile con Vi"
 LangString str_msg_compat_vim      ${LANG_ITALIAN} \
    "Vim originale"
 LangString str_msg_compat_defaults ${LANG_ITALIAN} \
-    "Vim con alcune funzionalità aggiuntive (defaults.vim)"
+    "Vim con alcune funzionalità ulteriori (esecuzione defaults.vim)"
 LangString str_msg_compat_all      ${LANG_ITALIAN} \
-    "Vim con tutte le funzionalità aggiuntive (vimrc_example.vim) (predefinito)"
+    "Vim con tutte le funzionalità ulteriori (esecuzione vimrc_example.vim) (Default)"

 LangString str_msg_keymap_title   ${LANG_ITALIAN} \
-    " Mappature tastiera "
+    " Mappature "
 LangString str_msg_keymap_desc    ${LANG_ITALIAN} \
-    "&Rimappa alcuni tasti Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc.)"
+    "&Rimappatura di alcuni tasti per Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc.)"
 LangString str_msg_keymap_default ${LANG_ITALIAN} \
-    "Non rimappare i tasti (predefinito)"
+    "Non effettuare rimappature di tasti (Default)"
 LangString str_msg_keymap_windows ${LANG_ITALIAN} \
-    "Rimappa solo alcuni tasti"
+    "Rimappare solo alcuni tasti"

 LangString str_msg_mouse_title   ${LANG_ITALIAN} \
    " Mouse "
 LangString str_msg_mouse_desc    ${LANG_ITALIAN} \
-    "&Comportamento pulsanti destro/sinistro"
+    "&Comportamento dei pulsanti destro e sinistro"
 LangString str_msg_mouse_default ${LANG_ITALIAN} \
-    "Destro: menu popup, Sinistro: modalità visuale (predefinito)"
+    "Destro: popup menu, Sinistro: modalità visuale (Default)"
 LangString str_msg_mouse_windows ${LANG_ITALIAN} \
-    "Destro: menu popup, Sinistro: selezione modalità (Windows)"
+    "Destro: popup menu, Sinistro: seleziona modalità (Windows)"
 LangString str_msg_mouse_unix    ${LANG_ITALIAN} \
-    "Destro: estensione selezione, Sinistro: modalità visuale (Unix)"
+    "Destro: estende selezione, Sinistro: modalità visuale (Unix)"
@@ -1,11 +1,10 @@
 vim9script noclear

 # Vim completion script
-# Language:	C
-# Maintainer:	The Vim Project <https://github.com/vim/vim>
-# Last Change:	2023 Aug 10
+# Language:     C
+# Maintainer:   Bram Moolenaar <Bram@vim.org>
 #		Rewritten in Vim9 script by github user lacygoill
-# Former Maintainer:   Bram Moolenaar <Bram@vim.org>
+# Last Change:  2022 Jan 31

 var prepended: string
 var grepCache: dict<list<dict<any>>>
@@ -2,9 +2,8 @@ vim9script

 # Vim functions for file type detection
 #
-# Maintainer:	The Vim Project <https://github.com/vim/vim>
-# Last Change:	2023 Aug 10
-# Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+# Maintainer:	Bram Moolenaar <Bram@vim.org>
+# Last Change:	2022 Dec 14

 # These functions are moved here from runtime/filetype.vim to make startup
 # faster.
@@ -62,7 +61,7 @@ export def FTasmsyntax()
  endif
 enddef

-var ft_visual_basic_content = '\c^\s*\%(Attribute\s\+VB_Name\|Begin\s\+\%(VB\.\|{\%(\x\+-\)\+\x\+}\)\)'
+var ft_visual_basic_content = '\cVB_Name\|Begin VB\.\(Form\|MDIForm\|UserControl\)'

 # See FTfrm() for Visual Basic form file detection
 export def FTbas()
@@ -146,20 +145,12 @@ export def FTcls()
    return
  endif

-  var line1 = getline(1)
-  if line1 =~ '^#!.*\<\%(rexx\|regina\)\>'
-    setf rexx
-    return
-  elseif line1 == 'VERSION 1.0 CLASS'
-    setf vb
-    return
-  endif
-
-  var nonblank1 = getline(nextnonblank(1))
-  if nonblank1 =~ '^\v%(\%|\\)'
+  if getline(1) =~ '^\v%(\%|\\)'
    setf tex
-  elseif nonblank1 =~ '^\s*\%(/\*\|::\w\)'
+  elseif getline(1)[0] == '#' && getline(1) =~ 'rexx'
    setf rexx
+  elseif getline(1) == 'VERSION 1.0 CLASS'
+    setf vb
  else
    setf st
  endif
@@ -295,48 +286,12 @@ export def FTe()
  endif
 enddef

-def IsForth(): bool
-  var first_line = nextnonblank(1)
-
-  # SwiftForth block comment (line is usually filled with '-' or '=') or
-  # OPTIONAL (sometimes precedes the header comment)
-  if getline(first_line) =~? '^\%({\%(\s\|$\)\|OPTIONAL\s\)'
-    return true
-  endif
-
-  var n = first_line
-  while n < 100 && n <= line("$")
-    # Forth comments and colon definitions
-    if getline(n) =~ '^[:(\\] '
-      return true
-    endif
-    n += 1
-  endwhile
-  return false
-enddef
-
-# Distinguish between Forth and Fortran
-export def FTf()
-  if exists("g:filetype_f")
-    exe "setf " .. g:filetype_f
-  elseif IsForth()
-    setf forth
-  else
-    setf fortran
-  endif
-enddef
-
 export def FTfrm()
  if exists("g:filetype_frm")
    exe "setf " .. g:filetype_frm
    return
  endif

-  if getline(1) == "VERSION 5.00"
-    setf vb
-    return
-  endif
-
  var lines = getline(1, min([line("$"), 5]))

  if match(lines, ft_visual_basic_content) > -1
@@ -346,14 +301,20 @@ export def FTfrm()
  endif
 enddef

-# Distinguish between Forth and F#
+# Distinguish between Forth and F#.
+# Provided by Doug Kearns.
 export def FTfs()
  if exists("g:filetype_fs")
    exe "setf " .. g:filetype_fs
-  elseif IsForth()
-    setf forth
  else
-    setf fsharp
+    var line = getline(nextnonblank(1))
+    # comments and colon definitions
+    if line =~ '^\s*\.\=( ' || line =~ '^\s*\\G\= ' || line =~ '^\\$'
+	  \ || line =~ '^\s*: \S'
+      setf forth
+    else
+      setf fsharp
+    endif
  endif
 enddef

@@ -399,8 +360,8 @@ export def ProtoCheck(default: string)
  else
    # recognize Prolog by specific text in the first non-empty line
    # require a blank after the '%' because Perl uses "%list" and "%translate"
-    var lnum = getline(nextnonblank(1))
-    if lnum =~ '\<prolog\>' || lnum =~ '^\s*\(%\+\(\s\|$\)\|/\*\)' || lnum =~ ':-'
+    var l = getline(nextnonblank(1))
+    if l =~ '\<prolog\>' || l =~ '^\s*\(%\+\(\s\|$\)\|/\*\)' || l =~ ':-'
      setf prolog
    else
      exe 'setf ' .. default
@@ -507,28 +468,28 @@ enddef

 # Returns true if file content looks like LambdaProlog module
 def IsLProlog(): bool
-  # skip apparent comments and blank lines, what looks like
+  # skip apparent comments and blank lines, what looks like 
  # LambdaProlog comment may be RAPID header
-  var lnum: number = nextnonblank(1)
-  while lnum > 0 && lnum < line('$') && getline(lnum) =~ '^\s*%' # LambdaProlog comment
-    lnum = nextnonblank(lnum + 1)
+  var l: number = nextnonblank(1)
+  while l > 0 && l < line('$') && getline(l) =~ '^\s*%' # LambdaProlog comment
+    l = nextnonblank(l + 1)
  endwhile
  # this pattern must not catch a go.mod file
-  return getline(lnum) =~ '\<module\s\+\w\+\s*\.\s*\(%\|$\)'
+  return getline(l) =~ '\<module\s\+\w\+\s*\.\s*\(%\|$\)'
 enddef

 # Determine if *.mod is ABB RAPID, LambdaProlog, Modula-2, Modsim III or go.mod
 export def FTmod()
  if exists("g:filetype_mod")
    exe "setf " .. g:filetype_mod
-  elseif expand("<afile>") =~ '\<go.mod$'
-    setf gomod
  elseif IsLProlog()
    setf lprolog
  elseif getline(nextnonblank(1)) =~ '\%(\<MODULE\s\+\w\+\s*;\|^\s*(\*\)'
    setf modula2
  elseif IsRapid()
    setf rapid
+  elseif expand("<afile>") =~ '\<go.mod$'
+    setf gomod
  else
    # Nothing recognized, assume modsim3
    setf modsim3
@@ -541,8 +502,8 @@ export def FTpl()
  else
    # recognize Prolog by specific text in the first non-empty line
    # require a blank after the '%' because Perl uses "%list" and "%translate"
-    var line = getline(nextnonblank(1))
-    if line =~ '\<prolog\>' || line =~ '^\s*\(%\+\(\s\|$\)\|/\*\)' || line =~ ':-'
+    var l = getline(nextnonblank(1))
+    if l =~ '\<prolog\>' || l =~ '^\s*\(%\+\(\s\|$\)\|/\*\)' || l =~ ':-'
      setf prolog
    else
      setf perl
@@ -715,24 +676,26 @@ export def McSetf()
 enddef

 # Called from filetype.vim and scripts.vim.
-# When "setft" is passed and false then the 'filetype' option is not set.
-export def SetFileTypeSH(name: string, setft = true): string
-  if setft && did_filetype()
+export def SetFileTypeSH(name: string)
+  if did_filetype()
    # Filetype was already detected
-    return ''
+    return
  endif
-  if setft && expand("<amatch>") =~ g:ft_ignore_pat
-    return ''
+  if expand("<amatch>") =~ g:ft_ignore_pat
+    return
  endif
  if name =~ '\<csh\>'
    # Some .sh scripts contain #!/bin/csh.
-    return SetFileTypeShell("csh", setft)
+    SetFileTypeShell("csh")
+    return
  elseif name =~ '\<tcsh\>'
    # Some .sh scripts contain #!/bin/tcsh.
-    return SetFileTypeShell("tcsh", setft)
+    SetFileTypeShell("tcsh")
+    return
  elseif name =~ '\<zsh\>'
    # Some .sh scripts contain #!/bin/zsh.
-    return SetFileTypeShell("zsh", setft)
+    SetFileTypeShell("zsh")
+    return
  elseif name =~ '\<ksh\>'
    b:is_kornshell = 1
    if exists("b:is_bash")
@@ -759,43 +722,34 @@ export def SetFileTypeSH(name: string, setft = true): string
      unlet b:is_bash
    endif
  endif
-
-  return SetFileTypeShell("sh", setft)
+  SetFileTypeShell("sh")
 enddef

 # For shell-like file types, check for an "exec" command hidden in a comment,
 # as used for Tcl.
-# When "setft" is passed and false then the 'filetype' option is not set.
 # Also called from scripts.vim, thus can't be local to this script.
-export def SetFileTypeShell(name: string, setft = true): string
-  if setft && did_filetype()
+export def SetFileTypeShell(name: string)
+  if did_filetype()
    # Filetype was already detected
-    return ''
+    return
  endif
-  if setft && expand("<amatch>") =~ g:ft_ignore_pat
-    return ''
+  if expand("<amatch>") =~ g:ft_ignore_pat
+    return
  endif
-
-  var lnum = 2
-  while lnum < 20 && lnum < line("$") && getline(lnum) =~ '^\s*\(#\|$\)'
+  var l = 2
+  while l < 20 && l < line("$") && getline(l) =~ '^\s*\(#\|$\)'
    # Skip empty and comment lines.
-    lnum += 1
+    l += 1
  endwhile
-  if lnum < line("$") && getline(lnum) =~ '\s*exec\s' && getline(lnum - 1) =~ '^\s*#.*\\$'
+  if l < line("$") && getline(l) =~ '\s*exec\s' && getline(l - 1) =~ '^\s*#.*\\$'
    # Found an "exec" line after a comment with continuation
-    var n = substitute(getline(lnum), '\s*exec\s\+\([^ ]*/\)\=', '', '')
+    var n = substitute(getline(l), '\s*exec\s\+\([^ ]*/\)\=', '', '')
    if n =~ '\<tclsh\|\<wish'
-      if setft
-	setf tcl
-      endif
-      return 'tcl'
+      setf tcl
+      return
    endif
  endif
-
-  if setft
-    exe "setf " .. name
-  endif
-  return name
+  exe "setf " .. name
 enddef

 export def CSH()
@@ -1150,73 +1104,5 @@ export def FTlsl()
  endif
 enddef

-export def FTtyp()
-  if exists("g:filetype_typ")
-    exe "setf " .. g:filetype_typ
-    return
-  endif
-
-  # Look for SQL type definition syntax
-  for line in getline(1, 200)
-    # SQL type files may define the casing
-    if line =~ '^CASE\s\==\s\=\(SAME\|LOWER\|UPPER\|OPPOSITE\)$'
-      setf sql
-      return
-    endif
-
-    # SQL type files may define some types as follows
-    if line =~ '^TYPE\s.*$'
-      setf sql
-      return
-    endif
-  endfor
-
-  # Otherwise, affect the typst filetype
-  setf typst
-enddef
-
-# Set the filetype of a *.v file to Verilog, V or Cog based on the first 200
-# lines.
-export def FTv()
-  if did_filetype()
-    # ":setf" will do nothing, bail out early
-    return
-  endif
-
-  for line in getline(1, 200)
-    if line[0] =~ '^\s*/'
-      # skip comment line
-      continue
-    endif
-
-    # Verilog: line ends with ';' followed by an optional variable number of
-    # spaces and an optional start of a comment.
-    # Example: " b <= a + 1; // Add 1".
-    if line =~ ';\(\s*\)\?\(/.*\)\?$'
-      setf verilog
-      return
-    endif
-
-    # Coq: line ends with a '.' followed by an optional variable number of
-    # spaces and an optional start of a comment.
-    # Example: "Definition x := 10. (*".
-    if line =~ '\.\(\s*\)\?\((\*.*\)\?$'
-      setf coq
-      return
-    endif
-  endfor
-
-  # No line matched, fall back to "v".
-  setf v
-enddef
-
-export def FTvba()
-  if getline(1) =~ '^["#] Vimball Archiver'
-    setf vim
-  else
-    setf vb
-  endif
-enddef
-
 # Uncomment this line to check for compilation errors early
 # defcompile
@@ -1,9 +1,9 @@
 " Vim filetype plugin autoload file
 " Language:	man
-" Maintainer:	Jason Franklin <jason@oneway.dev>
+" Maintainer:	Jason Franklin <vim@justemail.net>
 " Maintainer:	SungHyun Nam <goweol@gmail.com>
 " Autoload Split: Bram Moolenaar
-" Last Change: 	2023 Jun 28
+" Last Change: 	2022 Jun 18

 let s:cpo_save = &cpo
 set cpo-=C
@@ -21,65 +21,31 @@ catch /E145:/
  " Ignore the error in restricted mode
 endtry

-func s:ParseIntoPageAndSection()
-  " Accommodate a reference that terminates in a hyphen.
-  "
-  " See init_charset_table() at
-  " https://git.savannah.gnu.org/cgit/groff.git/tree/src/roff/troff/input.cpp?h=1.22.4#n6794
-  "
-  " See can_break_after() at
-  " https://git.savannah.gnu.org/cgit/groff.git/tree/src/roff/troff/charinfo.h?h=1.22.4#n140
-  "
-  " Assumptions and limitations:
-  " 1) Manual-page references (in consequence of command-related filenames)
-  "    do not contain non-ASCII HYPHENs (0x2010), any terminating HYPHEN
-  "    must have been introduced to mark division of a word at the end of
-  "    a line and can be discarded; whereas similar references may contain
-  "    ASCII HYPHEN-MINUSes (0x002d) and any terminating HYPHEN-MINUS forms
-  "    a compound word in addition to marking word division.
-  " 2) Well-formed manual-page references always have a section suffix, e.g.
-  "    "git-commit(1)", therefore suspended hyphenated compounds are not
-  "    determined, e.g.     [V] (With cursor at _git-merge-_ below...)
-  "    ".................... git-merge- and git-merge-base. (See git-cherry-
-  "    pick(1) and git-cherry(1).)" (... look up "git-merge-pick(1)".)
-  "
-  " Note that EM DASH (0x2014), a third stooge from init_charset_table(),
-  " neither connects nor divides parts of a word.
-  let str = expand("<cWORD>")
-
-  if str =~ '\%u2010$'	" HYPHEN (-1).
-    let str = strpart(str, 0, strridx(str, "\u2010"))
-
-    " Append the leftmost WORD (or an empty string) from the line below.
-    let str .= get(split(get(getbufline(bufnr('%'), line('.') + 1), 0, '')), 0, '')
-  elseif str =~ '-$'	" HYPHEN-MINUS.
-    " Append the leftmost WORD (or an empty string) from the line below.
-    let str .= get(split(get(getbufline(bufnr('%'), line('.') + 1), 0, '')), 0, '')
-  endif
-
-  " According to man(1), section name formats vary (MANSECT):
-  " 1 n l 8 3 2 3posix 3pm 3perl 3am 5 4 9 6 7
-  let parts = matchlist(str, '\(\k\+\)(\(\k\+\))')
-  return (len(parts) > 2)
-	  \ ? {'page': parts[1], 'section': parts[2]}
-	  \ : {'page': matchstr(str, '\k\+'), 'section': ''}
-endfunc
-
 func dist#man#PreGetPage(cnt)
  if a:cnt == 0
-    let what = s:ParseIntoPageAndSection()
-    let sect = what.section
-    let page = what.page
+    let old_isk = &iskeyword
+    if &ft == 'man'
+      setl iskeyword+=(,)
+    endif
+    let str = expand("<cword>")
+    let &l:iskeyword = old_isk
+    let page = substitute(str, '(*\(\k\+\).*', '\1', '')
+    let sect = substitute(str, '\(\k\+\)(\([^()]*\)).*', '\2', '')
+    if match(sect, '^[0-9 ]\+$') == -1
+      let sect = ""
+    endif
+    if sect == page
+      let sect = ""
+    endif
  else
-    let what = s:ParseIntoPageAndSection()
    let sect = a:cnt
-    let page = what.page
+    let page = expand("<cword>")
  endif
-
  call dist#man#GetPage('', sect, page)
 endfunc

 func s:GetCmdArg(sect, page)
+
  if empty(a:sect)
    return shellescape(a:page)
  endif
@@ -109,11 +75,9 @@ func dist#man#GetPage(cmdmods, ...)
    return
  endif

-  " To support:	    nmap K :Man <cWORD><CR>
-  if page ==? '<cword>'
-    let what = s:ParseIntoPageAndSection()
-    let sect = what.section
-    let page = what.page
+  " To support:	    nmap K :Man <cword>
+  if page == '<cword>'
+    let page = expand('<cword>')
  endif

  if !exists('g:ft_man_no_sect_fallback') || (g:ft_man_no_sect_fallback == 0)
@@ -190,14 +154,9 @@ func dist#man#GetPage(cmdmods, ...)
  endif
  let env_cmd = s:env_has_u ? 'env -u MANPAGER' : 'env MANPAGER=cat'
  let env_cmd .= ' GROFF_NO_SGR=1'
-  let man_cmd = env_cmd . ' man ' . s:GetCmdArg(sect, page)
-
+  let man_cmd = env_cmd . ' man ' . s:GetCmdArg(sect, page) . ' | col -b'
  silent exec "r !" . man_cmd

-  " Emulate piping the buffer through the "col -b" command.
-  " Ref: https://github.com/vim/vim/issues/12301
-  silent! keepjumps keeppatterns %s/\v(.)\b\ze\1?//ge
-
  if unsetwidth
    let $MANWIDTH = ''
  endif
@@ -221,10 +180,9 @@ func dist#man#PopPage()
    exec "let s:man_tag_buf=s:man_tag_buf_".s:man_tag_depth
    exec "let s:man_tag_lin=s:man_tag_lin_".s:man_tag_depth
    exec "let s:man_tag_col=s:man_tag_col_".s:man_tag_depth
-
    exec s:man_tag_buf."b"
-    call cursor(s:man_tag_lin, s:man_tag_col)
-
+    exec s:man_tag_lin
+    exec "norm! ".s:man_tag_col."|"
    exec "unlet s:man_tag_buf_".s:man_tag_depth
    exec "unlet s:man_tag_lin_".s:man_tag_depth
    exec "unlet s:man_tag_col_".s:man_tag_depth
@@ -3,9 +3,8 @@ vim9script
 # Vim function for detecting a filetype from the file contents.
 # Invoked from "scripts.vim" in 'runtimepath'
 #
-# Maintainer:	The Vim Project <https://github.com/vim/vim>
-# Last Change:	2023 Aug 10
-# Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+# Maintainer:	Bram Moolenaar <Bram@vim.org>
+# Last Change:	2022 Nov 24

 export def DetectFiletype()
  var line1 = getline(1)
@@ -45,7 +44,7 @@ def DetectFromHashBang(firstline: string)
  elseif line1 =~ '^#!\s*[^/\\ ]*\>\([^/\\]\|$\)'
    name = substitute(line1, '^#!\s*\([^/\\ ]*\>\).*', '\1', '')
  else
-    name = substitute(line1, '^#!\s*\S*[/\\]\(\f\+\).*', '\1', '')
+    name = substitute(line1, '^#!\s*\S*[/\\]\(\i\+\).*', '\1', '')
  endif

  # tcl scripts may have #!/bin/sh in the first line and "exec wish" in the
@@ -54,172 +53,151 @@ def DetectFromHashBang(firstline: string)
    name = 'wish'
  endif

-  var ft = Exe2filetype(name, line1)
-  if ft != ''
-    exe 'setl ft=' .. ft
-  endif
-enddef
-
-# Returns the filetype name associated with program "name".
-# "line1" is the #! line at the top of the file.  Use the same as "name" if
-# not available.
-# Returns an empty string when not recognized.
-export def Exe2filetype(name: string, line1: string): string
    # Bourne-like shell scripts: bash bash2 dash ksh ksh93 sh
  if name =~ '^\(bash\d*\|dash\|ksh\d*\|sh\)\>'
-    return dist#ft#SetFileTypeSH(line1, false)
+    call dist#ft#SetFileTypeSH(line1)

    # csh scripts
  elseif name =~ '^csh\>'
-    return dist#ft#SetFileTypeShell(exists("g:filetype_csh") ? g:filetype_csh : 'csh', false)
+    if exists("g:filetype_csh")
+      call dist#ft#SetFileTypeShell(g:filetype_csh)
+    else
+      call dist#ft#SetFileTypeShell("csh")
+    endif

    # tcsh scripts
  elseif name =~ '^tcsh\>'
-    return dist#ft#SetFileTypeShell("tcsh", false)
+    call dist#ft#SetFileTypeShell("tcsh")

    # Z shell scripts
  elseif name =~ '^zsh\>'
-    return 'zsh'
+    set ft=zsh

    # TCL scripts
  elseif name =~ '^\(tclsh\|wish\|expectk\|itclsh\|itkwish\)\>'
-    return 'tcl'
+    set ft=tcl

    # Expect scripts
  elseif name =~ '^expect\>'
-    return 'expect'
+    set ft=expect

    # Gnuplot scripts
  elseif name =~ '^gnuplot\>'
-    return 'gnuplot'
+    set ft=gnuplot

    # Makefiles
  elseif name =~ 'make\>'
-    return 'make'
+    set ft=make

    # Pike
  elseif name =~ '^pike\%(\>\|[0-9]\)'
-    return 'pike'
+    set ft=pike

    # Lua
  elseif name =~ 'lua'
-    return 'lua'
+    set ft=lua

    # Perl
  elseif name =~ 'perl'
-    return 'perl'
+    set ft=perl

    # PHP
  elseif name =~ 'php'
-    return 'php'
+    set ft=php

    # Python
  elseif name =~ 'python'
-    return 'python'
+    set ft=python

    # Groovy
  elseif name =~ '^groovy\>'
-    return 'groovy'
+    set ft=groovy

    # Raku
  elseif name =~ 'raku'
-    return 'raku'
+    set ft=raku

    # Ruby
  elseif name =~ 'ruby'
-    return 'ruby'
+    set ft=ruby

    # JavaScript
  elseif name =~ 'node\(js\)\=\>\|js\>' || name =~ 'rhino\>'
-    return 'javascript'
+    set ft=javascript

    # BC calculator
  elseif name =~ '^bc\>'
-    return 'bc'
+    set ft=bc

    # sed
  elseif name =~ 'sed\>'
-    return 'sed'
+    set ft=sed

    # OCaml-scripts
  elseif name =~ 'ocaml'
-    return 'ocaml'
+    set ft=ocaml

    # Awk scripts; also finds "gawk"
  elseif name =~ 'awk\>'
-    return 'awk'
+    set ft=awk

    # Website MetaLanguage
  elseif name =~ 'wml'
-    return 'wml'
+    set ft=wml

    # Scheme scripts
  elseif name =~ 'scheme'
-    return 'scheme'
+    set ft=scheme

    # CFEngine scripts
  elseif name =~ 'cfengine'
-    return 'cfengine'
+    set ft=cfengine

    # Erlang scripts
  elseif name =~ 'escript'
-    return 'erlang'
+    set ft=erlang

    # Haskell
  elseif name =~ 'haskell'
-    return 'haskell'
+    set ft=haskell

    # Scala
  elseif name =~ 'scala\>'
-    return 'scala'
+    set ft=scala

    # Clojure
  elseif name =~ 'clojure'
-    return 'clojure'
+    set ft=clojure

    # Free Pascal
  elseif name =~ 'instantfpc\>'
-    return 'pascal'
+    set ft=pascal

    # Fennel
  elseif name =~ 'fennel\>'
-    return 'fennel'
+    set ft=fennel

    # MikroTik RouterOS script
  elseif name =~ 'rsc\>'
-    return 'routeros'
+    set ft=routeros

    # Fish shell
  elseif name =~ 'fish\>'
-    return 'fish'
+    set ft=fish

    # Gforth
  elseif name =~ 'gforth\>'
-    return 'forth'
+    set ft=forth

    # Icon
  elseif name =~ 'icon\>'
-    return 'icon'
+    set ft=icon

    # Guile
  elseif name =~ 'guile'
-    return 'scheme'
-
-    # Nix
-  elseif name =~ 'nix-shell'
-    return 'nix'
-
-    # Crystal
-  elseif name =~ '^crystal\>'
-    return 'crystal'
-
-    # Rexx
-  elseif name =~ '^\%(rexx\|regina\)\>'
-    return 'rexx'
+    set ft=scheme

  endif
-
-  return ''
 enddef


@@ -240,28 +218,28 @@ def DetectFromText(line1: string)
      || "\n" .. line1 .. "\n" .. line2 .. "\n" .. line3 ..
 	 "\n" .. line4 .. "\n" .. line5
 	 =~ '\n\s*emulate\s\+\%(-[LR]\s\+\)\=[ckz]\=sh\>'
-    setl ft=zsh
+    set ft=zsh

  # ELM Mail files
  elseif line1 =~ '^From \([a-zA-Z][a-zA-Z_0-9\.=-]*\(@[^ ]*\)\=\|-\) .* \(19\|20\)\d\d$'
-    setl ft=mail
+    set ft=mail

  # Mason
  elseif line1 =~ '^<[%&].*>'
-    setl ft=mason
+    set ft=mason

  # Vim scripts (must have '" vim' as the first line to trigger this)
  elseif line1 =~ '^" *[vV]im$'
-    setl ft=vim
+    set ft=vim

  # libcxx and libstdc++ standard library headers like "iostream" do not have
  # an extension, recognize the Emacs file mode.
  elseif line1 =~? '-\*-.*C++.*-\*-'
-    setl ft=cpp
+    set ft=cpp

  # MOO
  elseif line1 =~ '^\*\* LambdaMOO Database, Format Version \%([1-3]\>\)\@!\d\+ \*\*$'
-    setl ft=moo
+    set ft=moo

    # Diff file:
    # - "diff" in first line (context diff)
@@ -280,11 +258,11 @@ def DetectFromText(line1: string)
 	 || (line1 =~ '^\*\*\* ' && line2 =~ '^--- ')
 	 || (line1 =~ '^=== ' && ((line2 =~ '^=\{66\}' && line3 =~ '^--- ' && line4 =~ '^+++') || (line2 =~ '^--- ' && line3 =~ '^+++ ')))
 	 || (line1 =~ '^=== \(removed\|added\|renamed\|modified\)')
-    setl ft=diff
+    set ft=diff

    # PostScript Files (must have %!PS as the first line, like a2ps output)
  elseif line1 =~ '^%![ \t]*PS'
-    setl ft=postscr
+    set ft=postscr

    # M4 scripts: Guess there is a line that starts with "dnl".
  elseif line1 =~ '^\s*dnl\>'
@@ -292,64 +270,64 @@ def DetectFromText(line1: string)
 	 || line3 =~ '^\s*dnl\>'
 	 || line4 =~ '^\s*dnl\>'
 	 || line5 =~ '^\s*dnl\>'
-    setl ft=m4
+    set ft=m4

    # AmigaDos scripts
  elseif $TERM == "amiga" && (line1 =~ "^;" || line1 =~? '^\.bra')
-    setl ft=amiga
+    set ft=amiga

    # SiCAD scripts (must have procn or procd as the first line to trigger this)
  elseif line1 =~? '^ *proc[nd] *$'
-    setl ft=sicad
+    set ft=sicad

    # Purify log files start with "****  Purify"
  elseif line1 =~ '^\*\*\*\*  Purify'
-    setl ft=purifylog
+    set ft=purifylog

    # XML
  elseif line1 =~ '<?\s*xml.*?>'
-    setl ft=xml
+    set ft=xml

    # XHTML (e.g.: PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN")
  elseif line1 =~ '\<DTD\s\+XHTML\s'
-    setl ft=xhtml
+    set ft=xhtml

    # HTML (e.g.: <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN")
    # Avoid "doctype html", used by slim.
  elseif line1 =~? '<!DOCTYPE\s\+html\>'
-    setl ft=html
+    set ft=html

    # PDF
  elseif line1 =~ '^%PDF-'
-    setl ft=pdf
+    set ft=pdf

    # XXD output
  elseif line1 =~ '^\x\{7}: \x\{2} \=\x\{2} \=\x\{2} \=\x\{2} '
-    setl ft=xxd
+    set ft=xxd

    # RCS/CVS log output
  elseif line1 =~ '^RCS file:' || line2 =~ '^RCS file:'
-    setl ft=rcslog
+    set ft=rcslog

    # CVS commit
  elseif line2 =~ '^CVS:' || getline("$") =~ '^CVS: '
-    setl ft=cvs
+    set ft=cvs

    # Prescribe
  elseif line1 =~ '^!R!'
-    setl ft=prescribe
+    set ft=prescribe

    # Send-pr
  elseif line1 =~ '^SEND-PR:'
-    setl ft=sendpr
+    set ft=sendpr

    # SNNS files
  elseif line1 =~ '^SNNS network definition file'
-    setl ft=snnsnet
+    set ft=snnsnet
  elseif line1 =~ '^SNNS pattern definition file'
-    setl ft=snnspat
+    set ft=snnspat
  elseif line1 =~ '^SNNS result file'
-    setl ft=snnsres
+    set ft=snnsres

    # Virata
  elseif line1 =~ '^%.\{-}[Vv]irata'
@@ -357,81 +335,79 @@ def DetectFromText(line1: string)
 	 || line3 =~ '^%.\{-}[Vv]irata'
 	 || line4 =~ '^%.\{-}[Vv]irata'
 	 || line5 =~ '^%.\{-}[Vv]irata'
-    setl ft=virata
+    set ft=virata

    # Strace
-    # inaccurate fast match first, then use accurate slow match
-  elseif (line1 =~ 'execve(' && line1 =~ '^[0-9:.]* *execve(')
-	   || line1 =~ '^__libc_start_main'
-    setl ft=strace
+  elseif line1 =~ '[0-9:.]* *execve(' || line1 =~ '^__libc_start_main'
+    set ft=strace

    # VSE JCL
  elseif line1 =~ '^\* $$ JOB\>' || line1 =~ '^// *JOB\>'
-    setl ft=vsejcl
+    set ft=vsejcl

    # TAK and SINDA
  elseif line4 =~ 'K & K  Associates' || line2 =~ 'TAK 2000'
-    setl ft=takout
+    set ft=takout
  elseif line3 =~ 'S Y S T E M S   I M P R O V E D '
-    setl ft=sindaout
+    set ft=sindaout
  elseif getline(6) =~ 'Run Date: '
-    setl ft=takcmp
+    set ft=takcmp
  elseif getline(9) =~ 'Node    File  1'
-    setl ft=sindacmp
+    set ft=sindacmp

    # DNS zone files
  elseif line1 .. line2 .. line3 .. line4 =~ '^; <<>> DiG [0-9.]\+.* <<>>\|$ORIGIN\|$TTL\|IN\s\+SOA'
-    setl ft=bindzone
+    set ft=bindzone

    # BAAN
  elseif line1 =~ '|\*\{1,80}' && line2 =~ 'VRC '
 	 || line2 =~ '|\*\{1,80}' && line3 =~ 'VRC '
-    setl ft=baan
+    set ft=baan

    # Valgrind
  elseif line1 =~ '^==\d\+== valgrind' || line3 =~ '^==\d\+== Using valgrind'
-    setl ft=valgrind
+    set ft=valgrind

    # Go docs
  elseif line1 =~ '^PACKAGE DOCUMENTATION$'
-    setl ft=godoc
+    set ft=godoc

    # Renderman Interface Bytestream
  elseif line1 =~ '^##RenderMan'
-    setl ft=rib
+    set ft=rib

    # Scheme scripts
  elseif line1 =~ 'exec\s\+\S*scheme' || line2 =~ 'exec\s\+\S*scheme'
-    setl ft=scheme
+    set ft=scheme

    # Git output
  elseif line1 =~ '^\(commit\|tree\|object\) \x\{40,\}\>\|^tag \S\+$'
-    setl ft=git
+    set ft=git

    # Gprof (gnu profiler)
  elseif line1 == 'Flat profile:'
 	&& line2 == ''
 	&& line3 =~ '^Each sample counts as .* seconds.$'
-    setl ft=gprof
+    set ft=gprof

    # Erlang terms
    # (See also: http://www.gnu.org/software/emacs/manual/html_node/emacs/Choosing-Modes.html#Choosing-Modes)
  elseif line1 =~? '-\*-.*erlang.*-\*-'
-    setl ft=erlang
+    set ft=erlang

    # YAML
  elseif line1 =~ '^%YAML'
-    setl ft=yaml
+    set ft=yaml

    # MikroTik RouterOS script
  elseif line1 =~ '^#.*by RouterOS.*$'
-    setl ft=routeros
+    set ft=routeros

    # Sed scripts
    # #ncomment is allowed but most likely a false positive so require a space
    # before any trailing comment text
  elseif line1 =~ '^#n\%($\|\s\)'
-    setl ft=sed
+    set ft=sed

  else
    var lnum = 1
@@ -440,7 +416,7 @@ def DetectFromText(line1: string)
    endwhile
    if getline(lnum) =~ '^Index:\s\+\f\+$'
      # CVS diff
-      setl ft=diff
+      set ft=diff

      # locale input files: Formal Definitions of Cultural Conventions
      # filename must be like en_US, fr_FR@euro or en_US.UTF-8
@@ -2,7 +2,7 @@ vim9script

 # Language:     Vim script
 # Maintainer:   github user lacygoill
-# Last Change:  2023 Jun 29
+# Last Change:  2023 Feb 01

 # NOTE: Whenever you change the code, make sure the tests are still passing:
 #
@@ -112,6 +112,10 @@ const DICT_KEY: string = '^\s*\%('
    .. '\)'
    .. ':\%(\s\|$\)'

+# NOT_A_DICT_KEY {{{3
+
+const NOT_A_DICT_KEY: string = ':\@!'
+
 # END_OF_COMMAND {{{3

 const END_OF_COMMAND: string = $'\s*\%($\|||\@!\|{INLINE_COMMENT}\)'
@@ -193,13 +197,13 @@ patterns =<< trim eval END
    ldo\=\>!\=
    tabdo\=\>
    windo\>
-    au\%[tocmd]\>!\=.*
-    com\%[mand]\>!\=.*
+    au\%[tocmd]\>.*
+    com\%[mand]\>.*
    g\%[lobal]!\={PATTERN_DELIMITER}.*
    v\%[global]!\={PATTERN_DELIMITER}.*
 END

-const HIGHER_ORDER_COMMAND: string = $'\%(^\|{BAR_SEPARATION}\)\s*\<\%({patterns->join('\|')}\)\%(\s\|$\)\@='
+const HIGHER_ORDER_COMMAND: string = $'\%(^\|{BAR_SEPARATION}\)\s*\<\%({patterns->join('\|')}\){NOT_A_DICT_KEY}'

 # START_MIDDLE_END {{{3

@@ -250,7 +254,7 @@ START_MIDDLE_END = START_MIDDLE_END
        kwds->map((_, kwd: string) => kwd == ''
        ? ''
        : $'\%(^\|{BAR_SEPARATION}\|\<sil\%[ent]\|{HIGHER_ORDER_COMMAND}\)\s*'
-        .. $'\<\%({kwd}\)\>\%(\s\|$\|!\)\@=\%(\s*{OPERATOR}\)\@!'))
+        .. $'\<\%({kwd}\)\>\%(\s*{OPERATOR}\)\@!'))

 lockvar! START_MIDDLE_END

@@ -275,7 +279,7 @@ patterns = BLOCKS

 const ENDS_BLOCK_OR_CLAUSE: string = '^\s*\%(' .. patterns->join('\|') .. $'\){END_OF_COMMAND}'
    .. $'\|^\s*cat\%[ch]\%(\s\+\({PATTERN_DELIMITER}\).*\1\)\={END_OF_COMMAND}'
-    .. $'\|^\s*elseif\=\>\%(\s\|$\)\@=\%(\s*{OPERATOR}\)\@!'
+    .. $'\|^\s*elseif\=\>\%({OPERATOR}\)\@!'

 # STARTS_NAMED_BLOCK {{{3

@@ -292,7 +296,7 @@ patterns = []
    endfor
 }

-const STARTS_NAMED_BLOCK: string = $'^\s*\%(sil\%[ent]\s\+\)\=\%({patterns->join('\|')}\)\>\%(\s\|$\|!\)\@='
+const STARTS_NAMED_BLOCK: string = $'^\s*\%(sil\%[ent]\s\+\)\=\%({patterns->join('\|')}\)\>{NOT_A_DICT_KEY}'

 # STARTS_CURLY_BLOCK {{{3

@@ -308,7 +312,7 @@ const STARTS_CURLY_BLOCK: string = '\%('

 # STARTS_FUNCTION {{{3

-const STARTS_FUNCTION: string = $'^\s*\%({MODIFIERS.def}\)\=def\>!\=\s\@='
+const STARTS_FUNCTION: string = $'^\s*\%({MODIFIERS.def}\)\=def\>{NOT_A_DICT_KEY}'

 # ENDS_FUNCTION {{{3

@@ -1117,8 +1121,13 @@ def Is_IN_KeywordForLoop(line_1: string, line_2: string): bool # {{{3
 enddef

 def InCommentOrString(): bool # {{{3
-    return synstack('.', col('.'))
-        ->indexof((_, id: number): bool => synIDattr(id, 'name') =~ '\ccomment\|string\|heredoc') >= 0
+    for synID: number in synstack('.', col('.'))
+        if synIDattr(synID, 'name') =~ '\ccomment\|string\|heredoc'
+            return true
+        endif
+    endfor
+
+    return false
 enddef

 def AlsoClosesBlock(line_B: dict<any>): bool # {{{3
@@ -1,7 +1,6 @@
 " Vim autoload file for editing compressed files.
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
-" Last Change:	2023 Aug 10
-" Former Maintainer: Bram Moolenaar <Bram@vim.org>
+" Maintainer: Bram Moolenaar <Bram@vim.org>
+" Last Change: 2016 Sep 28

 " These functions are used by the gzip plugin.

@@ -10,20 +9,12 @@
 fun s:check(cmd)
  let name = substitute(a:cmd, '\(\S*\).*', '\1', '')
  if !exists("s:have_" . name)
-    " safety check, don't execute anything from the current directory
-    let s:tmp_cwd = getcwd()
-    let f = (fnamemodify(exepath(name), ":p:h") !=# s:tmp_cwd
-          \ || (index(split($PATH,has("win32")? ';' : ':'), s:tmp_cwd) != -1 && s:tmp_cwd != '.'))
-    unlet s:tmp_cwd
-    if !f
-      echoerr "Warning: NOT executing " .. name .. " from current directory!"
-    endif
    let e = executable(name)
    if e < 0
      let r = system(name . " --version")
      let e = (r !~ "not found" && r != "")
    endif
-    exe "let s:have_" . name . "=" . (e && f)
+    exe "let s:have_" . name . "=" . e
  endif
  exe "return s:have_" . name
 endfun
@@ -156,8 +156,8 @@ function! javascriptcomplete#CompleteJS(findstart, base)
 					\ 'text', 'vLink']
 		let bodys = bodyprop
 		" Document - document.
-		let docuprop = ['anchors', 'applets', 'body', 'characterSet', 'childNodes',
-					\ 'doctype', 'documentElement', 'documentURI', 'embeds', 'fonts', 'forms',
+		let docuprop = ['anchors', 'body', 'characterSet', 'doctype',
+					\ 'documentElement', 'documentURI', 'embeds', 'fonts', 'forms',
 					\ 'head', 'hidden', 'images', 'implementation', 'lastStyleSheetSet',
 					\ 'links', 'plugins', 'preferredStyleSheetSet', 'scripts',
 					\ 'scrollingElement', 'selectedStyleSheetSet', 'styleSheetSets',
@@ -171,7 +171,7 @@ function! javascriptcomplete#CompleteJS(findstart, base)
 					\ 'createEvent', 'createExpression', 'createNSResolver',
 					\ 'createNodeIterator', 'createProcessingInstruction', 'createRange',
 					\ 'createTextNode', 'createTouchList', 'createTreeWalker',
-					\ 'enableStyleSheetsForSet', 'evaluate', 'focus', 
+					\ 'enableStyleSheetsForSet', 'evaluate', 'focus', 'getElementById',
 					\ 'getElementById', 'getElementsByClassName', 'getElementsByName',
 					\ 'getElementsByTagName', 'getElementsByTagNameNS',
 					\ 'hasStorageAccess', 'importNode', 'onClick', 'onDblClick',
@@ -1,7 +1,7 @@
 vim9script
 # Support scripts for MacVim-specific functionality
 # Maintainer:   Yee Cheng Chin (macvim-dev@macvim.org)
-# Last Change:  2023-03-15
+# Last Change:  2022-10-14

 # Retrieves the text under the selection, without polluting the registers.
 # This is easier if we could yank, but we don't know what the user has been
@@ -76,44 +76,4 @@ export def ShowDefinitionUnderCursor()
  endif
 enddef

-# Print functionality. We simply show the file in Preview and let the user
-# decide what to do. This allows for more control instead of immediately
-# piping the file to lpr which will actually print the file.
-#
-# PreviewConvertPostScript: 
-#   Convert the provided PostScript file to PDF, then show in Preview. This is
-#   necessary in macOS 13+ as Preview doesn't support .ps files anymore.
-# PreviewPostScript:
-#   Directly open PostScript file in Preview. Can use this if
-#   PreviewConvertPostScript doesn't work.
-export def PreviewConvertPostScript(deltimer = 10000): number
-  # Convert PS to PDF because Preview can't use PS files in macOS 13+
-  system($"pstopdf {v:fname_in} -o {v:fname_in}.pdf")
-  if v:shell_error != 0
-    return v:shell_error
-  endif
-  system($"open -a Preview {v:fname_in}.pdf")
-  delete(v:fname_in)
-
-  # Delete the file after it's opened in Preview for privacy. We don't have an
-  # easy way to detect that Preview has opened the file already, so we just
-  # use a generous 10 secs timer.
-  # Note that we can't use `open -W` instead because 1) it will block
-  # synchronously, and 2) it will only return if Preview.app has closed, which
-  # may not happen for a while if it has other unrelated documents opened.
-  var to_delete_file = $"{v:fname_in}.pdf"
-  timer_start(deltimer, (timer) => delete(to_delete_file))
-
-  return v:shell_error
-enddef
-
-export def PreviewPostScript(deltimer = 10000): number
-  system($"open -a Preview {v:fname_in}")
-
-  var to_delete_file = v:fname_in
-  timer_start(deltimer, (timer) => delete(to_delete_file))
-
-  return v:shell_error
-enddef
-
 # vim: set sw=2 ts=2 et :
@@ -1,7 +1,7 @@
 " netrw.vim: Handles file transfer and remote directory listing across
 "            AUTOLOAD SECTION
-" Date:		May 03, 2023
-" Version:	173
+" Date:		Aug 16, 2021
+" Version:	171
 " Maintainer:	Charles E Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
 " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
 " Copyright:    Copyright (C) 2016 Charles E. Campbell {{{1
@@ -43,7 +43,7 @@ if exists("s:needspatches")
 endfor
 endif

-let g:loaded_netrw = "v173"
+let g:loaded_netrw = "v171"
 if !exists("s:NOTE")
 let s:NOTE    = 0
 let s:WARNING = 1
@@ -208,6 +208,7 @@ let g:netrw_localcopycmdopt    = ""
 let g:netrw_localcopydircmdopt = ""
 let g:netrw_localmkdiropt      = ""
 let g:netrw_localmovecmdopt    = ""
+let g:netrw_localrmdiropt      = ""

 " ---------------------------------------------------------------------
 " Default values for netrw's global protocol variables {{{2
@@ -1185,11 +1186,6 @@ endfun

 " ---------------------------------------------------------------------
 " netrw#Lexplore: toggle Explorer window, keeping it on the left of the current tab {{{2
-"   Uses  g:netrw_chgwin  : specifies the window where Lexplore files are to be opened
-"         t:netrw_lexposn : winsaveview() output (used on Lexplore window)
-"         t:netrw_lexbufnr: the buffer number of the Lexplore buffer  (internal to this function)
-"         s:lexplore_win  : window number of Lexplore window (serves to indicate which window is a Lexplore window)
-"         w:lexplore_buf  : buffer number of Lexplore window (serves to indicate which window is a Lexplore window)
 fun! netrw#Lexplore(count,rightside,...)
 "  call Dfunc("netrw#Lexplore(count=".a:count." rightside=".a:rightside.",...) a:0=".a:0." ft=".&ft)
  let curwin= winnr()
@@ -1206,8 +1202,6 @@ fun! netrw#Lexplore(count,rightside,...)
 "    call Decho("exe Explore ".fnameescape(a:1),'~'.expand("<slnum>"))
    exe "Explore ".fnameescape(a1)
    exe curwin."wincmd w"
-    let s:lexplore_win= curwin
-    let w:lexplore_buf= bufnr("%")
    if exists("t:netrw_lexposn")
 "     call Decho("forgetting t:netrw_lexposn",'~'.expand("<slnum>"))
     unlet t:netrw_lexposn
@@ -1282,7 +1276,7 @@ fun! netrw#Lexplore(count,rightside,...)
   let t:netrw_lexbufnr = bufnr("%")
   " done to prevent build-up of hidden buffers due to quitting and re-invocation of :Lexplore.
   " Since the intended use of :Lexplore is to have an always-present explorer window, the extra
-   " effort to prevent mis-use of :Lex is warranted.
+   " effort to mis-use :Lex is warranted.
   set bh=wipe
 "   call Decho("let t:netrw_lexbufnr=".t:netrw_lexbufnr) 
 "   call Decho("t:netrw_lexposn".(exists("t:netrw_lexposn")? string(t:netrw_lexposn) : " n/a"))
@@ -1686,7 +1680,7 @@ fun! s:NetrwOptionsSave(vt)
  endif
  let {a:vt}netrw_fokeep    = &l:fo           " formatoptions
  let {a:vt}netrw_gdkeep    = &l:gd           " gdefault
-  let {a:vt}netrw_gokeep    = &go             " guioptions
+  let {a:vt}netrw_gokeep    = &l:go           " guioptions
  let {a:vt}netrw_hidkeep   = &l:hidden
  let {a:vt}netrw_imkeep    = &l:im
  let {a:vt}netrw_iskkeep   = &l:isk
@@ -1757,9 +1751,8 @@ fun! s:NetrwOptionsSafe(islocal)
  if &cpo =~ 'a' | call s:NetrwSetSafeSetting("&cpo",substitute(&cpo,'a','','g')) | endif
  if &cpo =~ 'A' | call s:NetrwSetSafeSetting("&cpo",substitute(&cpo,'A','','g')) | endif
  setl fo=nroql2
-  if &go =~ 'a' | set go-=a | endif
-  if &go =~ 'A' | set go-=A | endif
-  if &go =~ 'P' | set go-=P | endif
+  " call s:NetrwSetSafeSetting("&go","begmr")
+  if &go =~ '\ca' | call s:NetrwSetSafeSetting("&go",substitute(&go,'\ca','','g')) | endif
  call s:NetrwSetSafeSetting("&l:hid",0)
  call s:NetrwSetSafeSetting("&l:im",0)
  setl isk+=@ isk+=* isk+=/
@@ -1798,13 +1791,11 @@ 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>"))
-   if filereadable(expand("%"))
+   if !isdirectory(expand('%'))
 "    call Decho("..doing filetype detect anyway")
-    filetype detect
-"    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>"))
-   else
-    setl ft=netrw
+     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")
   return
@@ -1844,7 +1835,7 @@ fun! s:NetrwOptionsRestore(vt)
 "  call Decho("(s:NetrwOptionsRestore) #4 lines=".&lines)
  call s:NetrwRestoreSetting(a:vt."netrw_fokeep"   ,"&l:fo")
  call s:NetrwRestoreSetting(a:vt."netrw_gdkeep"   ,"&l:gd")
-  call s:NetrwRestoreSetting(a:vt."netrw_gokeep"   ,"&go")
+  call s:NetrwRestoreSetting(a:vt."netrw_gokeep"   ,"&l:go")
  call s:NetrwRestoreSetting(a:vt."netrw_hidkeep"  ,"&l:hidden")
 "  call Decho("(s:NetrwOptionsRestore) #5 lines=".&lines)
  call s:NetrwRestoreSetting(a:vt."netrw_imkeep"   ,"&l:im")
@@ -1915,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>"))
@@ -2992,19 +2985,13 @@ fun! s:NetrwGetFile(readcmd, tfile, method)
   " rename buffer back to remote filename
   call s:NetrwBufRename(rfile)

-   " Jan 19, 2022: COMBAK -- bram problem with https://github.com/vim/vim/pull/9554.diff filetype
   " Detect filetype of local version of remote file.
   " Note that isk must not include a "/" for scripts.vim
   " to process this detection correctly.
-"   call Decho("detect filetype of local version of remote file<".rfile.">",'~'.expand("<slnum>"))
-"   call Decho("..did_filetype()=".did_filetype())
-   setl ft=
-"   call Decho("..initial filetype<".&ft."> for buf#".bufnr()."<".bufname().">")
-   let iskkeep= &isk
+"   call Decho("detect filetype of local version of remote file",'~'.expand("<slnum>"))
+   let iskkeep= &l:isk
   setl isk-=/
-   filetype detect
-"   call Decho("..local filetype<".&ft."> for buf#".bufnr()."<".bufname().">")
-   let &isk= iskkeep
+   let &l:isk= iskkeep
 "   call Dredir("ls!","NetrwGetFile (renamed buffer back to remote filename<".rfile."> : expand(%)<".expand("%").">)")
   let line1 = 1
   let line2 = line("$")
@@ -4285,7 +4272,7 @@ fun! s:NetrwGetBuffer(islocal,dirname)
  endif
 "  call Decho("  bufnum#".bufnum,'~'.expand("<slnum>"))

-  " highjack the current buffer
+  " hijack the current buffer
  "   IF the buffer already has the desired name
  "   AND it is empty
  let curbuf = bufname("%")
@@ -4293,7 +4280,7 @@ fun! s:NetrwGetBuffer(islocal,dirname)
   let curbuf = getcwd()
  endif
 "  call Dredir("ls!","NetrwGetFile (renamed buffer back to remote filename<".rfile."> : expand(%)<".expand("%").">)")
-"  call Decho("deciding if netrw may highjack the current buffer#".bufnr("%")."<".curbuf.">",'~'.expand("<slnum>"))
+"  call Decho("deciding if netrw may hijack the current buffer#".bufnr("%")."<".curbuf.">",'~'.expand("<slnum>"))
 "  call Decho("..dirname<".dirname.">  IF dirname == bufname",'~'.expand("<slnum>"))
 "  call Decho("..curbuf<".curbuf.">",'~'.expand("<slnum>"))
 "  call Decho("..line($)=".line("$")." AND this is 1",'~'.expand("<slnum>"))
@@ -4302,7 +4289,7 @@ fun! s:NetrwGetBuffer(islocal,dirname)
 "   call Dret("s:NetrwGetBuffer 0<cleared buffer> : highjacking buffer#".bufnr("%"))
   return 0
  else  " DEBUG
-"   call Decho("..did NOT highjack buffer",'~'.expand("<slnum>"))
+"   call Decho("..did NOT hijack buffer",'~'.expand("<slnum>"))
  endif
  " Aug 14, 2021: was thinking about looking for a [No Name] buffer here and using it, but that might cause problems

@@ -4338,25 +4325,19 @@ fun! s:NetrwGetBuffer(islocal,dirname)

  else " Re-use the buffer
 "   call Decho("--re-use buffer#".bufnum." (bufnum#".bufnum.">=0 AND bufexists(".bufnum.")=".bufexists(bufnum)."!=0)",'~'.expand("<slnum>"))
-   " ignore all events
   let eikeep= &ei
   setl ei=all
-
-   if &ft == "netrw"
-"    call Decho("buffer type is netrw; not using keepalt with b ".bufnum)
-    exe "sil! NetrwKeepj noswapfile b ".bufnum
-"    call Dredir("ls!","one")
+   if getline(2) =~# '^" Netrw Directory Listing'
+"    call Decho("  getline(2)<".getline(2).'> matches "Netrw Directory Listing" : using keepalt b '.bufnum,'~'.expand("<slnum>"))
+    exe "sil! NetrwKeepj noswapfile keepalt b ".bufnum
   else
-"    call Decho("buffer type is not netrw; using keepalt with b ".bufnum)
-    call s:NetrwEditBuf(bufnum)
-"    call Dredir("ls!","two")
+"    call Decho("  getline(2)<".getline(2).'> does not match "Netrw Directory Listing" : using b '.bufnum,'~'.expand("<slnum>"))
+    exe "sil! NetrwKeepj noswapfile keepalt b ".bufnum
   endif
 "   call Decho("  line($)=".line("$"),'~'.expand("<slnum>"))
   if bufname("%") == '.'
    call s:NetrwBufRename(getcwd())
   endif
-
-   " restore ei
   let &ei= eikeep

   if line("$") <= 1 && getline(1) == ""
@@ -5007,7 +4988,7 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)

    " the point where netrw actually edits the (local) file
    " if its local only: LocalBrowseCheck() doesn't edit a file, but NetrwBrowse() will
-    " use keepalt to support  :e #  to return to a directory listing
+    " no keepalt to support  :e #  to return to a directory listing
    if !&mod
     " if e the new file would fail due to &mod, then don't change any of the flags
     let dolockout= 1
@@ -5018,8 +4999,12 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
     " others like c-^ to return to the netrw buffer
     " Apr 30, 2020: used to have e! here.  That can cause loss of a modified file,
     " so emit error E37 instead.
-     call s:NetrwEditFile("e","",dirname)
-"     call Decho("edit-a-file: after e ".dirname.": hidden=".&hidden." bufhidden<".&bufhidden."> mod=".&mod,'~'.expand("<slnum>"))
+     if exists("g:netrw_altfile") && g:netrw_altfile
+      exe "NetrwKeepj keepalt e ".fnameescape(dirname)
+     else
+      exe "NetrwKeepj e ".fnameescape(dirname)
+     endif
+"     call Decho("edit-a-file: after e! ".dirname.": hidden=".&hidden." bufhidden<".&bufhidden."> mod=".&mod,'~'.expand("<slnum>"))
     " COMBAK -- cuc cul related
     call s:NetrwCursor(1)
     if &hidden || &bufhidden == "hide"
@@ -5360,8 +5345,8 @@ fun! netrw#BrowseX(fname,remote)
     " g:Netrw_corehandler is a List of function references (see :help Funcref)
 "     call Decho("g:Netrw_corehandler is a List",'~'.expand("<slnum>"))
     for Fncref in g:Netrw_corehandler
-      if type(Fncref) == 2
-       call Fncref(a:fname)
+      if type(FncRef) == 2
+       call FncRef(a:fname)
      endif
     endfor
    endif
@@ -5434,8 +5419,6 @@ fun! netrw#BrowseX(fname,remote)
   else
    let redir= &srr . "/dev/null"
   endif
-  else
-   let redir= ""
  endif
 "  call Decho("set up redirection: redir{".redir."} srr{".&srr."}",'~'.expand("<slnum>"))

@@ -5725,35 +5708,6 @@ fun! s:NetrwClearExplore()
 "  call Dret("s:NetrwClearExplore")
 endfun

-" ---------------------------------------------------------------------
-" s:NetrwEditBuf: decides whether or not to use keepalt to edit a buffer {{{2
-fun! s:NetrwEditBuf(bufnum)
-"  call Dfunc("s:NetrwEditBuf(fname<".a:bufnum.">)")
-  if exists("g:netrw_altfile") && g:netrw_altfile && &ft == "netrw"
-"   call Decho("exe sil! NetrwKeepj keepalt noswapfile b ".fnameescape(a:bufnum))
-   exe "sil! NetrwKeepj keepalt noswapfile b ".fnameescape(a:bufnum)
-  else
-"   call Decho("exe sil! NetrwKeepj noswapfile b ".fnameescape(a:bufnum))
-   exe "sil! NetrwKeepj noswapfile b ".fnameescape(a:bufnum)
-  endif
-"  call Dret("s:NetrwEditBuf")
-endfun
-
-" ---------------------------------------------------------------------
-" s:NetrwEditFile: decides whether or not to use keepalt to edit a file {{{2
-"    NetrwKeepj [keepalt] <OPT> <CMD> <FILENAME>
-fun! s:NetrwEditFile(cmd,opt,fname)
-"  call Dfunc("s:NetrwEditFile(cmd<".a:cmd.">,opt<".a:opt.">,fname<".a:fname.">)  ft<".&ft.">")
-  if exists("g:netrw_altfile") && g:netrw_altfile && &ft == "netrw"
-"   call Decho("exe NetrwKeepj keepalt ".a:opt." ".a:cmd." ".fnameescape(a:fname))
-   exe "NetrwKeepj keepalt ".a:opt." ".a:cmd." ".fnameescape(a:fname)
-  else
-"   call Decho("exe NetrwKeepj ".a:opt." ".a:cmd." ".fnameescape(a:fname))
-   exe "NetrwKeepj ".a:opt." ".a:cmd." ".fnameescape(a:fname)
-  endif
-"  call Dret("s:NetrwEditFile")
-endfun
-
 " ---------------------------------------------------------------------
 " s:NetrwExploreListUniq: {{{2
 fun! s:NetrwExploreListUniq(explist)
@@ -7860,16 +7814,8 @@ fun! s:NetrwMarkFileMove(islocal)
 "    call Decho("movecmd<".movecmd."> (#3 linux or cygwin)",'~'.expand("<slnum>"))
   endif
   for fname in s:netrwmarkfilelist_{bufnr("%")}
-    if g:netrw_keepdir
-    " Jul 19, 2022: fixing file move when g:netrw_keepdir is 1
-     let fname= b:netrw_curdir."/".fname
-    endif
    if !g:netrw_cygwin && (has("win32") || has("win95") || has("win64") || has("win16"))
     let fname= substitute(fname,'/','\\','g')
-     if g:netrw_keepdir
-      " Jul 19, 2022: fixing file move when g:netrw_keepdir is 1
-      let fname= b:netrw_curdir."\\".fname
-     endif
    endif
 "    call Decho("system(".movecmd." ".s:ShellEscape(fname)." ".tgt.")",'~'.expand("<slnum>"))
    let ret= system(movecmd.g:netrw_localmovecmdopt." ".s:ShellEscape(fname)." ".tgt)
@@ -8627,28 +8573,21 @@ endfun
 "     choice = 2 : didn't save modified file, opened window
 "     choice = 3 : cancel open
 fun! s:NetrwPrevWinOpen(islocal)
-"  call Dfunc("s:NetrwPrevWinOpen(islocal=".a:islocal.") win#".winnr())
+"  call Dfunc("s:NetrwPrevWinOpen(islocal=".a:islocal.")")

  let ykeep= @@
  " grab a copy of the b:netrw_curdir to pass it along to newly split windows
  let curdir = b:netrw_curdir
-"  call Decho("COMBAK#1: mod=".&mod." win#".winnr())

  " get last window number and the word currently under the cursor
  let origwin   = winnr()
  let lastwinnr = winnr("$")
-"  call Decho("origwin#".origwin." lastwinnr#".lastwinnr)
-"  call Decho("COMBAK#2: mod=".&mod." win#".winnr())
-  let curword      = s:NetrwGetWord()
-  let choice       = 0
-  let s:prevwinopen= 1	" lets s:NetrwTreeDir() know that NetrwPrevWinOpen called it (s:NetrwTreeDir() will unlet s:prevwinopen)
-"  call Decho("COMBAK#3: mod=".&mod." win#".winnr())
+  let curword   = s:NetrwGetWord()
+  let choice    = 0
+  let s:prevwinopen= 1	" lets s:NetrwTreeDir() know that NetrwPrevWinOpen called it
  let s:treedir = s:NetrwTreeDir(a:islocal)
-"  call Decho("COMBAK#4: mod=".&mod." win#".winnr())
  let curdir    = s:treedir
-"  call Decho("COMBAK#5: mod=".&mod." win#".winnr())
 "  call Decho("winnr($)#".lastwinnr." curword<".curword.">",'~'.expand("<slnum>"))
-"  call Decho("COMBAK#6: mod=".&mod." win#".winnr())

  let didsplit = 0
  if lastwinnr == 1
@@ -8671,26 +8610,11 @@ fun! s:NetrwPrevWinOpen(islocal)
 "   call Decho("did split",'~'.expand("<slnum>"))

  else
-"   call Decho("COMBAK#7: mod=".&mod." win#".winnr())
   NetrwKeepj call s:SaveBufVars()
-"   call Decho("COMBAK#8: mod=".&mod." win#".winnr())
   let eikeep= &ei
-"   call Decho("COMBAK#9: mod=".&mod." win#".winnr())
   setl ei=all
-"   call Decho("COMBAK#10: mod=".&mod." win#".winnr())
   wincmd p
-"  call Decho("COMBAK#11: mod=".&mod)
 "   call Decho("wincmd p  (now in win#".winnr().") curdir<".curdir.">",'~'.expand("<slnum>"))
-"  call Decho("COMBAK#12: mod=".&mod)
-   
-   if exists("s:lexplore_win") && s:lexplore_win == winnr()
-    " whoops -- user trying to open file in the Lexplore window.
-    " Use Lexplore's opening-file window instead.
-"    call Decho("whoops -- user trying to open file in Lexplore Window. Use win#".g:netrw_chgwin." instead")
-"    exe g:netrw_chgwin."wincmd w"
-     wincmd p
-     call s:NetrwBrowse(0,s:NetrwBrowseChgDir(0,s:NetrwGetWord()))
-   endif

   " prevwinnr: the window number of the "prev" window
   " prevbufnr: the buffer number of the buffer in the "prev" window
@@ -8700,10 +8624,8 @@ fun! s:NetrwPrevWinOpen(islocal)
   let prevbufname = bufname("%")
   let prevmod     = &mod
   let bnrcnt      = 0
-"   call Decho("COMBAK#13: mod=".&mod." win#".winnr())
   NetrwKeepj call s:RestoreBufVars()
 "   call Decho("after wincmd p: win#".winnr()." win($)#".winnr("$")." origwin#".origwin." &mod=".&mod." bufname(%)<".bufname("%")."> prevbufnr=".prevbufnr,'~'.expand("<slnum>"))
-"   call Decho("COMBAK#14: mod=".&mod." win#".winnr())

   " if the previous window's buffer has been changed (ie. its modified flag is set),
   " and it doesn't appear in any other extant window, then ask the
@@ -8713,7 +8635,6 @@ fun! s:NetrwPrevWinOpen(islocal)
    windo if winbufnr(0) == prevbufnr | let bnrcnt=bnrcnt+1 | endif
 "    call Decho("prevbufnr=".prevbufnr." bnrcnt=".bnrcnt." buftype=".&bt." winnr()=".winnr()." prevwinnr#".prevwinnr,'~'.expand("<slnum>"))
    exe prevwinnr."wincmd w"
-"    call Decho("COMBAK#15: mod=".&mod." win#".winnr())

    if bnrcnt == 1 && &hidden == 0
     " only one copy of the modified buffer in a window, and
@@ -8721,7 +8642,6 @@ fun! s:NetrwPrevWinOpen(islocal)
     let choice = confirm("Save modified buffer<".prevbufname."> first?","&Yes\n&No\n&Cancel")
 "     call Decho("prevbufname<".prevbufname."> choice=".choice." current-winnr#".winnr(),'~'.expand("<slnum>"))
     let &ei= eikeep
-"     call Decho("COMBAK#16: mod=".&mod." win#".winnr())

     if choice == 1
      " Yes -- write file & then browse
@@ -8754,7 +8674,6 @@ fun! s:NetrwPrevWinOpen(islocal)
   endif
   let &ei= eikeep
  endif
-"  call Decho("COMBAK#17: mod=".&mod." win#".winnr())

  " restore b:netrw_curdir (window split/enew may have lost it)
  let b:netrw_curdir= curdir
@@ -9442,23 +9361,19 @@ fun! s:NetrwTreeDir(islocal)
  if exists("s:prevwinopen")
   unlet s:prevwinopen
  endif
-"  call Decho("COMBAK#18 : mod=".&mod." win#".winnr())

  if !exists("b:netrw_curdir") || b:netrw_curdir == ""
   let b:netrw_curdir= getcwd()
  endif
  let treedir = b:netrw_curdir
 "  call Decho("set initial treedir<".treedir.">",'~'.expand("<slnum>"))
-"  call Decho("COMBAK#19 : mod=".&mod." win#".winnr())

  let s:treecurpos= winsaveview()
 "  call Decho("saving posn to s:treecurpos<".string(s:treecurpos).">",'~'.expand("<slnum>"))
-"  call Decho("COMBAK#20 : mod=".&mod." win#".winnr())

  if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST
 "   call Decho("w:netrw_liststyle is TREELIST:",'~'.expand("<slnum>"))
 "   call Decho("line#".line(".")." getline(.)<".getline('.')."> treecurpos<".string(s:treecurpos).">",'~'.expand("<slnum>"))
-"  call Decho("COMBAK#21 : mod=".&mod." win#".winnr())

   " extract tree directory if on a line specifying a subdirectory (ie. ends with "/")
   let curline= substitute(getline('.'),"\t -->.*$",'','')
@@ -9474,7 +9389,6 @@ fun! s:NetrwTreeDir(islocal)
 "    call Decho("do not extract tree subdirectory from current line and set treedir to empty",'~'.expand("<slnum>"))
    let treedir= ""
   endif
-"  call Decho("COMBAK#22 : mod=".&mod." win#".winnr())

   " detect user attempting to close treeroot
 "   call Decho("check if user is attempting to close treeroot",'~'.expand("<slnum>"))
@@ -9490,12 +9404,10 @@ fun! s:NetrwTreeDir(islocal)
 "   else " Decho
 "    call Decho(".user not attempting to close treeroot",'~'.expand("<slnum>"))
   endif
-"  call Decho("COMBAK#23 : mod=".&mod." win#".winnr())

 "   call Decho("islocal=".a:islocal." curline<".curline.">",'~'.expand("<slnum>"))
   let potentialdir= s:NetrwFile(substitute(curline,'^'.s:treedepthstring.'\+ \(.*\)@$','\1',''))
 "   call Decho("potentialdir<".potentialdir."> isdir=".isdirectory(potentialdir),'~'.expand("<slnum>"))
-"  call Decho("COMBAK#24 : mod=".&mod." win#".winnr())

   " COMBAK: a symbolic link may point anywhere -- so it will be used to start a new treetop
 "   if a:islocal && curline =~ '@$' && isdirectory(s:NetrwFile(potentialdir))
@@ -9509,12 +9421,10 @@ fun! s:NetrwTreeDir(islocal)
    let treedir = s:NetrwTreePath(w:netrw_treetop)
 "   endif
  endif
-"  call Decho("COMBAK#25 : mod=".&mod." win#".winnr())

  " sanity maintenance: keep those //s away...
  let treedir= substitute(treedir,'//$','/','')
 "  call Decho("treedir<".treedir.">",'~'.expand("<slnum>"))
-"  call Decho("COMBAK#26 : mod=".&mod." win#".winnr())

 "  call Dret("s:NetrwTreeDir <".treedir."> : (side effect) s:treecurpos<".(exists("s:treecurpos")? string(s:treecurpos) : 'n/a').">")
  return treedir
@@ -10885,8 +10795,7 @@ fun! netrw#LocalBrowseCheck(dirname)
 "  call Dfunc("netrw#LocalBrowseCheck(dirname<".a:dirname.">)")
 "  call Decho("isdir<".a:dirname."> =".isdirectory(s:NetrwFile(a:dirname)).((exists("s:treeforceredraw")? " treeforceredraw" : "")).'~'.expand("<slnum>"))
 "  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,'~'.expand("<slnum>"))
-  " getting E930: Cannot use :redir inside execute
-""  call Dredir("ls!","netrw#LocalBrowseCheck")
+"  call Dredir("ls!","netrw#LocalBrowseCheck")
 "  call Decho("tab#".tabpagenr()." win#".winnr()." buf#".bufnr("%")."<".bufname("%")."> line#".line(".")." col#".col(".")." winline#".winline()." wincol#".wincol(),'~'.expand("<slnum>"))
 "  call Decho("current buffer#".bufnr("%")."<".bufname("%")."> ft=".&ft,'~'.expand("<slnum>"))

@@ -11180,15 +11089,12 @@ fun! s:LocalListing()

   if w:netrw_liststyle == s:LONGLIST
    let sz   = getfsize(filename)
-	let szlen = 15 - (strdisplaywidth(longfile) - g:netrw_maxfilenamelen)
-    let szlen = (szlen > 0) ? szlen : 0
-    let fsz  = printf("%".szlen."S",sz)
-
+    let fsz  = strpart("               ",1,15-strlen(sz)).sz
    if g:netrw_sizestyle =~# "[hH]"
     let sz= s:NetrwHumanReadable(sz)
    endif
-	let longfile= printf("%-".g:netrw_maxfilenamelen."S",pfile)
-    let pfile   = longfile."  ".sz." ".strftime(g:netrw_timefmt,getftime(filename))
+    let longfile= printf("%-".(g:netrw_maxfilenamelen+1)."s",pfile)
+    let pfile   = longfile.sz." ".strftime(g:netrw_timefmt,getftime(filename))
 "    call Decho("longlist support: sz=".sz." fsz=".fsz,'~'.expand("<slnum>"))
   endif

@@ -11487,8 +11393,34 @@ fun! s:NetrwLocalRmFile(path,fname,all)
   let rmfile= substitute(rmfile,'[\/]$','','e')

   if all || ok =~# 'y\%[es]' || ok == ""
-    if delete(rmfile,"d")
-     call netrw#ErrorMsg(s:ERROR,"unable to delete directory <".rmfile.">!",103)
+    if v:version < 704 || (v:version == 704 && !has("patch1107"))
+" "    call Decho("1st attempt: system(netrw#WinPath(".g:netrw_localrmdir.') '.s:ShellEscape(rmfile).')','~'.expand("<slnum>"))
+     call system(netrw#WinPath(g:netrw_localrmdir).' '.s:ShellEscape(rmfile))
+" "    call Decho("v:shell_error=".v:shell_error,'~'.expand("<slnum>"))
+
+     if v:shell_error != 0
+" "     call Decho("2nd attempt to remove directory<".rmfile.">",'~'.expand("<slnum>"))
+      let errcode= s:NetrwDelete(rmfile)
+" "     call Decho("errcode=".errcode,'~'.expand("<slnum>"))
+
+      if errcode != 0
+       if has("unix")
+" "       call Decho("3rd attempt to remove directory<".rmfile.">",'~'.expand("<slnum>"))
+	call system("rm ".s:ShellEscape(rmfile))
+	if v:shell_error != 0 && !exists("g:netrw_quiet")
+	 call netrw#ErrorMsg(s:ERROR,"unable to remove directory<".rmfile."> -- is it empty?",34)
+	 let ok="no"
+	endif
+       elseif !exists("g:netrw_quiet")
+	call netrw#ErrorMsg(s:ERROR,"unable to remove directory<".rmfile."> -- is it empty?",35)
+	let ok="no"
+       endif
+      endif
+     endif
+    else
+     if delete(rmfile,"d")
+      call netrw#ErrorMsg(s:ERROR,"unable to delete directory <".rmfile.">!",103)
+     endif
    endif
   endif
  endif
@@ -12083,13 +12015,13 @@ fun! s:NetrwEnew(...)
  if exists("b:netrw_prvdir")         |let netrw_prvdir          = b:netrw_prvdir         |endif

  NetrwKeepj call s:NetrwOptionsRestore("w:")
-"  call Decho("generate a buffer with NetrwKeepj enew!",'~'.expand("<slnum>"))
+"  call Decho("generate a buffer with NetrwKeepj keepalt enew!",'~'.expand("<slnum>"))
  " when tree listing uses file TreeListing... a new buffer is made.
  " Want the old buffer to be unlisted.
  " COMBAK: this causes a problem, see P43
 "  setl nobl
  let netrw_keepdiff= &l:diff
-  call s:NetrwEditFile("enew!","","")
+  noswapfile NetrwKeepj keepalt enew!
  let &l:diff= netrw_keepdiff
 "  call Decho("bufnr($)=".bufnr("$")."<".bufname(bufnr("$"))."> winnr($)=".winnr("$"),'~'.expand("<slnum>"))
  NetrwKeepj call s:NetrwOptionsSave("w:")
@@ -12138,7 +12070,7 @@ endfun
 " s:NetrwExe: executes a string using "!" {{{2
 fun! s:NetrwExe(cmd)
 "  call Dfunc("s:NetrwExe(a:cmd<".a:cmd.">)")
-  if has("win32") && &shell !~? 'cmd\|pwsh\|powershell' && !g:netrw_cygwin
+  if has("win32") && &shell !~? 'cmd' && !g:netrw_cygwin
 "    call Decho("using win32:",expand("<slnum>"))
    let savedShell=[&shell,&shellcmdflag,&shellxquote,&shellxescape,&shellquote,&shellpipe,&shellredir,&shellslash]
    set shell& shellcmdflag& shellxquote& shellxescape&
@@ -12807,54 +12739,3 @@ unlet s:keepcpo
 " Modelines: {{{1
 " ===============
 " vim:ts=8 fdm=marker
-" doing autoload/netrw.vim version v172g ~57
-" varname<g:netrw_dirhistcnt> value=0 ~1
-" varname<s:THINLIST> value=0 ~1
-" varname<s:LONGLIST> value=1 ~1
-" varname<s:WIDELIST> value=2 ~1
-" varname<s:TREELIST> value=3 ~1
-" varname<s:MAXLIST> value=4 ~1
-" varname<g:netrw_use_errorwindow> value=2 ~1
-" varname<g:netrw_http_xcmd> value=-q -O ~1
-" varname<g:netrw_http_put_cmd> value=curl -T ~1
-" varname<g:netrw_keepj> value=keepj ~1
-" varname<g:netrw_rcp_cmd> value=rcp ~1
-" varname<g:netrw_rsync_cmd> value=rsync ~1
-" varname<g:netrw_rsync_sep> value=/ ~1
-" varname<g:netrw_scp_cmd> value=scp -q ~1
-" varname<g:netrw_sftp_cmd> value=sftp ~1
-" varname<g:netrw_ssh_cmd> value=ssh ~1
-" varname<g:netrw_alto> value=0 ~1
-" varname<g:netrw_altv> value=1 ~1
-" varname<g:netrw_banner> value=1 ~1
-" varname<g:netrw_browse_split> value=0 ~1
-" varname<g:netrw_bufsettings> value=noma nomod nonu nobl nowrap ro nornu ~1
-" varname<g:netrw_chgwin> value=-1 ~1
-" varname<g:netrw_clipboard> value=1 ~1
-" varname<g:netrw_compress> value=gzip ~1
-" varname<g:netrw_ctags> value=ctags ~1
-" varname<g:netrw_cursor> value=2 ~1
-" (netrw) COMBAK: cuc=0 cul=0 initialization of s:netrw_cu[cl]
-" varname<g:netrw_cygdrive> value=/cygdrive ~1
-" varname<s:didstarstar> value=0 ~1
-" varname<g:netrw_dirhistcnt> value=0 ~1
-" varname<g:netrw_decompress> value={ ".gz" : "gunzip", ".bz2" : "bunzip2", ".zip" : "unzip", ".tar" : "tar -xf", ".xz" : "unxz" } ~1
-" varname<g:netrw_dirhistmax> value=10 ~1
-" varname<g:netrw_errorlvl> value=0 ~1
-" varname<g:netrw_fastbrowse> value=1 ~1
-" varname<g:netrw_ftp_browse_reject> value=^total\s\+\d\+$\|^Trying\s\+\d\+.*$\|^KERBEROS_V\d rejected\|^Security extensions not\|No such file\|: connect to address [0-9a-fA-F:]*: No route to host$ ~1
-" varname<g:netrw_ftpmode> value=binary ~1
-" varname<g:netrw_hide> value=1 ~1
-" varname<g:netrw_keepdir> value=1 ~1
-" varname<g:netrw_list_hide> value= ~1
-" varname<g:netrw_localmkdir> value=mkdir ~1
-" varname<g:netrw_remote_mkdir> value=mkdir ~1
-" varname<g:netrw_liststyle> value=0 ~1
-" varname<g:netrw_markfileesc> value=*./[\~ ~1
-" varname<g:netrw_maxfilenamelen> value=32 ~1
-" varname<g:netrw_menu> value=1 ~1
-" varname<g:netrw_mkdir_cmd> value=ssh USEPORT HOSTNAME mkdir ~1
-" varname<g:netrw_mousemaps> value=1 ~1
-" varname<g:netrw_retmap> value=0 ~1
-" varname<g:netrw_chgperm> value=chmod PERM FILENAME ~1
-" varname<g:netrw_preview> value=0 ~1
@@ -1,7 +1,7 @@
 " netrwSettings.vim: makes netrw settings simpler
-" Date:		Nov 15, 2021
+" Date:		Aug 12, 2021
 " Maintainer:	Charles E Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
-" Version:	18
+" Version:	17	ASTRO-ONLY
 " Copyright:    Copyright (C) 1999-2007 Charles E. Campbell {{{1
 "               Permission is hereby granted to use and distribute this code,
 "               with or without modifications, provided that this copyright
@@ -19,7 +19,7 @@
 if exists("g:loaded_netrwSettings") || &cp
  finish
 endif
-let g:loaded_netrwSettings = "v18"
+let g:loaded_netrwSettings = "v17"
 if v:version < 700
 echohl WarningMsg
 echo "***warning*** this version of netrwSettings needs vim 7.0"
@@ -159,6 +159,8 @@ fun! netrwSettings#NetrwSettings()
  put = 'let g:netrw_localmkdiropt     = '.g:netrw_localmkdiropt
  put = 'let g:netrw_localmovecmd      = '.g:netrw_localmovecmd
  put = 'let g:netrw_localmovecmdopt   = '.g:netrw_localmovecmdopt
+  put = 'let g:netrw_localrmdir        = '.g:netrw_localrmdir
+  put = 'let g:netrw_localrmdiropt     = '.g:netrw_localrmdiropt
  put = 'let g:netrw_maxfilenamelen    = '.g:netrw_maxfilenamelen
  put = 'let g:netrw_menu              = '.g:netrw_menu
  put = 'let g:netrw_mousemaps         = '.g:netrw_mousemaps
@@ -1,7 +1,6 @@
 " Vim support file to help with paste mappings and menus
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
-" Last Change:	2023 Aug 10
-" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2019 Jan 27

 " Define the string to use for items that are present both in Edit, Popup and
 " Toolbar menu.  Also used in mswin.vim and macmap.vim.
@@ -22,7 +22,8 @@ let s:maxoff = 50       " maximum number of lines to look backwards for ()
 function s:SearchBracket(fromlnum, flags)
  return searchpairpos('[[({]', '', '[])}]', a:flags,
          \ {-> synstack('.', col('.'))
-          \ ->indexof({_, id -> synIDattr(id, 'name') =~ '\%(Comment\|Todo\|String\)$'}) >= 0},
+          \   ->map({_, id -> id->synIDattr('name')})
+          \   ->match('\%(Comment\|Todo\|String\)$') >= 0},
          \ [0, a:fromlnum - s:maxoff]->max(), g:python_indent.searchpair_timeout)
 endfunction

@@ -156,13 +157,15 @@ function python#GetIndent(lnum, ...)
    " the start of the comment.  synID() is slow, a linear search would take
    " too long on a long line.
    if synstack(plnum, pline_len)
-    \ ->indexof({_, id -> synIDattr(id, 'name') =~ '\%(Comment\|Todo\)$'}) >= 0
+    \ ->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)
-        \ ->indexof({_, id -> synIDattr(id, 'name') =~ '\%(Comment\|Todo\)$'}) >= 0
+        \ ->map({_, id -> id->synIDattr('name')})
+        \ ->match('\%(Comment\|Todo\)$') >= 0
 	  let max = col
 	else
 	  let min = col + 1
@@ -1,4 +1,4 @@
-" Author: Lily Ballard
+" Author: Kevin Ballard
 " Description: Helper functions for Rust commands/mappings
 " Last Modified: May 27, 2014
 " For bugs, patches and license go to https://github.com/rust-lang/rust.vim
@@ -1,7 +1,6 @@
 " Vim script to download a missing spell file
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
-" Last Change:	2023 Aug 10
-" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2020 Jul 10

 if !exists('g:spellfile_URL')
  " Always use https:// because it's secure.  The certificate is for nluug.nl,
@@ -1,6 +1,6 @@
 " Vim autoload file for the tohtml plugin.
 " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
-" Last Change: 2023 Sep 03
+" Last Change: 2023 Jan 01
 "
 " Additional contributors:
 "
@@ -307,7 +307,7 @@ func! tohtml#Convert2HTML(line1, line2) "{{{
    let g:html_diff_win_num = 0
    for window in win_list
      " switch to the next buffer to convert
-      exe ":" .. bufwinnr(window) .. "wincmd w"
+      exe ":" . bufwinnr(window) . "wincmd w"

      " figure out whether current charset and encoding will work, if not
      " default to UTF-8
@@ -355,7 +355,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
  if !s:settings.no_doc
    if s:settings.use_xhtml
      if s:settings.encoding != ""
-	let xml_line = "<?xml version=\"1.0\" encoding=\"" .. s:settings.encoding .. "\"?>"
+	let xml_line = "<?xml version=\"1.0\" encoding=\"" . s:settings.encoding . "\"?>"
      else
 	let xml_line = "<?xml version=\"1.0\"?>"
      endif
@@ -387,34 +387,34 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
    " contained in XML information
    if s:settings.encoding != "" && !s:settings.use_xhtml
      if s:html5
-	call add(html, '<meta charset="' .. s:settings.encoding .. '"' .. tag_close)
+	call add(html, '<meta charset="' . s:settings.encoding . '"' . tag_close)
      else
-	call add(html, "<meta http-equiv=\"content-type\" content=\"text/html; charset=" .. s:settings.encoding .. '"' .. tag_close)
+	call add(html, "<meta http-equiv=\"content-type\" content=\"text/html; charset=" . s:settings.encoding . '"' . tag_close)
      endif
    endif

    call add(html, '<title>diff</title>')
-    call add(html, '<meta name="Generator" content="Vim/'..v:version/100..'.'..v:version%100..'"'..tag_close)
-    call add(html, '<meta name="plugin-version" content="'..g:loaded_2html_plugin..'"'..tag_close)
+    call add(html, '<meta name="Generator" content="Vim/'.v:version/100.'.'.v:version%100.'"'.tag_close)
+    call add(html, '<meta name="plugin-version" content="'.g:loaded_2html_plugin.'"'.tag_close)
    call add(html, '<meta name="settings" content="'.
 	  \ join(filter(keys(s:settings),'s:settings[v:val]'),',').
-	  \ ',prevent_copy='..s:settings.prevent_copy.
-	  \ ',use_input_for_pc='..s:settings.use_input_for_pc.
-	  \ '"'..tag_close)
+	  \ ',prevent_copy='.s:settings.prevent_copy.
+	  \ ',use_input_for_pc='.s:settings.use_input_for_pc.
+	  \ '"'.tag_close)
    call add(html, '<meta name="colorscheme" content="'.
 	  \ (exists('g:colors_name')
 	  \ ? g:colors_name
-	  \ : 'none').. '"'..tag_close)
+	  \ : 'none'). '"'.tag_close)

    call add(html, '</head>')
    let body_line_num = len(html)
-    call add(html, '<body'..(s:settings.line_ids ? ' onload="JumpToLine();"' : '')..'>')
+    call add(html, '<body'.(s:settings.line_ids ? ' onload="JumpToLine();"' : '').'>')
  endif
-  call add(html, "<table "..(s:settings.use_css? "" : "border='1' width='100%' ").."id='vimCodeElement"..s:settings.id_suffix.."'>")
+  call add(html, "<table ".(s:settings.use_css? "" : "border='1' width='100%' ")."id='vimCodeElement".s:settings.id_suffix."'>")

  call add(html, '<tr>')
  for buf in a:win_list
-    call add(html, '<th>'..bufname(buf)..'</th>')
+    call add(html, '<th>'.bufname(buf).'</th>')
  endfor
  call add(html, '</tr><tr>')

@@ -423,7 +423,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{

  for buf in a:buf_list
    let temp = []
-    exe bufwinnr(buf) .. 'wincmd w'
+    exe bufwinnr(buf) . 'wincmd w'

    " If text is folded because of user foldmethod settings, etc. we don't want
    " to act on everything in a fold by mistake.
@@ -526,16 +526,16 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
  endif

  let i = 1
-  let name = "Diff" .. (s:settings.use_xhtml ? ".xhtml" : ".html")
+  let name = "Diff" . (s:settings.use_xhtml ? ".xhtml" : ".html")
  " Find an unused file name if current file name is already in use
  while filereadable(name)
-    let name = substitute(name, '\d*\.x\?html$', '', '') .. i .. '.' .. fnamemodify(copy(name), ":t:e")
+    let name = substitute(name, '\d*\.x\?html$', '', '') . i . '.' . fnamemodify(copy(name), ":t:e")
    let i += 1
  endwhile

  let s:ei_sav = &eventignore
  set eventignore+=FileType
-  exe "topleft new " .. name
+  exe "topleft new " . name
  let &eventignore=s:ei_sav
  unlet s:ei_sav

@@ -601,7 +601,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
 		\ "",
 		\ "  /* navigate upwards in the DOM tree to open all folds containing the line */",
 		\ "  var node = lineElem;",
-		\ "  while (node && node.id != 'vimCodeElement"..s:settings.id_suffix.."')",
+		\ "  while (node && node.id != 'vimCodeElement".s:settings.id_suffix."')",
 		\ "  {",
 		\ "    if (node.className == 'closed-fold')",
 		\ "    {",
@@ -640,7 +640,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
 	call append(style_start, [
 	      \  "  function toggleFold(objID)",
 	      \  "  {",
-	      \  "    for (win_num = 1; win_num <= "..len(a:buf_list).."; win_num++)",
+	      \  "    for (win_num = 1; win_num <= ".len(a:buf_list)."; win_num++)",
 	      \  "    {",
 	      \  "      var fold;",
 	      \  '      fold = document.getElementById("win"+win_num+objID);',
@@ -660,7 +660,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
      if s:uses_script
 	" insert script tag if needed
 	call append(style_start, [
-	      \ "<script" .. (s:html5 ? "" : " type='text/javascript'") .. ">",
+	      \ "<script" . (s:html5 ? "" : " type='text/javascript'") . ">",
 	      \ s:settings.use_xhtml ? '//<![CDATA[' : "<!--"])
      endif

@@ -671,14 +671,14 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
      " is pretty useless for really long lines. {{{
      if s:settings.use_css
 	call append(style_start,
-	      \ ['<style' .. (s:html5 ? '' : 'type="text/css"') .. '>']+
+	      \ ['<style' . (s:html5 ? '' : 'type="text/css"') . '>']+
 	      \ style+
 	      \ [ s:settings.use_xhtml ? '' : '<!--',
 	      \   'table { table-layout: fixed; }',
 	      \   'html, body, table, tbody { width: 100%; margin: 0; padding: 0; }',
 	      \   'table, td, th { border: 1px solid; }',
 	      \   'td { vertical-align: top; }',
-	      \   'th, td { width: '..printf("%.1f",100.0/len(a:win_list))..'%; }',
+	      \   'th, td { width: '.printf("%.1f",100.0/len(a:win_list)).'%; }',
 	      \   'td div { overflow: auto; }',
 	      \   s:settings.use_xhtml ? '' : '-->',
 	      \   '</style>'
@@ -694,7 +694,7 @@ endfunc "}}}
 " Gets a single user option and sets it in the passed-in Dict, or gives it the
 " default value if the option doesn't actually exist.
 func! tohtml#GetOption(settings, option, default) "{{{
-  if exists('g:html_'..a:option)
+  if exists('g:html_'.a:option)
    let a:settings[a:option] = g:html_{a:option}
  else
    let a:settings[a:option] = a:default
@@ -713,11 +713,10 @@ func! tohtml#GetUserSettings() "{{{
    let user_settings = {}

    " Define the correct option if the old option name exists and we haven't
-    " already defined the correct one.
+    " already defined the correct one. Maybe I'll put out a warning message about
+    " this sometime and remove the old option entirely at some even later time,
+    " but for now just silently accept the old option.
    if exists('g:use_xhtml') && !exists("g:html_use_xhtml")
-      echohl WarningMsg
-      echomsg "Warning: g:use_xhtml is deprecated, use g:html_use_xhtml"
-      echohl None
      let g:html_use_xhtml = g:use_xhtml
    endif

@@ -740,7 +739,7 @@ func! tohtml#GetUserSettings() "{{{
    call tohtml#GetOption(user_settings,      'whole_filler', 0 )
    call tohtml#GetOption(user_settings,         'use_xhtml', 0 )
    call tohtml#GetOption(user_settings,          'line_ids', user_settings.number_lines )
-    call tohtml#GetOption(user_settings, 'use_input_for_pc', 'none')
+    call tohtml#GetOption(user_settings, 'use_input_for_pc', 'fallback')
    " }}}
    
    " override those settings that need it {{{
@@ -855,16 +854,16 @@ func! tohtml#GetUserSettings() "{{{
    if user_settings.use_css
      if exists("g:html_prevent_copy")
 	if user_settings.dynamic_folds && !user_settings.no_foldcolumn && g:html_prevent_copy =~# 'f'
-	  let user_settings.prevent_copy ..= 'f'
+	  let user_settings.prevent_copy .= 'f'
 	endif
 	if user_settings.number_lines && g:html_prevent_copy =~# 'n'
-	  let user_settings.prevent_copy ..= 'n'
+	  let user_settings.prevent_copy .= 'n'
 	endif
 	if &diff && g:html_prevent_copy =~# 'd'
-	  let user_settings.prevent_copy ..= 'd'
+	  let user_settings.prevent_copy .= 'd'
 	endif
 	if !user_settings.ignore_folding && g:html_prevent_copy =~# 't'
-	  let user_settings.prevent_copy ..= 't'
+	  let user_settings.prevent_copy .= 't'
 	endif
      else
 	let user_settings.prevent_copy = ""
@@ -876,10 +875,10 @@ func! tohtml#GetUserSettings() "{{{

    " enforce valid values for use_input_for_pc
    if user_settings.use_input_for_pc !~# 'fallback\|none\|all'
-      let user_settings.use_input_for_pc = 'none'
+      let user_settings.use_input_for_pc = 'fallback'
      echohl WarningMsg
-      echomsg '2html: "' .. g:html_use_input_for_pc .. '" is not valid for g:html_use_input_for_pc'
-      echomsg '2html: defaulting to "' .. user_settings.use_input_for_pc .. '"'
+      echomsg '2html: "' . g:html_use_input_for_pc . '" is not valid for g:html_use_input_for_pc'
+      echomsg '2html: defaulting to "' . user_settings.use_input_for_pc . '"'
      echohl None
      sleep 3
    endif
@@ -1,7 +1,7 @@
 " zip.vim: Handles browsing zipfiles
 "            AUTOLOAD PORTION
-" Date:		Mar 12, 2023
-" Version:	33
+" Date:		Nov 08, 2021
+" Version:	32
 " Maintainer:	Charles E Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
 " License:	Vim License  (see vim's :help license)
 " Copyright:    Copyright (C) 2005-2019 Charles E. Campbell {{{1
@@ -20,7 +20,7 @@
 if &cp || exists("g:loaded_zip")
 finish
 endif
-let g:loaded_zip= "v33"
+let g:loaded_zip= "v32"
 if v:version < 702
 echohl WarningMsg
 echo "***warning*** this version of zip needs vim 7.2 or later"
@@ -57,15 +57,6 @@ if !exists("g:zip_extractcmd")
 let g:zip_extractcmd= g:zip_unzipcmd
 endif

-let s:tmp_cwd = getcwd()
-if (fnamemodify(exepath(g:zip_unzipcmd), ":p:h") ==# getcwd()
-          \ && (index(split($PATH,has("win32")? ';' : ':'), s:tmp_cwd) == -1 || s:tmp_cwd == '.'))
- unlet s:tmp_cwd
- echoerr "Warning: NOT executing " .. g:zip_unzipcmd .. " from current directory!"
- finish
-endif
-unlet s:tmp_cwd
-
 " ----------------
 "  Functions: {{{1
 " ----------------
@@ -169,14 +160,10 @@ endfun
 " ---------------------------------------------------------------------
 " ZipBrowseSelect: {{{2
 fun! s:ZipBrowseSelect()
-  "  call Dfunc("ZipBrowseSelect() zipfile<".((exists("b:zipfile"))? b:zipfile : "n/a")."> curfile<".expand("%").">")
+"  call Dfunc("ZipBrowseSelect() zipfile<".b:zipfile."> curfile<".expand("%").">")
  let repkeep= &report
  set report=10
  let fname= getline(".")
-  if !exists("b:zipfile")
-"   call Dret("ZipBrowseSelect : b:zipfile doesn't exist!")
-   return
-  endif

  " sanity check
  if fname =~ '^"'
@@ -1,9 +1,8 @@
 :" Use this script to create the file "bugreport.txt", which contains
 :" information about the environment of a possible bug in Vim.
 :"
-:" Maintainer:	The Vim Project <https://github.com/vim/vim>
-:" Last change:	2023 Aug 10
-:" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+:" Maintainer:	Bram Moolenaar <Bram@vim.org>
+:" Last change:	2019 Jan 27
 :"
 :" To use inside Vim:
 :"	:so $VIMRUNTIME/bugreport.vim
@@ -1,7 +1,6 @@
 " Vim color file
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
-" Last Change:	2023 Aug 10
-" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2001 Jul 23

 " This is the default color scheme.  It doesn't define the Normal
 " highlighting, it uses whatever the colors used to be.
@@ -4,7 +4,7 @@
 " Maintainer:   Maxim Kim <habamax@gmail.com>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Fri 24 Mar 2023 20:28:06 AEDT
+" Last Updated: Fri 02 Sep 2022 09:45:11 MSK

 " Generated by Colortemplate v2.2.0

@@ -36,6 +36,38 @@ 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
@@ -56,14 +88,10 @@ 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=#3a3a3a 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 PmenuKind guifg=#d7875f guibg=#3a3a3a gui=NONE cterm=NONE
-hi PmenuKindSel guifg=#d75f5f guibg=#afaf87 gui=NONE cterm=NONE
-hi PmenuExtra guifg=#767676 guibg=#3a3a3a gui=NONE cterm=NONE
-hi PmenuExtraSel 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
@@ -72,7 +100,7 @@ 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=#ff00af guibg=NONE gui=bold cterm=bold
+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
@@ -84,7 +112,7 @@ 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=#3a3a3a 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
@@ -104,13 +132,13 @@ 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=#dadada guibg=#5f875f 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=#dadada guibg=#878787 gui=NONE cterm=NONE
-hi DiffChange guifg=#bcbcbc guibg=#5f5f5f 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
@@ -131,6 +159,38 @@ if s:t_Co >= 256
  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
@@ -151,14 +211,10 @@ if s:t_Co >= 256
  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=237 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 PmenuKind ctermfg=173 ctermbg=237 cterm=NONE
-  hi PmenuKindSel ctermfg=167 ctermbg=144 cterm=NONE
-  hi PmenuExtra ctermfg=243 ctermbg=237 cterm=NONE
-  hi PmenuExtraSel 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
@@ -167,7 +223,7 @@ if s:t_Co >= 256
  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=199 ctermbg=NONE cterm=bold
+  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
@@ -177,7 +233,7 @@ if s:t_Co >= 256
  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=237 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
@@ -197,18 +253,27 @@ if s:t_Co >= 256
  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=253 ctermbg=65 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=253 ctermbg=102 cterm=NONE
-  hi DiffChange ctermfg=250 ctermbg=59 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
@@ -229,14 +294,10 @@ if s:t_Co >= 16
  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=black ctermbg=gray cterm=NONE
-  hi PmenuThumb ctermfg=gray ctermbg=black cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=gray 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 PmenuKind ctermfg=darkred ctermbg=gray cterm=NONE
-  hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE
-  hi PmenuExtra ctermfg=darkgray ctermbg=gray cterm=NONE
-  hi PmenuExtraSel 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
@@ -245,7 +306,7 @@ if s:t_Co >= 16
  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=magenta ctermbg=NONE cterm=bold
+  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
@@ -275,13 +336,13 @@ if s:t_Co >= 16
  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=white ctermbg=darkgreen 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=lightgrey cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkgray cterm=NONE
+  hi DiffText ctermfg=black ctermbg=lightgrey cterm=NONE
+  hi DiffChange ctermfg=black ctermbg=darkgray cterm=NONE
  unlet s:t_Co
  finish
 endif
@@ -305,16 +366,12 @@ if s:t_Co >= 8
  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=black ctermbg=darkcyan cterm=NONE
-  hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE
+  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 PmenuKind ctermfg=darkred ctermbg=gray cterm=NONE
-  hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE
-  hi PmenuExtra ctermfg=black ctermbg=gray cterm=NONE
-  hi PmenuExtraSel 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
@@ -323,7 +380,7 @@ if s:t_Co >= 8
  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=magenta ctermbg=NONE cterm=bold
+  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
@@ -353,7 +410,7 @@ if s:t_Co >= 8
  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=white ctermbg=darkgreen 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
@@ -450,19 +507,17 @@ endif
 " Color: color07          #9E9E9E        247            gray
 " Color: color15          #BCBCBC        250            white
 " Color: colorLine        #303030        236            darkgrey
-" Color: colorB           #3a3a3a        237            darkgrey
-" Color: colorF           #262626        235            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: colorMP          #ff00af        199            magenta
-" Color: diffAdd          #5f875f        65             darkgreen
+" Color: diffAdd          #87AF87        108            darkgreen
 " Color: diffDelete       #af875f        137            darkyellow
-" Color: diffChange       #5f5f5f        59             darkgray
-" Color: diffText         #878787        102            lightgrey
+" Color: diffChange       #AFAFAF        145            darkgray
+" Color: diffText         #D7D7D7        188            lightgrey
 " Color: black            #000000        16             black
-" Color: white            #dadada        253            white
+" 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
@@ -1,5 +1,5 @@
 " Maintainer:  Drew Vogel <dvogel@sidejump.org>
-" Last Change: 2023 Apr 19
+" Last Change: 2022 Mar 20
 "
 " Replaced rgb.txt as the source of de facto standard color names. This is
 " sourced each time the colorscheme command is run. It is also sourced each
@@ -7,8 +7,7 @@
 " these colors by introducing a new colors/lists/default.vim file earlier in
 " the runtimepath.

-" make sure line continuation works
-let s:keepcpo = &cpo
+let s:keepcpo= &cpo
 set cpo&vim

 call extend(v:colornames, {
@@ -802,7 +801,7 @@ call extend(v:colornames, {
 			\ 'teal': '#008080'
 			\ }, 'keep')

-let &cpo = s:keepcpo
+let &cpo= s:keepcpo
 unlet s:keepcpo

 "vim: sw=4
@@ -4,7 +4,7 @@
 " Maintainer:   Maxim Kim <habamax@gmail.com>
 " Website:      https://www.github.com/vim/colorschemes
 " License:      Vim License (see `:help license`)
-" Last Updated: Sun 26 Mar 2023 23:04:18 AEDT
+" Last Updated: Fri 16 Sep 2022 13:15:33 MSK

 " Generated by Colortemplate v2.2.0

@@ -16,8 +16,24 @@ let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1
 hi! link helpVim Title
 hi! link helpHeader Title
 hi! link helpHyperTextJump Underlined
+hi! link fugitiveSymbolicRef PreProc
+hi! link fugitiveHeading Statement
+hi! link fugitiveStagedHeading Statement
+hi! link fugitiveUnstagedHeading Statement
+hi! link fugitiveUntrackedHeading Statement
+hi! link fugitiveStagedModifier PreProc
+hi! link fugitiveUnstagedModifier PreProc
+hi! link fugitiveHash Constant
 hi! link diffFile PreProc
 hi! link markdownHeadingDelimiter Special
+hi! link rstSectionDelimiter Statement
+hi! link rstDirective PreProc
+hi! link rstHyperlinkReference Special
+hi! link rstFieldName Constant
+hi! link rstDelimiter Special
+hi! link rstInterpretedText Special
+hi! link rstCodeBlock Normal
+hi! link rstLiteralBlock rstCodeBlock
 hi! link markdownUrl String
 hi! link colortemplateKey Statement
 hi! link xmlTagName Statement
@@ -35,6 +51,30 @@ hi! link vimParenSep Normal
 hi! link vimOption Normal
 hi! link vimCommentString Comment
 hi! link pythonInclude Statement
+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 elixirVariable Special
+hi! link elixirAtom Constant
+hi! link elixirDocTest String
 hi! link shQuote Constant
 hi! link shNoQuote Normal
 hi! link shTestOpr Normal
@@ -94,16 +134,12 @@ if &background ==# 'dark'
  hi LineNr guifg=#585858 guibg=NONE gui=NONE cterm=NONE
  hi NonText guifg=#585858 guibg=NONE gui=NONE cterm=NONE
  hi FoldColumn guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-  hi SpecialKey guifg=#585858 guibg=NONE gui=NONE cterm=NONE
  hi EndOfBuffer guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-  hi Pmenu guifg=NONE guibg=#303030 gui=NONE cterm=NONE
-  hi PmenuSel guifg=NONE guibg=#4e4e4e gui=NONE cterm=NONE
+  hi SpecialKey guifg=#585858 guibg=NONE gui=NONE cterm=NONE
+  hi Pmenu guifg=NONE guibg=#1c1c1c gui=NONE cterm=NONE
+  hi PmenuSel guifg=NONE guibg=#444444 gui=NONE cterm=NONE
  hi PmenuThumb guifg=NONE guibg=#c6c6c6 gui=NONE cterm=NONE
  hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuKind guifg=#ff5f5f guibg=#303030 gui=NONE cterm=NONE
-  hi PmenuKindSel guifg=#ff5f5f guibg=#4e4e4e gui=NONE cterm=NONE
-  hi PmenuExtra guifg=#767676 guibg=#303030 gui=NONE cterm=NONE
-  hi PmenuExtraSel guifg=#767676 guibg=#4e4e4e gui=NONE cterm=NONE
  hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
  hi Error guifg=#ffffff guibg=#ff5f5f gui=NONE cterm=NONE
  hi ErrorMsg guifg=#ffffff guibg=#ff5f5f gui=NONE cterm=NONE
@@ -125,8 +161,8 @@ if &background ==# 'dark'
  hi VisualNOS guifg=#000000 guibg=#5fafaf gui=NONE cterm=NONE
  hi CursorLine guifg=NONE guibg=#262626 gui=NONE cterm=NONE
  hi CursorColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE
-  hi Folded guifg=#767676 guibg=#303030 gui=NONE cterm=NONE
-  hi ColorColumn guifg=NONE guibg=#303030 gui=NONE cterm=NONE
+  hi Folded guifg=#767676 guibg=#1c1c1c gui=NONE cterm=NONE
+  hi ColorColumn guifg=NONE guibg=#1c1c1c gui=NONE cterm=NONE
  hi SpellBad guifg=NONE guibg=NONE guisp=#ff5f5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
  hi SpellCap guifg=NONE guibg=NONE guisp=#5fafaf gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
  hi SpellLocal guifg=NONE guibg=NONE guisp=#5faf5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -144,9 +180,9 @@ if &background ==# 'dark'
  hi Directory guifg=#5fafff guibg=NONE gui=bold cterm=bold
  hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
  hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi DiffAdd guifg=#c6c6c6 guibg=#875f87 gui=NONE cterm=NONE
-  hi DiffChange guifg=#c6c6c6 guibg=#5f5f5f gui=NONE cterm=NONE
-  hi DiffText guifg=#afffff guibg=#5f8787 gui=NONE cterm=NONE
+  hi DiffAdd guifg=#000000 guibg=#af87af gui=NONE cterm=NONE
+  hi DiffChange guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE
+  hi DiffText guifg=#000000 guibg=#5fd7d7 gui=NONE cterm=NONE
  hi DiffDelete guifg=#d78787 guibg=NONE gui=NONE cterm=NONE
  hi diffAdded guifg=#5fd75f guibg=NONE gui=NONE cterm=NONE
  hi diffRemoved guifg=#d78787 guibg=NONE gui=NONE cterm=NONE
@@ -186,14 +222,10 @@ else
  hi FoldColumn guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE
  hi EndOfBuffer guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE
  hi SpecialKey guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE
-  hi Pmenu guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi Pmenu guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
  hi PmenuSel guifg=NONE guibg=#c6c6c6 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 PmenuKind guifg=#af0000 guibg=#e4e4e4 gui=NONE cterm=NONE
-  hi PmenuKindSel guifg=#af0000 guibg=#c6c6c6 gui=NONE cterm=NONE
-  hi PmenuExtra guifg=#767676 guibg=#e4e4e4 gui=NONE cterm=NONE
-  hi PmenuExtraSel guifg=#767676 guibg=#c6c6c6 gui=NONE cterm=NONE
  hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
  hi Error guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
  hi ErrorMsg guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
@@ -213,10 +245,10 @@ else
  hi Visual guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
  hi MatchParen guifg=NONE guibg=#c5e7c5 gui=NONE cterm=NONE
  hi VisualNOS guifg=#ffffff guibg=#008787 gui=NONE cterm=NONE
-  hi CursorLine guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
-  hi CursorColumn guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
-  hi Folded guifg=#767676 guibg=#e4e4e4 gui=NONE cterm=NONE
-  hi ColorColumn guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi CursorLine guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi CursorColumn guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi Folded guifg=#767676 guibg=#eeeeee gui=NONE cterm=NONE
+  hi ColorColumn guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
  hi SpellBad guifg=NONE guibg=NONE guisp=#af0000 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
  hi SpellCap guifg=NONE guibg=NONE guisp=#005f5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
  hi SpellLocal guifg=NONE guibg=NONE guisp=#008700 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -262,8 +294,24 @@ if s:t_Co >= 256
  hi! link helpVim Title
  hi! link helpHeader Title
  hi! link helpHyperTextJump Underlined
+  hi! link fugitiveSymbolicRef PreProc
+  hi! link fugitiveHeading Statement
+  hi! link fugitiveStagedHeading Statement
+  hi! link fugitiveUnstagedHeading Statement
+  hi! link fugitiveUntrackedHeading Statement
+  hi! link fugitiveStagedModifier PreProc
+  hi! link fugitiveUnstagedModifier PreProc
+  hi! link fugitiveHash Constant
  hi! link diffFile PreProc
  hi! link markdownHeadingDelimiter Special
+  hi! link rstSectionDelimiter Statement
+  hi! link rstDirective PreProc
+  hi! link rstHyperlinkReference Special
+  hi! link rstFieldName Constant
+  hi! link rstDelimiter Special
+  hi! link rstInterpretedText Special
+  hi! link rstCodeBlock Normal
+  hi! link rstLiteralBlock rstCodeBlock
  hi! link markdownUrl String
  hi! link colortemplateKey Statement
  hi! link xmlTagName Statement
@@ -281,6 +329,30 @@ if s:t_Co >= 256
  hi! link vimOption Normal
  hi! link vimCommentString Comment
  hi! link pythonInclude Statement
+  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 elixirVariable Special
+  hi! link elixirAtom Constant
+  hi! link elixirDocTest String
  hi! link shQuote Constant
  hi! link shNoQuote Normal
  hi! link shTestOpr Normal
@@ -337,16 +409,12 @@ if s:t_Co >= 256
    hi LineNr ctermfg=240 ctermbg=NONE cterm=NONE
    hi NonText ctermfg=240 ctermbg=NONE cterm=NONE
    hi FoldColumn ctermfg=240 ctermbg=NONE cterm=NONE
-    hi SpecialKey ctermfg=240 ctermbg=NONE cterm=NONE
    hi EndOfBuffer ctermfg=240 ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=NONE ctermbg=236 cterm=NONE
-    hi PmenuSel ctermfg=NONE ctermbg=239 cterm=NONE
+    hi SpecialKey ctermfg=240 ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=NONE ctermbg=234 cterm=NONE
+    hi PmenuSel ctermfg=NONE ctermbg=238 cterm=NONE
    hi PmenuThumb ctermfg=NONE ctermbg=251 cterm=NONE
    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi PmenuKind ctermfg=203 ctermbg=236 cterm=NONE
-    hi PmenuKindSel ctermfg=203 ctermbg=239 cterm=NONE
-    hi PmenuExtra ctermfg=243 ctermbg=236 cterm=NONE
-    hi PmenuExtraSel ctermfg=243 ctermbg=239 cterm=NONE
    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
    hi Error ctermfg=231 ctermbg=203 cterm=NONE
    hi ErrorMsg ctermfg=231 ctermbg=203 cterm=NONE
@@ -366,8 +434,8 @@ if s:t_Co >= 256
    hi VisualNOS ctermfg=16 ctermbg=73 cterm=NONE
    hi CursorLine ctermfg=NONE ctermbg=235 cterm=NONE
    hi CursorColumn ctermfg=NONE ctermbg=235 cterm=NONE
-    hi Folded ctermfg=243 ctermbg=236 cterm=NONE
-    hi ColorColumn ctermfg=NONE ctermbg=236 cterm=NONE
+    hi Folded ctermfg=243 ctermbg=234 cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=234 cterm=NONE
    hi SpellBad ctermfg=203 ctermbg=NONE cterm=underline
    hi SpellCap ctermfg=73 ctermbg=NONE cterm=underline
    hi SpellLocal ctermfg=77 ctermbg=NONE cterm=underline
@@ -385,9 +453,9 @@ if s:t_Co >= 256
    hi Directory ctermfg=75 ctermbg=NONE cterm=bold
    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi DiffAdd ctermfg=251 ctermbg=96 cterm=NONE
-    hi DiffChange ctermfg=251 ctermbg=59 cterm=NONE
-    hi DiffText ctermfg=159 ctermbg=66 cterm=NONE
+    hi DiffAdd ctermfg=16 ctermbg=139 cterm=NONE
+    hi DiffChange ctermfg=16 ctermbg=252 cterm=NONE
+    hi DiffText ctermfg=16 ctermbg=80 cterm=NONE
    hi DiffDelete ctermfg=174 ctermbg=NONE cterm=NONE
    hi diffAdded ctermfg=77 ctermbg=NONE cterm=NONE
    hi diffRemoved ctermfg=174 ctermbg=NONE cterm=NONE
@@ -424,14 +492,10 @@ if s:t_Co >= 256
    hi FoldColumn ctermfg=247 ctermbg=NONE cterm=NONE
    hi EndOfBuffer ctermfg=247 ctermbg=NONE cterm=NONE
    hi SpecialKey ctermfg=247 ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=NONE ctermbg=254 cterm=NONE
+    hi Pmenu ctermfg=NONE ctermbg=255 cterm=NONE
    hi PmenuSel ctermfg=NONE ctermbg=251 cterm=NONE
    hi PmenuThumb ctermfg=NONE ctermbg=243 cterm=NONE
    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi PmenuKind ctermfg=124 ctermbg=254 cterm=NONE
-    hi PmenuKindSel ctermfg=124 ctermbg=251 cterm=NONE
-    hi PmenuExtra ctermfg=243 ctermbg=254 cterm=NONE
-    hi PmenuExtraSel ctermfg=243 ctermbg=251 cterm=NONE
    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
    hi Error ctermfg=231 ctermbg=160 cterm=NONE
    hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE
@@ -449,10 +513,10 @@ if s:t_Co >= 256
    hi Visual ctermfg=231 ctermbg=67 cterm=NONE
    hi MatchParen ctermfg=30 ctermbg=231 cterm=reverse
    hi VisualNOS ctermfg=231 ctermbg=30 cterm=NONE
-    hi CursorLine ctermfg=NONE ctermbg=255 cterm=NONE
-    hi CursorColumn ctermfg=NONE ctermbg=255 cterm=NONE
-    hi Folded ctermfg=243 ctermbg=254 cterm=NONE
-    hi ColorColumn ctermfg=NONE ctermbg=254 cterm=NONE
+    hi CursorLine ctermfg=NONE ctermbg=254 cterm=NONE
+    hi CursorColumn ctermfg=NONE ctermbg=254 cterm=NONE
+    hi Folded ctermfg=243 ctermbg=255 cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=255 cterm=NONE
    hi SpellBad ctermfg=124 ctermbg=NONE cterm=underline
    hi SpellCap ctermfg=23 ctermbg=NONE cterm=underline
    hi SpellLocal ctermfg=28 ctermbg=NONE cterm=underline
@@ -513,16 +577,12 @@ if s:t_Co >= 16
    hi LineNr ctermfg=grey ctermbg=NONE cterm=NONE
    hi NonText ctermfg=grey ctermbg=NONE cterm=NONE
    hi FoldColumn ctermfg=grey ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=grey ctermbg=NONE cterm=NONE
    hi SpecialKey ctermfg=grey ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
-    hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
-    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=black ctermbg=darkgrey cterm=NONE
    hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
-    hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE
-    hi PmenuKindSel ctermfg=darkred ctermbg=darkcyan cterm=NONE
-    hi PmenuExtra ctermfg=black ctermbg=grey cterm=NONE
-    hi PmenuExtraSel ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
    hi Error ctermfg=white ctermbg=red cterm=NONE
    hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
@@ -561,8 +621,8 @@ if s:t_Co >= 16
    hi Directory ctermfg=blue ctermbg=NONE cterm=bold
    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi DiffAdd ctermfg=white ctermbg=darkmagenta cterm=NONE
-    hi DiffChange ctermfg=white ctermbg=darkgreen cterm=NONE
+    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi DiffChange ctermfg=black ctermbg=lightgray cterm=NONE
    hi DiffText ctermfg=black ctermbg=cyan cterm=NONE
    hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
    hi diffAdded ctermfg=green ctermbg=NONE cterm=NONE
@@ -601,13 +661,9 @@ if s:t_Co >= 16
    hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
    hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
    hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
-    hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
-    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
    hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
-    hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE
-    hi PmenuKindSel ctermfg=darkred ctermbg=darkcyan cterm=NONE
-    hi PmenuExtra ctermfg=black ctermbg=grey cterm=NONE
-    hi PmenuExtraSel ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi PmenuThumb ctermfg=NONE ctermbg=darkgrey cterm=NONE
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
    hi Error ctermfg=white ctermbg=red cterm=NONE
    hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
@@ -687,18 +743,14 @@ if s:t_Co >= 8
    hi QuickFixLine ctermfg=grey ctermbg=darkblue cterm=bold
    hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold
    hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
-    hi NonText ctermfg=grey ctermbg=NONE cterm=NONE
-    hi FoldColumn ctermfg=grey ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=grey ctermbg=NONE cterm=NONE
-    hi SpecialKey ctermfg=grey ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
+    hi NonText ctermfg=black ctermbg=NONE cterm=NONE
+    hi FoldColumn ctermfg=black ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=black ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=black ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=NONE ctermbg=grey cterm=NONE
    hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
    hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
-    hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE
-    hi PmenuKindSel ctermfg=darkred ctermbg=darkcyan cterm=NONE
-    hi PmenuExtra ctermfg=black ctermbg=grey cterm=NONE
-    hi PmenuExtraSel ctermfg=black ctermbg=darkcyan cterm=NONE
    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
    hi Error ctermfg=grey ctermbg=darkred cterm=NONE
    hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
@@ -736,8 +788,8 @@ if s:t_Co >= 8
    hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi DiffAdd ctermfg=white ctermbg=darkmagenta cterm=NONE
-    hi DiffChange ctermfg=white ctermbg=darkgreen cterm=NONE
+    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
+    hi DiffChange ctermfg=black ctermbg=darkcyan cterm=NONE
    hi DiffText ctermfg=black ctermbg=grey cterm=NONE
    hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
  else
@@ -758,14 +810,10 @@ if s:t_Co >= 8
    hi FoldColumn ctermfg=black ctermbg=NONE cterm=NONE
    hi EndOfBuffer ctermfg=black ctermbg=NONE cterm=NONE
    hi SpecialKey ctermfg=black ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=grey ctermbg=black cterm=NONE
+    hi Pmenu ctermfg=NONE ctermbg=black cterm=NONE
    hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
    hi PmenuSel ctermfg=NONE ctermbg=darkcyan cterm=NONE
-    hi PmenuKind ctermfg=darkred ctermbg=black cterm=NONE
-    hi PmenuKindSel ctermfg=darkred ctermbg=darkcyan cterm=NONE
-    hi PmenuExtra ctermfg=grey ctermbg=black cterm=NONE
-    hi PmenuExtraSel ctermfg=black ctermbg=darkcyan cterm=NONE
    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
    hi Error ctermfg=grey ctermbg=darkred cterm=NONE
    hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
@@ -900,21 +948,20 @@ endif
 " Color: color15                 #FFFFFF        231            white
 " Color: colorDimWhite           #E4E4E4        254            grey
 " Color: colorLine               #262626        235            darkgrey
-" Color: colorB                  #303030        236            darkgrey
+" Color: colorB                  #1C1C1C        234            darkgrey
 " Color: colorNonT               #585858        240            grey
 " Color: colorTab                #585858        240            grey
 " Color: colorC                  #FFFFFF        231            white
 " Color: colorlC                 #FF5FFF        207            magenta
 " Color: colorV                  #005F87        24             darkblue
 " Color: colorMP                 #C5E7C5        30             darkcyan
-" Color: colorPMenuSel           #4e4e4e        239            darkcyan
+" Color: colorPMenuSel           #444444        238            darkcyan
 " Color: colorDim                #878787        102            grey
-" Color: diffAdd                 #875f87        96             darkmagenta
+" Color: diffAdd                 #AF87AF        139            darkmagenta
 " Color: diffDelete              #D78787        174            darkred
-" Color: diffChange              #5f5f5f        59             darkgreen
-" Color: diffText                #5f8787        66             cyan
-" Color: fgDiffText              #afffff        159            black
-" Color: fgDiff                  #C6C6C6        251            white
+" Color: diffChange              #D0D0D0        252            lightgray
+" Color: diffText                #5FD7D7        80             cyan
+" Color: fgDiff                  #000000        16             black
 " Term colors: color00 color01 color02 color03 color04 color05 color06 color07
 " Term colors: color08 color09 color10 color11 color12 color13 color14 color15
 " Background: light
@@ -934,8 +981,8 @@ endif
 " Color: color14                 #008787        30             cyan
 " Color: color07                 #808080        244            grey
 " Color: color15                 #FFFFFF        231            white
-" Color: colorLine               #EEEEEE        255            grey
-" Color: colorB                  #E4E4E4        254            grey
+" Color: colorLine               #E4E4E4        254            grey
+" Color: colorB                  #EEEEEE        255            grey
 " Color: colorNonT               #9E9E9E        247            darkgrey
 " Color: colorTab                #BCBCBC        250            lightgrey
 " Color: colorC                  #000000        16             black
@@ -1,10 +1,10 @@
 " Name:         quiet
-" Description:  A mostly monochrome colorscheme, with a few niceties.
-" Author:       Maxence Weynans <neutaaaaan@gmail.com>
-" Maintainer:   Maxence Weynans <neutaaaaan@gmail.com>
+" 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: Wed 15 Mar 2023 06:45:06 PM CET
+" Last Updated: Fri 16 Sep 2022 09:52:50 MSK

 " Generated by Colortemplate v2.2.0

@@ -48,62 +48,57 @@ hi! link debugPC CursorLine

 if &background ==# 'dark'
  if (has('termguicolors') && &termguicolors) || has('gui_running')
-    let g:terminal_ansi_colors = ['#000000', '#d7005f', '#00af5f', '#d78700', '#0087d7', '#d787d7', '#00afaf', '#dadada', '#707070', '#ff005f', '#00d75f', '#ffaf00', '#5fafff', '#ff87ff', '#00d7d7', '#ffffff']
+    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=#000000 gui=NONE cterm=NONE
+  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 CurSearch guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
  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=#000000 gui=reverse cterm=reverse
-  hi DiffChange guifg=#87afd7 guibg=#000000 gui=reverse cterm=reverse
-  hi DiffDelete guifg=#d75f5f guibg=#000000 gui=reverse cterm=reverse
-  hi DiffText guifg=#d787d7 guibg=#000000 gui=reverse cterm=reverse
+  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=#707070 guibg=NONE gui=NONE cterm=NONE
-  hi ErrorMsg guifg=#dadada guibg=#000000 gui=reverse cterm=reverse
+  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=#000000 gui=NONE cterm=NONE
-  hi IncSearch guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse
-  hi LineNr guifg=#585858 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=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
-  hi PmenuExtra guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
-  hi PmenuKind guifg=#000000 guibg=#a8a8a8 gui=bold cterm=bold
-  hi PmenuSbar guifg=#707070 guibg=#585858 gui=NONE cterm=NONE
-  hi PmenuSel guifg=#000000 guibg=#dadada gui=NONE cterm=NONE
-  hi PmenuExtraSel guifg=#000000 guibg=#dadada gui=NONE cterm=NONE
-  hi PmenuKindSel guifg=#000000 guibg=#dadada gui=bold cterm=bold
-  hi PmenuThumb guifg=#dadada guibg=#dadada 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=#ff5fff guibg=#000000 gui=reverse cterm=reverse
-  hi Search guifg=#00afff guibg=#000000 gui=reverse cterm=reverse
+  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=#707070 guibg=NONE gui=bold cterm=bold
+  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=#000000 guibg=#dadada gui=bold cterm=bold
-  hi StatusLineNC guifg=#707070 guibg=#000000 gui=reverse cterm=reverse
-  hi TabLine guifg=#707070 guibg=#000000 gui=reverse cterm=reverse
+  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=#000000 guibg=#dadada gui=bold cterm=bold
+  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=#000000 gui=NONE cterm=NONE
-  hi Visual guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse
+  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=#000000 gui=bold cterm=bold
+  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=#000000 gui=bold,reverse cterm=bold,reverse
+  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
@@ -112,137 +107,127 @@ if &background ==# 'dark'
  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=#000000 guibg=#afff00 gui=NONE cterm=NONE
-  hi ToolbarLine guifg=NONE guibg=#000000 gui=NONE cterm=NONE
-  hi ToolbarButton guifg=#dadada guibg=#000000 gui=bold cterm=bold
+  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 = ['#000000', '#af0000', '#005f00', '#af5f00', '#005faf', '#870087', '#008787', '#d7d7d7', '#626262', '#d70000', '#008700', '#d78700', '#0087d7', '#af00af', '#00afaf', '#ffffff']
+    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=#000000 guibg=#d7d7d7 gui=NONE cterm=NONE
+  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 CurSearch guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
  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=#000000 guibg=#eeeeee gui=NONE cterm=NONE
-  hi DiffAdd guifg=#87d787 guibg=#000000 gui=reverse cterm=reverse
-  hi DiffChange guifg=#afafd7 guibg=#000000 gui=reverse cterm=reverse
-  hi DiffDelete guifg=#d78787 guibg=#000000 gui=reverse cterm=reverse
-  hi DiffText guifg=#d787d7 guibg=#000000 gui=reverse cterm=reverse
-  hi Directory guifg=#000000 guibg=NONE gui=NONE cterm=NONE
-  hi EndOfBuffer guifg=#626262 guibg=NONE gui=NONE cterm=NONE
-  hi ErrorMsg guifg=#000000 guibg=#d7d7d7 gui=reverse cterm=reverse
+  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=#000000 gui=reverse cterm=reverse
+  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=#000000 guibg=NONE gui=bold cterm=bold
-  hi MoreMsg guifg=#000000 guibg=NONE gui=NONE cterm=NONE
+  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=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
-  hi PmenuExtra guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
-  hi PmenuKind guifg=#000000 guibg=#a8a8a8 gui=bold cterm=bold
-  hi PmenuSbar guifg=#000000 guibg=#e4e4e4 gui=NONE cterm=NONE
-  hi PmenuSel guifg=#d7d7d7 guibg=#000000 gui=NONE cterm=NONE
-  hi PmenuExtraSel guifg=#d7d7d7 guibg=#000000 gui=NONE cterm=NONE
-  hi PmenuKindSel guifg=#d7d7d7 guibg=#000000 gui=bold cterm=bold
-  hi PmenuThumb guifg=#000000 guibg=#000000 gui=NONE cterm=NONE
-  hi Question guifg=#000000 guibg=NONE gui=NONE cterm=NONE
-  hi QuickFixLine guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
-  hi Search guifg=#00afff guibg=#000000 gui=reverse cterm=reverse
-  hi SignColumn guifg=#000000 guibg=NONE gui=NONE cterm=NONE
-  hi SpecialKey guifg=#626262 guibg=NONE gui=bold cterm=bold
+  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=#000000 gui=bold cterm=bold
-  hi StatusLineNC guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
-  hi TabLine guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
-  hi TabLineFill guifg=#000000 guibg=#d7d7d7 gui=NONE cterm=NONE
-  hi TabLineSel guifg=#eeeeee guibg=#000000 gui=bold cterm=bold
+  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=#000000 gui=reverse cterm=reverse
+  hi Visual guifg=#ffaf00 guibg=#080808 gui=reverse cterm=reverse
  hi VisualNOS guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
-  hi WarningMsg guifg=#000000 guibg=NONE gui=NONE cterm=NONE
-  hi WildMenu guifg=#000000 guibg=#eeeeee gui=bold cterm=bold
-  hi Comment guifg=#000000 guibg=NONE gui=bold cterm=bold
-  hi Constant guifg=#000000 guibg=NONE gui=NONE cterm=NONE
-  hi Error guifg=#ff005f guibg=#000000 gui=bold,reverse cterm=bold,reverse
-  hi Identifier guifg=#000000 guibg=NONE gui=NONE cterm=NONE
-  hi Ignore guifg=#000000 guibg=NONE gui=NONE cterm=NONE
-  hi PreProc guifg=#000000 guibg=NONE gui=NONE cterm=NONE
-  hi Special guifg=#000000 guibg=NONE gui=NONE cterm=NONE
-  hi Statement guifg=#000000 guibg=NONE gui=NONE cterm=NONE
-  hi Todo guifg=#00ffaf guibg=#000000 gui=bold,reverse cterm=bold,reverse
-  hi Type guifg=#000000 guibg=NONE gui=NONE cterm=NONE
-  hi Underlined guifg=#000000 guibg=NONE gui=underline cterm=underline
-  hi CursorIM guifg=#000000 guibg=#afff00 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=#000000 guibg=#d7d7d7 gui=bold cterm=bold
+  hi ToolbarButton guifg=#080808 guibg=#d7d7d7 gui=bold cterm=bold
 endif

 if s:t_Co >= 256
  if &background ==# 'dark'
-    hi Normal ctermfg=253 ctermbg=16 cterm=NONE
+    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 CurSearch ctermfg=207 ctermbg=16 cterm=reverse
    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=16 cterm=reverse
-    hi DiffChange ctermfg=110 ctermbg=16 cterm=reverse
-    hi DiffDelete ctermfg=167 ctermbg=16 cterm=reverse
-    hi DiffText ctermfg=176 ctermbg=16 cterm=reverse
+    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=242 ctermbg=NONE cterm=NONE
-    hi ErrorMsg ctermfg=253 ctermbg=16 cterm=reverse
+    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=16 cterm=NONE
-    hi IncSearch ctermfg=214 ctermbg=16 cterm=reverse
-    hi LineNr ctermfg=240 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=16 ctermbg=248 cterm=NONE
-    hi PmenuExtra ctermfg=16 ctermbg=248 cterm=NONE
-    hi PmenuKind ctermfg=16 ctermbg=248 cterm=bold
-    hi PmenuSbar ctermfg=242 ctermbg=240 cterm=NONE
-    hi PmenuSel ctermfg=16 ctermbg=253 cterm=NONE
-    hi PmenuExtraSel ctermfg=16 ctermbg=253 cterm=NONE
-    hi PmenuKindSel ctermfg=16 ctermbg=253 cterm=bold
-    hi PmenuThumb ctermfg=253 ctermbg=253 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=207 ctermbg=16 cterm=reverse
-    hi Search ctermfg=39 ctermbg=16 cterm=reverse
+    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=242 ctermbg=NONE cterm=bold
+    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=16 ctermbg=253 cterm=bold
-    hi StatusLineNC ctermfg=242 ctermbg=16 cterm=reverse
-    hi TabLine ctermfg=242 ctermbg=16 cterm=reverse
+    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=16 ctermbg=253 cterm=bold
+    hi TabLineSel ctermfg=232 ctermbg=253 cterm=bold
    hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi VertSplit ctermfg=242 ctermbg=16 cterm=NONE
-    hi Visual ctermfg=214 ctermbg=16 cterm=reverse
+    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=16 cterm=bold
+    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=16 cterm=bold,reverse
+    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
@@ -251,76 +236,71 @@ if s:t_Co >= 256
    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=16 ctermbg=154 cterm=NONE
-    hi ToolbarLine ctermfg=NONE ctermbg=16 cterm=NONE
-    hi ToolbarButton ctermfg=253 ctermbg=16 cterm=bold
+    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=16 ctermbg=188 cterm=NONE
+    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 CurSearch ctermfg=207 ctermbg=16 cterm=reverse
    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=16 ctermbg=255 cterm=NONE
-    hi DiffAdd ctermfg=114 ctermbg=16 cterm=reverse
-    hi DiffChange ctermfg=146 ctermbg=16 cterm=reverse
-    hi DiffDelete ctermfg=174 ctermbg=16 cterm=reverse
-    hi DiffText ctermfg=176 ctermbg=16 cterm=reverse
-    hi Directory ctermfg=16 ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=241 ctermbg=NONE cterm=NONE
-    hi ErrorMsg ctermfg=16 ctermbg=188 cterm=reverse
+    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=16 cterm=reverse
+    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=16 ctermbg=NONE cterm=bold
-    hi MoreMsg ctermfg=16 ctermbg=NONE cterm=NONE
+    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=16 ctermbg=248 cterm=NONE
-    hi PmenuExtra ctermfg=16 ctermbg=248 cterm=NONE
-    hi PmenuKind ctermfg=16 ctermbg=248 cterm=bold
-    hi PmenuSbar ctermfg=16 ctermbg=254 cterm=NONE
-    hi PmenuSel ctermfg=188 ctermbg=16 cterm=NONE
-    hi PmenuExtraSel ctermfg=188 ctermbg=16 cterm=NONE
-    hi PmenuKindSel ctermfg=188 ctermbg=16 cterm=bold
-    hi PmenuThumb ctermfg=16 ctermbg=16 cterm=NONE
-    hi Question ctermfg=16 ctermbg=NONE cterm=NONE
-    hi QuickFixLine ctermfg=207 ctermbg=16 cterm=reverse
-    hi Search ctermfg=39 ctermbg=16 cterm=reverse
-    hi SignColumn ctermfg=16 ctermbg=NONE cterm=NONE
-    hi SpecialKey ctermfg=241 ctermbg=NONE cterm=bold
+    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=16 cterm=bold
-    hi StatusLineNC ctermfg=16 ctermbg=248 cterm=NONE
-    hi TabLine ctermfg=16 ctermbg=248 cterm=NONE
-    hi TabLineFill ctermfg=16 ctermbg=188 cterm=NONE
-    hi TabLineSel ctermfg=255 ctermbg=16 cterm=bold
+    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=16 cterm=reverse
+    hi Visual ctermfg=214 ctermbg=232 cterm=reverse
    hi VisualNOS ctermfg=NONE ctermbg=255 cterm=NONE
-    hi WarningMsg ctermfg=16 ctermbg=NONE cterm=NONE
-    hi WildMenu ctermfg=16 ctermbg=255 cterm=bold
-    hi Comment ctermfg=16 ctermbg=NONE cterm=bold
-    hi Constant ctermfg=16 ctermbg=NONE cterm=NONE
-    hi Error ctermfg=197 ctermbg=16 cterm=bold,reverse
-    hi Identifier ctermfg=16 ctermbg=NONE cterm=NONE
-    hi Ignore ctermfg=16 ctermbg=NONE cterm=NONE
-    hi PreProc ctermfg=16 ctermbg=NONE cterm=NONE
-    hi Special ctermfg=16 ctermbg=NONE cterm=NONE
-    hi Statement ctermfg=16 ctermbg=NONE cterm=NONE
-    hi Todo ctermfg=49 ctermbg=16 cterm=bold,reverse
-    hi Type ctermfg=16 ctermbg=NONE cterm=NONE
-    hi Underlined ctermfg=16 ctermbg=NONE cterm=underline
-    hi CursorIM ctermfg=16 ctermbg=154 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=16 ctermbg=188 cterm=bold
+    hi ToolbarButton ctermfg=232 ctermbg=188 cterm=bold
  endif
  unlet s:t_Co
  finish
@@ -328,19 +308,6 @@ endif

 if s:t_Co >= 16
  if &background ==# 'dark'
-    hi Comment ctermfg=darkgrey ctermbg=NONE cterm=bold
-    hi CurSearch ctermfg=magenta ctermbg=black cterm=reverse
-    hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
-    hi Folded ctermfg=darkgrey ctermbg=NONE cterm=NONE
-    hi IncSearch ctermfg=yellow ctermbg=black cterm=reverse
-    hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
-    hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
-    hi PmenuSbar ctermfg=darkgrey ctermbg=NONE cterm=reverse
-    hi Search ctermfg=cyan ctermbg=black cterm=reverse
-    hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=bold
-    hi StatusLineNC ctermfg=darkgrey ctermbg=NONE cterm=reverse
-    hi TabLine ctermfg=darkgrey ctermbg=NONE cterm=reverse
-    hi VertSplit ctermfg=darkgrey ctermbg=NONE cterm=NONE
    hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
    hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -353,35 +320,43 @@ if s:t_Co >= 16
    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 PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
    hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
-    hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
-    hi PmenuKindSel 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=darkred ctermbg=black cterm=bold,reverse
+    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
@@ -395,18 +370,6 @@ if s:t_Co >= 16
    hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse
  else
    " Light background
-    hi CurSearch ctermfg=magenta ctermbg=black cterm=reverse
-    hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
-    hi Folded ctermfg=darkgrey ctermbg=NONE cterm=NONE
-    hi IncSearch ctermfg=yellow ctermbg=black cterm=reverse
-    hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
-    hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
-    hi PmenuSbar ctermfg=darkgrey ctermbg=NONE cterm=reverse
-    hi Search ctermfg=cyan ctermbg=black cterm=reverse
-    hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=bold
-    hi StatusLineNC ctermfg=darkgrey ctermbg=NONE cterm=reverse
-    hi TabLine ctermfg=darkgrey ctermbg=NONE cterm=reverse
-    hi VertSplit ctermfg=darkgrey ctermbg=NONE cterm=NONE
    hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
    hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -419,36 +382,43 @@ if s:t_Co >= 16
    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 PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
    hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
-    hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
-    hi PmenuKindSel 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=darkred ctermbg=black cterm=bold,reverse
+    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
@@ -467,19 +437,6 @@ endif

 if s:t_Co >= 8
  if &background ==# 'dark'
-    hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
-    hi CurSearch ctermfg=darkmagenta ctermbg=black cterm=reverse
-    hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
-    hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
-    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
-    hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
-    hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
-    hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
    hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
    hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -492,35 +449,43 @@ if s:t_Co >= 8
    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 PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
    hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
-    hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
-    hi PmenuKindSel 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=darkred ctermbg=black cterm=bold,reverse
+    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
@@ -534,18 +499,6 @@ if s:t_Co >= 8
    hi ToolbarButton ctermfg=NONE ctermbg=NONE cterm=bold,reverse
  else
    " Light background
-    hi CurSearch ctermfg=darkmagenta ctermbg=black cterm=reverse
-    hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
-    hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
-    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
-    hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
-    hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
-    hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
    hi Normal ctermfg=NONE ctermbg=NONE cterm=NONE
    hi ColorColumn ctermfg=NONE ctermbg=NONE cterm=reverse
    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
@@ -558,36 +511,43 @@ if s:t_Co >= 8
    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 PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
    hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
-    hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
-    hi PmenuKindSel 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=darkred ctermbg=black cterm=bold,reverse
+    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
@@ -673,7 +633,7 @@ if s:t_Co >= 0
 endif

 " Background: dark
-" Color: dark0         #000000           16                black
+" Color: dark0         #080808           232               black
 " Color: dark1         #d7005f           161               darkred
 " Color: dark2         #00af5f           35                darkgreen
 " Color: dark3         #d78700           172               darkyellow
@@ -701,15 +661,13 @@ endif
 " Color: uiamber       #ffaf00           214               darkyellow
 " Color: uiblack       #303030           236               darkgrey
 " Color: yasogrey      #1c1c1c           234               black
-" Color: linenrblack   #585858           240               darkgrey
-" Color: uicursearch   #ff5fff           207               magenta
-" Color: invisigrey    #a8a8a8           248               darkgrey
+" 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        #000000           16                black
+" Color: light0        #080808           232               black
 " Color: light1        #af0000           124               darkred
 " Color: light2        #005f00           22                darkgreen
 " Color: light3        #af5f00           130               darkyellow
@@ -737,7 +695,6 @@ endif
 " Color: uiamber       #ffaf00           214               yellow
 " Color: invisigrey    #a8a8a8           248               darkgrey
 " Color: yasogrey      #e4e4e4           254               grey
-" Color: uicursearch   #ff5fff           207               magenta
 " 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
@@ -1,874 +0,0 @@
-" Name:         Retro Box
-" Description:  Retro groove color scheme similar to gruvbox originally designed by morhetz <morhetz@gmail.com>
-" Author:       Maxim Kim <habamax@gmail.com>, ported from gruvbox8 of Lifepillar <lifepillar@lifepillar.me>
-" Maintainer:   Maxim Kim <habamax@gmail.com>, ported from gruvbox8 of Lifepillar <lifepillar@lifepillar.me>
-" Website:      https://www.github.com/vim/colorschemes
-" License:      Vim License (see `:help license`)
-" Last Updated: Sun 12 Mar 2023 15:14:04 AEDT
-
-" Generated by Colortemplate v2.2.0
-
-hi clear
-let g:colors_name = 'retrobox'
-
-let s:t_Co = exists('&t_Co') && !has('gui_running') ? (&t_Co ?? 0) : -1
-
-hi! link CursorColumn CursorLine
-hi! link StatusLineTerm StatusLine
-hi! link StatusLineTermNC StatusLineNC
-hi! link VisualNOS Visual
-hi! link Tag Special
-hi! link lCursor Cursor
-hi! link MessageWindow PMenu
-hi! link PopupNotification Todo
-hi! link CurSearch Search
-
-if &background ==# 'dark'
-  if (has('termguicolors') && &termguicolors) || has('gui_running')
-    let g:terminal_ansi_colors = ['#1c1c1c', '#cc241d', '#98971a', '#d79921', '#458588', '#b16286', '#689d6a', '#a89984', '#928374', '#fb4934', '#b8bb26', '#fabd2f', '#83a598', '#d3869b', '#8ec07c', '#ebdbb2']
-  endif
-  hi Normal guifg=#ebdbb2 guibg=#1c1c1c gui=NONE cterm=NONE
-  hi CursorLineNr guifg=#fabd2f guibg=#303030 gui=NONE cterm=NONE
-  hi FoldColumn guifg=#928374 guibg=#1c1c1c gui=NONE cterm=NONE
-  hi SignColumn guifg=#928374 guibg=#1c1c1c gui=NONE cterm=NONE
-  hi VertSplit guifg=#303030 guibg=#1c1c1c gui=NONE cterm=NONE
-  hi ColorColumn guifg=NONE guibg=#000000 gui=NONE cterm=NONE
-  hi Comment guifg=#928374 guibg=NONE gui=NONE cterm=NONE
-  hi CursorLine guifg=NONE guibg=#303030 gui=NONE cterm=NONE
-  hi Error guifg=#fb4934 guibg=#1c1c1c gui=bold,reverse cterm=bold,reverse
-  hi ErrorMsg guifg=#1c1c1c guibg=#fb4934 gui=bold cterm=bold
-  hi Folded guifg=#928374 guibg=#121212 gui=NONE cterm=NONE
-  hi LineNr guifg=#7c6f64 guibg=NONE gui=NONE cterm=NONE
-  hi MatchParen guifg=NONE guibg=#504945 gui=bold,underline cterm=bold,underline
-  hi NonText guifg=#504945 guibg=NONE gui=NONE cterm=NONE
-  hi Pmenu guifg=#ebdbb2 guibg=#3c3836 gui=NONE cterm=NONE
-  hi PmenuSbar guifg=NONE guibg=#3c3836 gui=NONE cterm=NONE
-  hi PmenuSel guifg=#3c3836 guibg=#83a598 gui=bold cterm=bold
-  hi PmenuThumb guifg=NONE guibg=#7c6f64 gui=NONE cterm=NONE
-  hi PmenuKind guifg=#fb4934 guibg=#3c3836 gui=NONE cterm=NONE
-  hi PmenuKindSel guifg=#fb4934 guibg=#83a598 gui=NONE cterm=NONE
-  hi PmenuExtra guifg=#a89984 guibg=#3c3836 gui=NONE cterm=NONE
-  hi PmenuExtraSel guifg=#303030 guibg=#83a598 gui=NONE cterm=NONE
-  hi SpecialKey guifg=#928374 guibg=NONE gui=NONE cterm=NONE
-  hi StatusLine guifg=#504945 guibg=#ebdbb2 gui=bold,reverse cterm=bold,reverse
-  hi StatusLineNC guifg=#3c3836 guibg=#a89984 gui=reverse cterm=reverse
-  hi TabLine guifg=#a89984 guibg=#3c3836 gui=NONE cterm=NONE
-  hi TabLineFill guifg=#ebdbb2 guibg=#3c3836 gui=NONE cterm=NONE
-  hi TabLineSel guifg=#fbf1c7 guibg=#1c1c1c gui=bold cterm=bold
-  hi ToolbarButton guifg=#fbf1c7 guibg=#303030 gui=bold cterm=bold
-  hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Visual guifg=#1c1c1c guibg=#83a598 gui=NONE cterm=NONE
-  hi WildMenu guifg=#83a598 guibg=#504945 gui=bold cterm=bold
-  hi EndOfBuffer guifg=#504945 guibg=NONE gui=NONE cterm=NONE
-  hi Conceal guifg=#83a598 guibg=NONE gui=NONE cterm=NONE
-  hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi DiffAdd guifg=#b8bb26 guibg=#1c1c1c gui=reverse cterm=reverse
-  hi DiffChange guifg=#8ec07c guibg=#1c1c1c gui=reverse cterm=reverse
-  hi DiffDelete guifg=#fb4934 guibg=#1c1c1c gui=reverse cterm=reverse
-  hi DiffText guifg=#fabd2f guibg=#1c1c1c gui=reverse cterm=reverse
-  hi Directory guifg=#b8bb26 guibg=NONE gui=bold cterm=bold
-  hi IncSearch guifg=#fe8019 guibg=#1c1c1c gui=reverse cterm=reverse
-  hi ModeMsg guifg=#fabd2f guibg=NONE gui=bold cterm=bold
-  hi MoreMsg guifg=#fabd2f guibg=NONE gui=bold cterm=bold
-  hi Question guifg=#fe8019 guibg=NONE gui=bold cterm=bold
-  hi Search guifg=#98971a guibg=#1c1c1c gui=reverse cterm=reverse
-  hi QuickFixLine guifg=#8ec07c guibg=#1c1c1c gui=reverse cterm=reverse
-  hi SpellBad guifg=#fb4934 guibg=NONE guisp=#fb4934 gui=undercurl cterm=underline
-  hi SpellCap guifg=#83a598 guibg=NONE guisp=#83a598 gui=undercurl cterm=underline
-  hi SpellLocal guifg=#8ec07c guibg=NONE guisp=#8ec07c gui=undercurl cterm=underline
-  hi SpellRare guifg=#d3869b guibg=NONE guisp=#d3869b gui=undercurl cterm=underline
-  hi Title guifg=#b8bb26 guibg=NONE gui=bold cterm=bold
-  hi WarningMsg guifg=#fb4934 guibg=NONE gui=bold cterm=bold
-  hi Boolean guifg=#d3869b guibg=NONE gui=NONE cterm=NONE
-  hi Character guifg=#d3869b guibg=NONE gui=NONE cterm=NONE
-  hi Conditional guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
-  hi Constant guifg=#d3869b guibg=NONE gui=NONE cterm=NONE
-  hi Define guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE
-  hi Debug guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
-  hi Delimiter guifg=#fe8019 guibg=NONE gui=NONE cterm=NONE
-  hi Error guifg=#fb4934 guibg=#1c1c1c gui=bold,reverse cterm=bold,reverse
-  hi Exception guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
-  hi Float guifg=#d3869b guibg=NONE gui=NONE cterm=NONE
-  hi Function guifg=#b8bb26 guibg=NONE gui=bold cterm=bold
-  hi Identifier guifg=#83a598 guibg=NONE gui=NONE cterm=NONE
-  hi Ignore guifg=fg guibg=NONE gui=NONE cterm=NONE
-  hi Include guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE
-  hi Keyword guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
-  hi Label guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
-  hi Macro guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE
-  hi Number guifg=#d3869b guibg=NONE gui=NONE cterm=NONE
-  hi Operator guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE
-  hi PreCondit guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE
-  hi PreProc guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE
-  hi Repeat guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
-  hi SpecialChar guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
-  hi SpecialComment guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
-  hi Statement guifg=#fb4934 guibg=NONE gui=NONE cterm=NONE
-  hi StorageClass guifg=#fe8019 guibg=NONE gui=NONE cterm=NONE
-  hi Special guifg=#fe8019 guibg=NONE gui=NONE cterm=NONE
-  hi String guifg=#b8bb26 guibg=NONE gui=NONE cterm=NONE
-  hi Structure guifg=#8ec07c guibg=NONE gui=NONE cterm=NONE
-  hi Todo guifg=fg guibg=#1c1c1c gui=bold cterm=bold
-  hi Type guifg=#fabd2f guibg=NONE gui=NONE cterm=NONE
-  hi Typedef guifg=#fabd2f guibg=NONE gui=NONE cterm=NONE
-  hi Underlined guifg=#83a598 guibg=NONE gui=underline cterm=underline
-  hi CursorIM guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-else
-  " Light background
-  if (has('termguicolors') && &termguicolors) || has('gui_running')
-    let g:terminal_ansi_colors = ['#3c3836', '#cc241d', '#98971a', '#d79921', '#458588', '#b16286', '#689d6a', '#7c6f64', '#928374', '#9d0006', '#79740e', '#b57614', '#076678', '#8f3f71', '#427b58', '#fbf1c7']
-  endif
-  hi Normal guifg=#3c3836 guibg=#fbf1c7 gui=NONE cterm=NONE
-  hi CursorLineNr guifg=#b57614 guibg=#e5d4b1 gui=NONE cterm=NONE
-  hi FoldColumn guifg=#928374 guibg=#fbf1c7 gui=NONE cterm=NONE
-  hi SignColumn guifg=#3c3836 guibg=#fbf1c7 gui=NONE cterm=NONE
-  hi VertSplit guifg=#bdae93 guibg=#fbf1c7 gui=NONE cterm=NONE
-  hi ColorColumn guifg=NONE guibg=#ebe1b7 gui=NONE cterm=NONE
-  hi Comment guifg=#928374 guibg=NONE gui=NONE cterm=NONE
-  hi CursorLine guifg=NONE guibg=#e5d4b1 gui=NONE cterm=NONE
-  hi Error guifg=#9d0006 guibg=#fbf1c7 gui=bold,reverse cterm=bold,reverse
-  hi ErrorMsg guifg=#fbf1c7 guibg=#9d0006 gui=bold cterm=bold
-  hi Folded guifg=#928374 guibg=#ffffd7 gui=NONE cterm=NONE
-  hi LineNr guifg=#a89984 guibg=NONE gui=NONE cterm=NONE
-  hi MatchParen guifg=NONE guibg=#e5d4b1 gui=bold,underline cterm=bold,underline
-  hi NonText guifg=#e5d4b1 guibg=NONE gui=NONE cterm=NONE
-  hi Pmenu guifg=#3c3836 guibg=#e5d4b1 gui=NONE cterm=NONE
-  hi PmenuSbar guifg=NONE guibg=#e5d4b1 gui=NONE cterm=NONE
-  hi PmenuSel guifg=#e5d4b1 guibg=#076678 gui=bold cterm=bold
-  hi PmenuThumb guifg=NONE guibg=#a89984 gui=NONE cterm=NONE
-  hi PmenuKind guifg=#9d0006 guibg=#e5d4b1 gui=NONE cterm=NONE
-  hi PmenuKindSel guifg=#9d0006 guibg=#076678 gui=NONE cterm=NONE
-  hi PmenuExtra guifg=#7c6f64 guibg=#e5d4b1 gui=NONE cterm=NONE
-  hi PmenuExtraSel guifg=#bdae93 guibg=#076678 gui=NONE cterm=NONE
-  hi SpecialKey guifg=#928374 guibg=NONE gui=NONE cterm=NONE
-  hi StatusLine guifg=#bdae93 guibg=#3c3836 gui=bold,reverse cterm=bold,reverse
-  hi StatusLineNC guifg=#ebdbb2 guibg=#3c3836 gui=reverse cterm=reverse
-  hi TabLine guifg=#665c54 guibg=#ebdbb2 gui=NONE cterm=NONE
-  hi TabLineFill guifg=#ebdbb2 guibg=#ebdbb2 gui=NONE cterm=NONE
-  hi TabLineSel guifg=#282828 guibg=#fbf1c7 gui=bold cterm=bold
-  hi ToolbarButton guifg=#282828 guibg=#bdae93 gui=bold cterm=bold
-  hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Visual guifg=#fbf1c7 guibg=#076678 gui=NONE cterm=NONE
-  hi WildMenu guifg=#076678 guibg=#e5d4b1 gui=bold cterm=bold
-  hi EndOfBuffer guifg=#e5d4b1 guibg=NONE gui=NONE cterm=NONE
-  hi Conceal guifg=#076678 guibg=NONE gui=NONE cterm=NONE
-  hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi DiffAdd guifg=#79740e guibg=#fbf1c7 gui=reverse cterm=reverse
-  hi DiffChange guifg=#427b58 guibg=#fbf1c7 gui=reverse cterm=reverse
-  hi DiffDelete guifg=#9d0006 guibg=#fbf1c7 gui=reverse cterm=reverse
-  hi DiffText guifg=#b57614 guibg=#fbf1c7 gui=reverse cterm=reverse
-  hi Directory guifg=#79740e guibg=NONE gui=bold cterm=bold
-  hi IncSearch guifg=#ff5f00 guibg=#fbf1c7 gui=reverse cterm=reverse
-  hi ModeMsg guifg=#3c3836 guibg=NONE gui=bold cterm=bold
-  hi MoreMsg guifg=#3c3836 guibg=NONE gui=bold cterm=bold
-  hi Question guifg=#ff5f00 guibg=NONE gui=bold cterm=bold
-  hi Search guifg=#98971a guibg=#fbf1c7 gui=reverse cterm=reverse
-  hi QuickFixLine guifg=#427b58 guibg=#fbf1c7 gui=reverse cterm=reverse
-  hi SpellBad guifg=#9d0006 guibg=NONE guisp=#9d0006 gui=undercurl cterm=underline
-  hi SpellCap guifg=#076678 guibg=NONE guisp=#076678 gui=undercurl cterm=underline
-  hi SpellLocal guifg=#427b58 guibg=NONE guisp=#427b58 gui=undercurl cterm=underline
-  hi SpellRare guifg=#8f3f71 guibg=NONE guisp=#8f3f71 gui=undercurl cterm=underline
-  hi Title guifg=#79740e guibg=NONE gui=bold cterm=bold
-  hi WarningMsg guifg=#9d0006 guibg=NONE gui=bold cterm=bold
-  hi Boolean guifg=#8f3f71 guibg=NONE gui=NONE cterm=NONE
-  hi Character guifg=#8f3f71 guibg=NONE gui=NONE cterm=NONE
-  hi Conditional guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
-  hi Constant guifg=#8f3f71 guibg=NONE gui=NONE cterm=NONE
-  hi Define guifg=#427b58 guibg=NONE gui=NONE cterm=NONE
-  hi Debug guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
-  hi Delimiter guifg=#ff5f00 guibg=NONE gui=NONE cterm=NONE
-  hi Error guifg=#9d0006 guibg=#fbf1c7 gui=bold,reverse cterm=bold,reverse
-  hi Exception guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
-  hi Float guifg=#8f3f71 guibg=NONE gui=NONE cterm=NONE
-  hi Function guifg=#79740e guibg=NONE gui=bold cterm=bold
-  hi Identifier guifg=#076678 guibg=NONE gui=NONE cterm=NONE
-  hi Ignore guifg=fg guibg=NONE gui=NONE cterm=NONE
-  hi Include guifg=#427b58 guibg=NONE gui=NONE cterm=NONE
-  hi Keyword guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
-  hi Label guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
-  hi Macro guifg=#427b58 guibg=NONE gui=NONE cterm=NONE
-  hi Number guifg=#8f3f71 guibg=NONE gui=NONE cterm=NONE
-  hi Operator guifg=#427b58 guibg=NONE gui=NONE cterm=NONE
-  hi PreCondit guifg=#427b58 guibg=NONE gui=NONE cterm=NONE
-  hi PreProc guifg=#427b58 guibg=NONE gui=NONE cterm=NONE
-  hi Repeat guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
-  hi SpecialChar guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
-  hi SpecialComment guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
-  hi Statement guifg=#9d0006 guibg=NONE gui=NONE cterm=NONE
-  hi StorageClass guifg=#ff5f00 guibg=NONE gui=NONE cterm=NONE
-  hi Special guifg=#ff5f00 guibg=NONE gui=NONE cterm=NONE
-  hi String guifg=#79740e guibg=NONE gui=NONE cterm=NONE
-  hi Structure guifg=#427b58 guibg=NONE gui=NONE cterm=NONE
-  hi Todo guifg=fg guibg=#fbf1c7 gui=bold cterm=bold
-  hi Type guifg=#b57614 guibg=NONE gui=NONE cterm=NONE
-  hi Typedef guifg=#b57614 guibg=NONE gui=NONE cterm=NONE
-  hi Underlined guifg=#076678 guibg=NONE gui=underline cterm=underline
-  hi CursorIM guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-endif
-
-if s:t_Co >= 256
-  if &background ==# 'dark'
-    hi Normal ctermfg=187 ctermbg=234 cterm=NONE
-    hi CursorLineNr ctermfg=214 ctermbg=236 cterm=NONE
-    hi FoldColumn ctermfg=102 ctermbg=234 cterm=NONE
-    hi SignColumn ctermfg=102 ctermbg=234 cterm=NONE
-    hi VertSplit ctermfg=236 ctermbg=234 cterm=NONE
-    hi ColorColumn ctermfg=NONE ctermbg=16 cterm=NONE
-    hi Comment ctermfg=102 ctermbg=NONE cterm=NONE
-    hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE
-    hi Error ctermfg=203 ctermbg=234 cterm=bold,reverse
-    hi ErrorMsg ctermfg=234 ctermbg=203 cterm=bold
-    hi Folded ctermfg=102 ctermbg=233 cterm=NONE
-    hi LineNr ctermfg=243 ctermbg=NONE cterm=NONE
-    hi MatchParen ctermfg=NONE ctermbg=239 cterm=bold,underline
-    hi NonText ctermfg=239 ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=187 ctermbg=237 cterm=NONE
-    hi PmenuSbar ctermfg=NONE ctermbg=237 cterm=NONE
-    hi PmenuSel ctermfg=237 ctermbg=109 cterm=bold
-    hi PmenuThumb ctermfg=NONE ctermbg=243 cterm=NONE
-    hi PmenuKind ctermfg=203 ctermbg=237 cterm=NONE
-    hi PmenuKindSel ctermfg=203 ctermbg=109 cterm=NONE
-    hi PmenuExtra ctermfg=102 ctermbg=237 cterm=NONE
-    hi PmenuExtraSel ctermfg=236 ctermbg=109 cterm=NONE
-    hi SpecialKey ctermfg=102 ctermbg=NONE cterm=NONE
-    hi StatusLine ctermfg=239 ctermbg=187 cterm=bold,reverse
-    hi StatusLineNC ctermfg=237 ctermbg=102 cterm=reverse
-    hi TabLine ctermfg=102 ctermbg=237 cterm=NONE
-    hi TabLineFill ctermfg=187 ctermbg=237 cterm=NONE
-    hi TabLineSel ctermfg=230 ctermbg=234 cterm=bold
-    hi ToolbarButton ctermfg=230 ctermbg=236 cterm=bold
-    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Visual ctermfg=234 ctermbg=109 cterm=NONE
-    hi WildMenu ctermfg=109 ctermbg=239 cterm=bold
-    hi EndOfBuffer ctermfg=239 ctermbg=NONE cterm=NONE
-    hi Conceal ctermfg=109 ctermbg=NONE cterm=NONE
-    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi DiffAdd ctermfg=142 ctermbg=234 cterm=reverse
-    hi DiffChange ctermfg=107 ctermbg=234 cterm=reverse
-    hi DiffDelete ctermfg=203 ctermbg=234 cterm=reverse
-    hi DiffText ctermfg=214 ctermbg=234 cterm=reverse
-    hi Directory ctermfg=142 ctermbg=NONE cterm=bold
-    hi IncSearch ctermfg=208 ctermbg=234 cterm=reverse
-    hi ModeMsg ctermfg=214 ctermbg=NONE cterm=bold
-    hi MoreMsg ctermfg=214 ctermbg=NONE cterm=bold
-    hi Question ctermfg=208 ctermbg=NONE cterm=bold
-    hi Search ctermfg=100 ctermbg=234 cterm=reverse
-    hi QuickFixLine ctermfg=107 ctermbg=234 cterm=reverse
-    hi SpellBad ctermfg=203 ctermbg=NONE cterm=underline
-    hi SpellCap ctermfg=109 ctermbg=NONE cterm=underline
-    hi SpellLocal ctermfg=107 ctermbg=NONE cterm=underline
-    hi SpellRare ctermfg=175 ctermbg=NONE cterm=underline
-    hi Title ctermfg=142 ctermbg=NONE cterm=bold
-    hi WarningMsg ctermfg=203 ctermbg=NONE cterm=bold
-    hi Boolean ctermfg=175 ctermbg=NONE cterm=NONE
-    hi Character ctermfg=175 ctermbg=NONE cterm=NONE
-    hi Conditional ctermfg=203 ctermbg=NONE cterm=NONE
-    hi Constant ctermfg=175 ctermbg=NONE cterm=NONE
-    hi Define ctermfg=107 ctermbg=NONE cterm=NONE
-    hi Debug ctermfg=203 ctermbg=NONE cterm=NONE
-    hi Delimiter ctermfg=208 ctermbg=NONE cterm=NONE
-    hi Error ctermfg=203 ctermbg=234 cterm=bold,reverse
-    hi Exception ctermfg=203 ctermbg=NONE cterm=NONE
-    hi Float ctermfg=175 ctermbg=NONE cterm=NONE
-    hi Function ctermfg=142 ctermbg=NONE cterm=bold
-    hi Identifier ctermfg=109 ctermbg=NONE cterm=NONE
-    hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE
-    hi Include ctermfg=107 ctermbg=NONE cterm=NONE
-    hi Keyword ctermfg=203 ctermbg=NONE cterm=NONE
-    hi Label ctermfg=203 ctermbg=NONE cterm=NONE
-    hi Macro ctermfg=107 ctermbg=NONE cterm=NONE
-    hi Number ctermfg=175 ctermbg=NONE cterm=NONE
-    hi Operator ctermfg=107 ctermbg=NONE cterm=NONE
-    hi PreCondit ctermfg=107 ctermbg=NONE cterm=NONE
-    hi PreProc ctermfg=107 ctermbg=NONE cterm=NONE
-    hi Repeat ctermfg=203 ctermbg=NONE cterm=NONE
-    hi SpecialChar ctermfg=203 ctermbg=NONE cterm=NONE
-    hi SpecialComment ctermfg=203 ctermbg=NONE cterm=NONE
-    hi Statement ctermfg=203 ctermbg=NONE cterm=NONE
-    hi StorageClass ctermfg=208 ctermbg=NONE cterm=NONE
-    hi Special ctermfg=208 ctermbg=NONE cterm=NONE
-    hi String ctermfg=142 ctermbg=NONE cterm=NONE
-    hi Structure ctermfg=107 ctermbg=NONE cterm=NONE
-    hi Todo ctermfg=fg ctermbg=234 cterm=bold
-    hi Type ctermfg=214 ctermbg=NONE cterm=NONE
-    hi Typedef ctermfg=214 ctermbg=NONE cterm=NONE
-    hi Underlined ctermfg=109 ctermbg=NONE cterm=underline
-    hi CursorIM ctermfg=NONE ctermbg=NONE cterm=reverse
-  else
-    " Light background
-    hi Normal ctermfg=237 ctermbg=230 cterm=NONE
-    hi CursorLineNr ctermfg=172 ctermbg=188 cterm=NONE
-    hi FoldColumn ctermfg=102 ctermbg=230 cterm=NONE
-    hi SignColumn ctermfg=237 ctermbg=230 cterm=NONE
-    hi VertSplit ctermfg=144 ctermbg=230 cterm=NONE
-    hi ColorColumn ctermfg=NONE ctermbg=229 cterm=NONE
-    hi Comment ctermfg=102 ctermbg=NONE cterm=NONE
-    hi CursorLine ctermfg=NONE ctermbg=188 cterm=NONE
-    hi Error ctermfg=124 ctermbg=230 cterm=bold,reverse
-    hi ErrorMsg ctermfg=230 ctermbg=124 cterm=bold
-    hi Folded ctermfg=102 ctermbg=231 cterm=NONE
-    hi LineNr ctermfg=137 ctermbg=NONE cterm=NONE
-    hi MatchParen ctermfg=NONE ctermbg=188 cterm=bold,underline
-    hi NonText ctermfg=188 ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=237 ctermbg=188 cterm=NONE
-    hi PmenuSbar ctermfg=NONE ctermbg=188 cterm=NONE
-    hi PmenuSel ctermfg=188 ctermbg=23 cterm=bold
-    hi PmenuThumb ctermfg=NONE ctermbg=137 cterm=NONE
-    hi PmenuKind ctermfg=124 ctermbg=188 cterm=NONE
-    hi PmenuKindSel ctermfg=124 ctermbg=23 cterm=NONE
-    hi PmenuExtra ctermfg=243 ctermbg=188 cterm=NONE
-    hi PmenuExtraSel ctermfg=144 ctermbg=23 cterm=NONE
-    hi SpecialKey ctermfg=102 ctermbg=NONE cterm=NONE
-    hi StatusLine ctermfg=144 ctermbg=237 cterm=bold,reverse
-    hi StatusLineNC ctermfg=187 ctermbg=237 cterm=reverse
-    hi TabLine ctermfg=59 ctermbg=187 cterm=NONE
-    hi TabLineFill ctermfg=187 ctermbg=187 cterm=NONE
-    hi TabLineSel ctermfg=235 ctermbg=230 cterm=bold
-    hi ToolbarButton ctermfg=235 ctermbg=144 cterm=bold
-    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Visual ctermfg=230 ctermbg=23 cterm=NONE
-    hi WildMenu ctermfg=23 ctermbg=188 cterm=bold
-    hi EndOfBuffer ctermfg=188 ctermbg=NONE cterm=NONE
-    hi Conceal ctermfg=23 ctermbg=NONE cterm=NONE
-    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi DiffAdd ctermfg=64 ctermbg=230 cterm=reverse
-    hi DiffChange ctermfg=29 ctermbg=230 cterm=reverse
-    hi DiffDelete ctermfg=124 ctermbg=230 cterm=reverse
-    hi DiffText ctermfg=172 ctermbg=230 cterm=reverse
-    hi Directory ctermfg=64 ctermbg=NONE cterm=bold
-    hi IncSearch ctermfg=202 ctermbg=230 cterm=reverse
-    hi ModeMsg ctermfg=237 ctermbg=NONE cterm=bold
-    hi MoreMsg ctermfg=237 ctermbg=NONE cterm=bold
-    hi Question ctermfg=202 ctermbg=NONE cterm=bold
-    hi Search ctermfg=100 ctermbg=230 cterm=reverse
-    hi QuickFixLine ctermfg=29 ctermbg=230 cterm=reverse
-    hi SpellBad ctermfg=124 ctermbg=NONE cterm=underline
-    hi SpellCap ctermfg=23 ctermbg=NONE cterm=underline
-    hi SpellLocal ctermfg=29 ctermbg=NONE cterm=underline
-    hi SpellRare ctermfg=126 ctermbg=NONE cterm=underline
-    hi Title ctermfg=64 ctermbg=NONE cterm=bold
-    hi WarningMsg ctermfg=124 ctermbg=NONE cterm=bold
-    hi Boolean ctermfg=126 ctermbg=NONE cterm=NONE
-    hi Character ctermfg=126 ctermbg=NONE cterm=NONE
-    hi Conditional ctermfg=124 ctermbg=NONE cterm=NONE
-    hi Constant ctermfg=126 ctermbg=NONE cterm=NONE
-    hi Define ctermfg=29 ctermbg=NONE cterm=NONE
-    hi Debug ctermfg=124 ctermbg=NONE cterm=NONE
-    hi Delimiter ctermfg=202 ctermbg=NONE cterm=NONE
-    hi Error ctermfg=124 ctermbg=230 cterm=bold,reverse
-    hi Exception ctermfg=124 ctermbg=NONE cterm=NONE
-    hi Float ctermfg=126 ctermbg=NONE cterm=NONE
-    hi Function ctermfg=64 ctermbg=NONE cterm=bold
-    hi Identifier ctermfg=23 ctermbg=NONE cterm=NONE
-    hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE
-    hi Include ctermfg=29 ctermbg=NONE cterm=NONE
-    hi Keyword ctermfg=124 ctermbg=NONE cterm=NONE
-    hi Label ctermfg=124 ctermbg=NONE cterm=NONE
-    hi Macro ctermfg=29 ctermbg=NONE cterm=NONE
-    hi Number ctermfg=126 ctermbg=NONE cterm=NONE
-    hi Operator ctermfg=29 ctermbg=NONE cterm=NONE
-    hi PreCondit ctermfg=29 ctermbg=NONE cterm=NONE
-    hi PreProc ctermfg=29 ctermbg=NONE cterm=NONE
-    hi Repeat ctermfg=124 ctermbg=NONE cterm=NONE
-    hi SpecialChar ctermfg=124 ctermbg=NONE cterm=NONE
-    hi SpecialComment ctermfg=124 ctermbg=NONE cterm=NONE
-    hi Statement ctermfg=124 ctermbg=NONE cterm=NONE
-    hi StorageClass ctermfg=202 ctermbg=NONE cterm=NONE
-    hi Special ctermfg=202 ctermbg=NONE cterm=NONE
-    hi String ctermfg=64 ctermbg=NONE cterm=NONE
-    hi Structure ctermfg=29 ctermbg=NONE cterm=NONE
-    hi Todo ctermfg=fg ctermbg=230 cterm=bold
-    hi Type ctermfg=172 ctermbg=NONE cterm=NONE
-    hi Typedef ctermfg=172 ctermbg=NONE cterm=NONE
-    hi Underlined ctermfg=23 ctermbg=NONE cterm=underline
-    hi CursorIM ctermfg=NONE ctermbg=NONE cterm=reverse
-  endif
-  unlet s:t_Co
-  finish
-endif
-
-if s:t_Co >= 16
-  if &background ==# 'dark'
-    hi Normal ctermfg=White ctermbg=Black cterm=NONE
-    hi ColorColumn ctermfg=Black ctermbg=DarkYellow cterm=NONE
-    hi Comment ctermfg=DarkGray ctermbg=NONE cterm=NONE
-    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-    hi CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE
-    hi Error ctermfg=Red ctermbg=Black cterm=reverse
-    hi ErrorMsg ctermfg=Black ctermbg=Red cterm=NONE
-    hi FoldColumn ctermfg=DarkGray ctermbg=NONE cterm=NONE
-    hi Folded ctermfg=DarkGray ctermbg=NONE cterm=NONE
-    hi LineNr ctermfg=DarkGray ctermbg=NONE cterm=NONE
-    hi MatchParen ctermfg=NONE ctermbg=Black cterm=bold,underline
-    hi NonText ctermfg=DarkGray ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=White ctermbg=DarkGray cterm=NONE
-    hi PmenuSbar ctermfg=NONE ctermbg=DarkGray cterm=NONE
-    hi PmenuSel ctermfg=Black ctermbg=Blue cterm=NONE
-    hi PmenuThumb ctermfg=NONE ctermbg=Blue cterm=NONE
-    hi PmenuKind ctermfg=DarkRed ctermbg=DarkGray cterm=NONE
-    hi PmenuKindSel ctermfg=DarkRed ctermbg=Blue cterm=NONE
-    hi PmenuExtra ctermfg=gray ctermbg=DarkGray cterm=NONE
-    hi PmenuExtraSel ctermfg=Black ctermbg=Blue cterm=NONE
-    hi SignColumn ctermfg=DarkGray ctermbg=NONE cterm=NONE
-    hi SpecialKey ctermfg=DarkGray ctermbg=NONE cterm=NONE
-    hi StatusLine ctermfg=gray ctermbg=Black cterm=bold,reverse
-    hi StatusLineNC ctermfg=gray ctermbg=Black cterm=reverse
-    hi TabLine ctermfg=Black ctermbg=DarkGray cterm=NONE
-    hi TabLineFill ctermfg=Black ctermbg=DarkGray cterm=NONE
-    hi TabLineSel ctermfg=White ctermbg=Black cterm=bold
-    hi ToolbarButton ctermfg=White ctermbg=DarkGray cterm=bold
-    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi VertSplit ctermfg=Black ctermbg=gray cterm=NONE
-    hi Visual ctermfg=Black ctermbg=Blue cterm=NONE
-    hi WildMenu ctermfg=White ctermbg=Black cterm=bold
-    hi EndOfBuffer ctermfg=DarkGray ctermbg=NONE cterm=NONE
-    hi Conceal ctermfg=Blue ctermbg=NONE cterm=NONE
-    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi DiffAdd ctermfg=Green ctermbg=Black cterm=reverse
-    hi DiffChange ctermfg=Cyan ctermbg=Black cterm=reverse
-    hi DiffDelete ctermfg=Red ctermbg=Black cterm=reverse
-    hi DiffText ctermfg=Yellow ctermbg=Black cterm=reverse
-    hi Directory ctermfg=Green ctermbg=NONE cterm=bold
-    hi IncSearch ctermfg=Magenta ctermbg=Black cterm=reverse
-    hi ModeMsg ctermfg=Yellow ctermbg=NONE cterm=bold
-    hi MoreMsg ctermfg=Yellow ctermbg=NONE cterm=bold
-    hi Question ctermfg=Magenta ctermbg=NONE cterm=bold
-    hi Search ctermfg=DarkGreen ctermbg=Black cterm=reverse
-    hi QuickFixLine ctermfg=Cyan ctermbg=Black cterm=reverse
-    hi SpellBad ctermfg=Red ctermbg=NONE cterm=underline
-    hi SpellCap ctermfg=Blue ctermbg=NONE cterm=underline
-    hi SpellLocal ctermfg=Cyan ctermbg=NONE cterm=underline
-    hi SpellRare ctermfg=Magenta ctermbg=NONE cterm=underline
-    hi Title ctermfg=Green ctermbg=NONE cterm=bold
-    hi WarningMsg ctermfg=Red ctermbg=NONE cterm=bold
-    hi Boolean ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Character ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Conditional ctermfg=Red ctermbg=NONE cterm=NONE
-    hi Constant ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Define ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi Debug ctermfg=Red ctermbg=NONE cterm=NONE
-    hi Delimiter ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Error ctermfg=Red ctermbg=Black cterm=bold,reverse
-    hi Exception ctermfg=Red ctermbg=NONE cterm=NONE
-    hi Float ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Function ctermfg=Green ctermbg=NONE cterm=bold
-    hi Identifier ctermfg=Blue ctermbg=NONE cterm=NONE
-    hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE
-    hi Include ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi Keyword ctermfg=Red ctermbg=NONE cterm=NONE
-    hi Label ctermfg=Red ctermbg=NONE cterm=NONE
-    hi Macro ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi Number ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Operator ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi PreCondit ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi PreProc ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi Repeat ctermfg=Red ctermbg=NONE cterm=NONE
-    hi SpecialChar ctermfg=Red ctermbg=NONE cterm=NONE
-    hi SpecialComment ctermfg=Red ctermbg=NONE cterm=NONE
-    hi Statement ctermfg=Red ctermbg=NONE cterm=NONE
-    hi StorageClass ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Special ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi String ctermfg=Green ctermbg=NONE cterm=NONE
-    hi Structure ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi Todo ctermfg=fg ctermbg=Black cterm=bold
-    hi Type ctermfg=Yellow ctermbg=NONE cterm=NONE
-    hi Typedef ctermfg=Yellow ctermbg=NONE cterm=NONE
-    hi Underlined ctermfg=Blue ctermbg=NONE cterm=underline
-    hi CursorIM ctermfg=NONE ctermbg=NONE cterm=reverse
-  else
-    " Light background
-    hi Normal ctermfg=Black ctermbg=White cterm=NONE
-    hi ColorColumn ctermfg=White ctermbg=Grey cterm=NONE
-    hi Comment ctermfg=DarkGray ctermbg=NONE cterm=NONE
-    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-    hi CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE
-    hi Error ctermfg=Red ctermbg=White cterm=reverse
-    hi ErrorMsg ctermfg=White ctermbg=Red cterm=NONE
-    hi FoldColumn ctermfg=Grey ctermbg=NONE cterm=NONE
-    hi Folded ctermfg=Grey ctermbg=NONE cterm=NONE
-    hi LineNr ctermfg=Grey ctermbg=NONE cterm=NONE
-    hi MatchParen ctermfg=NONE ctermbg=White cterm=bold,underline
-    hi NonText ctermfg=Grey ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=Black ctermbg=Grey cterm=NONE
-    hi PmenuSbar ctermfg=NONE ctermbg=Grey cterm=NONE
-    hi PmenuSel ctermfg=White ctermbg=Blue cterm=NONE
-    hi PmenuThumb ctermfg=NONE ctermbg=Blue cterm=NONE
-    hi PmenuKind ctermfg=DarkRed ctermbg=Grey cterm=NONE
-    hi PmenuKindSel ctermfg=DarkRed ctermbg=Blue cterm=NONE
-    hi PmenuExtra ctermfg=DarkGray ctermbg=Grey cterm=NONE
-    hi PmenuExtraSel ctermfg=White ctermbg=Blue cterm=NONE
-    hi SignColumn ctermfg=Grey ctermbg=NONE cterm=NONE
-    hi SpecialKey ctermfg=Grey ctermbg=NONE cterm=NONE
-    hi StatusLine ctermfg=DarkGray ctermbg=White cterm=bold,reverse
-    hi StatusLineNC ctermfg=Grey ctermbg=DarkGray cterm=reverse
-    hi TabLine ctermfg=DarkGray ctermbg=Grey cterm=NONE
-    hi TabLineFill ctermfg=White ctermbg=Grey cterm=NONE
-    hi TabLineSel ctermfg=DarkGray ctermbg=White cterm=bold
-    hi ToolbarButton ctermfg=Black ctermbg=Grey cterm=bold
-    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi VertSplit ctermfg=DarkGray ctermbg=Grey cterm=NONE
-    hi Visual ctermfg=White ctermbg=Blue cterm=NONE
-    hi WildMenu ctermfg=Black ctermbg=White cterm=bold
-    hi EndOfBuffer ctermfg=Grey ctermbg=NONE cterm=NONE
-    hi Conceal ctermfg=Blue ctermbg=NONE cterm=NONE
-    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi DiffAdd ctermfg=Green ctermbg=White cterm=reverse
-    hi DiffChange ctermfg=Cyan ctermbg=White cterm=reverse
-    hi DiffDelete ctermfg=Red ctermbg=White cterm=reverse
-    hi DiffText ctermfg=Yellow ctermbg=White cterm=reverse
-    hi Directory ctermfg=Green ctermbg=NONE cterm=bold
-    hi IncSearch ctermfg=Magenta ctermbg=White cterm=reverse
-    hi ModeMsg ctermfg=Black ctermbg=NONE cterm=bold
-    hi MoreMsg ctermfg=Black ctermbg=NONE cterm=bold
-    hi Question ctermfg=Magenta ctermbg=NONE cterm=bold
-    hi Search ctermfg=DarkGreen ctermbg=White cterm=reverse
-    hi QuickFixLine ctermfg=Cyan ctermbg=White cterm=reverse
-    hi SpellBad ctermfg=Red ctermbg=NONE cterm=underline
-    hi SpellCap ctermfg=Blue ctermbg=NONE cterm=underline
-    hi SpellLocal ctermfg=Cyan ctermbg=NONE cterm=underline
-    hi SpellRare ctermfg=Magenta ctermbg=NONE cterm=underline
-    hi Title ctermfg=Green ctermbg=NONE cterm=bold
-    hi WarningMsg ctermfg=Red ctermbg=NONE cterm=bold
-    hi Boolean ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Character ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Conditional ctermfg=Red ctermbg=NONE cterm=NONE
-    hi Constant ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Define ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi Debug ctermfg=Red ctermbg=NONE cterm=NONE
-    hi Delimiter ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Error ctermfg=Red ctermbg=White cterm=bold,reverse
-    hi Exception ctermfg=Red ctermbg=NONE cterm=NONE
-    hi Float ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Function ctermfg=Green ctermbg=NONE cterm=bold
-    hi Identifier ctermfg=Blue ctermbg=NONE cterm=NONE
-    hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE
-    hi Include ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi Keyword ctermfg=Red ctermbg=NONE cterm=NONE
-    hi Label ctermfg=Red ctermbg=NONE cterm=NONE
-    hi Macro ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi Number ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Operator ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi PreCondit ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi PreProc ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi Repeat ctermfg=Red ctermbg=NONE cterm=NONE
-    hi SpecialChar ctermfg=Red ctermbg=NONE cterm=NONE
-    hi SpecialComment ctermfg=Red ctermbg=NONE cterm=NONE
-    hi Statement ctermfg=Red ctermbg=NONE cterm=NONE
-    hi StorageClass ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Special ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi String ctermfg=Green ctermbg=NONE cterm=NONE
-    hi Structure ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi Todo ctermfg=fg ctermbg=White cterm=bold
-    hi Type ctermfg=Yellow ctermbg=NONE cterm=NONE
-    hi Typedef ctermfg=Yellow ctermbg=NONE cterm=NONE
-    hi Underlined ctermfg=Blue ctermbg=NONE cterm=underline
-    hi CursorIM ctermfg=NONE ctermbg=NONE cterm=reverse
-  endif
-  unlet s:t_Co
-  finish
-endif
-
-if s:t_Co >= 8
-  if &background ==# 'dark'
-    hi Normal ctermfg=gray ctermbg=Black cterm=NONE
-    hi ColorColumn ctermfg=Black ctermbg=gray cterm=NONE
-    hi Comment ctermfg=gray ctermbg=NONE cterm=bold
-    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-    hi CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE
-    hi Error ctermfg=Red ctermbg=Black cterm=reverse
-    hi ErrorMsg ctermfg=Black ctermbg=Red cterm=NONE
-    hi FoldColumn ctermfg=gray ctermbg=NONE cterm=NONE
-    hi Folded ctermfg=gray ctermbg=NONE cterm=NONE
-    hi LineNr ctermfg=gray ctermbg=NONE cterm=NONE
-    hi MatchParen ctermfg=gray ctermbg=NONE cterm=bold,underline
-    hi NonText ctermfg=gray ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=DarkGray ctermbg=White cterm=NONE
-    hi PmenuSbar ctermfg=NONE ctermbg=DarkGray cterm=NONE
-    hi PmenuSel ctermfg=Black ctermbg=Blue cterm=NONE
-    hi PmenuThumb ctermfg=NONE ctermbg=Blue cterm=NONE
-    hi PmenuKind ctermfg=Red ctermbg=White cterm=NONE
-    hi PmenuKindSel ctermfg=Red ctermbg=Blue cterm=NONE
-    hi PmenuExtra ctermfg=DarkGray ctermbg=White cterm=NONE
-    hi PmenuExtraSel ctermfg=DarkGray ctermbg=Blue cterm=NONE
-    hi SignColumn ctermfg=gray ctermbg=NONE cterm=NONE
-    hi SpecialKey ctermfg=gray ctermbg=NONE cterm=NONE
-    hi StatusLine ctermfg=gray ctermbg=Black cterm=bold,reverse
-    hi StatusLineNC 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=gray ctermbg=Black cterm=NONE
-    hi ToolbarButton ctermfg=Black ctermbg=gray cterm=bold
-    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi VertSplit ctermfg=Black ctermbg=gray cterm=NONE
-    hi Visual ctermfg=Black ctermbg=Blue cterm=NONE
-    hi WildMenu ctermfg=Blue ctermbg=DarkGray cterm=bold
-    hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Conceal ctermfg=Blue ctermbg=NONE cterm=NONE
-    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi DiffAdd ctermfg=Green ctermbg=Black cterm=reverse
-    hi DiffChange ctermfg=Cyan ctermbg=Black cterm=reverse
-    hi DiffDelete ctermfg=Red ctermbg=Black cterm=reverse
-    hi DiffText ctermfg=Yellow ctermbg=Black cterm=reverse
-    hi Directory ctermfg=Green ctermbg=NONE cterm=bold
-    hi IncSearch ctermfg=Magenta ctermbg=Black cterm=reverse
-    hi ModeMsg ctermfg=Yellow ctermbg=NONE cterm=bold
-    hi MoreMsg ctermfg=Yellow ctermbg=NONE cterm=bold
-    hi Question ctermfg=Magenta ctermbg=NONE cterm=bold
-    hi Search ctermfg=DarkGreen ctermbg=Black cterm=reverse
-    hi QuickFixLine ctermfg=Cyan ctermbg=Black cterm=reverse
-    hi SpellBad ctermfg=Red ctermbg=NONE cterm=underline
-    hi SpellCap ctermfg=Blue ctermbg=NONE cterm=underline
-    hi SpellLocal ctermfg=Cyan ctermbg=NONE cterm=underline
-    hi SpellRare ctermfg=Magenta ctermbg=NONE cterm=underline
-    hi Title ctermfg=Green ctermbg=NONE cterm=bold
-    hi WarningMsg ctermfg=Red ctermbg=NONE cterm=bold
-    hi Boolean ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Character ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Conditional ctermfg=Red ctermbg=NONE cterm=NONE
-    hi Constant ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Define ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi Debug ctermfg=Red ctermbg=NONE cterm=NONE
-    hi Delimiter ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Error ctermfg=Red ctermbg=Black cterm=bold,reverse
-    hi Exception ctermfg=Red ctermbg=NONE cterm=NONE
-    hi Float ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Function ctermfg=Green ctermbg=NONE cterm=bold
-    hi Identifier ctermfg=Blue ctermbg=NONE cterm=NONE
-    hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE
-    hi Include ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi Keyword ctermfg=Red ctermbg=NONE cterm=NONE
-    hi Label ctermfg=Red ctermbg=NONE cterm=NONE
-    hi Macro ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi Number ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Operator ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi PreCondit ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi PreProc ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi Repeat ctermfg=Red ctermbg=NONE cterm=NONE
-    hi SpecialChar ctermfg=Red ctermbg=NONE cterm=NONE
-    hi SpecialComment ctermfg=Red ctermbg=NONE cterm=NONE
-    hi Statement ctermfg=Red ctermbg=NONE cterm=NONE
-    hi StorageClass ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Special ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi String ctermfg=Green ctermbg=NONE cterm=NONE
-    hi Structure ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi Todo ctermfg=fg ctermbg=Black cterm=bold
-    hi Type ctermfg=Yellow ctermbg=NONE cterm=NONE
-    hi Typedef ctermfg=Yellow ctermbg=NONE cterm=NONE
-    hi Underlined ctermfg=Blue ctermbg=NONE cterm=underline
-    hi CursorIM ctermfg=NONE ctermbg=NONE cterm=reverse
-  else
-    " Light background
-    hi Normal ctermfg=Black ctermbg=Grey cterm=NONE
-    hi ColorColumn ctermfg=White ctermbg=Black cterm=NONE
-    hi Comment ctermfg=Black ctermbg=NONE cterm=bold
-    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-    hi CursorLineNr ctermfg=Yellow ctermbg=NONE cterm=NONE
-    hi Error ctermfg=Red ctermbg=White cterm=reverse
-    hi ErrorMsg ctermfg=White ctermbg=Red cterm=NONE
-    hi FoldColumn ctermfg=Black ctermbg=NONE cterm=NONE
-    hi Folded ctermfg=Black ctermbg=NONE cterm=NONE
-    hi LineNr ctermfg=Black ctermbg=NONE cterm=NONE
-    hi MatchParen ctermfg=Black ctermbg=NONE cterm=bold,underline
-    hi NonText ctermfg=Black ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=Grey ctermbg=Black cterm=NONE
-    hi PmenuSbar ctermfg=NONE ctermbg=Grey cterm=NONE
-    hi PmenuSel ctermfg=White ctermbg=Blue cterm=NONE
-    hi PmenuThumb ctermfg=NONE ctermbg=Blue cterm=NONE
-    hi PmenuKind ctermfg=Red ctermbg=Black cterm=NONE
-    hi PmenuKindSel ctermfg=Red ctermbg=Blue cterm=NONE
-    hi PmenuExtra ctermfg=Grey ctermbg=Black cterm=NONE
-    hi PmenuExtraSel ctermfg=Grey ctermbg=Blue cterm=NONE
-    hi SignColumn ctermfg=Black ctermbg=NONE cterm=NONE
-    hi SpecialKey ctermfg=Black ctermbg=NONE cterm=NONE
-    hi StatusLine ctermfg=Black ctermbg=White cterm=bold,reverse
-    hi StatusLineNC ctermfg=Black ctermbg=White cterm=reverse
-    hi TabLine ctermfg=White ctermbg=Black cterm=NONE
-    hi TabLineFill ctermfg=White ctermbg=Black cterm=NONE
-    hi TabLineSel ctermfg=Black ctermbg=White cterm=NONE
-    hi ToolbarButton ctermfg=White ctermbg=Black cterm=bold
-    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi VertSplit ctermfg=White ctermbg=Black cterm=NONE
-    hi Visual ctermfg=White ctermbg=Blue cterm=NONE
-    hi WildMenu ctermfg=Blue ctermbg=Grey cterm=bold
-    hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Conceal ctermfg=Blue ctermbg=NONE cterm=NONE
-    hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi DiffAdd ctermfg=Green ctermbg=White cterm=reverse
-    hi DiffChange ctermfg=Cyan ctermbg=White cterm=reverse
-    hi DiffDelete ctermfg=Red ctermbg=White cterm=reverse
-    hi DiffText ctermfg=Yellow ctermbg=White cterm=reverse
-    hi Directory ctermfg=Green ctermbg=NONE cterm=bold
-    hi IncSearch ctermfg=Magenta ctermbg=White cterm=reverse
-    hi ModeMsg ctermfg=Black ctermbg=NONE cterm=bold
-    hi MoreMsg ctermfg=Black ctermbg=NONE cterm=bold
-    hi Question ctermfg=Magenta ctermbg=NONE cterm=bold
-    hi Search ctermfg=DarkGreen ctermbg=White cterm=reverse
-    hi QuickFixLine ctermfg=Cyan ctermbg=White cterm=reverse
-    hi SpellBad ctermfg=Red ctermbg=NONE cterm=underline
-    hi SpellCap ctermfg=Blue ctermbg=NONE cterm=underline
-    hi SpellLocal ctermfg=Cyan ctermbg=NONE cterm=underline
-    hi SpellRare ctermfg=Magenta ctermbg=NONE cterm=underline
-    hi Title ctermfg=Green ctermbg=NONE cterm=bold
-    hi WarningMsg ctermfg=Red ctermbg=NONE cterm=bold
-    hi Boolean ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Character ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Conditional ctermfg=Red ctermbg=NONE cterm=NONE
-    hi Constant ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Define ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi Debug ctermfg=Red ctermbg=NONE cterm=NONE
-    hi Delimiter ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Error ctermfg=Red ctermbg=White cterm=bold,reverse
-    hi Exception ctermfg=Red ctermbg=NONE cterm=NONE
-    hi Float ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Function ctermfg=Green ctermbg=NONE cterm=bold
-    hi Identifier ctermfg=Blue ctermbg=NONE cterm=NONE
-    hi Ignore ctermfg=fg ctermbg=NONE cterm=NONE
-    hi Include ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi Keyword ctermfg=Red ctermbg=NONE cterm=NONE
-    hi Label ctermfg=Red ctermbg=NONE cterm=NONE
-    hi Macro ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi Number ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Operator ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi PreCondit ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi PreProc ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi Repeat ctermfg=Red ctermbg=NONE cterm=NONE
-    hi SpecialChar ctermfg=Red ctermbg=NONE cterm=NONE
-    hi SpecialComment ctermfg=Red ctermbg=NONE cterm=NONE
-    hi Statement ctermfg=Red ctermbg=NONE cterm=NONE
-    hi StorageClass ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi Special ctermfg=Magenta ctermbg=NONE cterm=NONE
-    hi String ctermfg=Green ctermbg=NONE cterm=NONE
-    hi Structure ctermfg=Cyan ctermbg=NONE cterm=NONE
-    hi Todo ctermfg=fg ctermbg=White cterm=bold
-    hi Type ctermfg=Yellow ctermbg=NONE cterm=NONE
-    hi Typedef ctermfg=Yellow ctermbg=NONE cterm=NONE
-    hi Underlined ctermfg=Blue ctermbg=NONE cterm=underline
-    hi CursorIM ctermfg=NONE ctermbg=NONE cterm=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
-
-" Color: neutralred              #cc241d        160            DarkRed
-" Color: neutralgreen            #98971a        100            DarkGreen
-" Color: neutralyellow           #d79921        172            DarkYellow
-" Color: neutralblue             #458588        66             DarkBlue
-" Color: neutralpurple           #b16286        132            DarkMagenta
-" Color: neutralaqua             #689d6a        71             DarkCyan
-" Color: neutralorange           #d65d0e        166            LightRed
-" Background: dark
-" Color: bg0                     #1c1c1c        234            Black
-" Color: bg1                     #3c3836        237            DarkGray
-" Color: bg2                     #504945        239            DarkGray
-" Color: bg3                     #303030        236
-" Color: bg4                     #7c6f64        243
-" Color: bg5                     #000000        16             DarkGray
-" Color: bg6                     #121212        233            DarkGray
-" Color: fg0                     #fbf1c7        230            White
-" Color: fg1                     #ebdbb2        187            White
-" Color: fg2                     #d5c4a1        187
-" Color: fg3                     #bdae93        144
-" Color: fg4                     #a89984        102            gray
-" Color: grey                    #928374        102            DarkGray
-" Color: red                     #fb4934        203            Red
-" Color: green                   #b8bb26        142            Green
-" Color: yellow                  #fabd2f        214            Yellow
-" Color: blue                    #83a598        109            Blue
-" Color: purple                  #d3869b        175            Magenta
-" Color: aqua                    #8ec07c        107            Cyan
-" Color: orange                  #fe8019        208            Magenta
-" Term colors: bg0  neutralred neutralgreen neutralyellow neutralblue neutralpurple neutralaqua fg4
-" Term colors: grey red        green        yellow        blue        purple        aqua        fg1
-" Background: light
-" Color: bg0                     #fbf1c7        230            White
-" Color: bg1                     #ebdbb2        187            Grey
-" Color: bg2                     #e5d4b1        188            Grey
-" Color: bg3                     #bdae93        144
-" Color: bg4                     #a89984        137
-" Color: bg5                     #ebe1b7        229            Grey
-" Color: bg6                     #ffffd7        231            Grey
-" Color: fg0                     #282828        235            DarkGray
-" Color: fg1                     #3c3836        237            Black
-" Color: fg2                     #503836        237
-" Color: fg3                     #665c54        59
-" Color: fg4                     #7c6f64        243            Black
-" Color: grey                    #928374        102            DarkGray
-" Color: red                     #9d0006        124            Red
-" Color: green                   #79740e        64             Green
-" Color: yellow                  #b57614        172            Yellow
-" Color: blue                    #076678        23             Blue
-" Color: purple                  #8f3f71        126            Magenta
-" Color: aqua                    #427b58        29             Cyan
-" Color: orange                  #ff5f00        202            Magenta
-" Term colors: fg1  neutralred neutralgreen neutralyellow neutralblue neutralpurple neutralaqua fg4
-" Term colors: grey red        green        yellow        blue        purple        aqua        bg0
-" Background: any
-" vim: et ts=2 sw=2
@@ -1,444 +0,0 @@
-" Name:         sorbet
-" Description:  A shallow grave, a monument to the ruined age.
-" Author:       Maxence Weynans <neutaaaaan@gmail.com>
-" Maintainer:   Maxence Weynans <neutaaaaan@gmail.com>
-" Website:      https://github.com/vim/colorschemes
-" License:      Vim License (see `:help license`)`
-" Last Updated: Wed 15 Mar 2023 05:40:19 PM CET
-
-" Generated by Colortemplate v2.2.0
-
-set background=dark
-
-hi clear
-let g:colors_name = 'sorbet'
-
-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 ErrorMsg Error
-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 Structure Type
-hi! link Tag Special
-hi! link Typedef Type
-hi! link lCursor Cursor
-hi! link debugPC CursorLine
-
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#000000', '#d75f5f', '#87d75f', '#d7af5f', '#87afd7', '#af87d7', '#5fafaf', '#dadada', '#707070', '#ff5f5f', '#87ff5f', '#ffd75f', '#87d7ff', '#d787ff', '#5fd7d7', '#ffffff']
-endif
-hi Normal guifg=#dadada guibg=#161821 gui=NONE cterm=NONE
-hi ColorColumn guifg=NONE guibg=#262831 gui=NONE cterm=NONE
-hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi CurSearch guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
-hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-hi CursorColumn guifg=NONE guibg=#363841 gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#363841 gui=NONE cterm=NONE
-hi CursorLineNr guifg=#d7d7ff guibg=#363841 gui=NONE cterm=NONE
-hi DiffAdd guifg=#00af5f guibg=#000000 gui=reverse cterm=reverse
-hi DiffChange guifg=#87afff guibg=#000000 gui=reverse cterm=reverse
-hi DiffDelete guifg=#d7005f guibg=#000000 gui=reverse cterm=reverse
-hi DiffText guifg=#ff87ff guibg=#000000 gui=reverse cterm=reverse
-hi Directory guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-hi EndOfBuffer guifg=#5f5f87 guibg=NONE gui=NONE cterm=NONE
-hi FoldColumn guifg=#8787af guibg=NONE gui=NONE cterm=NONE
-hi Folded guifg=#5f5f87 guibg=#161821 gui=NONE cterm=NONE
-hi IncSearch guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse
-hi LineNr guifg=#5f5f87 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=#000000 guibg=#a6a8b1 gui=NONE cterm=NONE
-hi PmenuExtra guifg=#000000 guibg=#a6a8b1 gui=NONE cterm=NONE
-hi PmenuKind guifg=#000000 guibg=#a6a8b1 gui=bold cterm=bold
-hi PmenuSbar guifg=#707070 guibg=#5f5f87 gui=NONE cterm=NONE
-hi PmenuSel guifg=#000000 guibg=#d7d7ff gui=NONE cterm=NONE
-hi PmenuExtraSel guifg=#000000 guibg=#d7d7ff gui=NONE cterm=NONE
-hi PmenuKindSel guifg=#000000 guibg=#d7d7ff gui=bold cterm=bold
-hi PmenuThumb guifg=#dadada guibg=#d7d7ff gui=NONE cterm=NONE
-hi Question guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-hi QuickFixLine guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
-hi Search guifg=#00afff guibg=#000000 gui=reverse cterm=reverse
-hi SignColumn guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#5f5f87 guibg=NONE gui=bold cterm=bold
-hi SpellBad guifg=#d75f5f guibg=NONE guisp=#d75f5f gui=undercurl cterm=underline
-hi SpellCap guifg=#87afd7 guibg=NONE guisp=#87afd7 gui=undercurl cterm=underline
-hi SpellLocal guifg=#af87d7 guibg=NONE guisp=#af87d7 gui=undercurl cterm=underline
-hi SpellRare guifg=#5fafaf guibg=NONE guisp=#5fafaf gui=undercurl cterm=underline
-hi StatusLine guifg=#000000 guibg=#d7d7ff gui=bold cterm=bold
-hi StatusLineNC guifg=#8787af guibg=#000000 gui=reverse cterm=reverse
-hi TabLine guifg=#8787af guibg=#000000 gui=reverse cterm=reverse
-hi TabLineFill guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-hi TabLineSel guifg=#000000 guibg=#d7d7ff gui=bold cterm=bold
-hi Title guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi VertSplit guifg=#5f5f87 guibg=NONE gui=NONE cterm=NONE
-hi Visual guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse
-hi VisualNOS guifg=NONE guibg=#363841 gui=NONE cterm=NONE
-hi WarningMsg guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-hi WildMenu guifg=#d7d7ff guibg=#161821 gui=bold cterm=bold
-hi Comment guifg=#af87d7 guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE
-hi Error guifg=#ff5f5f guibg=#000000 gui=bold,reverse cterm=bold,reverse
-hi Identifier guifg=#87d75f guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-hi PreProc guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#5fafaf guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE
-hi String guifg=#d7af5f guibg=NONE gui=NONE cterm=NONE
-hi Todo guifg=#5fd7af guibg=NONE gui=bold,reverse cterm=bold,reverse
-hi Type guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE
-hi Underlined guifg=#dadada guibg=NONE gui=underline cterm=underline
-hi CursorIM guifg=#000000 guibg=#afff00 gui=NONE cterm=NONE
-hi ToolbarLine guifg=NONE guibg=#000000 gui=NONE cterm=NONE
-hi ToolbarButton guifg=#dadada guibg=#000000 gui=bold cterm=bold
-hi DiffRemoved guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE
-hi debugBreakpoint guifg=#8787af guibg=#000000 gui=bold,reverse cterm=bold,reverse
-
-if s:t_Co >= 256
-  hi Normal ctermfg=253 ctermbg=233 cterm=NONE
-  hi ColorColumn ctermfg=NONE ctermbg=235 cterm=NONE
-  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi CurSearch ctermfg=207 ctermbg=16 cterm=reverse
-  hi Cursor ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi CursorColumn ctermfg=NONE ctermbg=237 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=237 cterm=NONE
-  hi CursorLineNr ctermfg=189 ctermbg=237 cterm=NONE
-  hi DiffAdd ctermfg=35 ctermbg=16 cterm=reverse
-  hi DiffChange ctermfg=111 ctermbg=16 cterm=reverse
-  hi DiffDelete ctermfg=161 ctermbg=16 cterm=reverse
-  hi DiffText ctermfg=213 ctermbg=16 cterm=reverse
-  hi Directory ctermfg=253 ctermbg=NONE cterm=NONE
-  hi EndOfBuffer ctermfg=60 ctermbg=NONE cterm=NONE
-  hi FoldColumn ctermfg=103 ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=60 ctermbg=233 cterm=NONE
-  hi IncSearch ctermfg=214 ctermbg=16 cterm=reverse
-  hi LineNr ctermfg=60 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=16 ctermbg=248 cterm=NONE
-  hi PmenuExtra ctermfg=16 ctermbg=248 cterm=NONE
-  hi PmenuKind ctermfg=16 ctermbg=248 cterm=bold
-  hi PmenuSbar ctermfg=242 ctermbg=60 cterm=NONE
-  hi PmenuSel ctermfg=16 ctermbg=189 cterm=NONE
-  hi PmenuExtraSel ctermfg=16 ctermbg=189 cterm=NONE
-  hi PmenuKindSel ctermfg=16 ctermbg=189 cterm=bold
-  hi PmenuThumb ctermfg=253 ctermbg=189 cterm=NONE
-  hi Question ctermfg=253 ctermbg=NONE cterm=NONE
-  hi QuickFixLine ctermfg=207 ctermbg=16 cterm=reverse
-  hi Search ctermfg=39 ctermbg=16 cterm=reverse
-  hi SignColumn ctermfg=253 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=60 ctermbg=NONE cterm=bold
-  hi SpellBad ctermfg=167 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=110 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=140 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=73 ctermbg=NONE cterm=underline
-  hi StatusLine ctermfg=16 ctermbg=189 cterm=bold
-  hi StatusLineNC ctermfg=103 ctermbg=16 cterm=reverse
-  hi TabLine ctermfg=103 ctermbg=16 cterm=reverse
-  hi TabLineFill ctermfg=253 ctermbg=NONE cterm=NONE
-  hi TabLineSel ctermfg=16 ctermbg=189 cterm=bold
-  hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi VertSplit ctermfg=60 ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=214 ctermbg=16 cterm=reverse
-  hi VisualNOS ctermfg=NONE ctermbg=237 cterm=NONE
-  hi WarningMsg ctermfg=253 ctermbg=NONE cterm=NONE
-  hi WildMenu ctermfg=189 ctermbg=233 cterm=bold
-  hi Comment ctermfg=140 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=167 ctermbg=NONE cterm=NONE
-  hi Error ctermfg=203 ctermbg=16 cterm=bold,reverse
-  hi Identifier ctermfg=113 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=253 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=110 ctermbg=NONE cterm=NONE
-  hi Special ctermfg=73 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=110 ctermbg=NONE cterm=NONE
-  hi String ctermfg=179 ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=79 ctermbg=NONE cterm=bold,reverse
-  hi Type ctermfg=110 ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=253 ctermbg=NONE cterm=underline
-  hi CursorIM ctermfg=16 ctermbg=154 cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=16 cterm=NONE
-  hi ToolbarButton ctermfg=253 ctermbg=16 cterm=bold
-  hi DiffRemoved ctermfg=167 ctermbg=NONE cterm=NONE
-  hi debugBreakpoint ctermfg=103 ctermbg=16 cterm=bold,reverse
-  unlet s:t_Co
-  finish
-endif
-
-if s:t_Co >= 16
-  hi CurSearch ctermfg=magenta ctermbg=black cterm=reverse
-  hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi IncSearch ctermfg=yellow ctermbg=black cterm=reverse
-  hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi PmenuSbar ctermfg=darkgrey ctermbg=NONE cterm=reverse
-  hi Search ctermfg=cyan ctermbg=black cterm=reverse
-  hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=bold
-  hi StatusLineNC ctermfg=darkgrey ctermbg=NONE cterm=reverse
-  hi TabLine ctermfg=darkgrey ctermbg=NONE cterm=reverse
-  hi VertSplit ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  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 FoldColumn 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 Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-  hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
-  hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
-  hi PmenuKindSel 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 SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  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 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 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=darkmagenta ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse
-  hi Identifier ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi String ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=darkgreen ctermbg=black cterm=bold,reverse
-  hi Type ctermfg=darkblue 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
-  hi DiffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi debugBreakpoint ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-  unlet s:t_Co
-  finish
-endif
-
-if s:t_Co >= 8
-  hi CurSearch ctermfg=darkmagenta ctermbg=black cterm=reverse
-  hi EndOfBuffer ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
-  hi LineNr ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi Search ctermfg=darkcyan ctermbg=black cterm=reverse
-  hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
-  hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
-  hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
-  hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
-  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 FoldColumn 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 Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-  hi PmenuSel ctermfg=NONE ctermbg=NONE cterm=bold
-  hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
-  hi PmenuKindSel 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 SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  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 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 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=darkmagenta ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Error ctermfg=darkred ctermbg=black cterm=bold,reverse
-  hi Identifier ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=darkblue ctermbg=NONE cterm=NONE
-  hi String ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=darkgreen ctermbg=black cterm=bold,reverse
-  hi Type ctermfg=darkblue 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
-  hi DiffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi debugBreakpoint ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-  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: guibg         #161821           233               black
-" Color: statusline    #d7d7ff           189               white
-" Color: statuslineNC  #8787af           103               grey
-" Color: darkuipurple  #5f5f87           60                grey
-" Color: dark0         #000000           16                black
-" Color: dark1         #d75f5f           167               darkred
-" Color: dark2         #87d75f           113               darkgreen
-" Color: dark3         #d7af5f           179               darkyellow
-" Color: dark4         #87afd7           110               darkblue
-" Color: dark5         #af87d7           140               darkmagenta
-" Color: dark6         #5fafaf           73                darkcyan
-" Color: dark7         #dadada           253               grey
-" Color: dark8         #707070           242               darkgrey
-" Color: dark9         #ff5f5f           203               red
-" Color: dark10        #87ff5f           119               green
-" Color: dark11        #ffd75f           221               yellow
-" Color: dark12        #87d7ff           117               blue
-" Color: dark13        #d787ff           177               magenta
-" Color: dark14        #5fd7d7           80                cyan
-" Color: dark15        #ffffff           231               white
-" Color: diffred       #d7005f           161               darkred
-" Color: diffgreen     #00af5f           35                darkgreen
-" Color: diffblue      #87afff           111               darkblue
-" Color: diffpink      #ff87ff           213               darkmagenta
-" Color: uipink        #ff00af           199               magenta
-" Color: uilime        #afff00           154               green
-" Color: uiteal        #5fd7af           79                green
-" Color: uiblue        #00afff           39                blue
-" Color: uipurple      #af00ff           129               darkmagenta
-" Color: uiamber       #ffaf00           214               darkyellow
-" Color: uiblack       #363841           237               darkgrey
-" Color: yasogrey      #262831           235               black
-" Color: linenrblack   #585858           240               darkgrey
-" Color: uicursearch   #ff5fff           207               magenta
-" Color: invisigrey    #a6a8b1           248               darkgrey
-" Color: errorred      #ff5f5f           203               red
-" Term colors: dark0 dark1 dark2 dark3 dark4 dark5 dark6 dark7
-" Term colors: dark8 dark9 dark10 dark11 dark12 dark13 dark14 dark15
-" vim: et ts=2 sw=2
@@ -1,753 +0,0 @@
-" Name:         Wild Charm
-" Description:  Vibrant and playful, at least one popular AI thinks it is.
-" Author:       Maxim Kim <habamax@gmail.com>
-" Maintainer:   Maxim Kim <habamax@gmail.com>
-" Website:      https://github.com/vim/colorschemes
-" License:      Same as Vim
-" Last Updated: Sun 12 Mar 2023 18:46:06 AEDT
-
-" Generated by Colortemplate v2.2.0
-
-hi clear
-let g:colors_name = 'wildcharm'
-
-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 LineNrAbove LineNr
-hi! link LineNrBelow LineNr
-hi! link MessageWindow PMenu
-hi! link PopupNotification Todo
-hi! link CurSearch IncSearch
-if &background ==# 'dark'
-  if (has('termguicolors') && &termguicolors) || has('gui_running')
-    let g:terminal_ansi_colors = ['#000000', '#d7005f', '#00af5f', '#d78700', '#0087d7', '#d787d7', '#00afaf', '#d0d0d0', '#767676', '#ff5f87', '#00d75f', '#ffaf00', '#00afff', '#ff87ff', '#00d7d7', '#ffffff']
-  endif
-  hi Normal guifg=#d0d0d0 guibg=#000000 gui=NONE cterm=NONE
-  hi Statusline guifg=#d0d0d0 guibg=#000000 gui=reverse cterm=reverse
-  hi StatuslineNC guifg=#767676 guibg=#000000 gui=reverse cterm=reverse
-  hi VertSplit guifg=#767676 guibg=#767676 gui=NONE cterm=NONE
-  hi TabLine guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE
-  hi TabLineFill guifg=NONE guibg=#767676 gui=NONE cterm=NONE
-  hi TabLineSel guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE
-  hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
-  hi QuickFixLine guifg=#000000 guibg=#ff87ff gui=NONE cterm=NONE
-  hi CursorLineNr guifg=#ffffff guibg=NONE gui=bold cterm=bold
-  hi LineNr guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-  hi NonText guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-  hi FoldColumn guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-  hi SpecialKey guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-  hi EndOfBuffer guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-  hi EndOfBuffer guifg=#767676 guibg=NONE gui=NONE cterm=NONE
-  hi Pmenu guifg=#d0d0d0 guibg=#303030 gui=NONE cterm=NONE
-  hi PmenuSel guifg=#000000 guibg=#ffaf00 gui=NONE cterm=NONE
-  hi PmenuThumb guifg=NONE guibg=#d0d0d0 gui=NONE cterm=NONE
-  hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuKind guifg=#ff5f87 guibg=#303030 gui=NONE cterm=NONE
-  hi PmenuKindSel guifg=#d7005f guibg=#ffaf00 gui=NONE cterm=NONE
-  hi PmenuExtra guifg=#767676 guibg=#303030 gui=NONE cterm=NONE
-  hi PmenuExtraSel guifg=#000000 guibg=#ffaf00 gui=NONE cterm=NONE
-  hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Error guifg=#ffffff guibg=#d7005f gui=NONE cterm=NONE
-  hi ErrorMsg guifg=#ffffff guibg=#d7005f gui=NONE cterm=NONE
-  hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
-  hi MoreMsg guifg=#00d75f guibg=NONE gui=NONE cterm=NONE
-  hi Question guifg=#ff87ff guibg=NONE gui=NONE cterm=NONE
-  hi WarningMsg guifg=#ffaf00 guibg=NONE gui=NONE cterm=NONE
-  hi Todo guifg=#875fff guibg=#000000 gui=reverse cterm=reverse
-  hi Search guifg=#000000 guibg=#00d75f gui=NONE cterm=NONE
-  hi IncSearch guifg=#000000 guibg=#ffaf00 gui=NONE cterm=NONE
-  hi WildMenu guifg=#000000 guibg=#ffaf00 gui=NONE cterm=NONE
-  hi debugPC guifg=#0087d7 guibg=NONE gui=reverse cterm=reverse
-  hi debugBreakpoint guifg=#00afaf guibg=NONE gui=reverse cterm=reverse
-  hi Cursor guifg=#ffffff guibg=#000000 gui=reverse cterm=reverse
-  hi lCursor guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
-  hi Visual guifg=#000000 guibg=#0087d7 gui=NONE cterm=NONE
-  hi VisualNOS guifg=#000000 guibg=#00afff gui=NONE cterm=NONE
-  hi CursorLine guifg=NONE guibg=#262626 gui=NONE cterm=NONE
-  hi CursorColumn guifg=NONE guibg=#262626 gui=NONE cterm=NONE
-  hi Folded guifg=#767676 guibg=#303030 gui=NONE cterm=NONE
-  hi ColorColumn guifg=NONE guibg=#303030 gui=NONE cterm=NONE
-  hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold
-  hi SpellBad guifg=NONE guibg=NONE guisp=#ff5f87 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi SpellCap guifg=NONE guibg=NONE guisp=#00afaf gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi SpellLocal guifg=NONE guibg=NONE guisp=#00af5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi SpellRare guifg=NONE guibg=NONE guisp=#ff87ff gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Comment guifg=#767676 guibg=NONE gui=NONE cterm=NONE
-  hi Constant guifg=#ff5f87 guibg=NONE gui=NONE cterm=NONE
-  hi String guifg=#00d75f guibg=NONE gui=NONE cterm=NONE
-  hi Identifier guifg=#ff87ff guibg=NONE gui=NONE cterm=NONE
-  hi Statement guifg=#00afff guibg=NONE gui=NONE cterm=NONE
-  hi Type guifg=#ffaf00 guibg=NONE gui=NONE cterm=NONE
-  hi PreProc guifg=#00d7d7 guibg=NONE gui=NONE cterm=NONE
-  hi Special guifg=#875fff guibg=NONE gui=NONE cterm=NONE
-  hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Title guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
-  hi Directory guifg=#00afff guibg=NONE gui=bold cterm=bold
-  hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi DiffAdd guifg=#afffaf guibg=#5f875f gui=NONE cterm=NONE
-  hi DiffChange guifg=#d0d0d0 guibg=#5f5f5f gui=NONE cterm=NONE
-  hi DiffText guifg=#afffff guibg=#5f8787 gui=NONE cterm=NONE
-  hi DiffDelete guifg=#ffafaf guibg=#875f5f gui=NONE cterm=NONE
-  hi diffAdded guifg=#00af5f guibg=NONE gui=NONE cterm=NONE
-  hi diffRemoved guifg=#d7005f guibg=NONE gui=NONE cterm=NONE
-else
-  " Light background
-  if (has('termguicolors') && &termguicolors) || has('gui_running')
-    let g:terminal_ansi_colors = ['#000000', '#af0000', '#008700', '#af5f00', '#005faf', '#870087', '#008787', '#8a8a8a', '#808080', '#d70000', '#5faf5f', '#d78700', '#0087d7', '#af00af', '#00afaf', '#ffffff']
-  endif
-  hi Normal guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
-  hi Statusline guifg=#ffffff guibg=#5f5f5f gui=NONE cterm=NONE
-  hi StatuslineNC guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE
-  hi VertSplit guifg=#d0d0d0 guibg=#d0d0d0 gui=NONE cterm=NONE
-  hi TabLine guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE
-  hi TabLineFill guifg=NONE guibg=#808080 gui=NONE cterm=NONE
-  hi TabLineSel guifg=#ffffff guibg=#000000 gui=reverse cterm=reverse
-  hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE
-  hi QuickFixLine guifg=#ffffff guibg=#870087 gui=NONE cterm=NONE
-  hi CursorLineNr guifg=#000000 guibg=NONE gui=bold cterm=bold
-  hi LineNr guifg=#b2b2b2 guibg=NONE gui=NONE cterm=NONE
-  hi NonText guifg=#b2b2b2 guibg=NONE gui=NONE cterm=NONE
-  hi FoldColumn guifg=#b2b2b2 guibg=NONE gui=NONE cterm=NONE
-  hi EndOfBuffer guifg=#b2b2b2 guibg=NONE gui=NONE cterm=NONE
-  hi SpecialKey guifg=#b2b2b2 guibg=NONE gui=NONE cterm=NONE
-  hi Pmenu guifg=#000000 guibg=#e4e4e4 gui=NONE cterm=NONE
-  hi PmenuSel guifg=#ffffff guibg=#d78700 gui=NONE cterm=NONE
-  hi PmenuThumb guifg=NONE guibg=#808080 gui=NONE cterm=NONE
-  hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi PmenuKind guifg=#d70000 guibg=#e4e4e4 gui=NONE cterm=NONE
-  hi PmenuKindSel guifg=#af0000 guibg=#d78700 gui=NONE cterm=NONE
-  hi PmenuExtra guifg=#808080 guibg=#e4e4e4 gui=NONE cterm=NONE
-  hi PmenuExtraSel guifg=#ffffff guibg=#d78700 gui=NONE cterm=NONE
-  hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Error guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
-  hi ErrorMsg guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
-  hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
-  hi MoreMsg guifg=#008700 guibg=NONE gui=NONE cterm=NONE
-  hi Question guifg=#870087 guibg=NONE gui=NONE cterm=NONE
-  hi WarningMsg guifg=#af5f00 guibg=NONE gui=NONE cterm=NONE
-  hi Todo guifg=#8700ff guibg=#ffffff gui=reverse cterm=reverse
-  hi Search guifg=#ffffff guibg=#008700 gui=NONE cterm=NONE
-  hi IncSearch guifg=#ffffff guibg=#d78700 gui=NONE cterm=NONE
-  hi WildMenu guifg=#ffffff guibg=#d78700 gui=NONE cterm=NONE
-  hi debugPC guifg=#005faf guibg=NONE gui=reverse cterm=reverse
-  hi debugBreakpoint guifg=#008787 guibg=NONE gui=reverse cterm=reverse
-  hi Cursor guifg=#000000 guibg=#ffffff gui=reverse cterm=reverse
-  hi lCursor guifg=#ff00ff guibg=#000000 gui=reverse cterm=reverse
-  hi Visual guifg=#ffffff guibg=#0087d7 gui=NONE cterm=NONE
-  hi VisualNOS guifg=#ffffff guibg=#005faf gui=NONE cterm=NONE
-  hi CursorLine guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
-  hi CursorColumn guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
-  hi Folded guifg=#808080 guibg=#e4e4e4 gui=NONE cterm=NONE
-  hi ColorColumn guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
-  hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold
-  hi SpellBad guifg=NONE guibg=NONE guisp=#af0000 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi SpellCap guifg=NONE guibg=NONE guisp=#008787 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi SpellLocal guifg=NONE guibg=NONE guisp=#008700 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi SpellRare guifg=NONE guibg=NONE guisp=#af00af gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Comment guifg=#8a8a8a guibg=NONE gui=NONE cterm=NONE
-  hi Constant guifg=#af0000 guibg=NONE gui=NONE cterm=NONE
-  hi String guifg=#008700 guibg=NONE gui=NONE cterm=NONE
-  hi Identifier guifg=#870087 guibg=NONE gui=NONE cterm=NONE
-  hi Statement guifg=#005faf guibg=NONE gui=NONE cterm=NONE
-  hi Type guifg=#af5f00 guibg=NONE gui=NONE cterm=NONE
-  hi PreProc guifg=#008787 guibg=NONE gui=NONE cterm=NONE
-  hi Special guifg=#8700ff guibg=NONE gui=NONE cterm=NONE
-  hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Title guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
-  hi Directory guifg=#005faf guibg=NONE gui=bold cterm=bold
-  hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi DiffAdd guifg=#005f00 guibg=#afd7af gui=NONE cterm=NONE
-  hi DiffChange guifg=#262626 guibg=#dadada gui=NONE cterm=NONE
-  hi DiffText guifg=#005f5f guibg=#afd7d7 gui=NONE cterm=NONE
-  hi DiffDelete guifg=#875f5f guibg=#ffd7d7 gui=NONE cterm=NONE
-  hi diffAdded guifg=#008700 guibg=NONE gui=NONE cterm=NONE
-  hi diffRemoved guifg=#d70000 guibg=NONE gui=NONE cterm=NONE
-endif
-
-if s:t_Co >= 256
-  hi! link Terminal Normal
-  hi! link StatuslineTerm Statusline
-  hi! link StatuslineTermNC StatuslineNC
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link MessageWindow PMenu
-  hi! link PopupNotification Todo
-  hi! link CurSearch IncSearch
-  if &background ==# 'dark'
-    hi Normal ctermfg=252 ctermbg=16 cterm=NONE
-    hi Statusline ctermfg=252 ctermbg=16 cterm=reverse
-    hi StatuslineNC ctermfg=243 ctermbg=16 cterm=reverse
-    hi VertSplit ctermfg=243 ctermbg=243 cterm=NONE
-    hi TabLine ctermfg=16 ctermbg=252 cterm=NONE
-    hi TabLineFill ctermfg=NONE ctermbg=243 cterm=NONE
-    hi TabLineSel ctermfg=231 ctermbg=16 cterm=NONE
-    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi ToolbarButton ctermfg=16 ctermbg=231 cterm=NONE
-    hi QuickFixLine ctermfg=16 ctermbg=213 cterm=NONE
-    hi CursorLineNr ctermfg=231 ctermbg=NONE cterm=bold
-    hi LineNr ctermfg=240 ctermbg=NONE cterm=NONE
-    hi NonText ctermfg=240 ctermbg=NONE cterm=NONE
-    hi FoldColumn ctermfg=240 ctermbg=NONE cterm=NONE
-    hi SpecialKey ctermfg=240 ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=240 ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=243 ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=252 ctermbg=236 cterm=NONE
-    hi PmenuSel ctermfg=16 ctermbg=214 cterm=NONE
-    hi PmenuThumb ctermfg=NONE ctermbg=252 cterm=NONE
-    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi PmenuKind ctermfg=204 ctermbg=236 cterm=NONE
-    hi PmenuKindSel ctermfg=161 ctermbg=214 cterm=NONE
-    hi PmenuExtra ctermfg=243 ctermbg=236 cterm=NONE
-    hi PmenuExtraSel ctermfg=16 ctermbg=214 cterm=NONE
-    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Error ctermfg=231 ctermbg=161 cterm=NONE
-    hi ErrorMsg ctermfg=231 ctermbg=161 cterm=NONE
-    hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
-    hi MoreMsg ctermfg=41 ctermbg=NONE cterm=NONE
-    hi Question ctermfg=213 ctermbg=NONE cterm=NONE
-    hi WarningMsg ctermfg=214 ctermbg=NONE cterm=NONE
-    hi Todo ctermfg=99 ctermbg=16 cterm=reverse
-    hi Search ctermfg=16 ctermbg=41 cterm=NONE
-    hi IncSearch ctermfg=16 ctermbg=214 cterm=NONE
-    hi WildMenu ctermfg=16 ctermbg=214 cterm=NONE
-    hi debugPC ctermfg=32 ctermbg=NONE cterm=reverse
-    hi debugBreakpoint ctermfg=37 ctermbg=NONE cterm=reverse
-    hi Visual ctermfg=16 ctermbg=32 cterm=NONE
-    hi VisualNOS ctermfg=16 ctermbg=39 cterm=NONE
-    hi CursorLine ctermfg=NONE ctermbg=235 cterm=NONE
-    hi CursorColumn ctermfg=NONE ctermbg=235 cterm=NONE
-    hi Folded ctermfg=243 ctermbg=236 cterm=NONE
-    hi ColorColumn ctermfg=NONE ctermbg=236 cterm=NONE
-    hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold
-    hi SpellBad ctermfg=161 ctermbg=231 cterm=reverse
-    hi SpellCap ctermfg=37 ctermbg=16 cterm=reverse
-    hi SpellLocal ctermfg=41 ctermbg=16 cterm=reverse
-    hi SpellRare ctermfg=213 ctermbg=16 cterm=reverse
-    hi Comment ctermfg=243 ctermbg=NONE cterm=NONE
-    hi Constant ctermfg=204 ctermbg=NONE cterm=NONE
-    hi String ctermfg=41 ctermbg=NONE cterm=NONE
-    hi Identifier ctermfg=213 ctermbg=NONE cterm=NONE
-    hi Statement ctermfg=39 ctermbg=NONE cterm=NONE
-    hi Type ctermfg=214 ctermbg=NONE cterm=NONE
-    hi PreProc ctermfg=44 ctermbg=NONE cterm=NONE
-    hi Special ctermfg=99 ctermbg=NONE cterm=NONE
-    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
-    hi Directory ctermfg=39 ctermbg=NONE cterm=bold
-    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi DiffAdd ctermfg=157 ctermbg=65 cterm=NONE
-    hi DiffChange ctermfg=252 ctermbg=59 cterm=NONE
-    hi DiffText ctermfg=159 ctermbg=66 cterm=NONE
-    hi DiffDelete ctermfg=217 ctermbg=95 cterm=NONE
-    hi diffAdded ctermfg=35 ctermbg=NONE cterm=NONE
-    hi diffRemoved ctermfg=161 ctermbg=NONE cterm=NONE
-  else
-    " Light background
-    hi Normal ctermfg=16 ctermbg=231 cterm=NONE
-    hi Statusline ctermfg=231 ctermbg=59 cterm=NONE
-    hi StatuslineNC ctermfg=16 ctermbg=252 cterm=NONE
-    hi VertSplit ctermfg=252 ctermbg=252 cterm=NONE
-    hi TabLine ctermfg=16 ctermbg=252 cterm=NONE
-    hi TabLineFill ctermfg=NONE ctermbg=240 cterm=NONE
-    hi TabLineSel ctermfg=231 ctermbg=16 cterm=reverse
-    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi ToolbarButton ctermfg=231 ctermbg=16 cterm=NONE
-    hi QuickFixLine ctermfg=231 ctermbg=90 cterm=NONE
-    hi CursorLineNr ctermfg=16 ctermbg=NONE cterm=bold
-    hi LineNr ctermfg=249 ctermbg=NONE cterm=NONE
-    hi NonText ctermfg=249 ctermbg=NONE cterm=NONE
-    hi FoldColumn ctermfg=249 ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=249 ctermbg=NONE cterm=NONE
-    hi SpecialKey ctermfg=249 ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=16 ctermbg=254 cterm=NONE
-    hi PmenuSel ctermfg=231 ctermbg=172 cterm=NONE
-    hi PmenuThumb ctermfg=NONE ctermbg=240 cterm=NONE
-    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi PmenuKind ctermfg=160 ctermbg=254 cterm=NONE
-    hi PmenuKindSel ctermfg=124 ctermbg=172 cterm=NONE
-    hi PmenuExtra ctermfg=240 ctermbg=254 cterm=NONE
-    hi PmenuExtraSel ctermfg=231 ctermbg=172 cterm=NONE
-    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Error ctermfg=231 ctermbg=160 cterm=NONE
-    hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE
-    hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
-    hi MoreMsg ctermfg=28 ctermbg=NONE cterm=NONE
-    hi Question ctermfg=90 ctermbg=NONE cterm=NONE
-    hi WarningMsg ctermfg=130 ctermbg=NONE cterm=NONE
-    hi Todo ctermfg=93 ctermbg=231 cterm=reverse
-    hi Search ctermfg=231 ctermbg=28 cterm=NONE
-    hi IncSearch ctermfg=231 ctermbg=172 cterm=NONE
-    hi WildMenu ctermfg=231 ctermbg=172 cterm=NONE
-    hi debugPC ctermfg=25 ctermbg=NONE cterm=reverse
-    hi debugBreakpoint ctermfg=30 ctermbg=NONE cterm=reverse
-    hi Visual ctermfg=231 ctermbg=32 cterm=NONE
-    hi VisualNOS ctermfg=231 ctermbg=25 cterm=NONE
-    hi CursorLine ctermfg=NONE ctermbg=255 cterm=NONE
-    hi CursorColumn ctermfg=NONE ctermbg=255 cterm=NONE
-    hi Folded ctermfg=240 ctermbg=254 cterm=NONE
-    hi ColorColumn ctermfg=NONE ctermbg=254 cterm=NONE
-    hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold
-    hi SpellBad ctermfg=160 ctermbg=231 cterm=reverse
-    hi SpellCap ctermfg=30 ctermbg=231 cterm=reverse
-    hi SpellLocal ctermfg=28 ctermbg=231 cterm=reverse
-    hi SpellRare ctermfg=127 ctermbg=231 cterm=reverse
-    hi Comment ctermfg=245 ctermbg=NONE cterm=NONE
-    hi Constant ctermfg=124 ctermbg=NONE cterm=NONE
-    hi String ctermfg=28 ctermbg=NONE cterm=NONE
-    hi Identifier ctermfg=90 ctermbg=NONE cterm=NONE
-    hi Statement ctermfg=25 ctermbg=NONE cterm=NONE
-    hi Type ctermfg=130 ctermbg=NONE cterm=NONE
-    hi PreProc ctermfg=30 ctermbg=NONE cterm=NONE
-    hi Special ctermfg=93 ctermbg=NONE cterm=NONE
-    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
-    hi Directory ctermfg=25 ctermbg=NONE cterm=bold
-    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi DiffAdd ctermfg=22 ctermbg=151 cterm=NONE
-    hi DiffChange ctermfg=235 ctermbg=253 cterm=NONE
-    hi DiffText ctermfg=23 ctermbg=152 cterm=NONE
-    hi DiffDelete ctermfg=95 ctermbg=224 cterm=NONE
-    hi diffAdded ctermfg=28 ctermbg=NONE cterm=NONE
-    hi diffRemoved ctermfg=160 ctermbg=NONE cterm=NONE
-  endif
-  unlet s:t_Co
-  finish
-endif
-
-if s:t_Co >= 16
-  if &background ==# 'dark'
-    hi Normal ctermfg=grey ctermbg=black cterm=NONE
-    hi Statusline ctermfg=grey ctermbg=black cterm=reverse
-    hi StatuslineNC ctermfg=darkgrey ctermbg=black cterm=reverse
-    hi VertSplit ctermfg=darkgrey ctermbg=darkgrey cterm=NONE
-    hi TabLine ctermfg=black ctermbg=grey cterm=NONE
-    hi TabLineFill ctermfg=NONE ctermbg=darkgrey cterm=NONE
-    hi TabLineSel ctermfg=white ctermbg=black cterm=NONE
-    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi ToolbarButton ctermfg=black ctermbg=white cterm=NONE
-    hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE
-    hi CursorLineNr ctermfg=white ctermbg=NONE cterm=bold
-    hi LineNr ctermfg=grey ctermbg=NONE cterm=NONE
-    hi NonText ctermfg=grey ctermbg=NONE cterm=NONE
-    hi FoldColumn ctermfg=grey ctermbg=NONE cterm=NONE
-    hi SpecialKey ctermfg=grey ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
-    hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
-    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
-    hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE
-    hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE
-    hi PmenuExtra ctermfg=darkgrey ctermbg=grey cterm=NONE
-    hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE
-    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Error ctermfg=white ctermbg=darkred cterm=NONE
-    hi ErrorMsg ctermfg=white ctermbg=darkred cterm=NONE
-    hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
-    hi MoreMsg ctermfg=green ctermbg=NONE cterm=NONE
-    hi Question ctermfg=magenta ctermbg=NONE cterm=NONE
-    hi WarningMsg ctermfg=yellow ctermbg=NONE cterm=NONE
-    hi Todo ctermfg=darkred ctermbg=black cterm=reverse
-    hi Search ctermfg=black ctermbg=green cterm=NONE
-    hi IncSearch ctermfg=black ctermbg=yellow cterm=NONE
-    hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
-    hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse
-    hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
-    hi Visual ctermfg=black ctermbg=darkblue cterm=NONE
-    hi VisualNOS ctermfg=black ctermbg=blue cterm=NONE
-    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-    hi CursorColumn ctermfg=black ctermbg=yellow cterm=NONE
-    hi Folded ctermfg=black ctermbg=NONE cterm=bold
-    hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
-    hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
-    hi SpellBad ctermfg=darkred ctermbg=white cterm=reverse
-    hi SpellCap ctermfg=darkcyan ctermbg=black cterm=reverse
-    hi SpellLocal ctermfg=green ctermbg=black cterm=reverse
-    hi SpellRare ctermfg=magenta ctermbg=black cterm=reverse
-    hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
-    hi Constant ctermfg=red ctermbg=NONE cterm=NONE
-    hi String ctermfg=green ctermbg=NONE cterm=NONE
-    hi Identifier ctermfg=magenta ctermbg=NONE cterm=NONE
-    hi Statement ctermfg=blue ctermbg=NONE cterm=NONE
-    hi Type ctermfg=yellow ctermbg=NONE cterm=NONE
-    hi PreProc ctermfg=cyan ctermbg=NONE cterm=NONE
-    hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
-    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
-    hi Directory ctermfg=blue ctermbg=NONE cterm=bold
-    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
-    hi DiffChange ctermfg=black ctermbg=lightgray cterm=NONE
-    hi DiffText ctermfg=black ctermbg=cyan cterm=NONE
-    hi DiffDelete ctermfg=black ctermbg=darkred cterm=NONE
-    hi diffAdded ctermfg=darkgreen ctermbg=NONE cterm=NONE
-    hi diffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE
-  else
-    " Light background
-    hi Normal ctermfg=black ctermbg=white cterm=NONE
-    hi Statusline ctermfg=white ctermbg=darkgrey cterm=NONE
-    hi StatuslineNC ctermfg=black ctermbg=lightgrey cterm=NONE
-    hi VertSplit ctermfg=lightgrey ctermbg=lightgrey cterm=NONE
-    hi TabLine ctermfg=black ctermbg=lightgrey cterm=NONE
-    hi TabLineFill ctermfg=NONE ctermbg=darkgrey cterm=NONE
-    hi TabLineSel ctermfg=white ctermbg=black cterm=reverse
-    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi ToolbarButton ctermfg=white ctermbg=black cterm=NONE
-    hi QuickFixLine ctermfg=white ctermbg=darkmagenta cterm=NONE
-    hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold
-    hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
-    hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
-    hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
-    hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
-    hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
-    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
-    hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE
-    hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE
-    hi PmenuExtra ctermfg=darkgrey ctermbg=grey cterm=NONE
-    hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE
-    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Error ctermfg=white ctermbg=red cterm=NONE
-    hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
-    hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
-    hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
-    hi Question ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-    hi WarningMsg ctermfg=darkyellow ctermbg=NONE cterm=NONE
-    hi Todo ctermfg=darkred ctermbg=white cterm=reverse
-    hi Search ctermfg=white ctermbg=darkgreen cterm=NONE
-    hi IncSearch ctermfg=white ctermbg=yellow cterm=NONE
-    hi WildMenu ctermfg=white ctermbg=yellow cterm=NONE
-    hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse
-    hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
-    hi Visual ctermfg=white ctermbg=blue cterm=NONE
-    hi VisualNOS ctermfg=white ctermbg=darkblue cterm=NONE
-    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-    hi CursorColumn ctermfg=black ctermbg=yellow cterm=NONE
-    hi Folded ctermfg=black ctermbg=NONE cterm=bold
-    hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
-    hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
-    hi SpellBad ctermfg=red ctermbg=white cterm=reverse
-    hi SpellCap ctermfg=darkcyan ctermbg=white cterm=reverse
-    hi SpellLocal ctermfg=darkgreen ctermbg=white cterm=reverse
-    hi SpellRare ctermfg=magenta ctermbg=white cterm=reverse
-    hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
-    hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
-    hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
-    hi Identifier ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-    hi Statement ctermfg=darkblue ctermbg=NONE cterm=NONE
-    hi Type ctermfg=darkyellow ctermbg=NONE cterm=NONE
-    hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
-    hi Special ctermfg=darkred ctermbg=NONE cterm=NONE
-    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
-    hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
-    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
-    hi DiffChange ctermfg=black ctermbg=lightgray cterm=NONE
-    hi DiffText ctermfg=black ctermbg=cyan cterm=NONE
-    hi DiffDelete ctermfg=black ctermbg=darkred cterm=NONE
-    hi diffAdded ctermfg=darkgreen ctermbg=NONE cterm=NONE
-    hi diffRemoved ctermfg=red ctermbg=NONE cterm=NONE
-  endif
-  unlet s:t_Co
-  finish
-endif
-
-if s:t_Co >= 8
-  if &background ==# 'dark'
-    hi Normal ctermfg=grey ctermbg=black cterm=NONE
-    hi Statusline ctermfg=grey ctermbg=black cterm=bold,reverse
-    hi StatuslineNC ctermfg=black ctermbg=grey cterm=NONE
-    hi VertSplit ctermfg=grey ctermbg=grey cterm=NONE
-    hi TabLine ctermfg=grey ctermbg=black cterm=reverse
-    hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
-    hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE
-    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold,reverse
-    hi QuickFixLine ctermfg=black ctermbg=darkmagenta cterm=NONE
-    hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold
-    hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
-    hi NonText ctermfg=black ctermbg=NONE cterm=NONE
-    hi FoldColumn ctermfg=black ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=grey ctermbg=NONE cterm=NONE
-    hi SpecialKey ctermfg=black ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
-    hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
-    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
-    hi PmenuKind ctermfg=darkred ctermbg=grey cterm=NONE
-    hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE
-    hi PmenuExtra ctermfg=black ctermbg=grey cterm=NONE
-    hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE
-    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Error ctermfg=grey ctermbg=darkred cterm=NONE
-    hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
-    hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
-    hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
-    hi Question ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-    hi WarningMsg ctermfg=darkyellow ctermbg=NONE cterm=NONE
-    hi Todo ctermfg=darkred ctermbg=black cterm=reverse
-    hi Search ctermfg=darkgreen ctermbg=black cterm=reverse
-    hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
-    hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
-    hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse
-    hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
-    hi Visual ctermfg=black ctermbg=darkblue cterm=NONE
-    hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
-    hi VisualNOS ctermfg=black ctermbg=darkblue cterm=NONE
-    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-    hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
-    hi Folded ctermfg=black ctermbg=NONE cterm=bold
-    hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
-    hi SpellBad ctermfg=darkred ctermbg=NONE cterm=reverse
-    hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=reverse
-    hi SpellLocal ctermfg=darkgreen ctermbg=black cterm=reverse
-    hi SpellRare ctermfg=darkmagenta ctermbg=NONE cterm=reverse
-    hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
-    hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
-    hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
-    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
-    hi Type ctermfg=darkyellow ctermbg=NONE cterm=NONE
-    hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
-    hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
-    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
-    hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
-    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
-    hi DiffChange ctermfg=black ctermbg=darkcyan cterm=NONE
-    hi DiffText ctermfg=black ctermbg=grey cterm=NONE
-    hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
-  else
-    " Light background
-    hi Normal ctermfg=black ctermbg=grey cterm=NONE
-    hi Statusline ctermfg=grey ctermbg=black cterm=bold
-    hi StatuslineNC ctermfg=grey ctermbg=darkgrey cterm=NONE
-    hi VertSplit ctermfg=black ctermbg=black cterm=NONE
-    hi TabLine ctermfg=black ctermbg=grey cterm=reverse
-    hi TabLineFill ctermfg=NONE ctermbg=darkgrey cterm=NONE
-    hi TabLineSel ctermfg=black ctermbg=grey cterm=NONE
-    hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold
-    hi QuickFixLine ctermfg=black ctermbg=darkmagenta cterm=NONE
-    hi CursorLineNr ctermfg=black ctermbg=NONE cterm=bold
-    hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
-    hi NonText ctermfg=black ctermbg=NONE cterm=NONE
-    hi FoldColumn ctermfg=black ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=black ctermbg=NONE cterm=NONE
-    hi SpecialKey ctermfg=black ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=grey ctermbg=black cterm=NONE
-    hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
-    hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi PmenuSel ctermfg=NONE ctermbg=darkyellow cterm=NONE
-    hi PmenuKind ctermfg=darkred ctermbg=black cterm=NONE
-    hi PmenuKindSel ctermfg=darkred ctermbg=darkyellow cterm=NONE
-    hi PmenuExtra ctermfg=grey ctermbg=black cterm=NONE
-    hi PmenuExtraSel ctermfg=black ctermbg=darkyellow cterm=NONE
-    hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Error ctermfg=white ctermbg=darkred cterm=NONE
-    hi ErrorMsg ctermfg=white ctermbg=darkred cterm=NONE
-    hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
-    hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
-    hi Question ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-    hi WarningMsg ctermfg=darkyellow ctermbg=NONE cterm=NONE
-    hi Todo ctermfg=darkred ctermbg=black cterm=reverse
-    hi Search ctermfg=darkgreen ctermbg=black cterm=reverse
-    hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
-    hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
-    hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse
-    hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
-    hi Visual ctermfg=grey ctermbg=darkblue cterm=NONE
-    hi MatchParen ctermfg=NONE ctermbg=NONE cterm=bold,underline
-    hi VisualNOS ctermfg=black ctermbg=darkblue cterm=NONE
-    hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-    hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
-    hi Folded ctermfg=black ctermbg=NONE cterm=bold
-    hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
-    hi SpellBad ctermfg=darkred ctermbg=black cterm=reverse
-    hi SpellCap ctermfg=darkcyan ctermbg=black cterm=reverse
-    hi SpellLocal ctermfg=darkgreen ctermbg=black cterm=reverse
-    hi SpellRare ctermfg=darkmagenta ctermbg=black cterm=reverse
-    hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
-    hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
-    hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
-    hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Statement ctermfg=darkblue ctermbg=NONE cterm=bold
-    hi Type ctermfg=darkyellow ctermbg=NONE cterm=NONE
-    hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
-    hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
-    hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-    hi Title ctermfg=NONE ctermbg=NONE cterm=bold
-    hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
-    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
-    hi DiffChange ctermfg=black ctermbg=darkcyan cterm=NONE
-    hi DiffText ctermfg=grey ctermbg=black cterm=NONE
-    hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
-  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: any
-" Background: dark
-" Color: color00                 #000000        16             black
-" Color: color08                 #767676        243            darkgrey
-" Color: color01                 #d7005f        161            darkred
-" Color: color09                 #ff5f87        204            red
-" Color: color02                 #00af5f        35             darkgreen
-" Color: color10                 #00d75f        41             green
-" Color: color03                 #d78700        172            darkyellow
-" Color: color11                 #ffaf00        214            yellow
-" Color: color04                 #0087d7        32             darkblue
-" Color: color12                 #00afff        39             blue
-" Color: color05                 #d787d7        176            darkmagenta
-" Color: color13                 #ff87ff        213            magenta
-" Color: color06                 #00afaf        37             darkcyan
-" Color: color14                 #00d7d7        44             cyan
-" Color: color07                 #d0d0d0        252            grey
-" Color: color15                 #ffffff        231            white
-" Color: color16                 #875fff        99             darkred
-" Color: colorLine               #262626        235            darkgrey
-" Color: colorB                  #303030        236            darkgrey
-" Color: colorNonT               #585858        240            grey
-" Color: colorTab                #585858        240            grey
-" Color: colorC                  #ffffff        231            white
-" Color: colorlC                 #ff5fff        207            magenta
-" Color: colorDim                #878787        102            grey
-" Color: colorMP                 #ff00af        199            magenta
-" Color: diffAdd                 #5f875f        65             darkmagenta
-" Color: diffAddFg               #afffaf        157            black
-" Color: diffDelete              #875f5f        95             darkred
-" Color: diffDeleteFg            #ffafaf        217            black
-" Color: diffChange              #5f5f5f        59             lightgray
-" Color: diffChangeFg            #d0d0d0        252            black
-" Color: diffText                #5f8787        66             cyan
-" Color: diffTextFg              #afffff        159            black
-" Term colors: color00 color01 color02 color03 color04 color05 color06 color07
-" Term colors: color08 color09 color10 color11 color12 color13 color14 color15
-" Background: light
-" Color: color00                 #000000        16             black
-" Color: color08                 #808080        240            darkgrey
-" Color: color01                 #af0000        124            darkred
-" Color: color09                 #d70000        160            red
-" Color: color02                 #008700        28             darkgreen
-" Color: color10                 #5faf5f        71             green
-" Color: color03                 #af5f00        130            darkyellow
-" Color: color11                 #d78700        172            yellow
-" Color: color04                 #005faf        25             darkblue
-" Color: color12                 #0087d7        32             blue
-" Color: color05                 #870087        90             darkmagenta
-" Color: color13                 #af00af        127            magenta
-" Color: color06                 #008787        30             darkcyan
-" Color: color14                 #00afaf        37             cyan
-" Color: color07                 #8a8a8a        245            grey
-" Color: color15                 #ffffff        231            white
-" Color: color16                 #8700ff        93             darkred
-" Color: colorCm                 #8a8a8a        245            darkgrey
-" Color: colorLine               #EEEEEE        255            grey
-" Color: colorB                  #E4E4E4        254            grey
-" Color: colorNonT               #b2b2b2        249            darkgrey
-" Color: colorTab                #d0d0d0        252            lightgrey
-" Color: colorC                  #000000        16             black
-" Color: colorlC                 #FF00FF        201            magenta
-" Color: colorV                  #5F87AF        67             darkblue
-" Color: colorDim                #626262        241            darkgrey
-" Color: colorSt                 #5f5f5f        59             darkgrey
-" Color: colorMP                 #ff00af        199            magenta
-" Color: diffAdd                 #afd7af        151            darkmagenta
-" Color: diffAddFg               #005f00        22             black
-" Color: diffDelete              #ffd7d7        224            darkred
-" Color: diffDeleteFg            #875f5f        95             black
-" Color: diffChange              #dadada        253            lightgray
-" Color: diffChangeFg            #262626        235            black
-" Color: diffText                #afd7d7        152            cyan
-" Color: diffTextFg              #005f5f        23             black
-" Term colors: color00 color01 color02 color03 color04 color05 color06 color07
-" Term colors: color08 color09 color10 color11 color12 color13 color14 color15
-" Background: any
-" vim: et ts=2 sw=2
@@ -1,563 +0,0 @@
-" Name:         zaibatsu
-" Description:  "If you believe the journalists, he's the single wealthiest individual, period. As rich as some zaibatsu. But there's the catch, really: is he an individual? In the sense that you are, or I am? No." -- William Gibson, Count Zero
-" Author:       Romain Lafourcade <romainlafourcade@gmail.com>
-" Maintainer:   Romain Lafourcade <romainlafourcade@gmail.com>
-" Website:      https://github.com/vim/colorschemes
-" License:      Same as Vim
-" Last Updated: Sun Mar 12 17:21:15 2023
-
-" Generated by Colortemplate v2.2.0
-
-set background=dark
-
-hi clear
-let g:colors_name = 'zaibatsu'
-
-let s:t_Co = exists('&t_Co') && !empty(&t_Co) && &t_Co > 1 ? &t_Co : 1
-
-if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#0e0024', '#d7005f', '#00af5f', '#ffaf00', '#5f5fff', '#d700ff', '#00afff', '#d7d5db', '#878092', '#ff5faf', '#00d700', '#ffd700', '#8787ff', '#ff87ff', '#00ffff', '#ffffff']
-endif
-hi Normal guifg=#ffffff guibg=#0e0024 gui=NONE cterm=NONE
-hi EndOfBuffer guifg=#afafff guibg=#0e0024 gui=NONE cterm=NONE
-hi NonText guifg=#878092 guibg=#0e0024 gui=NONE cterm=NONE
-hi SpellBad guifg=NONE guibg=NONE guisp=#ff5faf gui=undercurl ctermfg=NONE ctermbg=NONE cterm=undercurl
-hi SpellCap guifg=NONE guibg=NONE guisp=#87ff00 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=undercurl
-hi SpellLocal guifg=NONE guibg=NONE guisp=#ffffff gui=undercurl ctermfg=NONE ctermbg=NONE cterm=undercurl
-hi SpellRare guifg=NONE guibg=NONE guisp=#ffafff gui=undercurl ctermfg=NONE ctermbg=NONE cterm=undercurl
-hi StatusLine guifg=#0e0024 guibg=#ffffff gui=NONE cterm=NONE
-hi StatusLineNC guifg=#0e0024 guibg=#afaab6 gui=NONE cterm=NONE
-hi Pmenu guifg=#0e0024 guibg=#ffffff gui=NONE cterm=NONE
-hi PmenuSbar guifg=#d7d5db guibg=#d7d5db gui=NONE cterm=NONE
-hi PmenuSel guifg=#0e0024 guibg=#afafff gui=NONE cterm=NONE
-hi PmenuThumb guifg=#878092 guibg=#878092 gui=NONE cterm=NONE
-hi PmenuExtra guifg=#878092 guibg=#ffffff gui=NONE cterm=NONE
-hi! link PmenuExtraSel PmenuSel
-hi PmenuKind guifg=#878092 guibg=#ffffff gui=NONE cterm=NONE
-hi! link PmenuKindSel PmenuSel
-hi ColorColumn guifg=NONE guibg=#510039 gui=NONE cterm=NONE
-hi CursorLine guifg=NONE guibg=#362b49 gui=NONE cterm=NONE
-hi CursorColumn guifg=NONE guibg=#362b49 gui=NONE cterm=NONE
-hi WildMenu guifg=#0e0024 guibg=#afafff gui=NONE cterm=NONE
-hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Cursor guifg=#0e0024 guibg=#ffff5f gui=NONE cterm=NONE
-hi CursorIM guifg=#0e0024 guibg=#ffff5f gui=NONE cterm=NONE
-hi Error guifg=#d70000 guibg=#ffffff gui=reverse cterm=reverse
-hi ErrorMsg guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
-hi FoldColumn guifg=#00afff guibg=NONE gui=NONE cterm=NONE
-hi Folded guifg=#ffaf00 guibg=#0e0024 gui=reverse cterm=reverse
-hi IncSearch guifg=#ffaf00 guibg=#0e0024 gui=reverse cterm=reverse
-hi LineNr guifg=#afafff guibg=NONE gui=NONE cterm=NONE
-hi MatchParen guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-hi ModeMsg guifg=#0e0024 guibg=#87ff00 gui=NONE cterm=NONE
-hi MoreMsg guifg=#87ffff guibg=NONE gui=NONE cterm=NONE
-hi Question guifg=#87ff00 guibg=NONE gui=NONE cterm=NONE
-hi QuickFixLine guifg=#ffafff guibg=#0e0024 gui=reverse cterm=reverse
-hi Search guifg=#87ffff guibg=#0e0024 gui=reverse cterm=reverse
-hi SignColumn guifg=#00afff guibg=NONE gui=NONE cterm=NONE
-hi SpecialKey guifg=#878092 guibg=NONE gui=NONE cterm=NONE
-hi ToolbarButton guifg=#ffffff guibg=#5e556d gui=NONE cterm=NONE
-hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi VertSplit guifg=#afafff guibg=NONE gui=NONE cterm=NONE
-hi Visual guifg=#0e0024 guibg=#5fd7ff gui=NONE cterm=NONE
-hi VisualNOS guifg=#0e0024 guibg=#ffffff gui=NONE cterm=NONE
-hi WarningMsg guifg=#ffafff guibg=NONE gui=NONE cterm=NONE
-hi debugBreakpoint guifg=#87ff00 guibg=#5f00d7 gui=reverse cterm=reverse
-hi debugPC guifg=#87ffff guibg=#5f00d7 gui=reverse cterm=reverse
-hi Directory guifg=#87ffff guibg=NONE gui=NONE cterm=NONE
-hi Title guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Comment guifg=#afafff guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#ffff5f guibg=NONE gui=NONE cterm=NONE
-hi Identifier guifg=#87ffff guibg=NONE gui=NONE cterm=NONE
-hi Ignore guifg=#878092 guibg=NONE gui=NONE cterm=NONE
-hi PreProc guifg=#00afff guibg=NONE gui=NONE cterm=NONE
-hi Special guifg=#87ff00 guibg=NONE gui=NONE cterm=NONE
-hi Statement guifg=#ffafff guibg=NONE gui=NONE cterm=NONE
-hi Todo guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
-hi Type guifg=#ff5faf guibg=NONE gui=NONE cterm=NONE
-hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
-hi! link CurSearch IncSearch
-hi! link CursorLineFold CursorLine
-hi! link CursorLineNr CursorLine
-hi! link CursorLineSign CursorLine
-hi! link LineNrAbove LineNr
-hi! link LineNrBelow LineNr
-hi! link StatusLineTerm StatusLine
-hi! link StatusLineTermNC StatusLineNC
-hi! link TabLine StatusLineNC
-hi! link TabLineFill StatusLineNC
-hi! link TabLineSel StatusLine
-hi! link Terminal Normal
-hi! link lCursor Cursor
-hi! link Boolean Constant
-hi! link Character Constant
-hi! link Conditional Statement
-hi! link Define PreProc
-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 Terminal Normal
-hi! link MessageWindow Pmenu
-hi! link PopupNotification Todo
-hi DiffAdd guifg=#87ff00 guibg=#362b49 gui=reverse cterm=reverse
-hi DiffChange guifg=#afafff guibg=#362b49 gui=reverse cterm=reverse
-hi DiffText guifg=#d7d5db guibg=#362b49 gui=reverse cterm=reverse
-hi DiffDelete guifg=#ff5faf guibg=#362b49 gui=reverse cterm=reverse
-
-if s:t_Co >= 256
-  hi Normal ctermfg=231 ctermbg=16 cterm=NONE
-  hi EndOfBuffer ctermfg=147 ctermbg=16 cterm=NONE
-  hi NonText ctermfg=103 ctermbg=16 cterm=NONE
-  hi SpellBad ctermfg=205 ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=118 ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=231 ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=219 ctermbg=NONE cterm=underline
-  hi StatusLine ctermfg=16 ctermbg=231 cterm=NONE
-  hi StatusLineNC ctermfg=16 ctermbg=146 cterm=NONE
-  hi Pmenu ctermfg=16 ctermbg=231 cterm=NONE
-  hi PmenuSbar ctermfg=189 ctermbg=189 cterm=NONE
-  hi PmenuSel ctermfg=16 ctermbg=147 cterm=NONE
-  hi PmenuThumb ctermfg=103 ctermbg=103 cterm=NONE
-  hi PmenuExtra ctermfg=103 ctermbg=231 cterm=NONE
-  hi! link PmenuExtraSel PmenuSel
-  hi PmenuKind ctermfg=103 ctermbg=231 cterm=NONE
-  hi! link PmenuKindSel PmenuSel
-  hi ColorColumn ctermfg=NONE ctermbg=52 cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=237 cterm=NONE
-  hi CursorColumn ctermfg=NONE ctermbg=237 cterm=NONE
-  hi WildMenu ctermfg=16 ctermbg=147 cterm=NONE
-  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Cursor ctermfg=16 ctermbg=227 cterm=NONE
-  hi CursorIM ctermfg=16 ctermbg=227 cterm=NONE
-  hi Error ctermfg=160 ctermbg=231 cterm=reverse
-  hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE
-  hi FoldColumn ctermfg=39 ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=214 ctermbg=16 cterm=reverse
-  hi IncSearch ctermfg=214 ctermbg=16 cterm=reverse
-  hi LineNr ctermfg=147 ctermbg=NONE cterm=NONE
-  hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi ModeMsg ctermfg=16 ctermbg=118 cterm=NONE
-  hi MoreMsg ctermfg=123 ctermbg=NONE cterm=NONE
-  hi Question ctermfg=118 ctermbg=NONE cterm=NONE
-  hi QuickFixLine ctermfg=219 ctermbg=16 cterm=reverse
-  hi Search ctermfg=123 ctermbg=16 cterm=reverse
-  hi SignColumn ctermfg=39 ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=103 ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=231 ctermbg=60 cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi VertSplit ctermfg=147 ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=16 ctermbg=81 cterm=NONE
-  hi VisualNOS ctermfg=16 ctermbg=231 cterm=NONE
-  hi WarningMsg ctermfg=219 ctermbg=NONE cterm=NONE
-  hi debugBreakpoint ctermfg=118 ctermbg=56 cterm=reverse
-  hi debugPC ctermfg=123 ctermbg=56 cterm=reverse
-  hi Directory ctermfg=123 ctermbg=NONE cterm=NONE
-  hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=147 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=227 ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=123 ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=103 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=39 ctermbg=NONE cterm=NONE
-  hi Special ctermfg=118 ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=219 ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi Type ctermfg=205 ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi! link CurSearch IncSearch
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineNr CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
-  hi! link TabLine StatusLineNC
-  hi! link TabLineFill StatusLineNC
-  hi! link TabLineSel StatusLine
-  hi! link Terminal Normal
-  hi! link lCursor Cursor
-  hi! link Boolean Constant
-  hi! link Character Constant
-  hi! link Conditional Statement
-  hi! link Define PreProc
-  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 Terminal Normal
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi DiffAdd ctermfg=118 ctermbg=237 cterm=reverse
-  hi DiffChange ctermfg=147 ctermbg=237 cterm=reverse
-  hi DiffText ctermfg=189 ctermbg=237 cterm=reverse
-  hi DiffDelete ctermfg=205 ctermbg=237 cterm=reverse
-  unlet s:t_Co
-  finish
-endif
-
-if s:t_Co >= 16
-  hi Normal ctermfg=white ctermbg=black cterm=NONE
-  hi EndOfBuffer ctermfg=blue ctermbg=black cterm=NONE
-  hi NonText ctermfg=darkgray ctermbg=black cterm=NONE
-  hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=green ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=white ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
-  hi StatusLine ctermfg=white ctermbg=black cterm=reverse
-  hi StatusLineNC ctermfg=darkgray ctermbg=gray cterm=reverse
-  hi Pmenu ctermfg=black ctermbg=white cterm=NONE
-  hi PmenuSbar ctermfg=gray ctermbg=gray cterm=NONE
-  hi PmenuSel ctermfg=white ctermbg=blue cterm=NONE
-  hi PmenuThumb ctermfg=darkgray ctermbg=darkgray cterm=NONE
-  hi PmenuExtra ctermfg=darkgray ctermbg=white cterm=NONE
-  hi! link PmenuExtraSel PmenuSel
-  hi PmenuKind ctermfg=darkgray ctermbg=white cterm=NONE
-  hi! link PmenuKindSel PmenuSel
-  hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorColumn ctermfg=NONE ctermbg=blue cterm=NONE
-  hi WildMenu ctermfg=white ctermbg=blue cterm=NONE
-  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Cursor ctermfg=black ctermbg=yellow cterm=NONE
-  hi CursorIM ctermfg=black ctermbg=yellow cterm=NONE
-  hi Error ctermfg=red ctermbg=white cterm=reverse
-  hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
-  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=darkyellow ctermbg=black cterm=reverse
-  hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
-  hi LineNr ctermfg=blue ctermbg=NONE cterm=NONE
-  hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi ModeMsg ctermfg=black ctermbg=green cterm=NONE
-  hi MoreMsg ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Question ctermfg=green ctermbg=NONE cterm=NONE
-  hi QuickFixLine ctermfg=magenta ctermbg=black cterm=reverse
-  hi Search ctermfg=cyan ctermbg=black cterm=reverse
-  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=darkgray ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=white ctermbg=darkgray cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi VertSplit ctermfg=blue ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi VisualNOS ctermfg=black ctermbg=white cterm=NONE
-  hi WarningMsg ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi debugBreakpoint ctermfg=green ctermbg=darkblue cterm=reverse
-  hi debugPC ctermfg=cyan ctermbg=darkblue cterm=reverse
-  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=darkgray ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Special ctermfg=green ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi Type ctermfg=red ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi! link CurSearch IncSearch
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineNr CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
-  hi! link TabLine StatusLineNC
-  hi! link TabLineFill StatusLineNC
-  hi! link TabLineSel StatusLine
-  hi! link Terminal Normal
-  hi! link lCursor Cursor
-  hi! link Boolean Constant
-  hi! link Character Constant
-  hi! link Conditional Statement
-  hi! link Define PreProc
-  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 Terminal Normal
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi DiffAdd ctermfg=darkgreen ctermbg=white cterm=reverse
-  hi DiffChange ctermfg=darkblue ctermbg=white cterm=reverse
-  hi DiffText ctermfg=grey ctermbg=black cterm=reverse
-  hi DiffDelete ctermfg=darkmagenta ctermbg=white cterm=reverse
-  unlet s:t_Co
-  finish
-endif
-
-if s:t_Co >= 8
-  hi Normal ctermfg=gray ctermbg=black cterm=NONE
-  hi EndOfBuffer ctermfg=blue ctermbg=black cterm=NONE
-  hi NonText ctermfg=darkgray ctermbg=black cterm=NONE
-  hi SpellBad ctermfg=red ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=green ctermbg=NONE cterm=underline
-  hi SpellLocal ctermfg=white ctermbg=NONE cterm=underline
-  hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
-  hi StatusLine ctermfg=white ctermbg=black cterm=reverse
-  hi StatusLineNC ctermfg=darkgray ctermbg=gray cterm=bold,reverse
-  hi Pmenu ctermfg=black ctermbg=white cterm=NONE
-  hi PmenuSbar ctermfg=white ctermbg=white cterm=NONE
-  hi PmenuSel ctermfg=white ctermbg=blue cterm=NONE
-  hi PmenuThumb ctermfg=blue ctermbg=blue cterm=NONE
-  hi! link PmenuExtra Pmenu
-  hi! link PmenuExtraSel PmenuSel
-  hi! link PmenuKind Pmenu
-  hi! link PmenuKindSel PmenuSel
-  hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
-  hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
-  hi CursorColumn ctermfg=NONE ctermbg=blue cterm=NONE
-  hi WildMenu ctermfg=white ctermbg=blue cterm=NONE
-  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Cursor ctermfg=black ctermbg=yellow cterm=NONE
-  hi CursorIM ctermfg=black ctermbg=yellow cterm=NONE
-  hi Error ctermfg=red ctermbg=white cterm=reverse
-  hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
-  hi FoldColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Folded ctermfg=darkyellow ctermbg=black cterm=reverse
-  hi IncSearch ctermfg=darkyellow ctermbg=black cterm=reverse
-  hi LineNr ctermfg=blue ctermbg=NONE cterm=NONE
-  hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi ModeMsg ctermfg=black ctermbg=green cterm=NONE
-  hi MoreMsg ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Question ctermfg=green ctermbg=NONE cterm=NONE
-  hi QuickFixLine ctermfg=magenta ctermbg=black cterm=reverse
-  hi Search ctermfg=cyan ctermbg=black cterm=reverse
-  hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi SpecialKey ctermfg=darkgray ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=white ctermbg=darkgray cterm=NONE
-  hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi VertSplit ctermfg=blue ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi VisualNOS ctermfg=black ctermbg=white cterm=NONE
-  hi WarningMsg ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi debugBreakpoint ctermfg=green ctermbg=darkblue cterm=reverse
-  hi debugPC ctermfg=cyan ctermbg=darkblue cterm=reverse
-  hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=yellow ctermbg=NONE cterm=NONE
-  hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
-  hi Ignore ctermfg=darkgray ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi Special ctermfg=green ctermbg=NONE cterm=NONE
-  hi Statement ctermfg=magenta ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=NONE ctermbg=NONE cterm=reverse
-  hi Type ctermfg=red ctermbg=NONE cterm=NONE
-  hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi! link CurSearch IncSearch
-  hi! link CursorLineFold CursorLine
-  hi! link CursorLineNr CursorLine
-  hi! link CursorLineSign CursorLine
-  hi! link LineNrAbove LineNr
-  hi! link LineNrBelow LineNr
-  hi! link StatusLineTerm StatusLine
-  hi! link StatusLineTermNC StatusLineNC
-  hi! link TabLine StatusLineNC
-  hi! link TabLineFill StatusLineNC
-  hi! link TabLineSel StatusLine
-  hi! link Terminal Normal
-  hi! link lCursor Cursor
-  hi! link Boolean Constant
-  hi! link Character Constant
-  hi! link Conditional Statement
-  hi! link Define PreProc
-  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 Terminal Normal
-  hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
-  hi DiffAdd ctermfg=darkgreen ctermbg=white cterm=reverse
-  hi DiffChange ctermfg=darkblue ctermbg=white cterm=reverse
-  hi DiffText ctermfg=grey ctermbg=black cterm=reverse
-  hi DiffDelete ctermfg=darkmagenta ctermbg=white cterm=reverse
-  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: background    #0e0024           16                black
-" Color: darkred       #510039           52                darkred
-" Color: darkgreen     #5faf00           70                darkgreen
-" Color: darkyellow    #ffaf00           214               darkyellow
-" Color: darkblue      #5f00d7           56                darkblue
-" Color: darkmagenta   #d700ff           165               darkmagenta
-" Color: darkcyan      #00afff           39                darkcyan
-" Color: red           #ff5faf           205               red
-" Color: green         #87ff00           118               green
-" Color: yellow        #ffff5f           227               yellow
-" Color: blue          #afafff           147               blue
-" Color: magenta       #ffafff           219               magenta
-" Color: cyan          #87ffff           123               cyan
-" Color: white         #ffffff           231               white
-" Color: neutral1      #D7D5DB           189               gray
-" Color: neutral2      #AFAAB6           146               gray
-" Color: neutral3      #878092           103               darkgray
-" Color: neutral4      #5E556D           60                darkgray
-" Color: neutral5      #362B49           237               darkgray
-" Color: error         #d70000           160               red
-" Color: visual        #5FD7FF           81                darkcyan
-" Color: Xdarkred      #d7005f           ~
-" Color: Xdarkgreen    #00af5f           ~
-" Color: Xdarkblue     #5f5fff           ~
-" Color: Xdarkwhite    #d7d7d7           ~
-" Color: Xgrey         #878787           ~
-" Color: Xbrightgreen  #00d700           ~
-" Color: Xbrightyellow #ffd700           ~
-" Color: Xbrightblue   #8787ff           ~
-" Color: Xbrightmagenta #ff87ff          ~
-" Color: Xbrightcyan   #00ffff           ~
-" Term colors: background
-" Term colors: Xdarkred
-" Term colors: Xdarkgreen
-" Term colors: darkyellow
-" Term colors: Xdarkblue
-" Term colors: darkmagenta
-" Term colors: darkcyan
-" Term colors: neutral1
-" Term colors: neutral3
-" Term colors: red
-" Term colors: Xbrightgreen
-" Term colors: Xbrightyellow
-" Term colors: Xbrightblue
-" Term colors: Xbrightmagenta
-" Term colors: Xbrightcyan
-" Term colors: white
-" Color: bgDiffA       #5F875F           65                darkgreen
-" Color: bgDiffT       #C6C6C6           251               grey
-" Color: fgDiffW       #FFFFFF           231               white
-" Color: fgDiffB       #000000           16                black
-" Color: bgDiffC8      #5F87AF           67                darkblue
-" Color: bgDiffD8      #AF5FAF           133               darkmagenta
-" vim: et ts=2 sw=2
@@ -8,4 +8,4 @@ If you want to write your own compiler plugin, have a look at the other files
 for how to do it, the format is simple.

 If you think a compiler plugin you have written is useful for others, please
-send it to the vim-dev mailing list: <vim-dev@vim.org>
+send it to Bram@vim.org.
@@ -1,8 +1,7 @@
 " Vim compiler file
 " Compiler:	Microsoft Visual C
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
-" Last Change:	2023 Aug 10
-" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2014 Sep 20

 if exists("current_compiler")
  finish
@@ -1,8 +1,7 @@
 " The default vimrc file.
 "
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
-" Last change:	2023 Aug 10
-" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last change:	2022 Mar 03
 "
 " This is loaded if no vimrc file was found.
 " Except when Vim is run with "-u NONE" or "-C".
@@ -98,21 +97,17 @@ if 1
  filetype plugin indent on

  " Put these in an autocmd group, so that you can revert them with:
-  " ":autocmd! vimStartup"
+  " ":augroup vimStartup | exe 'au!' | augroup END"
  augroup vimStartup
-    autocmd!
+    au!

    " When editing a file, always jump to the last known cursor position.
    " Don't do it when the position is invalid, when inside an event handler
-    " (happens when dropping a file on gvim), for a commit or rebase message
-    " (likely a different one than last time), and when using xxd(1) to filter
-    " and edit binary files (it transforms input files back and forth, causing
-    " them to have dual nature, so to speak)
+    " (happens when dropping a file on gvim) and for a commit message (it's
+    " likely a different one than last time).
    autocmd BufReadPost *
-      \ let line = line("'\"")
-      \ | if line >= 1 && line <= line("$") && &filetype !~# 'commit'
-      \      && index(['xxd', 'gitrebase'], &filetype) == -1
-      \ |   execute "normal! g`\""
+      \ if line("'\"") >= 1 && line("'\"") <= line("$") && &ft !~# 'commit'
+      \ |   exe "normal! g`\""
      \ | endif

  augroup END
@@ -120,12 +115,12 @@ if 1
  " Quite a few people accidentally type "q:" instead of ":q" and get confused
  " by the command line window.  Give a hint about how to get out.
  " If you don't like this you can put this in your vimrc:
-  " ":autocmd! vimHints"
+  " ":augroup vimHints | exe 'au!' | augroup END"
  augroup vimHints
    au!
    autocmd CmdwinEnter *
-	  \ echohl Todo |
-	  \ echo gettext('You discovered the command-line window! You can close it with ":q".') |
+	  \ echohl Todo | 
+	  \ echo 'You discovered the command-line window! You can close it with ":q".' |
 	  \ echohl None
  augroup END

@@ -1,9 +1,8 @@
 " This Vim script deletes all the menus, so that they can be redefined.
 " Warning: This also deletes all menus defined by the user!
 "
-" Maintainer:	The Vim Project <https://github.com/vim/vim>
-" Last Change:	2023 Aug 10
-" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2019 Dec 10

 aunmenu *
 tlunmenu *
@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 9.0.  Last change: 2023 May 20
+*autocmd.txt*   For Vim version 9.0.  Last change: 2022 Dec 12


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -64,7 +64,7 @@ Example in Vim9 script: >
 In legacy script: >
   call autocmd_add(#{replace: v:true,
 		    \ group: 'DemoGroup',
-		    \ event: 'BufEnter',
+   		    \ event: 'BufEnter',
 		    \ pattern: '*.txt',
 		    \ cmd: 'call DemoBufEnter()'
 		    \ })
@@ -334,7 +334,7 @@ Name			triggered by ~
 |EncodingChanged|	after the 'encoding' option has been changed
 |TermChanged|		after the value of 'term' has changed
 |OptionSet|		after setting any option
-|OSAppearanceChanged|	after the variable |v:os_appearance| has changed
+|OSAppearanceChanged|	after the variable |v:os_appearance| has changed 
 			{only in MacVim GUI}

 	Startup and exit
@@ -400,7 +400,7 @@ Name			triggered by ~
 |InsertEnter|		starting Insert mode
 |InsertChange|		when typing <Insert> while in Insert or Replace mode
 |InsertLeave|		when leaving Insert mode
-|InsertLeavePre|	just before leaving Insert mode
+|InsertLeavePre| 	just before leaving Insert mode
 |InsertCharPre|		when a character was typed in Insert mode, before
 			inserting it

@@ -613,11 +613,9 @@ CmdlineEnter			After moving the cursor to the command line,
 				where the user can type a command or search
 				string; including non-interactive use of ":"
 				in a mapping, but not when using |<Cmd>|.
-				The pattern is matched against the character
-				representing the type of command-line.
-				|cmdwin-char|
 				<afile> is set to a single character,
 				indicating the type of command-line.
+				|cmdwin-char|
 							*CmdlineLeave*
 CmdlineLeave			Before leaving the command line; including
 				non-interactive use of ":" in a mapping, but
@@ -1019,9 +1017,6 @@ OptionSet			After setting an option.  The pattern is
 				the option. Similarly |v:option_oldglobal| is
 				only set when |:set| or |:setglobal| was used.

-				This does not set |<abuf>|, you could use
-				|bufnr()|.
-
 				Note that when setting a |global-local| string
 				option with |:set|, then |v:option_old| is the
 				old global value. However, for all other kinds
@@ -1045,7 +1040,7 @@ OptionSet			After setting an option.  The pattern is
 				When using |:set| in the autocommand the event
 				is not triggered again.
                                                        *OSAppearanceChanged*
-OSAppearanceChanged             After changing the variable |v:os_appearance|.
+OSAppearanceChanged             After changing the variable |v:os_appearance|. 
                                This change happens only if the OS changes
                                its appearance and Vim is running with a GUI.
 				{only in MacVim GUI}
@@ -1,4 +1,4 @@
-*builtin.txt*	For Vim version 9.0.  Last change: 2023 Aug 09
+*builtin.txt*	For Vim version 9.0.  Last change: 2023 Jan 17


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -81,10 +81,8 @@ bufnr([{buf} [, {create}]])	Number	Number of the buffer {buf}
 bufwinid({buf})			Number	window ID of buffer {buf}
 bufwinnr({buf})			Number	window number of buffer {buf}
 byte2line({byte})		Number	line number at byte count {byte}
-byteidx({expr}, {nr} [, {utf16}])
-				Number	byte index of {nr}'th char in {expr}
-byteidxcomp({expr}, {nr} [, {utf16}])
-				Number	byte index of {nr}'th char in {expr}
+byteidx({expr}, {nr})		Number	byte index of {nr}'th char in {expr}
+byteidxcomp({expr}, {nr})	Number	byte index of {nr}'th char in {expr}
 call({func}, {arglist} [, {dict}])
 				any	call {func} with arguments {arglist}
 ceil({expr})			Float	round {expr} up
@@ -119,7 +117,7 @@ changenr()			Number	current change number
 char2nr({expr} [, {utf8}])	Number	ASCII/UTF-8 value of first char in {expr}
 charclass({string})		Number	character class of {string}
 charcol({expr} [, {winid}])	Number	column number of cursor or mark
-charidx({string}, {idx} [, {countcc} [, {utf16}]])
+charidx({string}, {idx} [, {countcc}])
 				Number	char index of byte {idx} in {string}
 chdir({dir})			String	change current working directory
 cindent({lnum})			Number	C indent for line {lnum}
@@ -156,7 +154,6 @@ digraph_setlist({digraphlist})	Boolean	register multiple |digraph|s
 echoraw({expr})			none	output {expr} as-is
 empty({expr})			Number	|TRUE| if {expr} is empty
 environ()			Dict	return environment variables
-err_teapot([{expr}])		none	give E418, or E503 if {expr} is |TRUE|
 escape({string}, {chars})	String	escape {chars} in {string} with '\'
 eval({string})			any	evaluate {string} into its value
 eventhandler()			Number	|TRUE| if inside an event handler
@@ -269,7 +266,7 @@ gettabwinvar({tabnr}, {winnr}, {name} [, {def}])
 gettagstack([{nr}])		Dict	get the tag stack of window {nr}
 gettext({text})			String	lookup translation of {text}
 getwininfo([{winid}])		List	list of info about each window
-getwinpos([{timeout}])		List	X and Y coord in pixels of Vim window
+getwinpos([{timeout}])		List	X and Y coord in pixels of the Vim window
 getwinposx()			Number	X coord in pixels of the Vim window
 getwinposy()			Number	Y coord in pixels of the Vim window
 getwinvar({nr}, {varname} [, {def}])
@@ -310,7 +307,6 @@ inputrestore()			Number	restore typeahead
 inputsave()			Number	save and clear typeahead
 inputsecret({prompt} [, {text}]) String	like input() but hiding the text
 insert({object}, {item} [, {idx}]) List	insert {item} in {object} [before {idx}]
-instanceof({object}, {class})	Number	|TRUE| if {object} is an instance of {class}
 interrupt()			none	interrupt script execution
 invert({expr})			Number	bitwise invert
 isabsolutepath({path})		Number	|TRUE| if {path} is an absolute path
@@ -386,7 +382,7 @@ matchstrpos({expr}, {pat} [, {start} [, {count}]])
 max({expr})			Number	maximum value of items in {expr}
 menu_info({name} [, {mode}])	Dict	get menu item information
 min({expr})			Number	minimum value of items in {expr}
-mkdir({name} [, {flags} [, {prot}]])
+mkdir({name} [, {path} [, {prot}]])
 				Number	create directory {name}
 mode([expr])			String	current editing mode
 mzeval({expr})			any	evaluate |MzScheme| expression
@@ -486,8 +482,7 @@ rename({from}, {to})		Number	rename (move) file from {from} to {to}
 repeat({expr}, {count})		List/Blob/String
 					repeat {expr} {count} times
 resolve({filename})		String	get filename a shortcut points to
-reverse({obj})			List/Blob/String
-					reverse {obj}
+reverse({list})			List	reverse {list} in-place
 round({expr})			Float	round off {expr}
 rubyeval({expr})		any	evaluate |Ruby| expression
 screenattr({row}, {col})	Number	attribute at screen position
@@ -611,8 +606,6 @@ strptime({format}, {timestring})
 strridx({haystack}, {needle} [, {start}])
 				Number	last index of {needle} in {haystack}
 strtrans({expr})		String	translate string to make it printable
-strutf16len({string} [, {countcc}])
-				Number	number of UTF-16 code units in {string}
 strwidth({expr})		Number	display cell length of the String {expr}
 submatch({nr} [, {list}])	String or List
 					specific match in ":s" or substitute()
@@ -710,14 +703,11 @@ trunc({expr})			Float	truncate Float {expr}
 type({expr})			Number	type of value {expr}
 typename({expr})		String	representation of the type of {expr}
 undofile({name})		String	undo file name for {name}
-undotree([{buf}])		List	undo file tree for buffer {buf}
+undotree()			List	undo file tree
 uniq({list} [, {func} [, {dict}]])
 				List	remove adjacent duplicates from a list
-utf16idx({string}, {idx} [, {countcc} [, {charidx}]])
-				Number	UTF-16 index of byte {idx} in {string}
 values({dict})			List	values in {dict}
-virtcol({expr} [, {list} [, {winid}])
-				Number or List
+virtcol({expr} [, {list}])	Number or List
 					screen column of cursor or mark
 virtcol2col({winid}, {lnum}, {col})
 				Number  byte index of a character on screen
@@ -1253,7 +1243,7 @@ bufload({buf})						*bufload()*
 		refers to an existing file then the file is read.  Otherwise
 		the buffer will be empty.  If the buffer was already loaded
 		then there is no change.  If the buffer is not related to a
-		file then no file is read (e.g., when 'buftype' is "nofile").
+		file the no file is read (e.g., when 'buftype' is "nofile").
 		If there is an existing swap file for the file of the buffer,
 		there will be no dialog, the buffer will be loaded anyway.
 		The {buf} argument is used like with |bufexists()|.
@@ -1375,7 +1365,7 @@ byte2line({byte})					*byte2line()*
 <		{not available when compiled without the |+byte_offset|
 		feature}

-byteidx({expr}, {nr} [, {utf16}])			*byteidx()*
+byteidx({expr}, {nr})					*byteidx()*
 		Return byte index of the {nr}'th character in the String
 		{expr}.  Use zero for the first character, it then returns
 		zero.
@@ -1385,13 +1375,6 @@ byteidx({expr}, {nr} [, {utf16}])			*byteidx()*
 		length is added to the preceding base character.  See
 		|byteidxcomp()| below for counting composing characters
 		separately.
-		When {utf16} is present and TRUE, {nr} is used as the UTF-16
-		index in the String {expr} instead of as the character index.
-		The UTF-16 index is the index in the string when it is encoded
-		with 16-bit words.  If the specified UTF-16 index is in the
-		middle of a character (e.g. in a 4-byte character), then the
-		byte index of the first byte in the character is returned.
-		Refer to |string-offset-encoding| for more information.
 		Example : >
 			echo matchstr(str, ".", byteidx(str, 3))
 <		will display the fourth character.  Another way to do the
@@ -1403,17 +1386,11 @@ byteidx({expr}, {nr} [, {utf16}])			*byteidx()*
 		If there are less than {nr} characters -1 is returned.
 		If there are exactly {nr} characters the length of the string
 		in bytes is returned.
-		See |charidx()| and |utf16idx()| for getting the character and
-		UTF-16 index respectively from the byte index.
-		Examples: >
-			echo byteidx('a😊😊', 2)	returns 5
-			echo byteidx('a😊😊', 2, 1)	returns 1
-			echo byteidx('a😊😊', 3, 1)	returns 5
-<
+
 		Can also be used as a |method|: >
 			GetName()->byteidx(idx)

-byteidxcomp({expr}, {nr} [, {utf16}])			*byteidxcomp()*
+byteidxcomp({expr}, {nr})					*byteidxcomp()*
 		Like byteidx(), except that a composing character is counted
 		as a separate character.  Example: >
 			let s = 'e' .. nr2char(0x301)
@@ -1518,38 +1495,27 @@ charcol({expr} [, {winid}])				*charcol()*
 			GetPos()->col()
 <
 							*charidx()*
-charidx({string}, {idx} [, {countcc} [, {utf16}]])
+charidx({string}, {idx} [, {countcc}])
 		Return the character index of the byte at {idx} in {string}.
 		The index of the first character is zero.
 		If there are no multibyte characters the returned value is
 		equal to {idx}.
-
 		When {countcc} is omitted or |FALSE|, then composing characters
-		are not counted separately, their byte length is added to the
-		preceding base character.
+		are not counted separately, their byte length is
+		added to the preceding base character.
 		When {countcc} is |TRUE|, then composing characters are
 		counted as separate characters.
-
-		When {utf16} is present and TRUE, {idx} is used as the UTF-16
-		index in the String {expr} instead of as the byte index.
-
-		Returns -1 if the arguments are invalid or if there are less
-		than {idx} bytes. If there are exactly {idx} bytes the length
-		of the string in characters is returned.
-
-		An error is given and -1 is returned if the first argument is
-		not a string, the second argument is not a number or when the
-		third argument is present and is not zero or one.
-
+		Returns -1 if the arguments are invalid or if {idx} is greater
+		than the index of the last byte in {string}.  An error is
+		given if the first argument is not a string, the second
+		argument is not a number or when the third argument is present
+		and is not zero or one.
 		See |byteidx()| and |byteidxcomp()| for getting the byte index
-		from the character index and |utf16idx()| for getting the
-		UTF-16 index from the character index.
-		Refer to |string-offset-encoding| for more information.
+		from the character index.
 		Examples: >
 			echo charidx('áb́ć', 3)		returns 1
 			echo charidx('áb́ć', 6, 1)	returns 4
 			echo charidx('áb́ć', 16)		returns -1
-			echo charidx('a😊😊', 4, 0, 1)	returns 2
 <
 		Can also be used as a |method|: >
 			GetName()->charidx(idx)
@@ -1599,7 +1565,7 @@ clearmatches([{win}])					*clearmatches()*
 		Can also be used as a |method|: >
 			GetWin()->clearmatches()
 <
-col({expr} [, {winid}])					*col()*
+col({expr} [, {winid})					*col()*
 		The result is a Number, which is the byte index of the column
 		position given with {expr}.  The accepted positions are:
 		    .	    the cursor position
@@ -1662,7 +1628,7 @@ complete({startcol}, {matches})			*complete()* *E785*
 		Example: >
 	inoremap <F5> <C-R>=ListMonths()<CR>

-	func ListMonths()
+	func! ListMonths()
 	  call complete(col('.'), ['January', 'February', 'March',
 		\ 'April', 'May', 'June', 'July', 'August', 'September',
 		\ 'October', 'November', 'December'])
@@ -1927,7 +1893,7 @@ cursor({list})
 		This is like the return value of |getpos()| or |getcurpos()|,
 		but without the first item.

-		To position the cursor using {col} as the character count, use
+		To position the cursor using the character count, use
 		|setcursorcharpos()|.

 		Does not change the jumplist.
@@ -2206,15 +2172,6 @@ environ()						*environ()*
 		use this: >
 			:echo index(keys(environ()), 'HOME', 0, 1) != -1

-
-err_teapot([{expr}])					*err_teapot()*
-		Produce an error with number 418, needed for implementation of
-		RFC 2324.
-		If {expr} is present and it is TRUE error 503 is given,
-		indicating that coffee is temporarily not available.
-		If {expr} is present it must be a String.
-
-
 escape({string}, {chars})				*escape()*
 		Escape the characters in {chars} that occur in {string} with a
 		backslash.  Example: >
@@ -2276,12 +2233,11 @@ execute({command} [, {silent}])					*execute()*
 		string.
 		{command} can be a string or a List.  In case of a List the
 		lines are executed one by one.
-		This is more or less equivalent to: >
+		This is equivalent to: >
 			redir => var
 			{command}
 			redir END
-<		Except that line continuation in {command} is not recognized.
-
+<
 		The optional {silent} argument can have these values:
 			""		no `:silent` used
 			"silent"	`:silent` used
@@ -2292,7 +2248,7 @@ execute({command} [, {silent}])					*execute()*
 							*E930*
 		It is not possible to use `:redir` anywhere in {command}.

-		To get a list of lines use `split()` on the result: >
+		To get a list of lines use |split()| on the result: >
 			execute('args')->split("\n")

 <		To execute a command in another window than the current one
@@ -2615,7 +2571,8 @@ extend({expr1}, {expr2} [, {expr3}])			*extend()*
 extendnew({expr1}, {expr2} [, {expr3}])			*extendnew()*
 		Like |extend()| but instead of adding items to {expr1} a new
 		List or Dictionary is created and returned.  {expr1} remains
-		unchanged.
+		unchanged.  Items can still be changed by {expr2}, if you
+		don't want that use |deepcopy()| first.


 feedkeys({string} [, {mode}])				*feedkeys()*
@@ -3040,7 +2997,7 @@ funcref({name} [, {arglist}] [, {dict}])
 		Can also be used as a |method|: >
 			GetFuncname()->funcref([arg])
 <
-				*function()* *partial* *E700* *E923*
+				*function()* *partial* *E700* *E922* *E923*
 function({name} [, {arglist}] [, {dict}])
 		Return a |Funcref| variable that refers to function {name}.
 		{name} can be the name of a user defined function or an
@@ -3554,8 +3511,6 @@ getcompletion({pat}, {type} [, {filtered}])		*getcompletion()*
 		cmdline		|cmdline-completion| result
 		compiler	compilers
 		cscope		|:cscope| suboptions
-		custom,{func}	custom completion, defined via {func}
-		customlist,{func} custom completion, defined via {func}
 		diff_buffer     |:diffget| and |:diffput| completion
 		dir		directory names
 		environment	environment variable names
@@ -4008,9 +3963,6 @@ getqflist([{what}])					*getqflist()*
 			text	description of the error
 			type	type of the error, 'E', '1', etc.
 			valid	|TRUE|: recognized error message
-		        user_data
-			        custom data associated with the item, can be
-				any type.

 		When there is no error list or it's empty, an empty list is
 		returned. Quickfix list entries with a non-existing buffer
@@ -4166,7 +4118,7 @@ getregtype([{regname}])					*getregtype()*
 		Can also be used as a |method|: >
 			GetRegname()->getregtype()

-getscriptinfo([{opts}])					*getscriptinfo()*
+getscriptinfo([{opts})					*getscriptinfo()*
 		Returns a |List| with information about all the sourced Vim
 		scripts in the order they were sourced, like what
 		`:scriptnames` shows.
@@ -4175,7 +4127,7 @@ getscriptinfo([{opts}])					*getscriptinfo()*
 		optional items:
 		    name	Script name match pattern. If specified,
 				and "sid" is not specified, information about
-				scripts with a name that match the pattern
+				scripts with name that match the pattern
 				"name" are returned.
 		    sid		Script ID |<SID>|.  If specified, only
 				information about the script with ID "sid" is
@@ -5055,17 +5007,6 @@ insert({object}, {item} [, {idx}])			*insert()*
 		Can also be used as a |method|: >
 			mylist->insert(item)

-instanceof({object}, {class})				*instanceof()*
-		The result is a Number, which is |TRUE| when the {object} argument is a
-		direct or indirect instance of a |Class| specified by {class}.
-		When {class} is a |List| the function returns |TRUE| when {object} is an
-		instance of any of the specified classes.
-		Example: >
-			instanceof(animal, [Dog, Cat])
-
-<		Can also be used as a |method|: >
-			myobj->instanceof(mytype)
-
 interrupt()						*interrupt()*
 		Interrupt script execution.  It works more or less like the
 		user typing CTRL-C, most commands won't execute and control
@@ -5728,7 +5669,7 @@ maparg({name} [, {mode} [, {abbr} [, {dict}]]])			*maparg()*
 			     "!"     Insert and Commandline mode
 				     (|mapmode-ic|)
 		  "sid"	     The script local ID, used for <sid> mappings
-			     (|<SID>|).  Negative for special contexts.
+			     (|<SID>|).
 		  "scriptversion"  The version of the script.  999999 for
 				   |Vim9| script.
 		  "lnum"     The line number in "sid", zero if unknown.
@@ -6322,20 +6263,17 @@ min({expr})	Return the minimum value of all items in {expr}. Example:  >
 			mylist->min()

 <							*mkdir()* *E739*
-mkdir({name} [, {flags} [, {prot}]])
+mkdir({name} [, {path} [, {prot}]])
 		Create directory {name}.

-		When {flags} is present it must be a string.  An empty string
-		has no effect.
+		If {path} contains "p" then intermediate directories are
+		created as necessary.  Otherwise it must be "".

-		If {flags} contains "p" then intermediate directories are
-		created as necessary.
-
-		If {flags} contains "D" then {name} is deleted at the end of
+		If {path} contains "D" then {name} is deleted at the end of
 		the current function, as with: >
 			defer delete({name}, 'd')
 <
-		If {flags} contains "R" then {name} is deleted recursively at
+		If {path} contains "R" then {name} is deleted recursively at
 		the end of the current function, as with: >
 			defer delete({name}, 'rf')
 <		Note that when {name} has more than one part and "p" is used
@@ -6410,7 +6348,6 @@ mode([expr])	Return a string that indicates the current mode.
 		   Rvc	    Virtual Replace mode completion |compl-generic|
 		   Rvx	    Virtual Replace mode |i_CTRL-X| completion
 		   c	    Command-line editing
-		   ct	    Command-line editing via Terminal-Job mode
 		   cv	    Vim Ex mode |gQ|
 		   ce	    Normal Ex mode |Q|
 		   r	    Hit-enter prompt
@@ -6608,11 +6545,7 @@ printf({fmt}, {expr1} ...)				*printf()*
 		The "%" starts a conversion specification.  The following
 		arguments appear in sequence:

-			% [pos-argument] [flags] [field-width] [.precision] type
-
-		pos-argument
-			At most one positional argument specifier. These
-			take the form {n$}, where n is >= 1.
+			%  [flags]  [field-width]  [.precision]  type

 		flags
 			Zero or more of the following flags:
@@ -6684,13 +6617,6 @@ printf({fmt}, {expr1} ...)				*printf()*
 <		This limits the length of the text used from "line" to
 		"width" bytes.

-		If the argument to be formatted is specified using a posional
-		argument specifier, and a '*' is used to indicate that a
-		number argument is to be used to specify the width or
-		precision, the argument(s) to be used must also be specified
-		using a {n$} positional argument specifier. See |printf-$|.
-
-
 		The conversion specifiers and their meanings are:

 				*printf-d* *printf-b* *printf-B* *printf-o*
@@ -6709,13 +6635,8 @@ printf({fmt}, {expr1} ...)				*printf()*
 			a conversion is wider than the field width, the field
 			is expanded to contain the conversion result.
 			The 'h' modifier indicates the argument is 16 bits.
-			The 'l' modifier indicates the argument is a long
-			integer.  The size will be 32 bits or 64 bits
-			depending on your platform.
-			The "ll" modifier indicates the argument is 64 bits.
-			The b and B conversion specifiers never take a width
-			modifier and always assume their argument is a 64 bit
-			integer.
+			The 'l' modifier indicates the argument is 32 bits.
+			The 'L' modifier indicates the argument is 64 bits.
 			Generally, these modifiers are not useful. They are
 			ignored when type is known from the argument.

@@ -6785,103 +6706,6 @@ printf({fmt}, {expr1} ...)				*printf()*
 		of "%" items.  If there are not sufficient or too many
 		arguments an error is given.  Up to 18 arguments can be used.

-							*printf-$*
-		In certain languages, error and informative messages are
-		more readable when the order of words is different from the
-		corresponding message in English. To accommodate translations
-		having a different word order, positional arguments may be
-		used to indicate this. For instance: >
-
-			#, c-format
-			msgid "%s returning %s"
-			msgstr "waarde %2$s komt terug van %1$s"
-<
-		In this example, the sentence has its 2 string arguments reversed
-		in the output. >
-
-			echo printf(
-				"In The Netherlands, vim's creator's name is: %1$s %2$s",
-				"Bram", "Moolenaar")
-<			In The Netherlands, vim's creator's name is: Bram Moolenaar >
-
-			echo printf(
-				"In Belgium, vim's creator's name is: %2$s %1$s",
-				"Bram", "Moolenaar")
-<			In Belgium, vim's creator's name is: Moolenaar Bram
-
-		Width (and precision) can be specified using the '*' specifier.
-		In this case, you must specify the field width position in the
-		argument list. >
-
-			echo printf("%1$*2$.*3$d", 1, 2, 3)
-<			001 >
-			echo printf("%2$*3$.*1$d", 1, 2, 3)
-<			  2 >
-			echo printf("%3$*1$.*2$d", 1, 2, 3)
-<			03 >
-			echo printf("%1$*2$.*3$g", 1.4142, 2, 3)
-<			1.414
-
-		You can mix specifying the width and/or precision directly
-		and via positional arguments: >
-
-			echo printf("%1$4.*2$f", 1.4142135, 6)
-<			1.414214 >
-			echo printf("%1$*2$.4f", 1.4142135, 6)
-<			1.4142 >
-			echo printf("%1$*2$.*3$f", 1.4142135, 6, 2)
-<			  1.41
-
-							*E1400*
-		You cannot mix positional and non-positional arguments: >
-			echo printf("%s%1$s", "One", "Two")
-<			E1400: Cannot mix positional and non-positional
-			arguments: %s%1$s
-
-							*E1401*
-		You cannot skip a positional argument in a format string: >
-			echo printf("%3$s%1$s", "One", "Two", "Three")
-<			E1401: format argument 2 unused in $-style
-			format: %3$s%1$s
-
-							*E1402*
-		You can re-use a [field-width] (or [precision]) argument: >
-			echo printf("%1$d at width %2$d is: %01$*2$d", 1, 2)
-<			1 at width 2 is: 01
-
-		However, you can't use it as a different type: >
-			echo printf("%1$d at width %2$ld is: %01$*2$d", 1, 2)
-<			E1402: Positional argument 2 used as field
-			width reused as different type: long int/int
-
-							*E1403*
-		When a positional argument is used, but not the correct number
-		or arguments is given, an error is raised: >
-			echo printf("%1$d at width %2$d is: %01$*2$.*3$d", 1, 2)
-<			E1403: Positional argument 3 out of bounds:
-			%1$d at width %2$d is: %01$*2$.*3$d
-
-		Only the first error is reported: >
-			echo printf("%01$*2$.*3$d %4$d", 1, 2)
-<			E1403: Positional argument 3 out of bounds:
-			%01$*2$.*3$d %4$d
-
-							*E1404*
-		A positional argument can be used more than once: >
-			echo printf("%1$s %2$s %1$s", "One", "Two")
-<			One Two One
-
-		However, you can't use a different type the second time: >
-			echo printf("%1$s %2$s %1$d", "One", "Two")
-<			E1404: Positional argument 1 type used
-			inconsistently: int/string
-
-							*E1405*
-		Various other errors that lead to a format string being
-		wrongly formatted lead to: >
-			echo printf("%1$d at width %2$d is: %01$*2$.3$d", 1, 2)
-<			E1405: Invalid format specifier:
-			%1$d at width %2$d is: %01$*2$.3$d

 prompt_getprompt({buf})					*prompt_getprompt()*
 		Returns the effective prompt text for buffer {buf}.  {buf} can
@@ -6913,20 +6737,17 @@ prompt_setcallback({buf}, {expr})			*prompt_setcallback()*
 		that was entered at the prompt.  This can be an empty string
 		if the user only typed Enter.
 		Example: >
+		   call prompt_setcallback(bufnr(), function('s:TextEntered'))
 		   func s:TextEntered(text)
 		     if a:text == 'exit' || a:text == 'quit'
 		       stopinsert
-		       " Reset 'modified' to allow the buffer to be closed.
-		       " We assume there is nothing useful to be saved.
-		       set nomodified
 		       close
 		     else
-		       " Do something useful with "a:text".  In this example
-		       " we just repeat it.
 		       call append(line('$') - 1, 'Entered: "' .. a:text .. '"')
+		       " Reset 'modified' to allow the buffer to be closed.
+		       set nomodified
 		     endif
 		   endfunc
-		   call prompt_setcallback(bufnr(), function('s:TextEntered'))

 <		Can also be used as a |method|: >
 			GetBuffer()->prompt_setcallback(callback)
@@ -7280,7 +7101,7 @@ reltime({start})
 reltime({start}, {end})					*reltime()*
 		Return an item that represents a time value.  The item is a
 		list with items that depend on the system.  In Vim 9 script
-		the type list<any> can be used.
+		list<any> can be used.
 		The item can be passed to |reltimestr()| to convert it to a
 		string or |reltimefloat()| to convert to a Float.  For
 		example, to see the time spent in function Work(): >
@@ -7329,8 +7150,7 @@ reltimestr({time})				*reltimestr()*
 			call MyFunction()
 			echo reltimestr(reltime(start))
 <		Note that overhead for the commands will be added to the time.
-		The accuracy depends on the system. Use reltimefloat() for the
-		greatest accuracy which is nanoseconds on some systems.
+		The accuracy depends on the system.
 		Leading spaces are used to make the string align nicely.  You
 		can use split() to remove it. >
 			echo split(reltimestr(reltime(start)))[0]
@@ -7462,9 +7282,8 @@ remote_send({server}, {string} [, {idvar}])
 <
 					*remote_startserver()* *E941* *E942*
 remote_startserver({name})
-		Become the server {name}.  {name} must be a non-empty string.
-		This fails if already running as a server, when |v:servername|
-		is not empty.
+		Become the server {name}.  This fails if already running as a
+		server, when |v:servername| is not empty.

 		Can also be used as a |method|: >
 			ServerName()->remote_startserver()
@@ -7554,13 +7373,11 @@ resolve({filename})					*resolve()* *E655*
 			GetName()->resolve()

 reverse({object})					*reverse()*
-		Reverse the order of items in {object}.  {object} can be a
-		|List|, a |Blob| or a |String|.  For a List and a Blob the
-		items are reversed in-place and {object} is returned.
-		For a String a new String is returned.
-		Returns zero if {object} is not a List, Blob or a String.
-		If you want a List or Blob to remain unmodified make a copy
-		first: >
+		Reverse the order of items in {object} in-place.
+		{object} can be a |List| or a |Blob|.
+		Returns {object}.
+		Returns zero if {object} is not a List or a Blob.
+		If you want an object to remain unmodified make a copy first: >
 			:let revlist = reverse(copy(mylist))
 <		Can also be used as a |method|: >
 			mylist->reverse()
@@ -8143,7 +7960,7 @@ setcellwidths({list})					*setcellwidths()*
 		terminal, counted in screen cells.  The values override
 		'ambiwidth'.  Example: >
 		   call setcellwidths([
-				\ [0x111, 0x111, 1],
+		   		\ [0x111, 0x111, 1],
 				\ [0x2194, 0x2199, 2],
 				\ ])

@@ -8157,7 +7974,7 @@ setcellwidths({list})					*setcellwidths()*
 		{width} must be either 1 or 2, indicating the character width
 		in screen cells.			*E1112*
 		An error is given if the argument is invalid, also when a
-		range overlaps with another.		*E1113*
+		range overlaps with another. 		*E1113*

 		If the new value causes 'fillchars' or 'listchars' to become
 		invalid it is rejected and an error is given.
@@ -8432,8 +8249,6 @@ setqflist({list} [, {action} [, {what}]])		*setqflist()*
 		    text	description of the error
 		    type	single-character error type, 'E', 'W', etc.
 		    valid	recognized error message
-		    user_data   custom data associated with the item, can be
-				any type.

 		The "col", "vcol", "nr", "type" and "text" entries are
 		optional.  Either "lnum" or "pattern" entry can be used to
@@ -8848,9 +8663,8 @@ sort({list} [, {how} [, {dict}]])			*sort()* *E702*

 		When {how} is given and it is 'n' then all items will be
 		sorted numerical (Implementation detail: this uses the
-		strtod() function to parse numbers.  Strings, Lists, Dicts and
-		Funcrefs will be considered as being 0).  Note that this won't
-		sort a list of strings with numbers!
+		strtod() function to parse numbers, Strings, Lists, Dicts and
+		Funcrefs will be considered as being 0).

 		When {how} is given and it is 'N' then all items will be
 		sorted numerical. This is like 'n' but a string containing
@@ -9449,28 +9263,6 @@ strtrans({string})					*strtrans()*
 		Can also be used as a |method|: >
 			GetString()->strtrans()

-strutf16len({string} [, {countcc}])			*strutf16len()*
-		The result is a Number, which is the number of UTF-16 code
-		units in String {string} (after converting it to UTF-16).
-
-		When {countcc} is TRUE, composing characters are counted
-		separately.
-		When {countcc} is omitted or FALSE, composing characters are
-		ignored.
-
-		Returns zero on error.
-
-		Also see |strlen()| and |strcharlen()|.
-		Examples: >
-		    echo strutf16len('a')		returns 1
-		    echo strutf16len('©')		returns 1
-		    echo strutf16len('😊')		returns 2
-		    echo strutf16len('ą́')		returns 1
-		    echo strutf16len('ą́', v:true)	returns 3
-
-		Can also be used as a |method|: >
-			GetText()->strutf16len()
-<
 strwidth({string})					*strwidth()*
 		The result is a Number, which is the number of display cells
 		String {string} occupies.  A Tab character is counted as one
@@ -10040,8 +9832,6 @@ timer_start({time}, {callback} [, {options}])
 		{time} is the waiting time in milliseconds. This is the
 		minimum time before invoking the callback.  When the system is
 		busy or Vim is not waiting for input the time will be longer.
-		Zero can be used to execute the callback when Vim is back in
-		the main loop.

 		{callback} is the function to call.  It can be the name of a
 		function or a |Funcref|.  It is called with one argument, which
@@ -10231,10 +10021,9 @@ undofile({name})					*undofile()*
 		Can also be used as a |method|: >
 			GetFilename()->undofile()

-undotree([{buf}])					*undotree()*
-		Return the current state of the undo tree for the current
-		buffer, or for a specific buffer if {buf} is given.  The
-		result is a dictionary with the following items:
+undotree()						*undotree()*
+		Return the current state of the undo tree in a dictionary with
+		the following items:
 		  "seq_last"	The highest undo sequence number used.
 		  "seq_cur"	The sequence number of the current position in
 				the undo tree.  This differs from "seq_last"
@@ -10287,38 +10076,6 @@ uniq({list} [, {func} [, {dict}]])			*uniq()* *E882*

 		Can also be used as a |method|: >
 			mylist->uniq()
-<
-							*utf16idx()*
-utf16idx({string}, {idx} [, {countcc} [, {charidx}]])
-		Same as |charidx()| but returns the UTF-16 code unit index of
-		the byte at {idx} in {string} (after converting it to UTF-16).
-
-		When {charidx} is present and TRUE, {idx} is used as the
-		character index in the String {string} instead of as the byte
-		index.
-		An {idx} in the middle of a UTF-8 sequence is rounded
-		downwards to the beginning of that sequence.
-
-		Returns -1 if the arguments are invalid or if there are less
-		than {idx} bytes in {string}. If there are exactly {idx} bytes
-		the length of the string in UTF-16 code units is returned.
-
-		See |byteidx()| and |byteidxcomp()| for getting the byte index
-		from the UTF-16 index and |charidx()| for getting the
-		character index from the UTF-16 index.
-		Refer to |string-offset-encoding| for more information.
-		Examples: >
-			echo utf16idx('a😊😊', 3)	returns 2
-			echo utf16idx('a😊😊', 7)	returns 4
-			echo utf16idx('a😊😊', 1, 0, 1)	returns 2
-			echo utf16idx('a😊😊', 2, 0, 1)	returns 4
-			echo utf16idx('aą́c', 6)		returns 2
-			echo utf16idx('aą́c', 6, 1)	returns 4
-			echo utf16idx('a😊😊', 9)	returns -1
-<
-		Can also be used as a |method|: >
-			GetName()->utf16idx(idx)
-

 values({dict})						*values()*
 		Return a |List| with all the values of {dict}.  The |List| is
@@ -10328,7 +10085,7 @@ values({dict})						*values()*
 		Can also be used as a |method|: >
 			mydict->values()

-virtcol({expr} [, {list} [, {winid}]])			*virtcol()*
+virtcol({expr} [, {list}])				*virtcol()*
 		The result is a Number, which is the screen column of the file
 		position given with {expr}.  That is, the last screen position
 		occupied by the character at that position, when the screen
@@ -10360,13 +10117,10 @@ virtcol({expr} [, {list} [, {winid}]])			*virtcol()*
 			    returns the cursor position.  Differs from |'<| in
 			    that it's updated right away.

-		If {list} is present and non-zero then virtcol() returns a
-		List with the first and last screen position occupied by the
+		If {list} is present and non-zero then virtcol() returns a List
+		with the first and last screen position occupied by the
 		character.

-		With the optional {winid} argument the values are obtained for
-		that window instead of the current window.
-
 		Note that only marks in the current file can be used.
 		Examples: >
 			" With text "foo^Lbar" and cursor on the "^L":
@@ -10378,7 +10132,7 @@ virtcol({expr} [, {list} [, {winid}]])			*virtcol()*
 			" With text "	  there", with 't at 'h':

 			virtcol("'t")	" returns 6
-<		The first column is 1.  0 or [0, 0] is returned for an error.
+<		The first column is 1.  0 is returned for an error.
 		A more advanced example that echoes the maximum length of
 		all lines: >
 		    echo max(map(range(1, line('$')), "virtcol([v:val, '$'])"))
@@ -10395,9 +10149,6 @@ virtcol2col({winid}, {lnum}, {col})			*virtcol2col()*
 		{lnum}, then the byte index of the character at the last
 		virtual column is returned.

-		For a multi-byte character, the column number of the first
-		byte in the character is returned.
-
 		The {winid} argument can be the window number or the
 		|window-ID|. If this is zero, then the current window is used.

@@ -10443,7 +10194,7 @@ win_execute({id}, {command} [, {silent}])		*win_execute()*
 		The window will temporarily be made the current window,
 		without triggering autocommands or changing directory.  When
 		executing {command} autocommands will be triggered, this may
-		have unexpected side effects.  Use `:noautocmd` if needed.
+		have unexpected side effects.  Use |:noautocmd| if needed.
 		Example: >
 			call win_execute(winid, 'set syntax=python')
 <		Doing the same with `setwinvar()` would not trigger
@@ -10824,7 +10575,7 @@ writefile({object}, {fname} [, {flags}])
 <
 		'D'  Delete the file when the current function ends.  This
 		     works like: >
-			:defer delete({fname})
+		     	:defer delete({fname})
 <		     Fails when not in a function.  Also see |:defer|.

 		's'  fsync() is called after writing the file.  This flushes
@@ -11021,14 +10772,12 @@ persistent_undo		Compiled with support for persistent undo history.
 postscript		Compiled with PostScript file printing.
 printer			Compiled with |:hardcopy| support.
 profile			Compiled with |:profile| support.
-prof_nsec		Profile results are in nanoseconds.
 python			Python 2.x interface available. |has-python|
 python_compiled		Compiled with Python 2.x interface. |has-python|
 python_dynamic		Python 2.x interface is dynamically loaded. |has-python|
 python3			Python 3.x interface available. |has-python|
 python3_compiled	Compiled with Python 3.x interface. |has-python|
 python3_dynamic		Python 3.x interface is dynamically loaded. |has-python|
-python3_stable		Python 3.x interface is using Python Stable ABI. |has-python|
 pythonx			Python 2.x and/or 3.x interface available. |python_x|
 qnx			QNX version of Vim.
 quickfix		Compiled with |quickfix| support.
@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 9.0.  Last change: 2023 Mar 07
+*change.txt*    For Vim version 9.0.  Last change: 2022 Nov 20


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -296,9 +296,7 @@ gr{char}		Replace the virtual characters under the cursor with
 			{char}.  This replaces in screen space, not file
 			space.  See |gR| and |Virtual-Replace-mode| for more
 			details.  As with |r| a count may be given.
-			{char} can be entered like with |r|, but characters
-			that have a special meaning in Insert mode, such as
-			most CTRL-keys, cannot be used.
+			{char} can be entered like with |r|.

 						*digraph-arg*
 The argument for Normal mode commands like |r| and |t| is a single character.
@@ -455,12 +453,6 @@ Note similarly, when 'nrformats' includes "bin", binary numbers with a leading
 '0x' or '0X' can be interpreted as hexadecimal rather than binary since '0b'
 are valid hexadecimal digits.

-When the number under the cursor is too big to fit into 32 or 64 bit
-(depending on how Vim was build), it will be rounded off to the nearest number
-that can be represented, and the addition/subtraction is skipped.  E.g. with
-64 bit support using CTRL-X on 18446744073709551616 results in
-18446744073709551615.  Same for larger numbers, such as 18446744073709551618.
-
 The CTRL-A command is very useful in a macro.  Example: Use the following
 steps to make a numbered list.

@@ -1041,7 +1033,7 @@ inside of strings can change!  Also see 'softtabstop' option. >
 <			to display registers '1' and 'a'.  Spaces are allowed
 			in {arg}.

-							*:di* *:dis* *:display*
+							*:di* *:display*
 :di[splay] [arg]	Same as :registers.

 							*y* *yank*
@@ -1,4 +1,4 @@
-*channel.txt*      For Vim version 9.0.  Last change: 2023 Aug 15
+*channel.txt*      For Vim version 9.0.  Last change: 2022 Dec 01


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -956,7 +956,7 @@ job_start({command} [, {options}])			*job_start()*
 		to String.  This works best on Unix.

 		On MS-Windows, job_start() makes a GUI application hidden. If
-		you want to show it, use |:!start| instead.
+		want to show it, Use |:!start| instead.

 		The command is executed directly, not through a shell, the
 		'shell' option is not used.  To use the shell: >
@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 9.0.  Last change: 2023 May 20
+*cmdline.txt*   For Vim version 9.0.  Last change: 2022 Nov 11


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -617,7 +617,6 @@ followed by another Vim command:
    :read !
    :scscope
    :sign
-    :tabdo
    :tcl
    :tcldo
    :tclfile
@@ -962,10 +961,9 @@ Note: these are typed literally, they are not special keys!
 		   write.  *E495*
 							*:<abuf>* *<abuf>*
 	<abuf>     When executing autocommands, is replaced with the currently
-		   effective buffer number.  It is not set for all events,
-		   also see |bufnr()|.  For ":r file" and ":so file" it is the
-		   current buffer, the file being read/sourced is not in a
-		   buffer.  *E496*
+		   effective buffer number (for ":r file" and ":so file" it is
+		   the current buffer, the file being read/sourced is not in a
+		   buffer).  *E496*
 							*:<amatch>* *<amatch>*
 	<amatch>   When executing autocommands, is replaced with the match for
 		   which this autocommand was executed.  *E497*
@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 9.0.  Last change: 2023 Apr 04
+*diff.txt*      For Vim version 9.0.  Last change: 2023 Jan 21


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -109,7 +109,6 @@ While already in Vim you can start diff mode in three ways.
 		accidentally being patched.  But it may still result in
 		various ".rej" files to be created.  And when absolute path
 		names are present these files may get patched anyway.
-		Using the "patch" command is not allowed in |restricted-mode|.

 To make these commands use a vertical split, prepend |:vertical|.  Examples: >

@@ -182,7 +181,7 @@ possible to view the changes you have made to a buffer since the file was
 loaded.  Since Vim doesn't allow having two buffers for the same file, you
 need another buffer.  This command is useful: >
 	 command DiffOrig vert new | set bt=nofile | r ++edit # | 0d_
-		\ | diffthis | wincmd p | diffthis
+	 	\ | diffthis | wincmd p | diffthis
 (this is in |defaults.vim|).  Use ":DiffOrig" to see the differences between
 the current buffer and the file it was loaded from.

@@ -1,4 +1,4 @@
-*digraph.txt*   For Vim version 9.0.  Last change: 2023 Mar 21
+*digraph.txt*   For Vim version 9.0.  Last change: 2022 Nov 22


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -547,7 +547,7 @@ char  digraph	hex	dec	official name ~
 Θ	H*	0398	0920	GREEK CAPITAL LETTER THETA
 Ι	I*	0399	0921	GREEK CAPITAL LETTER IOTA
 Κ	K*	039A	0922	GREEK CAPITAL LETTER KAPPA
-Λ	L*	039B	0923	GREEK CAPITAL LETTER LAMDA (aka LAMBDA)
+Λ	L*	039B	0923	GREEK CAPITAL LETTER LAMDA
 Μ	M*	039C	0924	GREEK CAPITAL LETTER MU
 Ν	N*	039D	0925	GREEK CAPITAL LETTER NU
 Ξ	C*	039E	0926	GREEK CAPITAL LETTER XI
@@ -578,7 +578,7 @@ char  digraph	hex	dec	official name ~
 θ	h*	03B8	0952	GREEK SMALL LETTER THETA
 ι	i*	03B9	0953	GREEK SMALL LETTER IOTA
 κ	k*	03BA	0954	GREEK SMALL LETTER KAPPA
-λ	l*	03BB	0955	GREEK SMALL LETTER LAMDA (aka LAMBDA)
+λ	l*	03BB	0955	GREEK SMALL LETTER LAMDA
 μ	m*	03BC	0956	GREEK SMALL LETTER MU
 ν	n*	03BD	0957	GREEK SMALL LETTER NU
 ξ	c*	03BE	0958	GREEK SMALL LETTER XI
@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 9.0.  Last change: 2023 Apr 23
+*editing.txt*   For Vim version 9.0.  Last change: 2022 Nov 02


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1533,10 +1533,9 @@ To disable the encryption, reset the 'key' option to an empty value: >

 You can use the 'cryptmethod' option to select the type of encryption, use one
 of these: >
-	:setlocal cm=zip          " weak method, backwards compatible
-	:setlocal cm=blowfish     " method with flaws, do not use
-	:setlocal cm=blowfish2    " medium strong method
-	:setlocal cm=xchacha20v2  " medium strong method using libsodium
+	:setlocal cm=zip        " weak method, backwards compatible
+	:setlocal cm=blowfish   " method with flaws
+	:setlocal cm=blowfish2  " medium strong method

 Do this before writing the file.  When reading an encrypted file it will be
 set automatically to the method used when that file was written.  You can
@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 9.0.  Last change: 2023 Jun 01
+*eval.txt*	For Vim version 9.0.  Last change: 2023 Jan 12


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1372,7 +1372,7 @@ Note that the dot is also used for String concatenation.  To avoid confusion
 always put spaces around the dot for String concatenation.


-expr10(expr1, ...)	|Funcref| function call		*E1085*
+expr10(expr1, ...)	|Funcref| function call  	*E1085*

 When expr10 is a |Funcref| type variable, invoke the function it refers to.

@@ -1580,33 +1580,6 @@ Examples: >
 	echo $"The square root of {{9}} is {sqrt(9)}"
 <	The square root of {9} is 3.0 ~

-						*string-offset-encoding*
-A string consists of multiple characters.  How the characters are stored
-depends on 'encoding'.  Most common is UTF-8, which uses one byte for ASCII
-characters, two bytes for other latin characters and more bytes for other
-characters.
-
-A string offset can count characters or bytes.  Other programs may use
-UTF-16 encoding (16-bit words) and an offset of UTF-16 words.  Some functions
-use byte offsets, usually for UTF-8 encoding.  Other functions use character
-offsets, in which case the encoding doesn't matter.
-
-The different offsets for the string "a©😊" are below:
-
-  UTF-8 offsets:
-      [0]: 61, [1]: C2, [2]: A9, [3]: F0, [4]: 9F, [5]: 98, [6]: 8A
-  UTF-16 offsets:
-      [0]: 0061, [1]: 00A9, [2]: D83D, [3]: DE0A
-  UTF-32 (character) offsets:
-      [0]: 00000061, [1]: 000000A9, [2]: 0001F60A
-
-You can use the "g8" and "ga" commands on a character to see the
-decimal/hex/octal values.
-
-The functions |byteidx()|, |utf16idx()| and |charidx()| can be used to convert
-between these indices.  The functions |strlen()|, |strutf16len()| and
-|strcharlen()| return the number of bytes, UTF-16 code units and characters in
-a string respectively.

 option						*expr-option* *E112* *E113*
 ------
@@ -1681,7 +1654,7 @@ See below |functions|.

 lambda expression				*expr-lambda* *lambda*
 -----------------
-{args -> expr1}		legacy lambda expression		*E451*
+{args -> expr1}		legacy lambda expression 		*E451*
 (args) => expr1		|Vim9| lambda expression

 A lambda expression creates a new unnamed function which returns the result of
@@ -1815,8 +1788,6 @@ b:changedtick	The total number of changes to the current buffer.  It is
 		    :	call My_Update()
 		    :endif
 <		You cannot change or delete the b:changedtick variable.
-		If you need more information about the change see
-		|listener_add()|.

 						*window-variable* *w:var* *w:*
 A variable name that is preceded with "w:" is local to the current window.  It
@@ -2390,9 +2361,9 @@ v:operator	The last operator given in Normal mode.  This is a single

                                        *v:os_appearance* *os-appearance-variable*
 v:os_appearance The current OS appearance mode. Useful if you want to change
-		options |background| or |colorscheme| according to the
+		options |background| or |colorscheme| according to the 
 		appearance of the GUI frontend. See also |OSAppearanceChanged|.
-			value   description ~
+		 	value   description ~
 			0       Light Mode (always 0 on unsupported platforms)
 			1       Dark Mode
 			2       High-Contrast Light Mode
@@ -2436,25 +2407,6 @@ v:progpath	Contains the command with which Vim was invoked, in a form
 		".exe" is not added to v:progpath.
 		Read-only.

-				    *v:python3_version* *python3-version-variable*
-v:python3_version
-		Version of Python 3 that Vim was built against.  When
-		Python is loaded dynamically (|python-dynamic|), this version
-		should exactly match the Python library up to the minor
-		version (e.g.  3.10.2 and 3.10.3 are compatible as the minor
-		version is "10", whereas 3.9.4 and 3.10.3 are not compatible).
-		When |python-stable-abi| is used, this will be the minimum Python
-		version that you can use instead. (e.g. if v:python3_version
-		indicates 3.9, you can use 3.9, 3.10, or anything above).
-
-		This number is encoded as a hex number following Python ABI
-		versioning conventions.  Do the following to have a
-		human-readable full version in hex: >
-			echo printf("%08X", v:python3_version)
-<		You can obtain only the minor version by doing: >
-			echo and(v:python3_version>>16,0xff)
-<		Read-only.
-
 					*v:register* *register-variable*
 v:register	The name of the register in effect for the current normal mode
 		command (regardless of whether that command actually used a
@@ -3122,7 +3074,7 @@ text...
 				let mylist = [1, 2, 3]
 				lockvar 0 mylist
 				let mylist[0] = 77	" OK
-				call add(mylist, 4)	" OK
+				call add(mylist, 4]	" OK
 				let mylist = [7, 8, 9]  " Error!
 <								*E743*
 			For unlimited depth use [!] and omit [depth].
@@ -4641,21 +4593,31 @@ The input is in the variable "line", the results in the variables "file",

 getting the scriptnames in a Dictionary ~
 						*scriptnames-dictionary*
-The `:scriptnames` command can be used to get a list of all script files that
-have been sourced.  There is also the `getscriptinfo()` function, but the
-information returned is not exactly the same.  In case you need to manipulate
-the list, this code can be used as a base: >
+The |:scriptnames| command can be used to get a list of all script files that
+have been sourced.  There is no equivalent function or variable for this
+(because it's rarely needed).  In case you need to manipulate the list this
+code can be used: >
+    " Get the output of ":scriptnames" in the scriptnames_output variable.
+    let scriptnames_output = ''
+    redir => scriptnames_output
+    silent scriptnames
+    redir END

-    # Create or update scripts dictionary, indexed by SNR, and return it.
-    def Scripts(scripts: dict<string> = {}): dict<string>
-      for info in getscriptinfo()
-        if scripts->has_key(info.sid)
-          continue
-        endif
-        scripts[info.sid] = info.name
-      endfor
-      return scripts
-    enddef
+    " Split the output into lines and parse each line.	Add an entry to the
+    " "scripts" dictionary.
+    let scripts = {}
+    for line in split(scriptnames_output, "\n")
+      " Only do non-blank lines.
+      if line =~ '\S'
+	" Get the first number in the line.
+	let nr = matchstr(line, '\d\+')
+	" Get the file name, remove the script number " 123: ".
+	let name = substitute(line, '.\+:\s*', '', '')
+	" Add an item to the Dictionary
+	let scripts[nr] = name
+      endif
+    endfor
+    unlet scriptnames_output

 ==============================================================================
 10. Vim script versions		*vimscript-version* *vimscript-versions*
@@ -1,6 +1,8 @@
 .TH EVIM 1 "16 febbraio 2002 "
 .SH NOME
-evim \- Vim "facile", impostato in modo da poter essere usato come editore non-modale
+evim \- Vim "facile", Vim impostato in modo da poter essere usato
+facilmente per modificare file, anche da chi non abbia familiarità
+con i comandi.
 .SH SINTASSI
 .br
 .B evim
@@ -11,39 +13,42 @@ evim \- Vim "facile", impostato in modo da poter essere usato come editore non-m
 .B evim
 Inizia
 .B Vim
-e imposta le opzioni per farlo comportare come un editore non-modale.
-Si tratta sempre di Vim, ma usato nello stile "posizionati-e-clicca".
-Rammenta molto l'utilizzo di Notepad in MS-Windows.
-.B eVim
-necessita della disponibilità della GUI, per utilizzare menù e barra strumenti.
+e imposta le opzioni per farlo comportare come un editore "modeless".
+State sempre usando Vim, ma come un editore "posizionati-e-clicca".
+Simile all'uso di Notepad in MS-Windows.
+.B evim
+richiede la presenza della GUI, per avere a disposizione menù e barra
+strumenti.
 .PP
-Va a usato soltanto se non si è in grado di lavorare con Vim nella maniera usuale.
-L'edit dei file sarà molto meno efficiente.
+Da usarsi soltanto se non si è in grado di lavorare con Vim nella
+maniera usuale.
+La modifica file sarà molto meno efficiente.
 .PP
 .B eview
-come sopra, ma si parte in modalità "Sola Lettura".  Funziona come evim \-R.
+come sopra, ma parte in modalità "Sola Lettura".  Funziona come evim \-R.
 .PP
 Vedere vim(1) per dettagli riguardo a Vim, opzioni, etc.
 .PP
-L'opzione 'insertmode' è impostata in modo da consentire l'immissione diretta di testo fin dall'inizio.
+L'opzione 'insertmode' è impostata per poter immettere del testo direttamente.
 .br
-Sono definite delle mappature che consentono di usare COPIA e INCOLLA con i familiari tasti usati sotto MS-Windows.
+Sono definite delle mappature che consentono di usare COPIA e INCOLLA con i
+familiari tasti usati sotto MS-Windows.
 CTRL-X taglia testo, CTRL-C copia testo e CTRL-V incolla testo.
-Occorre usare CTRL-Q per ottenere il comportamenti di CTRL-V in Vim nativo.
+Usate CTRL-Q per ottenere quello che si otterrebbe con CTRL-V in Vim nativo.
 .SH OPZIONI
 Vedere vim(1).
 .SH FILE
 .TP 15
 /usr/local/lib/vim/evim.vim
 Lo script caricato per inizializzare eVim.
-.SH AKA
-[Also Known As] noto anche come "Vim per semplici".
-Quando is usa evim si suppone che si prenda un fazzoletto,
-si faccia un nodo ad ogni angolo e lo si metta in testa.
+.SH NAC [NOTO ANCHE COME]
+Noto Anche Come "Vim per semplici".
+Quando usate evim si suppone che prendiate un fazzoletto,
+facciate un nodo ad ogni angolo e ve lo mettiate in testa.
 .SH VEDERE ANCHE
 vim(1)
 .SH AUTORE
 Buona parte di
 .B Vim
-è stato scritto da Bram Moolenaar, con molto aiuto da parte di altri.
+è stato scritto da Bram Moolenaar, con molto aiuto da altri.
 Vedere il menù "Aiuto/Crediti".
@@ -1,6 +1,8 @@
 .TH EVIM 1 "16 febbraio 2002 "
 .SH NOME
-evim \- Vim "facile", impostato in modo da poter essere usato come editore non-modale
+evim \- Vim "facile", Vim impostato in modo da poter essere usato
+facilmente per modificare file, anche da chi non abbia familiarità
+con i comandi.
 .SH SINTASSI
 .br
 .B evim
@@ -11,39 +13,42 @@ evim \- Vim "facile", impostato in modo da poter essere usato come editore non-m
 .B evim
 Inizia
 .B Vim
-e imposta le opzioni per farlo comportare come un editore non-modale.
-Si tratta sempre di Vim, ma usato nello stile "posizionati-e-clicca".
-Rammenta molto l'utilizzo di Notepad in MS-Windows.
-.B eVim
-necessita della disponibilità della GUI, per utilizzare menù e barra strumenti.
+e imposta le opzioni per farlo comportare come un editore "modeless".
+State sempre usando Vim, ma come un editore "posizionati-e-clicca".
+Simile all'uso di Notepad in MS-Windows.
+.B evim
+richiede la presenza della GUI, per avere a disposizione menù e barra
+strumenti.
 .PP
-Va a usato soltanto se non si è in grado di lavorare con Vim nella maniera usuale.
-L'edit dei file sarà molto meno efficiente.
+Da usarsi soltanto se non si è in grado di lavorare con Vim nella
+maniera usuale.
+La modifica file sarà molto meno efficiente.
 .PP
 .B eview
-come sopra, ma si parte in modalità "Sola Lettura".  Funziona come evim \-R.
+come sopra, ma parte in modalità "Sola Lettura".  Funziona come evim \-R.
 .PP
 Vedere vim(1) per dettagli riguardo a Vim, opzioni, etc.
 .PP
-L'opzione 'insertmode' è impostata in modo da consentire l'immissione diretta di testo fin dall'inizio.
+L'opzione 'insertmode' è impostata per poter immettere del testo direttamente.
 .br
-Sono definite delle mappature che consentono di usare COPIA e INCOLLA con i familiari tasti usati sotto MS-Windows.
+Sono definite delle mappature che consentono di usare COPIA e INCOLLA con i
+familiari tasti usati sotto MS-Windows.
 CTRL-X taglia testo, CTRL-C copia testo e CTRL-V incolla testo.
-Occorre usare CTRL-Q per ottenere il comportamenti di CTRL-V in Vim nativo.
+Usate CTRL-Q per ottenere quello che si otterrebbe con CTRL-V in Vim nativo.
 .SH OPZIONI
 Vedere vim(1).
 .SH FILE
 .TP 15
 /usr/local/lib/vim/evim.vim
 Lo script caricato per inizializzare eVim.
-.SH AKA
-[Also Known As] noto anche come "Vim per semplici".
-Quando is usa evim si suppone che si prenda un fazzoletto,
-si faccia un nodo ad ogni angolo e lo si metta in testa.
+.SH NAC [NOTO ANCHE COME]
+Noto Anche Come "Vim per semplici".
+Quando usate evim si suppone che prendiate un fazzoletto,
+facciate un nodo ad ogni angolo e ve lo mettiate in testa.
 .SH VEDERE ANCHE
 vim(1)
 .SH AUTORE
 Buona parte di
 .B Vim
-è stato scritto da Bram Moolenaar, con molto aiuto da parte di altri.
+è stato scritto da Bram Moolenaar, con molto aiuto da altri.
 Vedere il menù "Aiuto/Crediti".
@@ -1,4 +1,4 @@
-*filetype.txt*  For Vim version 9.0.  Last change: 2023 Sep 11
+*filetype.txt*  For Vim version 9.0.  Last change: 2022 Apr 09


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -138,38 +138,33 @@ what kind of file it is.  This doesn't always work.  A number of global
 variables can be used to overrule the filetype used for certain extensions:

 	file name	variable ~
-	*.asa		g:filetype_asa		|ft-aspperl-syntax|
-						|ft-aspvbs-syntax|
-	*.asm		g:asmsyntax		|ft-asm-syntax|
-	*.asp		g:filetype_asp		|ft-aspperl-syntax|
-						|ft-aspvbs-syntax|
-	*.bas		g:filetype_bas		|ft-basic-syntax|
+	*.asa		g:filetype_asa	|ft-aspvbs-syntax| |ft-aspperl-syntax|
+	*.asm		g:asmsyntax	|ft-asm-syntax|
+	*.asp		g:filetype_asp	|ft-aspvbs-syntax| |ft-aspperl-syntax|
+	*.bas		g:filetype_bas	|ft-basic-syntax|
 	*.cfg		g:filetype_cfg
 	*.cls		g:filetype_cls
-	*.csh		g:filetype_csh		|ft-csh-syntax|
+	*.csh		g:filetype_csh	|ft-csh-syntax|
 	*.dat		g:filetype_dat
-	*.f		g:filetype_f		|ft-forth-syntax|
-	*.frm		g:filetype_frm		|ft-form-syntax|
-	*.fs		g:filetype_fs		|ft-forth-syntax|
-	*.h		g:c_syntax_for_h	|ft-c-syntax|
-	*.i		g:filetype_i		|ft-progress-syntax|
+	*.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|
+	*.m		g:filetype_m	|ft-mathematica-syntax|
 	*.mod		g:filetype_mod
-	*.p		g:filetype_p		|ft-pascal-syntax|
+	*.p		g:filetype_p	|ft-pascal-syntax|
 	*.pl		g:filetype_pl
-	*.pp		g:filetype_pp		|ft-pascal-syntax|
+	*.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|
+	*.sql		g:filetype_sql	|ft-sql-syntax|
 	*.src		g:filetype_src
 	*.sys		g:filetype_sys
-	*.sh		g:bash_is_sh		|ft-sh-syntax|
-	*.tex		g:tex_flavor		|ft-tex-plugin|
-	*.typ		g:filetype_typ
-	*.w		g:filetype_w		|ft-cweb-syntax|
+	*.sh		g:bash_is_sh	|ft-sh-syntax|
+	*.tex		g:tex_flavor	|ft-tex-plugin|
+	*.w		g:filetype_w	|ft-cweb-syntax|

 For a few filetypes the global variable is used only when the filetype could
 not be detected:
@@ -398,7 +393,7 @@ ways to change this:
   You must create a new filetype plugin in a directory early in
   'runtimepath'.  For Unix, for example you could use this file: >
 	vim ~/.vim/ftplugin/fortran.vim
-<   You can set those settings and mappings that you would like to add.  Note
+<  You can set those settings and mappings that you would like to add.  Note
   that the global plugin will be loaded after this, it may overrule the
   settings that you do here.  If this is the case, you need to use one of the
   following two methods.
@@ -407,7 +402,7 @@ ways to change this:
   You must put the copy in a directory early in 'runtimepath'.  For Unix, for
   example, you could do this: >
 	cp $VIMRUNTIME/ftplugin/fortran.vim ~/.vim/ftplugin/fortran.vim
-<   Then you can edit the copied file to your liking.  Since the b:did_ftplugin
+<  Then you can edit the copied file to your liking.  Since the b:did_ftplugin
   variable will be set, the global plugin will not be loaded.
   A disadvantage of this method is that when the distributed plugin gets
   improved, you will have to copy and modify it again.
@@ -416,30 +411,17 @@ ways to change this:
   You must create a new filetype plugin in a directory from the end of
   'runtimepath'.  For Unix, for example, you could use this file: >
 	vim ~/.vim/after/ftplugin/fortran.vim
-<   In this file you can change just those settings that you want to change.
+<  In this file you can change just those settings that you want to change.

 ==============================================================================
 3.  Docs for the default filetype plugins.		*ftplugin-docs*


-					*plugin_exec* *g:plugin_exec*
-Enable executing of external commands.  This was done historically for e.g.
-the perl filetype plugin (and a few others) to set the search path.
-Disabled by default for security reasons: >
-	:let g:plugin_exec = 1
-It is also possible to enable this only for certain filetypes: >
-	:let g:<filetype>_exec = 1
-So to enable this only for ruby, set the following variable: >
-	:let g:ruby_exec = 1
-
-If both, the global `plugin_exec` and the `<filetype>_exec` specific variable
-are set, the filetpe specific variable should have precedent.
-
 AWK							*ft-awk-plugin*

 Support for features specific to GNU Awk, like @include, can be enabled by
 setting: >
-	:let g:awk_is_gawk = 1
+	let g:awk_is_gawk = 1


 CHANGELOG						*ft-changelog-plugin*
@@ -677,8 +659,8 @@ page in a Vim window: >

 MANPAGER				      *manpager.vim*

-The |:Man| command allows you to turn Vim into a manpager (that syntax
-highlights manpages and follows linked manpages on hitting CTRL-]).
+The |:Man| command allows you to turn Vim into a manpager (that syntax highlights
+manpages and follows linked manpages on hitting CTRL-]).

 For bash,zsh,ksh or dash, add to the config file (.bashrc,.zshrc, ...)

@@ -697,10 +679,7 @@ MARKDOWN                                                *ft-markdown-plugin*

 To enable folding use this: >
 	let g:markdown_folding = 1
-
-'expandtab' will be set by default.  If you do not want that use this: >
-	let g:markdown_recommended_style = 0
-
+<

 PDF							*ft-pdf-plugin*

@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 9.0.  Last change: 2023 Mar 24
+*fold.txt*      For Vim version 9.0.  Last change: 2023 Jan 29


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -353,8 +353,7 @@ zC		Close all folds under the cursor recursively.  Folds that
 		'foldenable' will be set.

 							*za*
-za		Summary: Toggle the fold under the cursor.
-		When on a closed fold: open it.  When folds are nested, you
+za		When on a closed fold: open it.  When folds are nested, you
 		may have to use "za" several times.  When a count is given,
 		that many closed folds are opened.
 		When on an open fold: close it and set 'foldenable'.  This
@@ -1,4 +1,4 @@
-*gui.txt*       For Vim version 9.0.  Last change: 2023 Apr 29
+*gui.txt*       For Vim version 9.0.  Last change: 2022 Nov 17


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -96,11 +96,11 @@ terminal version.

 Recommended place for your personal GUI initializations:
 	Unix and macOS      $HOME/.gvimrc or $HOME/.vim/gvimrc
-	Win32		    $HOME/_gvimrc, $HOME/vimfiles/gvimrc
+	Win32    	    $HOME/_gvimrc, $HOME/vimfiles/gvimrc
 			    or $VIM/_gvimrc
 	Amiga		    s:.gvimrc, home:.gvimrc, home:vimfiles:gvimrc
 			    or $VIM/.gvimrc
-	Haiku		    $HOME/config/settings/vim/gvimrc
+	Haiku	            $HOME/config/settings/vim/gvimrc

 The personal initialization files are searched in the order specified above
 and only the first one that is found is read.
@@ -145,7 +145,7 @@ task bar with the 'guiheadroom' option.
 		remembered until the window is opened.  The position is
 		adjusted to make the window fit on the screen (if possible).

-					    *:wi* *:win* *:winsize* *E465*
+						    *:win* *:winsize* *E465*
 :win[size] {width} {height}
 		Set the window height to {width} by {height} characters.
 		It is recommended to use `:set lines=11 columns=22` instead,
@@ -861,7 +861,7 @@ Example for debugger tools: >
 	nnoremenu 1.20 WinBar.Next :Next<CR>
 	nnoremenu 1.30 WinBar.Finish :Finish<CR>
 	nnoremenu 1.40 WinBar.Cont :Continue<CR>
-<					*hl-ToolbarLine* *hl-ToolbarButton*
+<
 The window toolbar uses the ToolbarLine and ToolbarButton highlight groups.

 When splitting the window the window toolbar is not copied to the new window.
@@ -1202,7 +1202,7 @@ MacVim performs automatic font substitution.  If 'guifontwide' is set, that
 font will be used for all wide fonts.  However, if a glyph is not available in
 the wide font, then font substitution is still used.

-GTK+ GUI only:				*guifontwide_gtk*
+GTK+ GUI only:  		    	*guifontwide_gtk*

 If set and valid, 'guifontwide' is always used for double width characters,
 even if 'encoding' is not set to "utf-8".
@@ -1247,9 +1247,10 @@ This section describes other features which are related to the GUI.
  like this to set options specifically for each type of GUI: >

 	if has("gui_running")
-	    if has("gui_gtk")
+	    if has("gui_gtk2")
 		:set guifont=Luxi\ Mono\ 12
 	    elseif has("x11")
+		" Also for GTK 1
 		:set guifont=*-lucidatypewriter-medium-r-normal-*-*-180-*-*-m-*-*
 	    elseif has("gui_win32")
 		:set guifont=Luxi_Mono:h12:cANSI
@@ -1,6 +1,8 @@
-*gui_mac.txt*
+*gui_mac.txt*	For Vim version 8.2.  Last change: 2020 Aug 13
+
+
+		  VIM REFERENCE MANUAL    by Bjorn Winckler

-			MACVIM REFERENCE MANUAL

 The MacVim Graphical User Interface			*macvim* *gui-macvim*

@@ -27,8 +29,6 @@ Other relevant documentation:

 {Vi does not have a GUI}

-This manual is also available at https://macvim.org/docs/gui_mac.txt.html.
-
 ==============================================================================
 1. MacVim differences					*macvim-differences*

@@ -188,38 +188,34 @@ The advantage of using the latter method is that the settings relating to file
 opening in the settings panel are respected, and files open instantly if
 |Quickstart| is enabled.

-Starting MacVim from a terminal ~
+Starting MacVim from a terminal~

-						    *mvim* *macvim-cmdline*
+					    *mvim* *macvim-PATH* *macvim-cmdline*
 MacVim comes bundled with a shell script called "mvim" that can be used to
 launch MacVim from the terminal. It's located at: >
 	/Applications/MacVim.app/Contents/bin/mvim
-<
-							*macvim-PATH*
+
 To be able to easily use it, put this folder in your path: >
 	/Applications/MacVim.app/Contents/bin
 For example, if you use zsh, you can put the following in `~/.zprofile`: >
 	export PATH="/Applications/MacVim.app/Contents/bin:$PATH"
-<
+
 After that, type "mvim" to start MacVim from Terminal. >
 	$ mvim
 You can also specify files to open with. >
 	$ mvim file ...
-The bin folder also contains `mvimdiff` and `mview` that work as alias of
-|gvimdiff| and |gview|, as well as `xxd` for |hex-editing|.
+Also the bin folder has convenient scripts for diffing and opening file as the file is read-only. >
+	* Diff:		mvimdiff
+	* Read-only:	mview

 You can still use the normal "vim", "vimdiff", and "view" commands if you want
 to use non-GUI Vim, and "gvim" to launch MacVim ("gvim" works the same way as
 "mvim").

-If you would like to have man pages with the command-line tools, you can add
-the following to `~/.zprofile`: >
-	export MANPATH="/Applications/MacVim.app/Contents/man:$MANPATH"
-<
-Going from terminal to GUI mode ~
+Going from terminal to GUI mode~

 Once in terminal Vim it is possible to start the MacVim GUI by using the
-following command (see |:gui|): >
+following command (see |:gui|):
 	:gui [++opt] [+cmd] [-f|-b] [files...]
 Note: Forking ("-b") currently does not work.

@@ -242,8 +238,8 @@ history as the window you just closed (however the next window you open will).
 For these reasons Quickstart is disabled by default.

 						*odbeditor* *external-editor*
-MacVim can act as an "external editor" for macOS applications that support the
-ODB Editor Protocol (or the "external editor" protocol).  Each application has
+MacVim can act as an 'external editor' for macOS applications that support the
+ODB Editor Protocol (or the 'external editor' protocol).  Each application has
 different ways of configuring this option, check the application's
 documentation.  Once configured properly MacVim can be used to open files in
 such an application.
@@ -253,9 +249,6 @@ the open event the FTok and Burl parameters are parsed (the latter is ignored
 at the moment though).  In the modified and closed events the Tokn parameter
 is sent back to the server application.

-The ODB editor protocol is documented at:
-	https://www.barebones.com/support/develop/odbsuite.html
-
 ==============================================================================
 3. Settings		    *macvim-prefs* *macvim-preferences* *macvim-settings*

@@ -284,7 +277,6 @@ KEY				VALUE ~
 *MMDisableLaunchAnimation*	disable launch animation when opening a new
 				MacVim window [bool]
 *MMFontPreserveLineSpacing*	use the line-spacing as specified by font [bool]
-*MMLoginShell*			use login shell for launching Vim [bool]
 *MMLoginShellArgument*		login shell parameter [string]
 *MMLoginShellCommand*		which shell to use to launch Vim [string]
 *MMFullScreenFadeTime*		fade delay for non-native fullscreen [float]
@@ -315,13 +307,12 @@ KEY				VALUE ~
 *MMVerticalSplit*		files open in vertical splits [bool]
 *MMZoomBoth*			zoom button maximizes both directions [bool]
 *MMUpdaterPrereleaseChannel*	opt-in to pre-release software update [bool]
-*MMShowWhatsNewOnStartup*	show "What's New" after updating to new version [bool]

 As an example, if you have more than one mouse button and would wish to free
 up Ctrl-click so you can bind it to something else, then the appropriate
 command is: >
 	defaults write org.vim.MacVim MMTranslateCtrlClick 0
-<
+
 If you wish to restore all user defaults to their starting values, open
 Terminal and type: >
 	defaults delete org.vim.MacVim
@@ -335,15 +326,13 @@ new Vim processes via a login shell so that all environment variables are set.

 By default MacVim uses the $SHELL environment variable to determine which
 shell to use (if $SHELL is not set "/bin/bash" is used).  It is possible to
-override this choice by setting the user default |MMLoginShellCommand| to the
+override this choice by setting the user default MMLoginShellCommand to the
 shell that should be used (e.g. "/bin/tcsh").  MacVim tries to make the shell
 a login shell by prepending argv[0] with a dash.  If you use an exotic shell
 and need to pass it a parameter to make it a login shell then you can set the
-user default |MMLoginShellArgument| (e.g. to "-l").  Finally, if the "bash"
+user default MMLoginShellArgument (e.g. to "-l").  Finally, if the "bash"
 shell is used, then "-l" is automatically added as an argument.  To override
-this behaviour set |MMLoginShellArgument| to "--".
-
-To turn off using a login shell, you can set |MMLoginShell| to 0.
+this behaviour set MMLoginShellArgument to "--".

 ==============================================================================
 4. MacVim appearance					*macvim-appearance*
@@ -400,7 +389,7 @@ a Cocoa application when it is not in focus.

 							*Colors.plist*
 Apart from the system colors, it is also possible to use the standard X11
-color names (see https://en.wikipedia.org/wiki/X11_color_names) which usually
+color names (see http://en.wikipedia.org/wiki/X11_color_names) which usually
 come in a file called "rgb.txt".  MacVim does not have such a file, instead it
 keeps these colors in a dictionary called "Colors.plist". The key in this
 dictionary is the name of the color and the value is an RGB value on the form
@@ -429,16 +418,16 @@ highlight color when a window becomes inactive.
 ==============================================================================
 6. Menus						*macvim-menus*

-Default Menus ~
+Default Menus~

 See |macvim-default-menus|.

-Icons ~
+Icons~

 Unlike regular Vim, MacVim menus can be customized with an icon.  Simply use
 the "icon=" parameter similar to toolbar. See |macvim-toolbar-icon| for usage.

-Customization ~
+Customization~

 Menus in macOS behave slightly different from other platforms.  For that
 reason two new commands have been added to Vim.  To understand what these
@@ -633,7 +622,7 @@ The separators work similar to how toolbars work: >
 	:an TouchBar.-Sep-          <Nop>
 	:an TouchBar.-space1-       <Nop>
 	:an TouchBar.-flexspace2-   <Nop>
-<
+
 The first example is a Vim separator (see |menu-separator|) and injects a
 space between two buttons. The second creates a smaller space than a normal
 separator and are specified by names that begin with "-space" and ends with
@@ -642,14 +631,13 @@ that items after it will be right-aligned, and is specified by names that
 begin with "-flexspace" and ends with "-".

 						*macvim-touchbar-icon*
-You can specify icons for Touch Bar buttons the same way as toolbar icons,
-including using SF Symbols (see |macvim-toolbar-icon|).  When a button has an
-icon, it won't show the menu name.  Touch Bar icons should ideally be 36x36
-pixels, and no larger than 44x44 pixels. >
+You can specify icons for Touch Bar buttons the same way for toolbar icons
+(see |macvim-toolbar-icon|).  When a button has an icon, it won't show the menu
+name.  Touch Bar icons should ideally be 36x36 pixels, and no larger than
+44x44 pixels. >
 	:an icon=/home/foo/bar.png          TouchBar.DoThing  :echo 'Do'<CR>
-	:an icon=gearshape.2                TouchBar.Setting  <Nop>
-macOS also comes with a few default template images designed for use with
-Touch Bar.  Some examples: >
+You can use any image for the icon, but macOS comes with a few default
+template images designed for use with Touch Bar.  Some examples: >
 	:an icon=NSTouchBarListViewTemplate TouchBar.ShowList :ls<CR>
 	:an icon=NSTouchBarRefreshTemplate  TouchBar.Refresh  :e!<CR>
 <
@@ -682,7 +670,7 @@ ExitFullScreen		|'fullscreen'| mode. To disable, add the following to
 			and emojis in insert and terminal modes. To disable,
 			add the following to your vimrc file: >
 			  let g:macvim_default_touchbar_characterpicker=0
-<
+
 ==============================================================================
 9. Looking up data					*macvim-lookup*

@@ -729,32 +717,26 @@ outline.
 ==============================================================================
 11. System services					*macvim-services*

-MacVim provides two system services.  These can be accessed from the MacVim
+MacVim supports two system services.  These can be accessed from the MacVim
 submenu in the Services menu or by right-clicking a selection.  For services
 to work, MacVim.app should be located in the /Applications folder.  (You might
 have to logout and then login again before macOS detects the MacVim services.)

 These are the currently supported services:
-* `New MacVim Buffer With Selection`: Create a new buffer and paste the
-  currently selected text.
-* `New MacVim Buffer Here`: Create a new buffer and set the current
-  directory to the file or folder that is selected in the Finder.
+	* New MacVim Buffer With Selection: Create a new buffer and paste the
+	  currently selected text.
+	* New MacVim Buffer Here: Create a new buffer and set the current
+	  directory to the file or folder that is selected in the Finder.

 The services respect the "Open files from applications" setting in the general
 settings.

-For the other direction, within MacVim, you can access system services
-associated with selected texts (e.g. opening a URL, converting between
-Traditional/Simplified Chinese, do a web search) by selecting them in visual
-mode and opening the "Services" submenu either by right-clicking on the text,
-or the top-level "MacVim" menu.
-
 ==============================================================================
 12. mvim:// URL handler				*mvim://* *macvim-url-handler*

 MacVim supports a custom URL handler for "mvim://" URLs. The handler is
-supposed to be compatible to TextMate's URL scheme as documented at:
-	https://macromates.com/blog/2007/the-textmate-url-scheme/
+supposed to be compatible to TextMate's URL scheme as documented at >
+	http://blog.macromates.com/2007/the-textmate-url-scheme/.

 Currently, this means that the format is >
 	mvim://open?<arguments>
@@ -773,7 +755,7 @@ characters to be encoded twice. For example, a space should be encoded into
 "%2520" instead of "%20". A file "/tmp/file name?.txt" would need the
 following link: >
 	mvim://open?url=file:///tmp/file%2520name%253F.txt
-<
+
 MacVim will try to be smart and detect cases where a user has erroneously only
 encoded once, but for best results use double-encoding as described above.

@@ -797,7 +779,7 @@ Cmd-.			Interrupt Vim.  Unlike Ctrl-C which is sent as normal

 							*Cmd-`* *<D-`>*
 Cmd-`			Cycle to the next window.  On an American keyboard the
-			key "`" is located under the Esc-key.  On European
+			`-key is located under the Esc-key.  On European
 			keyboards this key is often adjacent to the left
 			Shift-key and it may be not even be marked with "`".
 			This Cmd-key combination can only be unmapped via the
@@ -892,12 +874,12 @@ to the previous/next tab in normal mode: >

 	nmap <SwipeLeft> gT
 	nmap <SwipeRight> gt
-<
+
 As another example, here is how to switch buffers by swiping left/right: >

 	nmap <SwipeLeft> :bN<CR>
 	nmap <SwipeRight> :bn<CR>
-<
+
 See the section on |key-mapping| for more help on how to map keys.

 ==============================================================================
@@ -945,20 +927,20 @@ prominent bugs/missing features.
 - Sometimes multibyte characters look "too wide", i.e. they overlap the
  following character.  It might help to change 'ambiwidth', or override the
  automatic font substitution by setting 'guifontwide' manually.
- Built-in printing.  |:hardcopy| / <D-p> creates a PDF file which is then
-  opened in Preview where it may be printed.  See |pexpr-option|.
+- Printing.  As a temporary solution <D-p> creates a PostScript file which is
+  then opened in Preview where it may be printed. See |hardcopy|.

 General bugs and issues are tracked on Github.  If you find new bugs or have
-feature requests then please file an issue there:
+feature requests then please file an issue there: >
 	https://github.com/macvim-dev/macvim/issues

 For general discussions, asking questions, you could use the Github
-discussions page:
+discussions page: >
 	https://github.com/macvim-dev/macvim/discussions

 There is also a vim_mac mailing list.  You can also post your findings of bugs
-and issues there as well:				*vim_mac_group*
-	https://groups.google.com/group/vim_mac
+and issues there as well:				*vim_mac_group*   >
+	http://groups.google.com/group/vim_mac

 ==============================================================================
 17. Hints						*macvim-hints*
@@ -1037,7 +1019,7 @@ If you have not installed the "mvim" script in your path you can provide the
 path to the Vim binary instead.  Thus, if "MacVim.app" resides in the
 Applications folder then you would use the following line: >
 	export EDITOR='/Applications/MacVim.app/Contents/MacOS/Vim -g -f'
-<
+
 Scenario: ~
 You have set MacVim to open from an external program and when you finish
 editing (by closing the MacVim window) you want the external program to regain
@@ -17,7 +17,7 @@ Vim's Win32 Graphical User Interface			*gui-w32* *win32-gui*

 Other relevant documentation:
 |gui.txt|	For generic items of the GUI.
-|os_win32.txt|	For Win32 specific items.
+|os_win32.txt| 	For Win32 specific items.


 ==============================================================================
@@ -101,7 +101,7 @@ Help on help files					*helphelp*
 			find a tag in a file with the same language as the
 			current file.  See |help-translated|.

-							*:helpc* *:helpclose*
+						 	*:helpc* *:helpclose*
 :helpc[lose]		Close one help window, if there is one.
 			Vim will try to restore the window layout (including
 			cursor position) to the same layout it was before
@@ -1,4 +1,4 @@
-*if_perl.txt*   For Vim version 9.0.  Last change: 2023 May 14
+*if_perl.txt*   For Vim version 9.0.  Last change: 2022 Mar 13


 		  VIM REFERENCE MANUAL    by Sven Verdoolaege
@@ -254,14 +254,23 @@ $main::curbuf

 							*script-here*
 When using a script language in-line, you might want to skip this when the
-language isn't supported.  >
+language isn't supported.  But this mechanism doesn't work: >
   if has('perl')
     perl << EOF
-       print 'perl works'
+       this will NOT work!
   EOF
   endif
-Note that "EOF" must be at the start of the line without preceding white
-space.
+Instead, put the Perl/Python/Ruby/etc. command in a function and call that
+function: >
+    if has('perl')
+      function DefPerl()
+	perl << EOF
+	  this works
+    EOF
+      endfunction
+      call DefPerl()
+    endif
+Note that "EOF" must be at the start of the line.

 ==============================================================================
 4. Dynamic loading					*perl-dynamic*
@@ -297,11 +306,5 @@ instead of DYNAMIC_PERL_DLL file what was specified at compile time.  The
 version of the shared library must match the Perl version Vim was compiled
 with.

-Note: If you are building Perl locally, you have to use a version compiled
-with threading support for it for Vim to successfully link against it. You can
-use the `-Dusethreads` flags when configuring Perl, and check that a Perl
-binary has it enabled by running `perl -V` and verify that `USE_ITHREADS` is
-under "Compile-time options".
-
 ==============================================================================
 vim:tw=78:ts=8:noet:ft=help:norl:
@@ -769,19 +769,7 @@ Unix ~
 The 'pythondll' or 'pythonthreedll' option can be used to specify the Python
 shared library file instead of DYNAMIC_PYTHON_DLL or DYNAMIC_PYTHON3_DLL file
 what were specified at compile time.  The version of the shared library must
-match the Python 2.x or Python 3 version (|v:python3_version|) Vim was
-compiled with unless using |python3-stable-abi|.
-
-
-Stable ABI and mixing Python versions ~
-			*python-stable* *python-stable-abi* *python3-stable-abi*
-If Vim was not compiled with Stable ABI (only available for Python 3), the
-version of the Python shared library must match the version that Vim was
-compiled with.  Otherwise, mixing versions could result in unexpected crashes
-and failures.  With Stable ABI, this restriction is relaxed, and any Python 3
-library with version of at least |v:python3_version| will work.  See
-|has-python| for how to check if Stable ABI is supported, or see if version
-output includes |+python3/dyn-stable|.
+match the Python 2.x or Python 3 version Vim was compiled with.

 ==============================================================================
 10. Python 3						*python3*
@@ -869,7 +857,7 @@ You can test what Python version is available with: >
 	if has('python')
 	  echo 'there is Python 2.x'
 	endif
-	if has('python3')
+  	if has('python3')
 	  echo 'there is Python 3.x'
 	endif

@@ -886,25 +874,13 @@ python support: >
 	    echo 'Python 2.x dynamically loaded'
 	  endif
 	endif
-	if has('python3_compiled')
+  	if has('python3_compiled')
 	  echo 'compiled with Python 3.x support'
 	  if has('python3_dynamic')
 	    echo 'Python 3.x dynamically loaded'
 	  endif
 	endif

-When loading the library dynamically, Vim can be compiled to support Python 3
-Stable ABI (|python3-stable-abi|) which allows you to load a different version
-of Python 3 library than the one Vim was compiled with.  To check it: >
-	if has('python3_dynamic')
-	  if has('python3_stable')
-	    echo 'support Python 3 Stable ABI.'
-	  else
-	    echo 'does not support Python 3 Stable ABI.'
-	    echo 'only use Python 3 version ' .. v:python3_version
-	  endif
-	endif
-
 This also tells you whether Python is dynamically loaded, which will fail if
 the runtime library cannot be found.

@@ -236,7 +236,7 @@ tag		char	      note action in Normal mode	~
 |CTRL-\_CTRL-N|	CTRL-\ CTRL-N	   go to Normal mode (no-op)
 |CTRL-\_CTRL-G|	CTRL-\ CTRL-G	   go to mode specified with 'insertmode'
 		CTRL-\ a - z	   reserved for extensions
-		CTRL-\ others	   not used
+		CTRL-\ others      not used
 |CTRL-]|	CTRL-]		   :ta to ident under cursor
 |CTRL-^|	CTRL-^		   edit Nth alternate file (equivalent to
 				   ":e #N")
@@ -247,7 +247,7 @@ tag		char	      note action in Normal mode	~
 				2  filter Nmove text through the {filter}
 				   command
 |!!|		!!{filter}	2  filter N lines through the {filter} command
-|quote|		"{register}	   use {register} for next delete, yank or put
+|quote|		"{register}  	   use {register} for next delete, yank or put
 				   ({.%#:} only work with put)
 |#|		#		1  search backward for the Nth occurrence of
 				   the ident under the cursor
@@ -127,11 +127,7 @@ CTRL-R {register}				*i_CTRL-R*
 			'/'	the last search pattern
 			':'	the last command-line
 			'.'	the last inserted text
-							*i_CTRL-R_-*
 			'-'	the last small (less than a line) delete
-				register. This is repeatable using |.| since
-				it remembers the register to put instead of
-				the literal text to insert.
 							*i_CTRL-R_=*
 			'='	the expression register: you are prompted to
 				enter an expression (see |expression|)
@@ -881,7 +877,7 @@ Groß): >

    func Thesaur(findstart, base)
      if a:findstart
-	return searchpos('\<', 'bnW', line('.'))[1] - 1
+    	return searchpos('\<', 'bnW', line('.'))[1] - 1
      endif
      let res = []
      let h = ''
@@ -1122,8 +1118,8 @@ cursor column will be replaced with the matches.  If the returned value is
 larger than the cursor column, the cursor column is used.

 Negative return values:
-   -2	To cancel silently and stay in completion mode.
-   -3	To cancel silently and leave completion mode.
+   -2 	To cancel silently and stay in completion mode.
+   -3 	To cancel silently and leave completion mode.
   Another negative value: completion starts at the cursor column

 On the second invocation the arguments are:
@@ -1180,7 +1176,7 @@ items:
 			item with the same word is already present.
 	empty		when non-zero this match will be added even when it is
 			an empty string
-	user_data	custom data which is associated with the item and
+	user_data 	custom data which is associated with the item and
 			available in |v:completed_item|; it can be any type;
 			defaults to an empty string

@@ -1,4 +1,4 @@
-*intro.txt*     For Vim version 9.0.  Last change: 2023 Aug 15
+*intro.txt*     For Vim version 9.0.  Last change: 2022 Nov 20


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -129,9 +129,8 @@ There are three ways to report bugs:
 3. Send bug reports to: Vim Developers <vim-dev@vim.org>
   This is a maillist, you need to become a member first and many people will
   see the message.  If you don't want that, e.g. because it is a security
-   issue, please contact any of the current Vim maintainers
-   https://github.com/orgs/vim/people (but not Bram or the vim-dev ML).
-   In the future, a proper process for handling security issues will be setup.
+   issue, send it to <bugs@vim.org>, this only goes to the Vim maintainer
+   (that's Bram).

 Please be brief; all the time that is spent on answering mail is subtracted
 from the time that is spent on improving Vim!  Always give a reproducible
@@ -182,9 +181,9 @@ The user may create scripts for Vim that use external commands.  These might
 introduce Y2K problems, but those are not really part of Vim itself.

 ==============================================================================
-3. Credits						*credits* *author*
+3. Credits				*credits* *author* *Bram* *Moolenaar*

-Most of Vim was created by Bram Moolenaar <Bram@vim.org> |Bram-Moolenaar|
+Most of Vim was created by Bram Moolenaar <Bram@vim.org>.

 Parts of the documentation come from several Vi manuals, written by:
 	W.N. Joy
@@ -215,9 +214,9 @@ Vim would never have become what it is now, without the help of these people!
 	Eric Fischer		Mac port, 'cindent', and other improvements
 	Benji Fisher		Answering lots of user questions
 	Bill Foster		Athena GUI port (later removed)
-	Google			Let Bram work on Vim one day a week
+	Google			Lets me work on Vim one day a week
 	Loic Grenie		xvim (ideas for multi windows version)
-	Sven Guckes		Vim promoter and previous WWW page maintainer |Sven-Guckes|
+	Sven Guckes		Vim promoter and previous WWW page maintainer
 	Darren Hiebert		Exuberant ctags
 	Jason Hildebrand	GTK+ 2 port
 	Bruce Hunsaker		improvements for VMS port
@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 9.0.  Last change: 2023 May 28
+*map.txt*       For Vim version 9.0.  Last change: 2023 Jan 09


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -400,7 +400,7 @@ Note:
 - The command is not echo'ed, no need for <silent>.
 - The {rhs} is not subject to abbreviations nor to other mappings, even if the
  mapping is recursive.
- In Visual mode you can use `line('v')` and `col('v')` to get one end of the
+- In Visual mode  you can use `line('v')` and `col('v')` to get one end of the
  Visual area, the cursor is at the other end.

 							*E1255* *E1136*
@@ -408,6 +408,10 @@ Note:
 by <CR> in the {rhs} of the mapping definition.  |Command-line| mode is never
 entered.

+							*E1137*
+<Cmd> and <ScriptCmd> commands can have only normal characters and cannot
+contain special characters like function keys.
+

 1.3 MAPPING AND MODES					*:map-modes*
 			*mapmode-nvo* *mapmode-n* *mapmode-v* *mapmode-o*
@@ -841,7 +845,7 @@ option).  After that it assumes that the 'q' is to be interpreted as such.  If
 you type slowly, or your system is slow, reset the 'timeout' option.  Then you
 might want to set the 'ttimeout' option.

-							*map-precedence*
+			      				*map-precedence*
 Buffer-local mappings (defined using |:map-<buffer>|) take precedence over
 global mappings.  When a buffer-local mapping is the same as a global mapping,
 Vim will use the buffer-local mapping.  In addition, Vim will use a complete
@@ -919,11 +923,6 @@ in the original Vi, you would get back the text before the first undo).

 1.10 MAPPING ALT-KEYS					*:map-alt-keys*

-For a readable mapping command the <A-k> form can be used.  Note that <A-k>
-and <A-K> are different, the latter will use an upper case letter.  Actually,
-<A-K> and <A-S-K> are the same.  Instead of "A" you can use "M".  If you have
-an actual Meta modifier key, please see |:map-meta-keys|.
-
 In the GUI Vim handles the Alt key itself, thus mapping keys with ALT should
 always work.  But in a terminal Vim gets a sequence of bytes and has to figure
 out whether ALT was pressed or not.
@@ -1029,7 +1028,7 @@ enabled when it spots an escape sequence that must have been created by it.
 To see if Vim detected such an escape sequence use `:verbose map`, the first
 line will then show "Seen modifyOtherKeys: true" (possibly translated).

-This automatic detection depends on receiving an escape code starting with
+This automatic detection depends on receiving an escape code starting with 
 "<1b>[27;".  This is the normal way xterm sends these key codes.  However, if
 the *formatOtherKeys* resource is set another form is used that is not
 recognized, therefore you must not set formatOtherKeys.
@@ -1069,8 +1068,8 @@ translated).  The meaning of {value}:
 	On		protocol is used
 	Disabled	protocol was used but expected to have been disabled
 			by 't_TE'
-	Cleared		protocol expected to have been disabled by 't_TE',
-			previous state is unknown
+	Cleared		protocol expected to have beeen disabled by 't_TE',
+			previous state is unknown 


 1.14 MAPPING AN OPERATOR				*:map-operator*
@@ -1213,7 +1212,7 @@ non-id	  The "non-id" type ends in a non-keyword character, the other
 Examples of strings that cannot be abbreviations: "a.b", "#def", "a b", "_$r"

 An abbreviation is only recognized when you type a non-keyword character.
-This can also be the <Esc> that ends Insert mode or the <CR> that ends a
+This can also be the <Esc> that ends insert mode or the <CR> that ends a
 command.  The non-keyword character which ends the abbreviation is inserted
 after the expanded abbreviation.  An exception to this is the character <C-]>,
 which is used to expand an abbreviation without inserting any extra
@@ -1417,13 +1416,12 @@ this, they can be made local to the script.

 						*<SID>* *<SNR>* *E81*
 The string "<SID>" can be used in a mapping or menu.  This requires that the
-'<' flag is not present in 'cpoptions'.  This is useful if you have a
-script-local function that you want to call from a mapping in the same script.
+'<' flag is not present in 'cpoptions'.
   When executing the map command, Vim will replace "<SID>" with the special
 key code <SNR>, followed by a number that's unique for the script, and an
 underscore.  Example: >
 	:map <SID>Add
-would define a mapping "<SNR>23_Add".
+could define a mapping "<SNR>23_Add".

 When defining a function in a script, "s:" can be prepended to the name to
 make it local to the script (in |Vim9| script functions without a prefix are
@@ -1562,11 +1560,6 @@ can have arguments, or have a range specified.  Arguments are subject to
 completion as filenames, buffers, etc.  Exactly how this works depends upon the
 command's attributes, which are specified when the command is defined.

-When defining a user command in a script, it will be able to call functions
-local to the script and use mappings local to the script.  When the user
-invokes the user command, it will run in the context of the script it was
-defined in.  This matters if |<SID>| is used in a command.
-
 There are a number of attributes, split into four categories: argument
 handling, completion behavior, range handling, and special cases.  The
 attributes are described below, by category.
@@ -1730,7 +1723,7 @@ by default correspond to the current line, last line and the whole buffer,
 relate to arguments, (loaded) buffers, windows or tab pages.

 Possible values are (second column is the short name used in listing):
-    -addr=lines			Range of lines (this is the default for -range)
+    -addr=lines		  	Range of lines (this is the default for -range)
    -addr=arguments	  arg	Range for arguments
    -addr=buffers	  buf	Range for buffers (also not loaded buffers)
    -addr=loaded_buffers  load	Range for loaded buffers
@@ -1782,11 +1775,6 @@ functions cannot be used.  Commands where a "|" may appear in the argument,
 such as commands with an expression argument, cannot be followed by a "|" and
 another command.

-If the command is defined in Vim9 script (a script that starts with
-`:vim9script` and in a `:def` function) then {repl} will be executed as in Vim9
-script.  Thus this depends on where the command is defined, not where it is
-used.
-
 The replacement text {repl} for a user defined command is scanned for special
 escape sequences, using <...> notation.  Escape sequences are replaced with
 values from the entered command line, and all other text is copied unchanged.
@@ -1873,14 +1861,8 @@ remains unmodified.  Also see |f-args-example| below.  Overview:
 	XX a\\\ b	   'a\ b'
 	XX a\\\\b	   'a\\b'
 	XX a\\\\ b	   'a\\', 'b'
-	XX		   [nothing]


-Note that if the "no arguments" situation is to be handled, you have to make
-sure that the function can be called without arguments.  For a compiled
-function you might want to use variable arguments, see
-|vim9-variable-arguments|.
-
 Examples for user commands: >

   " Delete everything after here to the end
@@ -1927,5 +1909,14 @@ errors and the "update" command to write modified buffers): >
 This will invoke: >
 	:call Allargs("%s/foo/bar/ge|update")
 <
+If the command is defined in Vim9 script (a script that starts with
+`:vim9script` and in a `:def` function) then {repl} will be executed as in Vim9
+script.  Thus this depends on where the command is defined, not where it is
+used.
+
+When defining a user command in a script, it will be able to call functions
+local to the script and use mappings local to the script.  When the user
+invokes the user command, it will run in the context of the script it was
+defined in.  This matters if |<SID>| is used in a command.

 vim:tw=78:ts=8:noet:ft=help:norl:
@@ -1,4 +1,4 @@
-*message.txt*   For Vim version 9.0.  Last change: 2023 May 24
+*message.txt*   For Vim version 9.0.  Last change: 2022 Oct 18


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -76,9 +76,9 @@ See `:messages` above.


 LIST OF MESSAGES
-			*E222* *E228* *E232* *E292* *E293* *E298* *E304* *E316*
-			*E317* *E318* *E320* *E322* *E323* *E341* *E356* *E438*
-			*E439* *E440* *E473* *E570*
+			*E222* *E228* *E232* *E293* *E298* *E304* *E317*
+			*E318* *E356* *E438* *E439* *E440* *E316* *E320* *E322*
+			*E323* *E341* *E473* *E570* *E685* *E292*
  Add to read buffer ~
  makemap: Illegal mode ~
  Cannot create BalloonEval with both message and callback ~
@@ -99,9 +99,9 @@ LIST OF MESSAGES
  Internal error in regexp ~
  fatal error in cs_manage_matches ~
  Invalid count for del_bytes(): {N} ~
-						*E340* *E685* *internal-error*
+
 This is an internal error.  If you can reproduce it, please send in a bug
-report, see |bugs|.
+report. |bugs|


  ATTENTION ~
@@ -242,8 +242,8 @@ gM			Like "g0", but to halfway the text of the line.
 			Thus "10gM" is near the start of the text and "90gM"
 			is near the end of the text.

-							*g$*
-g$			When lines wrap ('wrap' on): To the last character of
+							*g$* *g<End>*
+g$ or g<End>		When lines wrap ('wrap' on): To the last character of
 			the screen line and [count - 1] screen lines downward
 			|inclusive|.  Differs from "$" when a line is wider
 			than the screen.
@@ -256,10 +256,6 @@ g$			When lines wrap ('wrap' on): To the last character of
 			When 'virtualedit' is enabled moves to the end of the
 			screen line.

-							*g<End>* *g<kEnd>*
-g<End>			Like |g$| but to the last non-blank character
-			instead of the last character.
-
 							*bar*
 |			To screen column [count] in the current line.
 			|exclusive| motion.  Ceci n'est pas une pipe.
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 9.0.  Last change: 2023 Aug 15
+*options.txt*	For Vim version 9.0.  Last change: 2023 Feb 01


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -252,8 +252,6 @@ opt+=val" the expansion is done before the adding or removing.

 Handling of local options			*local-options*

-Note: The following also applies to |global-local| options.
-
 Some of the options only apply to a window or buffer.  Each window or buffer
 has its own copy of this option, thus each can have its own value.  This
 allows you to set 'list' in one window but not in another.  And set
@@ -303,30 +301,6 @@ The options local to a window are remembered for each buffer.  This also
 happens when the buffer is not loaded, but they are lost when the buffer is
 wiped out |:bwipe|.

-Special local window options			*local-noglobal*
-
-The following local window options won't be copied over when new windows are
-created, thus they behave slightly differently:
-
-	Option		Reason	~
-	'previewwindow'	there can only be a single one
-	'scroll'	specific to existing window
-	'winfixheight'	specific to existing window
-	'winfixwidth'	specific to existing window
-
-Special local buffer options
-
-The following local buffer options won't be copied over when new buffers are
-created, thus they behave slightly differently:
-
-	Option		Reason	~
-	'filetype'	explicitly set by autocommands
-	'syntax'	explicitly set by autocommands
-	'bufhidden'	denote |special-buffers|
-	'buftype'	denote |special-buffers|
-	'readonly'	will be detected automatically
-	'modified'	will be detected automatically
-
 							*:setl* *:setlocal*
 :setl[ocal][!] ...	Like ":set" but set only the value local to the
 			current buffer or window.  Not all options have a
@@ -400,6 +374,7 @@ used.  Thus it does the same as: >
 Note: In the future more global options can be made |global-local|.  Using
 ":setlocal" on a global option might work differently then.

+
 						*option-value-function*
 Some options ('completefunc', 'imactivatefunc', 'imstatusfunc', 'omnifunc',
 'operatorfunc', 'quickfixtextfunc', 'tagfunc' and 'thesaurusfunc') are set to
@@ -947,9 +922,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'autowriteall' for that.
 	Some buffers will not be written, specifically when 'buftype' is
 	"nowrite", "nofile", "terminal" or "prompt".
-	USE WITH CARE: If you make temporary changes to a buffer that you
-	don't want to be saved this option may cause it to be saved anyway.
-	Renaming the buffer with ":file {name}" may help avoid this.

 			 *'autowriteall'* *'awa'* *'noautowriteall'* *'noawa'*
 'autowriteall' 'awa'	boolean	(default off)
@@ -1479,7 +1451,7 @@ A jump table for the options with a short description can be found at |Q_op|.

 						*'bufhidden'* *'bh'*
 'bufhidden' 'bh'	string (default: "")
-			local to buffer  |local-noglobal|
+			local to buffer
 	This option specifies what happens when a buffer is no longer
 	displayed in a window:
 	  <empty>	follow the global 'hidden' option
@@ -1511,7 +1483,7 @@ A jump table for the options with a short description can be found at |Q_op|.

 						*'buftype'* *'bt'* *E382*
 'buftype' 'bt'		string (default: "")
-			local to buffer  |local-noglobal|
+			local to buffer
 	The value of this option specifies the type of a buffer:
 	  <empty>	normal buffer
 	  nofile	buffer which is not related to a file and will not be
@@ -1580,7 +1552,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			case mapping, the current locale is not effective.
 			This probably only matters for Turkish.

-				*'cdhome'* *'cdh'* *'nocdhome'* *'nocdh'*
+						*'cdhome'* *'cdh'*
 'cdhome' 'cdh'		boolean	(default: off)
 			global
 	When on, |:cd|, |:tcd| and |:lcd| without an argument changes the
@@ -1843,7 +1815,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The screen column can be an absolute number, or a number preceded with
 	'+' or '-', which is added to or subtracted from 'textwidth'. >

-		:set cc=+1	  " highlight column after 'textwidth'
+		:set cc=+1  " highlight column after 'textwidth'
 		:set cc=+1,+2,+3  " highlight three columns after 'textwidth'
 		:hi ColorColumn ctermbg=lightgrey guibg=lightgrey
 <
@@ -2554,14 +2526,12 @@ A jump table for the options with a short description can be found at |Q_op|.
 							*pkzip*
 	   zip		PkZip compatible method.  A weak kind of encryption.
 			Backwards compatible with Vim 7.2 and older.
-			Only use if you need to be backwards compatible.
 							*blowfish*
 	   blowfish	Blowfish method.  Medium strong encryption but it has
 			an implementation flaw.  Requires Vim 7.3 or later,
 			files can NOT be read by Vim 7.2 and older.  This adds
 			a "seed" to the file, every time you write the file
 			the encrypted bytes will be different.
-			Obsolete, please do no longer use.
 							*blowfish2*
 	   blowfish2	Blowfish method.  Medium strong encryption.  Requires
 			Vim 7.4.401 or later, files can NOT be read by Vim 7.3
@@ -2583,21 +2553,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 			enabled.
 			Encryption of undo files is not yet supported,
 			therefore no undo file will currently be written.
-			CAREFUL: Files written with this method might have to
-			be read back with the same version of Vim if the
-			binary format changes later.
-			Obsolete, please do no longer use.
-	   xchacha20v2  Same algorithm as with "xchacha20" that correctly
-			stores the key derivation parameters together with the
-			encrypted file.  Should work better in case the
-			parameters in the libsodium library ever change.
-			STILL EXPERIMENTAL: Files written with this method
+			CURRENTLY EXPERIMENTAL: Files written with this method
 			might have to be read back with the same version of
 			Vim if the binary format changes later.

-	You should use "blowfish2", also to re-encrypt older files.  The
-	"xchacha20" method provides better encryption, but it does not work
-	with all versions of Vim.
+	You should use "blowfish2", also to re-encrypt older files.

 	When reading an encrypted file 'cryptmethod' will be set automatically
 	to the detected method of the file being read.  Thus if you write it
@@ -3448,7 +3408,7 @@ A jump table for the options with a short description can be found at |Q_op|.

 					*'filetype'* *'ft'*
 'filetype' 'ft'		string (default: "")
-			local to buffer  |local-noglobal|
+			local to buffer
 	When this option is set, the FileType autocommand event is triggered.
 	All autocommands that match with the value of this option will be
 	executed.  Thus the value of 'filetype' is used in place of the file
@@ -3844,7 +3804,7 @@ A jump table for the options with a short description can be found at |Q_op|.

 	Custom / non-native full screen configuration:~

-	See 'fuoptions' for how Vim resizes and colors the background when
+	See 'fuoptions' for how Vim resizes and colors the background when 
 	entering and leaving fullscreen mode.

 	There is an optional fade-to-black effect while transitioning that
@@ -3858,6 +3818,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	they are determined by the size of the window.  'fuoptions' allows you
 	to override part of that behavior if using custom full screen.

+
 						*'fuoptions'* *'fuopt'*
 'fuoptions' 'fuopt'	string (default "maxvert,maxhorz")
 			global
@@ -3867,10 +3828,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	In non-native fullscreen mode, MacVim can be configured to either show
 	all the content filling up the whole screen, or only use part of the
 	screen to show the content, centered.  This option controls the size
-	of the Vim control as well as the color of the unused screen area.
+	of the Vim control as well as the color of the unused screen area. 
 	value	effect	~
        maxvert	When entering fullscreen, 'lines' is set to the maximum number
-		of lines fitting on the screen in fullscreen mode. If unset,
+		of lines fitting on the screen in fullscreen mode. If unset, 
 		'lines' will be unchanged when entering fullscreen mode.
        maxhorz	When entering fullscreen, 'columns' is set to the maximum number
 		of columns fitting on the screen in fullscreen mode. If unset,
@@ -3886,7 +3847,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		group's background color, as defined by the current color
 		scheme.

-	Examples:
+	Examples: 
 	Don't change size when entering fullscreen: >
 	  :set fuoptions=
 <	Only maximize vertically when entering fullscreen: >
@@ -3897,7 +3858,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 <	Don't change size when entering fullscreen, and color the background
 	like the current text background: >
 	  :set fuoptions=background:Normal
-<
+
+
+
 				   *'gdefault'* *'gd'* *'nogdefault'* *'nogd'*
 'gdefault' 'gd'		boolean	(default off)
 			global
@@ -4330,8 +4293,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 				     T:DiffText,>:SignColumn,-:Conceal,
 				     B:SpellBad,P:SpellCap,R:SpellRare,
 				     L:SpellLocal,+:Pmenu,=:PmenuSel,
-				     [:PmenuKind,]:PmenuKindSel,
-				     {:PmenuExtra,}:PmenuExtraSel,
 				     x:PmenuSbar,X:PmenuThumb,*:TabLine,
 				     #:TabLineSel,_:TabLineFill,!:CursorColumn,
 				     .:CursorLine,o:ColorColumn,q:QuickFixLine,
@@ -4388,10 +4349,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	|hl-SpellLocal|	 L  word from other region |spell|
 	|hl-Pmenu|	 +  popup menu normal line
 	|hl-PmenuSel|	 =  popup menu selected line
-	|hl-PmenuKind|	 [  popup menu "kind" normal line
-	|hl-PmenuKindSel|  ]  popup menu "kind" selected line
-	|hl-PmenuExtra|	 {  popup menu "kind" normal line
-	|hl-PmenuExtraSel| }  popup menu "kind" selected line
 	|hl-PmenuSbar|	 x  popup menu scrollbar
 	|hl-PmenuThumb|	 X  popup menu scrollbar thumb

@@ -5049,7 +5006,7 @@ A jump table for the options with a short description can be found at |Q_op|.

 <	This means that when 'term' contains "kitty, "foot" or "wezterm"
 	somewhere then the "kitty" protocol is used.  When 'term' contains
-	"xterm" somewhere, then the "mok2" protocol is used.
+	"xterm" somewhere, then the "mok2" protocol is used. 

 	The first match is used, thus if you want to have "kitty" use the
 	kitty protocol, but "badkitty" not, then you should match "badkitty"
@@ -5429,7 +5386,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	No longer supported, as the Mac OS X GUI code was removed.

 				*'macligatures'* *'nomacligatures'*
-'macligatures'		boolean (default off)
+'macligatures' 		boolean (default off)
 			global
 			{not in Vi}
                        {only available when compiled with GUI enabled on
@@ -5442,7 +5399,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'Use Core Text renderer' is enabled in the GUI preferences pane.

 				*'macthinstrokes'* *'nomacthinstrokes'*
-'macthinstrokes'		boolean (default off)
+'macthinstrokes' 		boolean (default off)
 			global
 			{not in Vi}
                        {only available when compiled with GUI enabled on
@@ -5719,7 +5676,7 @@ A jump table for the options with a short description can be found at |Q_op|.

 				*'modified'* *'mod'* *'nomodified'* *'nomod'*
 'modified' 'mod'	boolean	(default off)
-			local to buffer  |local-noglobal|
+			local to buffer
 	When on, the buffer is considered to be modified.  This option is set
 	when:
 	1. A change was made to the text since it was last written.  Using the
@@ -5840,7 +5797,7 @@ A jump table for the options with a short description can be found at |Q_op|.

 	The 'mousemodel' option is set by the |:behave| command.

-	      *'mousemoveevent'* *'mousemev'* *'nomousemoveevent'* *'nomousemev'*
+						*'mousemoveevent'* *'mousemev'*
 'mousemoveevent' 'mousemev'  boolean	(default off)
 			global
 			{only works in the GUI}
@@ -6290,7 +6247,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 					*'previewwindow'* *'nopreviewwindow'*
 					*'pvw'* *'nopvw'* *E590*
 'previewwindow' 'pvw'	boolean (default off)
-			local to window  |local-noglobal|
+			local to window
 			{not available when compiled without the |+quickfix|
 			feature}
 	Identifies the preview window.  Only one window can have this option
@@ -6485,7 +6442,7 @@ A jump table for the options with a short description can be found at |Q_op|.

 				   *'readonly'* *'ro'* *'noreadonly'* *'noro'*
 'readonly' 'ro'		boolean	(default off)
-			local to buffer  |local-noglobal|
+			local to buffer
 	If on, writes fail unless you use a '!'.  Protects you from
 	accidentally overwriting a file.  Default on when Vim is started
 	in read-only mode ("vim -R") or when the executable is called "view".
@@ -6864,7 +6821,7 @@ A jump table for the options with a short description can be found at |Q_op|.

 						*'scroll'* *'scr'*
 'scroll' 'scr'		number	(default: half the window height)
-			local to window  |local-noglobal|
+			local to window
 	Number of lines to scroll with CTRL-U and CTRL-D commands.  Will be
 	set to half the number of lines in the window when the window size
 	changes.  This may happen when enabling the |status-line| or
@@ -7289,7 +7246,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			local to buffer
 	Number of spaces to use for each step of (auto)indent.  Used for
 	|'cindent'|, |>>|, |<<|, etc.
-	When zero the 'tabstop' value will be used.  Use the |shiftwidth()|
+	When zero the 'ts' value will be used.  Use the |shiftwidth()|
 	function to get the effective shiftwidth value.

 						*'shortmess'* *'shm'*
@@ -7332,7 +7289,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	  A	don't give the "ATTENTION" message when an existing	*shm-A*
 		swap file is found
 	  I	don't give the intro message when starting Vim,		*shm-I*
-		see |:intro|
+	  	see |:intro|
 	  c	don't give |ins-completion-menu| messages; for		*shm-c*
 		example, "-- XXX completion (YYY)", "match 1 of 2", "The only
 		match", "Pattern not found", "Back at original", etc.
@@ -7342,8 +7299,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	  F	don't give the file info when editing a file, like	*shm-F*
 		`:silent` was used for the command; note that this also
 		affects messages from autocommands
-	  S	do not show search count message when searching, e.g.	*shm-S*
-		"[1/5]"
+	  S     do not show search count message when searching, e.g.	*shm-S*
+	        "[1/5]"

 	This gives you the opportunity to avoid that a change between buffers
 	requires you to hit <Enter>, but still gives as useful a message as
@@ -7520,9 +7477,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 			{not available when compiled without the |+signs|
 			feature}
 	Whether or not to draw the signcolumn. Valid values are:
-	   "auto"	only when there is a sign to display
-	   "no"		never
-	   "yes"	always
+	   "auto"   	only when there is a sign to display
+	   "no"	    	never
+	   "yes"    	always
 	   "number"	display signs in the 'number' column. If the number
 			column is not present, then behaves like "auto".

@@ -7588,8 +7545,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	line in the window wraps part of it may not be visible, as if it is
 	above the window. "<<<" is displayed at the start of the first line,
 	highlighted with |hl-NonText|.
-	You may also want to add "lastline" to the 'display' option to show as
-	much of the last line as possible.
 	NOTE: only partly implemented, currently works with CTRL-E, CTRL-Y
 	and scrolling with the mouse.

@@ -7828,12 +7783,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global
 	When "on" the commands listed below move the cursor to the first
 	non-blank of the line.  When off the cursor is kept in the same column
-	(if possible).  This applies to the commands:
-	- CTRL-D, CTRL-U, CTRL-B, CTRL-F, "G", "H", "M", "L", "gg"
-	- "d", "<<" and ">>" with a linewise operator
-	- "%" with a count
-	- buffer changing commands (CTRL-^, :bnext, :bNext, etc.)
-	- Ex commands that only has a line number, e.g., ":25" or ":+".
+	(if possible).  This applies to the commands: CTRL-D, CTRL-U, CTRL-B,
+	CTRL-F, "G", "H", "M", "L", gg, and to the commands "d", "<<" and ">>"
+	with a linewise operator, with "%" with a count and to buffer changing
+	commands (CTRL-^, :bnext, :bNext, etc.).  Also for an Ex command that
+	only has a line number, e.g., ":25" or ":+".
 	In case of buffer changing commands the cursor is placed at the column
 	where it was the last time the buffer was edited.
 	NOTE: This option is set when 'compatible' is set.
@@ -7954,10 +7908,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	      mark.  This information is used for mouse clicks.
 	< -   Where to truncate line if too long.  Default is at the start.
 	      No width fields allowed.
-	= -   Separation point between alignment sections.  Each section will
-	      be separated by an equal number of spaces.  With one %= what
-	      comes after it will be right-aligned.  With two %= there is a
-	      middle part, with white space left and right of it.
+	= -   Separation point between left and right aligned items.
 	      No width fields allowed.
 	# -   Set highlight group.  The name must follow and then a # again.
 	      Thus use %#HLname# for highlight group HLname.  The same
@@ -8087,18 +8038,16 @@ A jump table for the options with a short description can be found at |Q_op|.
 'switchbuf' 'swb'	string	(default "")
 			global
 	This option controls the behavior when switching between buffers.
-	This option is checked, when
-	- jumping to errors with the |quickfix| commands (|:cc|, |:cn|, |:cp|,
-	  etc.)
-	- jumping to a tag using the |:stag| command.
-	- opening a file using the |CTRL-W_f| or |CTRL-W_F| command.
-	- jumping to a buffer using a buffer split command (e.g.  |:sbuffer|,
-	  |:sbnext|, or |:sbrewind|).
+	Mostly for |quickfix| commands some values are also used for other
+	commands, as mentioned below.
 	Possible values (comma-separated list):
-	   useopen	If included, jump to the first open window in the
-			current tab page that contains the specified buffer
-			(if there is one).  Otherwise: Do not examine other
-			windows.
+	   useopen	If included, jump to the first open window that
+			contains the specified buffer (if there is one).
+			Otherwise: Do not examine other windows.
+			This setting is checked with |quickfix| commands, when
+			jumping to errors (":cc", ":cn", "cp", etc.).  It is
+			also used in all buffer related split commands, for
+			example ":sbuffer", ":sbnext", or ":sbrewind".
 	   usetab	Like "useopen", but also consider windows in other tab
 			pages.
 	   split	If included, split the current window before loading
@@ -8126,7 +8075,7 @@ A jump table for the options with a short description can be found at |Q_op|.

 						*'syntax'* *'syn'*
 'syntax' 'syn'		string	(default empty)
-			local to buffer  |local-noglobal|
+			local to buffer
 			{not available when compiled without the |+syntax|
 			feature}
 	When this option is set, the syntax with this name is loaded, unless
@@ -8200,25 +8149,13 @@ A jump table for the options with a short description can be found at |Q_op|.
 	   (or 3 or whatever you prefer) and use 'noexpandtab'.  Then Vim
 	   will use a mix of tabs and spaces, but typing <Tab> and <BS> will
 	   behave like a tab appears every 4 (or 3) characters.
-	   This is the recommended way, the file will look the same with other
-	   tools and when listing it in a terminal.
-	2. Set 'softtabstop' and 'shiftwidth' to whatever you prefer and use
-	   'expandtab'.  This way you will always insert spaces.  The
-	   formatting will never be messed up when 'tabstop' is changed (leave
-	   it at 8 just in case).  The file will be a bit larger.
-	   You do need to check if no Tabs exist in the file.  You can get rid
-	   of them by first setting 'expandtab' and using `%retab!`, making
-	   sure the value of 'tabstop' is set correctly.
-	3. Set 'tabstop' and 'shiftwidth' to whatever you prefer and use
+	2. Set 'tabstop' and 'shiftwidth' to whatever you prefer and use
 	   'expandtab'.  This way you will always insert spaces.  The
 	   formatting will never be messed up when 'tabstop' is changed.
-	   You do need to check if no Tabs exist in the file, just like in the
-	   item just above.
-	4. Set 'tabstop' and 'shiftwidth' to whatever you prefer and use a
+	3. Set 'tabstop' and 'shiftwidth' to whatever you prefer and use a
 	   |modeline| to set these values when editing the file again.  Only
-	   works when using Vim to edit the file, other tools assume a tabstop
-	   is worth 8 spaces.
-	5. Always set 'tabstop' and 'shiftwidth' to the same value, and
+	   works when using Vim to edit the file.
+	4. Always set 'tabstop' and 'shiftwidth' to the same value, and
 	   'noexpandtab'.  This should then work (for initial indents only)
 	   for any tabstop setting that people use.  It might be nice to have
 	   tabs after the first non-blank inserted as spaces if you do this
@@ -8427,7 +8364,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		:set encoding=utf-8
 <	You need to do this when your system has no locale support for UTF-8.

-		*'termguicolors'* *'tgc'* *'notermguicolors'* *'notgc'* *E954*
+					*'termguicolors'* *'tgc'* *E954*
 'termguicolors' 'tgc'	boolean (default off)
 			global
 			{not available when compiled without the
@@ -9079,11 +9016,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 	displayed when 'verbosefile' is set.

 						*'viewdir'* *'vdir'*
-'viewdir' 'vdir'	string	(default for Amiga "home:vimfiles/view",
-					 for Win32: "$HOME/vimfiles/view",
-					 for Unix: "$HOME/.vim/view",
-					 for macOS: "$VIM/vimfiles/view"
-					 for VMS: "sys$login:vimfiles/view")
+'viewdir' 'vdir'	string	(default for Amiga and Win32:
+							 "$VIM/vimfiles/view",
+				 for Unix: "~/.vim/view",
+				 for macOS: "$VIM:vimfiles:view"
+				 for VMS: "sys$login:vimfiles/view")
 			global
 			{not available when compiled without the |+mksession|
 			feature}
@@ -9587,7 +9524,7 @@ A jump table for the options with a short description can be found at |Q_op|.

 			*'winfixheight'* *'wfh'* *'nowinfixheight'* *'nowfh'*
 'winfixheight' 'wfh'	boolean	(default off)
-			local to window  |local-noglobal|
+			local to window
 	Keep the window height when windows are opened or closed and
 	'equalalways' is set.  Also for |CTRL-W_=|.  Set by default for the
 	|preview-window| and |quickfix-window|.
@@ -9595,7 +9532,7 @@ A jump table for the options with a short description can be found at |Q_op|.

 			*'winfixwidth'* *'wfw'* *'nowinfixwidth'* *'nowfw'*
 'winfixwidth' 'wfw'	boolean	(default off)
-			local to window  |local-noglobal|
+			local to window
 	Keep the window width when windows are opened or closed and
 	'equalalways' is set.  Also for |CTRL-W_=|.
 	The width may be changed anyway when running out of room.
@@ -10,7 +10,7 @@ This file contains the particulars for the z/OS UNIX version of Vim.
 2. Putty and Colors                     |zOS-PuTTY|
 3. Motif Problems			|zOS-Motif|
 4. Bugs					|zOS-Bugs|
-5. Limitations				|zOS-limitations|
+5. Limitations     			|zOS-limitations|
 6. Open source on z/OS UNIX		|zOS-open-source|

 Contributors: ~
@@ -75,7 +75,7 @@ There is no solution for this yet.
  this occurs in both the terminal and gui versions.

 ==============================================================================
-5. Limitations				*OS390-limitations* *zOS-limitations*
+5. Limitations     			*OS390-limitations* *zOS-limitations*

 - No binary search in tag files.
  The program /bin/sort sorts by ASCII value by default.  This program is
@@ -203,7 +203,7 @@ You can check that everything is at the right place with the :version command.

 Example LOGIN.COM: >

-	$ define/nolog VIM DKA0:[UTIL.VIM81]
+ 	$ define/nolog VIM DKA0:[UTIL.VIM81]
 	$ vi*m :== mcr VIM:VIM.EXE
 	$ gv*im:== spawn/nowait/input=NLA0 mcr VIM:VIM.EXE -g -GEOMETRY 80x40
 	$ set disp/create/node=192.168.10.202/trans=tcpip
@@ -1,4 +1,4 @@
-*pattern.txt*   For Vim version 9.0.  Last change: 2023 Feb 04
+*pattern.txt*   For Vim version 9.0.  Last change: 2022 Sep 24


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -101,8 +101,6 @@ g#			Like "#", but don't put "\<" and "\>" around the word.
 							*gd*
 gd			Goto local Declaration.  When the cursor is on a local
 			variable, this command will jump to its declaration.
-			This was made to work for C code, in other languages
-			it may not work well.
 			First Vim searches for the start of the current
 			function, just like "[[".  If it is not found the
 			search stops in line 1.  If it is found, Vim goes back
@@ -1144,21 +1142,21 @@ x	A single character, with no special meaning, matches itself
 	  are supported:
 		  Name	      Func	Contents ~
 *[:alnum:]*	  [:alnum:]   isalnum	ASCII letters and digits
-*[:alpha:]*	  [:alpha:]   isalpha	ASCII letters
-*[:blank:]*	  [:blank:]		space and tab
-*[:cntrl:]*	  [:cntrl:]   iscntrl	ASCII control characters
-*[:digit:]*	  [:digit:]		decimal digits '0' to '9'
+*[:alpha:]*	  [:alpha:]   isalpha  	ASCII letters
+*[:blank:]*	  [:blank:]     	space and tab
+*[:cntrl:]*	  [:cntrl:]   iscntrl 	ASCII control characters
+*[:digit:]*	  [:digit:]     	decimal digits '0' to '9'
 *[:graph:]*	  [:graph:]   isgraph	ASCII printable characters excluding
 					space
 *[:lower:]*	  [:lower:]   (1)	lowercase letters (all letters when
 					'ignorecase' is used)
-*[:print:]*	  [:print:]   (2)	printable characters including space
+*[:print:]*	  [:print:]   (2) 	printable characters including space
 *[:punct:]*	  [:punct:]   ispunct	ASCII punctuation characters
-*[:space:]*	  [:space:]		whitespace characters: space, tab, CR,
+*[:space:]*	  [:space:]     	whitespace characters: space, tab, CR,
 					NL, vertical tab, form feed
 *[:upper:]*	  [:upper:]   (3)	uppercase letters (all letters when
 					'ignorecase' is used)
-*[:xdigit:]*	  [:xdigit:]		hexadecimal digits: 0-9, a-f, A-F
+*[:xdigit:]*	  [:xdigit:]    	hexadecimal digits: 0-9, a-f, A-F
 *[:return:]*	  [:return:]		the <CR> character
 *[:tab:]*	  [:tab:]		the <Tab> character
 *[:escape:]*	  [:escape:]		the <Esc> character
@@ -24,7 +24,7 @@ get the latest versions of scripts listed therein from http://vim.sf.net/.

 ==============================================================================
 1. Contents				*glvs-contents* *glvs* *getscript*
-					*GetLatestVimScripts*
+   					*GetLatestVimScripts*

 	1. Contents........................................: |glvs-contents|
 	2. GetLatestVimScripts -- Getting Started..........: |glvs-install|
@@ -116,7 +116,7 @@ reflect the latest version of script(s) so downloaded.

 ==============================================================================
 4. GetLatestVimScripts Data File		*getscript-data* *glvs-data*
-						*:GetLatestVimScripts_dat*
+ 						*:GetLatestVimScripts_dat*
 The data file <GetLatestVimScripts.dat> must have for its first two lines
 the following text:
 >
@@ -330,7 +330,7 @@ after/syntax/c.vim contained in it to overwrite a user's c.vim.
 		This variable holds the options to be used with the
 		g:GetLatestVimScripts_wget command.
 >
-	g:GetLatestVimScripts_allowautoinstall
+ 	g:GetLatestVimScripts_allowautoinstall
 <	default= 1
 		This variable indicates whether GetLatestVimScripts is allowed
 		to attempt to automatically install scripts.  Furthermore, the
@@ -1,4 +1,4 @@
-*pi_netrw.txt*  For Vim version 9.0.  Last change: 2023 May 14
+*pi_netrw.txt*  For Vim version 9.0.  Last change: 2022 Apr 06

 	    ------------------------------------------------
 	    NETRW REFERENCE MANUAL    by Charles E. Campbell
@@ -208,7 +208,7 @@ EXTERNAL APPLICATIONS AND PROTOCOLS			*netrw-externapp* {{{2
 	  http:   g:netrw_http_cmd     = "links"      elseif links is available
 	  http:   g:netrw_http_cmd     = "curl"       elseif curl  is available
 	  http:   g:netrw_http_cmd     = "wget"       elseif wget  is available
-	  http:   g:netrw_http_cmd     = "fetch"      elseif fetch is available
+          http:   g:netrw_http_cmd     = "fetch"      elseif fetch is available
 	  http:   *g:netrw_http_put_cmd* = "curl -T"
 	   rcp:   *g:netrw_rcp_cmd*      = "rcp"
 	 rsync:   *g:netrw_rsync_cmd*    = "rsync"     (see |g:netrw_rsync_sep|)
@@ -1085,8 +1085,8 @@ QUICK REFERENCE: MAPS				*netrw-browse-maps* {{{2
 	 <c-tab> Shrink/expand a netrw/explore window                |netrw-c-tab|
 	   -	Makes Netrw go up one directory                      |netrw--|
 	   a	Cycles between normal display,                       |netrw-a|
-		hiding (suppress display of files matching g:netrw_list_hide)
-		and showing (display only files which match g:netrw_list_hide)
+	    	hiding (suppress display of files matching g:netrw_list_hide)
+	    	and showing (display only files which match g:netrw_list_hide)
 	   cd	Make browsing directory the current directory        |netrw-cd|
 	   C	Setting the editing window                           |netrw-C|
 	   d	Make a directory                                     |netrw-d|
@@ -1118,7 +1118,7 @@ QUICK REFERENCE: MAPS				*netrw-browse-maps* {{{2
 	   mX	Apply arbitrary shell command to marked files en bloc|netrw-mX|
 	   mz	Compress/decompress marked files                     |netrw-mz|
 	   o	Enter the file/directory under the cursor in a new   |netrw-o|
-		browser window.  A horizontal split is used.
+	    	browser window.  A horizontal split is used.
 	   O	Obtain a file specified by cursor                    |netrw-O|
 	   p	Preview the file                                     |netrw-p|
 	   P	Browse in the previously used window                 |netrw-P|
@@ -1134,7 +1134,7 @@ QUICK REFERENCE: MAPS				*netrw-browse-maps* {{{2
 	   u	Change to recently-visited directory                 |netrw-u|
 	   U	Change to subsequently-visited directory             |netrw-U|
 	   v	Enter the file/directory under the cursor in a new   |netrw-v|
-		browser window.  A vertical split is used.
+	    	browser window.  A vertical split is used.
 	   x	View file with an associated program                 |netrw-x|
 	   X	Execute filename under cursor via |system()|           |netrw-X|

@@ -2271,7 +2271,7 @@ Example:
 	...


-MARKED FILES, ARBITRARY SHELL COMMAND, EN BLOC			*netrw-mX* {{{2
+MARKED FILES, ARBITRARY SHELL COMMAND, EN BLOC 			*netrw-mX* {{{2
 	    (See |netrw-mf| and |netrw-mr| for how to mark files)
 		      (uses the global marked-file list)

@@ -2620,7 +2620,7 @@ your browsing preferences.  (see also: |netrw-settings|)
 				Used to change access permission for a file.

  *g:netrw_clipboard*		=1
-				By default, netrw will attempt to insure that
+  				By default, netrw will attempt to insure that
 				the clipboard's values will remain unchanged.
 				However, some users report that they have
 				speed problems with this; consequently, this
@@ -2768,7 +2768,7 @@ your browsing preferences.  (see also: |netrw-settings|)
 				escaped before applying glob()

  *g:netrw_gx*			="<cfile>"
-				This option controls how gx (|netrw-gx|) picks
+ 				This option controls how gx (|netrw-gx|) picks
 				up the text under the cursor.  See |expand()|
 				for possibilities.

@@ -2834,11 +2834,11 @@ your browsing preferences.  (see also: |netrw-settings|)
 				directory (|netrw-mt|, |netrw-mc|)

  *g:netrw_localcopycmdopt*	=''             Linux/Unix/MacOS/Cygwin
-				=' \c copy'                     Windows
+  				=' \c copy'                     Windows
 				Options for the |g:netrw_localcopycmd|

  *g:netrw_localcopydircmd*	="cp"           Linux/Unix/MacOS/Cygwin
-				=expand("$COMSPEC")             Windows
+ 				=expand("$COMSPEC")             Windows
 				Copies directories to target directory.
 				(|netrw-mc|, |netrw-mt|)

@@ -2864,13 +2864,17 @@ your browsing preferences.  (see also: |netrw-settings|)
 				Options for |g:netrw_localmovecmd|

  *g:netrw_localrmdir*		="rmdir"        Linux/Unix/MacOS/Cygwin
-				=expand("$COMSPEC")             Windows
+ 				=expand("$COMSPEC")             Windows
 				Remove directory command (rmdir)
 				This variable is only used if your vim is
 				earlier than 7.4 or if your vim doesn't
 				have patch#1107.  Otherwise, |delete()|
 				is used with the "d" option.

+  *g:netrw_localrmdiropt*	=""             Linux/Unix/MacOS/Cygwin
+				=" /c rmdir"                    Windows
+				Options for |g:netrw_localrmdir|
+
  *g:netrw_maxfilenamelen*	=32 by default, selected so as to make long
 				    listings fit on 80 column displays.
 				If your screen is wider, and you have file
@@ -2896,10 +2900,10 @@ your browsing preferences.  (see also: |netrw-settings|)
 				(see |'ballooneval'|)

 *g:netrw_sizestyle*		not defined: actual bytes (default)
-				="b" : actual bytes       (default)
-				="h" : human-readable (ex. 5k, 4m, 3g)
+ 				="b" : actual bytes       (default)
+ 				="h" : human-readable (ex. 5k, 4m, 3g)
 				       uses 1000 base
-				="H" : human-readable (ex. 5K, 4M, 3G)
+ 				="H" : human-readable (ex. 5K, 4M, 3G)
 				       uses 1024 base
 				The long listing (|netrw-i|) and query-file
 				maps (|netrw-qf|) will display file size
@@ -2947,7 +2951,7 @@ your browsing preferences.  (see also: |netrw-settings|)
 				 default: "NETRWSERVER"

  *g:netrw_sort_by*		sort by "name", "time", "size", or
-				"exten".
+  				"exten".
 				 default: "name"

  *g:netrw_sort_direction*	sorting direction: "normal" or "reverse"
@@ -3004,7 +3008,7 @@ your browsing preferences.  (see also: |netrw-settings|)
 					.vim/after/syntax/netrw.vim.
 <				 The netrwGray highlighting is set up by
 				netrw when >
-					* netrwGray has not been previously
+	       				* netrwGray has not been previously
 					  defined
 					* the gui is running
 <				 As an example, I myself use a dark-background
@@ -3262,7 +3266,7 @@ If there are marked files:  (see |netrw-mf|)
    name, applying that substitute, and renaming each file to the result.
    As an example : >

-	mr  [query: reply with *.c]
+    	mr  [query: reply with *.c]
 	R   [query: reply with s/^\(.*\)\.c$/\1.cpp/]
 <
    This example will mark all *.c files and then rename them to *.cpp
@@ -3271,7 +3275,7 @@ If there are marked files:  (see |netrw-mf|)

    The ctrl-X character has special meaning for renaming files: >

-	<c-x>      : a single ctrl-x tells netrw to ignore the portion of the response
+    	<c-x>      : a single ctrl-x tells netrw to ignore the portion of the response
 	             lying between the last '/' and the ctrl-x.

 	<c-x><c-x> : a pair of contiguous ctrl-x's tells netrw to ignore any
@@ -3839,7 +3843,7 @@ netrw:
 	  Decho.vim is provided as a "vimball"; see |vimball-intro|.  You
 	  should edit the Decho.vba.gz file and source it in: >

-		vim Decho.vba.gz
+	  	vim Decho.vba.gz
 		:so %
 		:q
 <
@@ -3881,7 +3885,7 @@ netrw:
 	   To save the file: under linux, the output will be in a separate
 	   remote server window; in it, just save the file with >

-		:w! DBG
+	   	:w! DBG

 <	   Under a vim that doesn't support clientserver, your debugging
 	   output will appear in another tab: >
@@ -3907,8 +3911,6 @@ netrw:
 ==============================================================================
 12. History						*netrw-history* {{{1

-	v172:	Apr 22, 2023	* removed g:netrw_localrmdiropt
-				  removed g:netrw_localrmdir
 	v171:	Oct 09, 2020	* included code in s:NetrwOptionsSafe()
 				  to allow |'bh'| to be set to delete when
 				  rather than hide when g:netrw_fastbrowse
@@ -3993,10 +3995,8 @@ netrw:
 		Nov 09, 2016	* Broke apart the command from the options,
 				  mostly for Windows.  Introduced new netrw
 				  settings: |g:netrw_localcopycmdopt|
-				  |g:netrw_localcopydircmdopt|
-				  |g:netrw_localmkdiropt|
-				  |g:netrw_localmovecmdopt|
-				  g:netrw_localrmdiropt
+				  |g:netrw_localcopydircmdopt| |g:netrw_localmkdiropt|
+				  |g:netrw_localmovecmdopt| |g:netrw_localrmdiropt|
 		Nov 21, 2016	* (mattn) provided a patch for preview; swapped
 				  winwidth() with winheight()
 		Nov 22, 2016	* (glacambre) reported that files containing
@@ -1,4 +1,4 @@
-*pi_zip.txt*	For Vim version 9.0.  Last change: 2023 Mar 12
+*pi_zip.txt*	For Vim version 9.0.  Last change: 2022 Oct 17

 				+====================+
 				| Zip File Interface |
@@ -102,7 +102,6 @@ Copyright: Copyright (C) 2005-2015 Charles E Campbell	 *zip-copyright*

 ==============================================================================
 4. History							*zip-history* {{{1
-   v33 Dec 07, 2021 * *.xlam mentioned twice in zipPlugin
   v32 Oct 22, 2021 * to avoid an issue with a vim 8.2 patch, zipfile: has
 		      been changed to zipfile:// . This often shows up
 		      as zipfile:/// with zipped files that are root-based.
@@ -770,7 +770,7 @@ The second argument of |popup_create()| is a dictionary with options:
 	cursorline	TRUE:	 Highlight the cursor line. Also scrolls the
 				 text to show this line (only works properly
 				 when 'wrap' is off).
-			zero:	 Do not highlight the cursor line.
+			zero: 	 Do not highlight the cursor line.
 			Default is zero, except for |popup_menu()|.
 	filter		A callback that can filter typed characters, see
 			|popup-filter|.
@@ -47,8 +47,6 @@ Note: If you have problems printing with |:hardcopy|, an alternative is to use
 			paper size, duplex, etc.
 			Note: If you want PDF, there are tools such as
 			"ps2pdf" that can convert the PostScript to PDF.
-			On macOS, you can also use "pstopdf" which comes
-			bundled with the system.

 :[range]ha[rdcopy][!] >{filename}
 			As above, but write the resulting PostScript in file
@@ -138,13 +136,8 @@ The arguments to the ":hardcopy" command are in |v:cmdarg|.
 The expression must take care of deleting the file after printing it.
 When there is an error, the expression must return a non-zero number.
 If there is no error, return zero or an empty string.
-
-The default for MacVim is to convert the PostScript file to PDF and then open
-it in Preview.app where you can print from there, using the function
-`macvim#PreviewConvertPostScript()`.
-
-The default for other non MS-Windows or VMS systems is to simply use "lpr" to
-print the file: >
+The default for non MS-Windows or VMS systems is to simply use "lpr" to print
+the file: >

    system('lpr' .. (&printdevice == '' ? '' : ' -P' .. &printdevice)
 	.. ' ' .. v:fname_in) .. delete(v:fname_in) + v:shell_error
@@ -1277,7 +1277,7 @@ The .NET CLI compiler outputs both errors and warnings by default. The output
 may be limited to include only errors, by setting the g:dotnet_errors_only
 variable to |v:true|.

-The associated project name is included in each error and warning. To suppress
+The associated project name is included in each error and warning. To supress
 the project name, set the g:dotnet_show_project_file variable to |v:false|.

 Example: limit output to only display errors, and suppress the project name: >
@@ -1,4 +1,4 @@
-*recover.txt*   For Vim version 9.0.  Last change: 2023 Apr 22
+*recover.txt*   For Vim version 9.0.  Last change: 2020 Aug 15


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -176,7 +176,7 @@ the recover command:
 :rec[over]! [file]	Like ":recover", but any changes in the current
 			buffer are lost.

-						*E312* *E309* *E310* *E1364*
+							*E312* *E309* *E310*
 Vim has some intelligence about what to do if the swap file is corrupt in
 some way.  If Vim has doubt about what it found, it will give an error
 message and insert lines with "???" in the text.  If you see an error message
@@ -65,7 +65,7 @@ The following command line arguments are available:
 				below).  The name used will be uppercase.
 								*--remote-send*
   --remote-send {keys}		Send {keys} to server and exit.  The {keys}
-				are not mapped.  Special key names are
+   				are not mapped.  Special key names are
 				recognized, e.g., "<CR>" results in a CR
 				character.
 								*--remote-expr*
@@ -1,4 +1,4 @@
-*repeat.txt*    For Vim version 9.0.  Last change: 2023 May 26
+*repeat.txt*    For Vim version 9.0.  Last change: 2022 Sep 22


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -65,7 +65,7 @@ Using the underscore after `:d` avoids clobbering registers or the clipboard.
 This also makes it faster.

 Instead of the '/' which surrounds the {pattern}, you can use any other
-single byte character, but not an alphabetic character, '\', '"', '|' or '!'.
+single byte character, but not an alphabetic character, '\', '"' or '|'.
 This is useful if you want to include a '/' in the search pattern or
 replacement string.

@@ -267,7 +267,7 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 			When [where] is omitted only 'runtimepath' is used.
 			Other values:
 				START	search under "start" in 'packpath'
-				OPT	search under "opt" in 'packpath'
+				OPT 	search under "opt" in 'packpath'
 				PACK	search under "start" and "opt" in
 					'packpath'
 				ALL	first use 'runtimepath', then search
@@ -308,8 +308,8 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 			'runtimepath'.

 			If the filetype detection was not enabled yet (this
-			is usually done with a `syntax enable` or `filetype on`
-			command in your .vimrc file), this will also look
+			is usually done with a "syntax enable" or "filetype
+			on" command in your .vimrc file), this will also look
 			for "{name}/ftdetect/*.vim" files.

 			When the optional ! is added no plugin files or
@@ -423,7 +423,6 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 			after resolving symbolic links got sourced with
 			another name the other script is after "->".  E.g.
 			"20->22" means script 20 was sourced as script 22.
-			Also see `getscriptinfo()`.
 			{not available when compiled without the |+eval|
 			feature}

@@ -730,15 +729,15 @@ up-to-date easily, but it requires a program like "git" to be available.
 You can do both, github can automatically create an archive for a release.

 Your directory layout would be like this:
-   start/foobar/plugin/foo.vim		" always loaded, defines commands
-   start/foobar/plugin/bar.vim		" always loaded, defines commands
-   start/foobar/autoload/foo.vim	" loaded when foo command used
-   start/foobar/doc/foo.txt		" help for foo.vim
-   start/foobar/doc/tags		" help tags
-   opt/fooextra/plugin/extra.vim	" optional plugin, defines commands
-   opt/fooextra/autoload/extra.vim	" loaded when extra command used
-   opt/fooextra/doc/extra.txt		" help for extra.vim
-   opt/fooextra/doc/tags		" help tags
+   start/foobar/plugin/foo.vim    	" always loaded, defines commands
+   start/foobar/plugin/bar.vim    	" always loaded, defines commands
+   start/foobar/autoload/foo.vim  	" loaded when foo command used
+   start/foobar/doc/foo.txt       	" help for foo.vim
+   start/foobar/doc/tags          	" help tags
+   opt/fooextra/plugin/extra.vim  	" optional plugin, defines commands
+   opt/fooextra/autoload/extra.vim  	" loaded when extra command used
+   opt/fooextra/doc/extra.txt  	        " help for extra.vim
+   opt/fooextra/doc/tags  	        " help tags

 This allows for the user to do: >
 	mkdir ~/.vim/pack
@@ -1148,10 +1147,9 @@ long you take to respond to the input() prompt is irrelevant.
 Profiling should give a good indication of where time is spent, but keep in
 mind there are various things that may clobber the results:

- The accuracy of the time measured depends on the gettimeofday(), or
-  clock_gettime if available, system function. The accuracy ranges from 1/100
-  second to nanoseconds. With clock_gettime the times are displayed in
-  nanoseconds, otherwise microseconds.  You can use `has("prof_nsec")`.
+- The accuracy of the time measured depends on the gettimeofday() system
+  function.  It may only be as accurate as 1/100 second, even though the times
+  are displayed in micro seconds.

 - Real elapsed time is measured, if other processes are busy they may cause
  delays at unpredictable moments.  You may want to run the profiling several
@@ -1,4 +1,4 @@
-*sign.txt*      For Vim version 9.0.  Last change: 2023 Feb 21
+*sign.txt*      For Vim version 9.0.  Last change: 2022 Dec 20


 		  VIM REFERENCE MANUAL    by Gordon Prieur
@@ -614,23 +614,23 @@ sign_placelist({list})
 		|sign_place()| function.  The {list} argument specifies the
 		List of signs to place. Each list item is a dict with the
 		following sign attributes:
-		    buffer	Buffer name or number. For the accepted
+		    buffer	buffer name or number. For the accepted
 				values, see |bufname()|.
-		    group	Sign group. {group} functions as a namespace
+		    group	sign group. {group} functions as a namespace
 				for {id}, thus two groups can use the same
 				IDs. If not specified or set to an empty
 				string, then the global group is used.   See
 				|sign-group| for more information.
-		    id		Sign identifier. If not specified or zero,
+		    id		sign identifier. If not specified or zero,
 				then a new unique identifier is allocated.
 				Otherwise the specified number is used. See
 				|sign-identifier| for more information.
-		    lnum	Line number in the buffer where the sign is to
+		    lnum	line number in the buffer where the sign is to
 				be placed. For the accepted values, see
 				|line()|.
-		    name	Name of the sign to place. See |sign_define()|
-				for more information.
-		    priority	Priority of the sign. When multiple signs are
+		    name	name of the sign to place. See |sign_define()|
+		    		for more information.
+		    priority	priority of the sign. When multiple signs are
 				placed on a line, the sign with the highest
 				priority is used. If not specified, the
 				default value of 10 is used. See
@@ -1,4 +1,4 @@
-*spell.txt*	For Vim version 9.0.  Last change: 2023 May 25
+*spell.txt*	For Vim version 9.0.  Last change: 2020 Aug 15


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -122,7 +122,7 @@ zuG			Undo |zW| and |zG|, remove the word from the internal
 			list, like with |zW|.

 							*:spellra* *:spellrare*
-:[count]spellra[re] {word}
+:[count]spellr[are] {word}
 			Add {word} as a rare word to 'spellfile', similar to
 			|zw|.  Without count the first name is used, with
 			a count of two the second entry, etc.
@@ -135,7 +135,7 @@ zuG			Undo |zW| and |zG|, remove the word from the internal
 		nnoremap z/  :exe ':spellrare! ' .. expand('<cWORD>')<CR>
 <			|:spellundo|, |zuw|, or |zuW| can be used to undo this.

-:spellra[re]! {word}	Add {word} as a rare word to the internal word
+:spellr[rare]! {word}	Add {word} as a rare word to the internal word
 			list, similar to |zW|.

 :[count]spellu[ndo] {word}				*:spellu* *:spellundo*
@@ -216,8 +216,7 @@ line may be postponed.  Use |CTRL-L| when needed.  Also see |set-spc-auto| for
 how it can be set automatically when 'spelllang' is set.

 The 'spelloptions' option has a few more flags that influence the way spell
-checking works.  For example, "camel" splits CamelCased words so that each
-part of the word is spell-checked separately.
+checking works.

 Vim counts the number of times a good word is encountered.  This is used to
 sort the suggestions: words that have been seen before get a small bonus,
@@ -1,4 +1,4 @@
-*sponsor.txt*   For Vim version 9.0.  Last change: 2023 Mar 24
+*sponsor.txt*   For Vim version 9.0.  Last change: 2022 May 26


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -20,12 +20,6 @@ For the most recent information about sponsoring look on the Vim web site:

 More explanations can be found in the |sponsor-faq|.

-SPONSOR MACVIM DEVELOPMENT				*macvim-sponsor*
-
-If you would like to support MacVim development itself, visit:
-
-	https://github.com/sponsors/macvim-dev
-

 REGISTERED VIM USER						*register*

@@ -64,7 +58,7 @@ But only if you enable this on your account page.
 HOW TO SEND MONEY						*send-money*

 Credit card	Through PayPal, see the PayPal site for information:
-			https://www.paypal.com/
+			https://www.paypal.com/en_US/mrb/pal=XAC62PML3GF8Q
 		The e-mail address for sending sponsorship money is:
 			donate@vim.org
 		The e-mail address for Vim registration is:
@@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 9.0.  Last change: 2023 May 30
+*starting.txt*  For Vim version 9.0.  Last change: 2022 Nov 30


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -792,11 +792,9 @@ accordingly.  Vim proceeds in this order:

 2. Process the arguments
 	The options and file names from the command that start Vim are
-	inspected.
+	inspected.  Buffers are created for all files (but not loaded yet).
 	The |-V| argument can be used to display or log what happens next,
 	useful for debugging the initializations.
-	The |--cmd| arguments are executed.
-	Buffers are created for all files (but not loaded yet).

 3. Execute Ex commands, from environment variables and/or files
 	An environment variable is read as one Ex command line, where multiple
@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 9.0.  Last change: 2023 Apr 24
+*syntax.txt*	For Vim version 9.0.  Last change: 2022 Dec 26


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -214,10 +214,10 @@ A syntax group name is to be used for syntax items that match the same kind of
 thing.  These are then linked to a highlight group that specifies the color.
 A syntax group name doesn't specify any color or attributes itself.

-The name for a highlight or syntax group must consist of ASCII letters,
-digits, underscores, dots, or hyphens.  As a regexp: "[a-zA-Z0-9_.-]*".
-However, Vim does not give an error when using other characters.  The maximum
-length of a group name is about 200 bytes.  *E1249*
+The name for a highlight or syntax group must consist of ASCII letters, digits
+and the underscore.  As a regexp: "[a-zA-Z0-9_]*".  However, Vim does not give
+an error when using other characters.  The maximum length of a group name is
+about 200 bytes.  *E1249*

 To be able to allow each user to pick their favorite set of colors, there must
 be preferred names for highlight groups that are common for many languages.
@@ -596,7 +596,7 @@ The method used to prevent copying in the generated page depends on the value
 of |g:html_use_input_for_pc|.

 						    *g:html_use_input_for_pc*
-Default: "none"
+Default: "fallback"
 If |g:html_prevent_copy| is non-empty, then:

 When "all", read-only <input> elements are used in place of normal text for
@@ -1307,32 +1307,18 @@ When not set 4 is used.

 DOSBATCH				*dosbatch.vim* *ft-dosbatch-syntax*

-Select the set of Windows Command interpreter extensions that should be
-supported with the variable dosbatch_cmdextversion.  For versions of Windows
-NT (before Windows 2000) this should have the value of 1.  For Windows 2000
-and later it should be 2.
+There is one option with highlighting DOS batch files.	This covers new
+extensions to the Command Interpreter introduced with Windows 2000 and
+is controlled by the variable dosbatch_cmdextversion.  For Windows NT
+this should have the value 1, and for Windows 2000 it should be 2.
 Select the version you want with the following line: >

   :let dosbatch_cmdextversion = 1

 If this variable is not defined it defaults to a value of 2 to support
-Windows 2000 and later.
+Windows 2000.

-The original MS-DOS supports an idiom of using a double colon (::) as an
-alternative way to enter a comment line.  This idiom can be used with the
-current Windows Command Interpreter, but it can lead to problems when used
-inside ( ... ) command blocks.  You can find a discussion about this on
-Stack Overflow -
-
-https://stackoverflow.com/questions/12407800/which-comment-style-should-i-use-in-batch-files
-
-To allow the use of the :: idiom for comments in the Windows Command
-Interpreter or working with MS-DOS bat files, set the
-dosbatch_colons_comment variable to anything: >
-
-   :let dosbatch_colons_comment = 1
-
-There is an option that covers whether *.btm files should be detected as type
+A second option covers whether *.btm files should be detected as type
 "dosbatch" (MS-DOS batch files) or type "btm" (4DOS batch files).  The latter
 is used by default.  You may select the former with the following line: >

@@ -1579,10 +1565,9 @@ example, FORM files, use this in your startup vimrc: >

 FORTH						*forth.vim* *ft-forth-syntax*

-Files matching "*.f" could be Fortran or Forth and those matching "*.fs" could
-be F# or Forth.  If the automatic detection doesn't work for you, or you don't
-edit F# or Fortran at all, use this in your startup vimrc: >
-   :let filetype_f  = "forth"
+Files matching "*.fs" could be F# or Forth.  If the automatic detection
+doesn't work for you, or you don't edit F# at all, use this in your
+startup vimrc: >
   :let filetype_fs = "forth"


@@ -2160,11 +2145,11 @@ should set a variable in your .vimrc file: >
 	:let lpc_syntax_for_c = 1

 If it doesn't work properly for some particular C or LPC files, use a
-modeline.  For a LPC file: >
+modeline.  For a LPC file:

 	// vim:set ft=lpc:

-For a C file that is recognized as LPC: >
+For a C file that is recognized as LPC:

 	// vim:set ft=c:

@@ -2196,7 +2181,7 @@ LUA						*lua.vim* *ft-lua-syntax*
 The Lua syntax file can be used for versions 4.0, 5.0, 5.1 and 5.2 (5.2 is
 the default). You can select one of these versions using the global variables
 lua_version and lua_subversion. For example, to activate Lua
-5.1 syntax highlighting, set the variables like this: >
+5.1 syntax highlighting, set the variables like this:

 	:let lua_version = 5
 	:let lua_subversion = 1
@@ -2792,25 +2777,17 @@ For highlighted doctests and code inside: >
 	:let python_no_doctest_highlight = 1
 or >
 	:let python_no_doctest_code_highlight = 1
-The first option implies the second one.
+(first option implies second one).

 For highlighted trailing whitespace and mix of spaces and tabs: >
 	:let python_space_error_highlight = 1

-If you want all possible Python highlighting:
+If you want all possible Python highlighting (the same as setting the
+preceding last option and unsetting all other ones): >
 	:let python_highlight_all = 1
-This has the same effect as setting python_space_error_highlight and
-unsetting all the other ones.
-
-If you use Python 2 or straddling code (Python 2 and 3 compatible),
-you can enforce the use of an older syntax file with support for
-Python 2 and up to Python 3.5. >
-	:let python_use_python2_syntax = 1
-This option will exclude all modern Python 3.6 or higher features.
-
-Note: Only existence of these options matters, not their value.
-      You can replace 1 above with anything.

+Note: Only existence of these options matter, not their value. You can replace
+      1 above with anything.

 QUAKE						*quake.vim* *ft-quake-syntax*

@@ -3749,12 +3726,11 @@ The syntax script for zsh allows for syntax-based folding: >
 Vim understands three types of syntax items:

 1. Keyword
-   It can only contain keyword characters, according to the characters
-   specified with |:syn-iskeyword| or the 'iskeyword' option.  It cannot
-   contain other syntax items.  It will only match with a complete word (there
-   are no keyword characters before or after the match).  The keyword "if"
-   would match in "if(a=b)", but not in "ifdef x", because "(" is not a
-   keyword character and "d" is.
+   It can only contain keyword characters, according to the 'iskeyword'
+   option.  It cannot contain other syntax items.  It will only match with a
+   complete word (there are no keyword characters before or after the match).
+   The keyword "if" would match in "if(a=b)", but not in "ifdef x", because
+   "(" is not a keyword character and "d" is.

 2. Match
   This is a match with a single regexp pattern.
@@ -3860,7 +3836,7 @@ SYNTAX ISKEYWORD SETTING				*:syn-iskeyword*

 	clear:		Syntax specific iskeyword setting is disabled and the
 			buffer-local 'iskeyword' setting is used.
-	{option}	Set the syntax 'iskeyword' option to a new value.
+	{option}       	Set the syntax 'iskeyword' option to a new value.

 	Example: >
  :syntax iskeyword @,48-57,192-255,$,_
@@ -4930,7 +4906,7 @@ is mostly used, because it looks better.
 ==============================================================================
 13. Colorschemes				*color-schemes*

-In the next section you can find information about individual highlight groups
+In the next section you can find information about indivisual highlight groups
 and how to specify colors for them.  Most likely you want to just select a set
 of colors by using the `:colorscheme` command, for example: >

@@ -5307,7 +5283,7 @@ guisp={color-name}					*highlight-guisp*
 	(guisp) color to use in the GUI.  "guisp" is used for undercurl and
 	strikethrough.
 	There are a few special names:
-		NONE		no color (transparent)		*E1361*
+		NONE		no color (transparent)
 		bg		use normal background color
 		background	use normal background color
 		fg		use normal foreground color
@@ -5380,7 +5356,7 @@ ColorColumn	Used for the columns set with 'colorcolumn'.
 							*hl-Conceal*
 Conceal		Placeholder characters substituted for concealed
 		text (see 'conceallevel').
-						*hl-Cursor* *hl-lCursor*
+							*hl-Cursor*
 Cursor		Character under the cursor.
 lCursor		Character under the cursor when |language-mapping|
 		is used (see 'guicursor').
@@ -5454,14 +5430,6 @@ Normal		Normal text.
 Pmenu		Popup menu: Normal item.
 							*hl-PmenuSel*
 PmenuSel	Popup menu: Selected item.
-							*hl-PmenuKind*
-PmenuKind	Popup menu: Normal item "kind".
-							*hl-PmenuKindSel*
-PmenuKindSel	Popup menu: Selected item "kind".
-							*hl-PmenuExtra*
-PmenuExtra	Popup menu: Normal item "extra text".
-							*hl-PmenuExtraSel*
-PmenuExtraSel	Popup menu: Selected item "extra text".
 							*hl-PmenuSbar*
 PmenuSbar	Popup menu: Scrollbar.
 							*hl-PmenuThumb*
@@ -580,8 +580,6 @@ $quote	eval.txt	/*$quote*
 'nobreakindent'	options.txt	/*'nobreakindent'*
 'nobri'	options.txt	/*'nobri'*
 'nobuflisted'	options.txt	/*'nobuflisted'*
-'nocdh'	options.txt	/*'nocdh'*
-'nocdhome'	options.txt	/*'nocdhome'*
 'nocf'	options.txt	/*'nocf'*
 'noci'	options.txt	/*'noci'*
 'nocin'	options.txt	/*'nocin'*
@@ -696,8 +694,6 @@ $quote	eval.txt	/*$quote*
 'nomousef'	options.txt	/*'nomousef'*
 'nomousefocus'	options.txt	/*'nomousefocus'*
 'nomousehide'	options.txt	/*'nomousehide'*
-'nomousemev'	options.txt	/*'nomousemev'*
-'nomousemoveevent'	options.txt	/*'nomousemoveevent'*
 'nonu'	options.txt	/*'nonu'*
 'nonumber'	options.txt	/*'nonumber'*
 'noodev'	options.txt	/*'noodev'*
@@ -767,12 +763,10 @@ $quote	eval.txt	/*$quote*
 'notbidi'	options.txt	/*'notbidi'*
 'notbs'	options.txt	/*'notbs'*
 'notermbidi'	options.txt	/*'notermbidi'*
-'notermguicolors'	options.txt	/*'notermguicolors'*
 'noterse'	options.txt	/*'noterse'*
 'notextauto'	options.txt	/*'notextauto'*
 'notextmode'	options.txt	/*'notextmode'*
 'notf'	options.txt	/*'notf'*
-'notgc'	options.txt	/*'notgc'*
 'notgst'	options.txt	/*'notgst'*
 'notildeop'	options.txt	/*'notildeop'*
 'notimeout'	options.txt	/*'notimeout'*
@@ -1456,7 +1450,6 @@ $quote	eval.txt	/*$quote*
 +python/dyn	various.txt	/*+python\/dyn*
 +python3	various.txt	/*+python3*
 +python3/dyn	various.txt	/*+python3\/dyn*
-+python3/dyn-stable	various.txt	/*+python3\/dyn-stable*
 +quickfix	various.txt	/*+quickfix*
 +reltime	various.txt	/*+reltime*
 +rightleft	various.txt	/*+rightleft*
@@ -2108,12 +2101,10 @@ $quote	eval.txt	/*$quote*
 :Continue	terminal.txt	/*:Continue*
 :DiffOrig	diff.txt	/*:DiffOrig*
 :DoMatchParen	pi_paren.txt	/*:DoMatchParen*
-:Down	terminal.txt	/*:Down*
 :Evaluate	terminal.txt	/*:Evaluate*
 :Explore	pi_netrw.txt	/*:Explore*
 :Finish	terminal.txt	/*:Finish*
 :FixBeginfigs	ft_mp.txt	/*:FixBeginfigs*
-:Frame	terminal.txt	/*:Frame*
 :GLVS	pi_getscript.txt	/*:GLVS*
 :Gdb	terminal.txt	/*:Gdb*
 :GetLatestVimScripts_dat	pi_getscript.txt	/*:GetLatestVimScripts_dat*
@@ -2166,9 +2157,7 @@ $quote	eval.txt	/*$quote*
 :TermdebugCommand	terminal.txt	/*:TermdebugCommand*
 :Texplore	pi_netrw.txt	/*:Texplore*
 :Until	terminal.txt	/*:Until*
-:Up	terminal.txt	/*:Up*
 :UseVimball	pi_vimball.txt	/*:UseVimball*
-:Var	terminal.txt	/*:Var*
 :Vexplore	pi_netrw.txt	/*:Vexplore*
 :VimballList	pi_vimball.txt	/*:VimballList*
 :Vimuntar	pi_tar.txt	/*:Vimuntar*
@@ -2487,7 +2476,6 @@ $quote	eval.txt	/*$quote*
 :diffupdate	diff.txt	/*:diffupdate*
 :dig	digraph.txt	/*:dig*
 :digraphs	digraph.txt	/*:digraphs*
-:dis	change.txt	/*:dis*
 :disa	vim9.txt	/*:disa*
 :disassemble	vim9.txt	/*:disassemble*
 :display	change.txt	/*:display*
@@ -2881,7 +2869,6 @@ $quote	eval.txt	/*$quote*
 :map-commands	map.txt	/*:map-commands*
 :map-expression	map.txt	/*:map-expression*
 :map-local	map.txt	/*:map-local*
-:map-meta-keys	map.txt	/*:map-meta-keys*
 :map-modes	map.txt	/*:map-modes*
 :map-nowait	map.txt	/*:map-nowait*
 :map-operator	map.txt	/*:map-operator*
@@ -3595,7 +3582,6 @@ $quote	eval.txt	/*$quote*
 :wall	editing.txt	/*:wall*
 :wh	eval.txt	/*:wh*
 :while	eval.txt	/*:while*
-:wi	gui.txt	/*:wi*
 :win	gui.txt	/*:win*
 :winc	windows.txt	/*:winc*
 :wincmd	windows.txt	/*:wincmd*
@@ -3908,8 +3894,7 @@ BeOS	os_beos.txt	/*BeOS*
 Blob	eval.txt	/*Blob*
 Blobs	eval.txt	/*Blobs*
 Boolean	eval.txt	/*Boolean*
-Bram	version9.txt	/*Bram*
-Bram-Moolenaar	version9.txt	/*Bram-Moolenaar*
+Bram	intro.txt	/*Bram*
 BufAdd	autocmd.txt	/*BufAdd*
 BufCreate	autocmd.txt	/*BufCreate*
 BufDelete	autocmd.txt	/*BufDelete*
@@ -4215,6 +4200,7 @@ E1104	vim9.txt	/*E1104*
 E1105	vim9.txt	/*E1105*
 E1106	vim9.txt	/*E1106*
 E1107	eval.txt	/*E1107*
+E1108	vim9.txt	/*E1108*
 E1109	builtin.txt	/*E1109*
 E111	eval.txt	/*E111*
 E1110	builtin.txt	/*E1110*
@@ -4246,6 +4232,7 @@ E1133	vim9.txt	/*E1133*
 E1134	vim9.txt	/*E1134*
 E1135	eval.txt	/*E1135*
 E1136	map.txt	/*E1136*
+E1137	map.txt	/*E1137*
 E1138	eval.txt	/*E1138*
 E1139	vim9.txt	/*E1139*
 E114	eval.txt	/*E114*
@@ -4373,6 +4360,7 @@ E125	userfunc.txt	/*E125*
 E1250	vim9.txt	/*E1250*
 E1251	vim9.txt	/*E1251*
 E1252	vim9.txt	/*E1252*
+E1253	vim9.txt	/*E1253*
 E1254	vim9.txt	/*E1254*
 E1255	map.txt	/*E1255*
 E1256	vim9.txt	/*E1256*
@@ -4490,22 +4478,10 @@ E1357	vim9class.txt	/*E1357*
 E1358	vim9class.txt	/*E1358*
 E1359	vim9class.txt	/*E1359*
 E136	starting.txt	/*E136*
-E1360	vim9class.txt	/*E1360*
-E1361	syntax.txt	/*E1361*
-E1362	vim9class.txt	/*E1362*
-E1363	vim9class.txt	/*E1363*
-E1364	recover.txt	/*E1364*
 E137	starting.txt	/*E137*
-E1370	vim9class.txt	/*E1370*
 E138	starting.txt	/*E138*
 E139	message.txt	/*E139*
 E140	message.txt	/*E140*
-E1400	builtin.txt	/*E1400*
-E1401	builtin.txt	/*E1401*
-E1402	builtin.txt	/*E1402*
-E1403	builtin.txt	/*E1403*
-E1404	builtin.txt	/*E1404*
-E1405	builtin.txt	/*E1405*
 E141	message.txt	/*E141*
 E142	message.txt	/*E142*
 E143	autocmd.txt	/*E143*
@@ -4720,7 +4696,6 @@ E337	gui.txt	/*E337*
 E338	editing.txt	/*E338*
 E339	message.txt	/*E339*
 E34	various.txt	/*E34*
-E340	message.txt	/*E340*
 E341	message.txt	/*E341*
 E342	message.txt	/*E342*
 E343	options.txt	/*E343*
@@ -5347,6 +5322,7 @@ E919	repeat.txt	/*E919*
 E92	message.txt	/*E92*
 E920	channel.txt	/*E920*
 E921	channel.txt	/*E921*
+E922	builtin.txt	/*E922*
 E923	builtin.txt	/*E923*
 E924	quickfix.txt	/*E924*
 E925	quickfix.txt	/*E925*
@@ -5522,7 +5498,6 @@ MMDialogsTrackPwd	gui_mac.txt	/*MMDialogsTrackPwd*
 MMDisableLaunchAnimation	gui_mac.txt	/*MMDisableLaunchAnimation*
 MMFontPreserveLineSpacing	gui_mac.txt	/*MMFontPreserveLineSpacing*
 MMFullScreenFadeTime	gui_mac.txt	/*MMFullScreenFadeTime*
-MMLoginShell	gui_mac.txt	/*MMLoginShell*
 MMLoginShellArgument	gui_mac.txt	/*MMLoginShellArgument*
 MMLoginShellCommand	gui_mac.txt	/*MMLoginShellCommand*
 MMNativeFullScreen	gui_mac.txt	/*MMNativeFullScreen*
@@ -5533,7 +5508,6 @@ MMNonNativeFullScreenShowMenu	gui_mac.txt	/*MMNonNativeFullScreenShowMenu*
 MMRendererClipToRow	gui_mac.txt	/*MMRendererClipToRow*
 MMShareFindPboard	gui_mac.txt	/*MMShareFindPboard*
 MMShowAddTabButton	gui_mac.txt	/*MMShowAddTabButton*
-MMShowWhatsNewOnStartup	gui_mac.txt	/*MMShowWhatsNewOnStartup*
 MMSmoothResize	gui_mac.txt	/*MMSmoothResize*
 MMTabMaxWidth	gui_mac.txt	/*MMTabMaxWidth*
 MMTabMinWidth	gui_mac.txt	/*MMTabMinWidth*
@@ -5562,7 +5536,7 @@ Mark	motion.txt	/*Mark*
 MenuPopup	autocmd.txt	/*MenuPopup*
 MiNT	os_mint.txt	/*MiNT*
 ModeChanged	autocmd.txt	/*ModeChanged*
-Moolenaar	version9.txt	/*Moolenaar*
+Moolenaar	intro.txt	/*Moolenaar*
 MorphOS	os_amiga.txt	/*MorphOS*
 Motif	gui_x11.txt	/*Motif*
 Myspell	spell.txt	/*Myspell*
@@ -5944,7 +5918,6 @@ abandon	editing.txt	/*abandon*
 abbreviations	map.txt	/*abbreviations*
 abel.vim	syntax.txt	/*abel.vim*
 abs()	builtin.txt	/*abs()*
-abstract-method	vim9class.txt	/*abstract-method*
 acos()	builtin.txt	/*acos()*
 active-buffer	windows.txt	/*active-buffer*
 ada#Create_Tags()	ft_ada.txt	/*ada#Create_Tags()*
@@ -6865,7 +6838,6 @@ err_mode	channel.txt	/*err_mode*
 err_modifiable	channel.txt	/*err_modifiable*
 err_msg	channel.txt	/*err_msg*
 err_name	channel.txt	/*err_name*
-err_teapot()	builtin.txt	/*err_teapot()*
 err_timeout	channel.txt	/*err_timeout*
 errmsg-variable	eval.txt	/*errmsg-variable*
 error-file-format	quickfix.txt	/*error-file-format*
@@ -7539,6 +7511,7 @@ g:netrw_localmkdiropt	pi_netrw.txt	/*g:netrw_localmkdiropt*
 g:netrw_localmovecmd	pi_netrw.txt	/*g:netrw_localmovecmd*
 g:netrw_localmovecmdopt	pi_netrw.txt	/*g:netrw_localmovecmdopt*
 g:netrw_localrmdir	pi_netrw.txt	/*g:netrw_localrmdir*
+g:netrw_localrmdiropt	pi_netrw.txt	/*g:netrw_localrmdiropt*
 g:netrw_maxfilenamelen	pi_netrw.txt	/*g:netrw_maxfilenamelen*
 g:netrw_menu	pi_netrw.txt	/*g:netrw_menu*
 g:netrw_mkdir_cmd	pi_netrw.txt	/*g:netrw_mkdir_cmd*
@@ -7584,7 +7557,6 @@ g:netrw_wiw	pi_netrw.txt	/*g:netrw_wiw*
 g:netrw_xstrlen	pi_netrw.txt	/*g:netrw_xstrlen*
 g:no_mail_maps	filetype.txt	/*g:no_mail_maps*
 g:no_plugin_maps	filetype.txt	/*g:no_plugin_maps*
-g:plugin_exec	filetype.txt	/*g:plugin_exec*
 g:rust_bang_comment_leader	ft_rust.txt	/*g:rust_bang_comment_leader*
 g:rust_conceal	ft_rust.txt	/*g:rust_conceal*
 g:rust_conceal_mod_path	ft_rust.txt	/*g:rust_conceal_mod_path*
@@ -7651,7 +7623,6 @@ g<LeftMouse>	tagsrch.txt	/*g<LeftMouse>*
 g<RightMouse>	tagsrch.txt	/*g<RightMouse>*
 g<Tab>	tabpage.txt	/*g<Tab>*
 g<Up>	motion.txt	/*g<Up>*
-g<kEnd>	motion.txt	/*g<kEnd>*
 g?	change.txt	/*g?*
 g??	change.txt	/*g??*
 g?g?	change.txt	/*g?g?*
@@ -7996,10 +7967,6 @@ hl-MoreMsg	syntax.txt	/*hl-MoreMsg*
 hl-NonText	syntax.txt	/*hl-NonText*
 hl-Normal	syntax.txt	/*hl-Normal*
 hl-Pmenu	syntax.txt	/*hl-Pmenu*
-hl-PmenuExtra	syntax.txt	/*hl-PmenuExtra*
-hl-PmenuExtraSel	syntax.txt	/*hl-PmenuExtraSel*
-hl-PmenuKind	syntax.txt	/*hl-PmenuKind*
-hl-PmenuKindSel	syntax.txt	/*hl-PmenuKindSel*
 hl-PmenuSbar	syntax.txt	/*hl-PmenuSbar*
 hl-PmenuSel	syntax.txt	/*hl-PmenuSel*
 hl-PmenuThumb	syntax.txt	/*hl-PmenuThumb*
@@ -8024,8 +7991,6 @@ hl-TabLineFill	syntax.txt	/*hl-TabLineFill*
 hl-TabLineSel	syntax.txt	/*hl-TabLineSel*
 hl-Terminal	syntax.txt	/*hl-Terminal*
 hl-Title	syntax.txt	/*hl-Title*
-hl-ToolbarButton	gui.txt	/*hl-ToolbarButton*
-hl-ToolbarLine	gui.txt	/*hl-ToolbarLine*
 hl-Tooltip	syntax.txt	/*hl-Tooltip*
 hl-User1	syntax.txt	/*hl-User1*
 hl-User1..9	syntax.txt	/*hl-User1..9*
@@ -8037,7 +8002,6 @@ hl-WarningMsg	syntax.txt	/*hl-WarningMsg*
 hl-WildMenu	syntax.txt	/*hl-WildMenu*
 hl-debugBreakpoint	terminal.txt	/*hl-debugBreakpoint*
 hl-debugPC	terminal.txt	/*hl-debugPC*
-hl-lCursor	syntax.txt	/*hl-lCursor*
 hlID()	builtin.txt	/*hlID()*
 hlexists()	builtin.txt	/*hlexists()*
 hlget()	builtin.txt	/*hlget()*
@@ -8138,7 +8102,6 @@ i_CTRL-O	insert.txt	/*i_CTRL-O*
 i_CTRL-P	insert.txt	/*i_CTRL-P*
 i_CTRL-Q	insert.txt	/*i_CTRL-Q*
 i_CTRL-R	insert.txt	/*i_CTRL-R*
-i_CTRL-R_-	insert.txt	/*i_CTRL-R_-*
 i_CTRL-R_=	insert.txt	/*i_CTRL-R_=*
 i_CTRL-R_CTRL-O	insert.txt	/*i_CTRL-R_CTRL-O*
 i_CTRL-R_CTRL-P	insert.txt	/*i_CTRL-R_CTRL-P*
@@ -8277,12 +8240,10 @@ insertmode-variable	eval.txt	/*insertmode-variable*
 install	usr_90.txt	/*install*
 install-home	usr_90.txt	/*install-home*
 install-registry	gui_w32.txt	/*install-registry*
-instanceof()	builtin.txt	/*instanceof()*
 intel-itanium	syntax.txt	/*intel-itanium*
 intellimouse-wheel-problems	gui_w32.txt	/*intellimouse-wheel-problems*
 interactive-functions	usr_41.txt	/*interactive-functions*
 interfaces-5.2	version5.txt	/*interfaces-5.2*
-internal-error	message.txt	/*internal-error*
 internal-variables	eval.txt	/*internal-variables*
 internal-wordlist	spell.txt	/*internal-wordlist*
 internet	intro.txt	/*internet*
@@ -8449,7 +8410,6 @@ load-plugins	starting.txt	/*load-plugins*
 load-vim-script	repeat.txt	/*load-vim-script*
 local-additions	help.txt	/*local-additions*
 local-function	userfunc.txt	/*local-function*
-local-noglobal	options.txt	/*local-noglobal*
 local-options	options.txt	/*local-options*
 local-variable	eval.txt	/*local-variable*
 local-variables	userfunc.txt	/*local-variables*
@@ -8550,7 +8510,6 @@ macvim-services	gui_mac.txt	/*macvim-services*
 macvim-settings	gui_mac.txt	/*macvim-settings*
 macvim-shift-movement	gui_mac.txt	/*macvim-shift-movement*
 macvim-shortcuts	gui_mac.txt	/*macvim-shortcuts*
-macvim-sponsor	sponsor.txt	/*macvim-sponsor*
 macvim-start	gui_mac.txt	/*macvim-start*
 macvim-tablabel	gui_mac.txt	/*macvim-tablabel*
 macvim-todo	gui_mac.txt	/*macvim-todo*
@@ -9309,7 +9268,6 @@ plugin	usr_05.txt	/*plugin*
 plugin-details	filetype.txt	/*plugin-details*
 plugin-filetype	usr_51.txt	/*plugin-filetype*
 plugin-special	usr_51.txt	/*plugin-special*
-plugin_exec	filetype.txt	/*plugin_exec*
 plugin_name.txt	helphelp.txt	/*plugin_name.txt*
 pmbcs-option	print.txt	/*pmbcs-option*
 pmbfn-option	print.txt	/*pmbfn-option*
@@ -9391,7 +9349,6 @@ print-intro	print.txt	/*print-intro*
 print-options	print.txt	/*print-options*
 print.txt	print.txt	/*print.txt*
 printf()	builtin.txt	/*printf()*
-printf-$	builtin.txt	/*printf-$*
 printf-%	builtin.txt	/*printf-%*
 printf-B	builtin.txt	/*printf-B*
 printf-E	builtin.txt	/*printf-E*
@@ -9479,8 +9436,6 @@ python-path_hook	if_pyth.txt	/*python-path_hook*
 python-pyeval	if_pyth.txt	/*python-pyeval*
 python-range	if_pyth.txt	/*python-range*
 python-special-path	if_pyth.txt	/*python-special-path*
-python-stable	if_pyth.txt	/*python-stable*
-python-stable-abi	if_pyth.txt	/*python-stable-abi*
 python-strwidth	if_pyth.txt	/*python-strwidth*
 python-tabpage	if_pyth.txt	/*python-tabpage*
 python-tabpages	if_pyth.txt	/*python-tabpages*
@@ -9493,8 +9448,6 @@ python.vim	syntax.txt	/*python.vim*
 python2-directory	if_pyth.txt	/*python2-directory*
 python3	if_pyth.txt	/*python3*
 python3-directory	if_pyth.txt	/*python3-directory*
-python3-stable-abi	if_pyth.txt	/*python3-stable-abi*
-python3-version-variable	eval.txt	/*python3-version-variable*
 python_x	if_pyth.txt	/*python_x*
 python_x-special-comments	if_pyth.txt	/*python_x-special-comments*
 pythonx	if_pyth.txt	/*pythonx*
@@ -10078,7 +10031,6 @@ string	eval.txt	/*string*
 string()	builtin.txt	/*string()*
 string-functions	usr_41.txt	/*string-functions*
 string-match	builtin.txt	/*string-match*
-string-offset-encoding	eval.txt	/*string-offset-encoding*
 strlen()	builtin.txt	/*strlen()*
 strpart()	builtin.txt	/*strpart()*
 strpbrk()	builtin.txt	/*strpbrk()*
@@ -10088,7 +10040,6 @@ strridx()	builtin.txt	/*strridx()*
 strspn()	builtin.txt	/*strspn()*
 strstr()	builtin.txt	/*strstr()*
 strtrans()	builtin.txt	/*strtrans()*
-strutf16len()	builtin.txt	/*strutf16len()*
 strwidth()	builtin.txt	/*strwidth()*
 style-changes	develop.txt	/*style-changes*
 style-compiler	develop.txt	/*style-compiler*
@@ -10507,20 +10458,15 @@ termdebug-communication	terminal.txt	/*termdebug-communication*
 termdebug-customizing	terminal.txt	/*termdebug-customizing*
 termdebug-events	terminal.txt	/*termdebug-events*
 termdebug-example	terminal.txt	/*termdebug-example*
-termdebug-frames	terminal.txt	/*termdebug-frames*
 termdebug-prompt	terminal.txt	/*termdebug-prompt*
 termdebug-starting	terminal.txt	/*termdebug-starting*
 termdebug-stepping	terminal.txt	/*termdebug-stepping*
 termdebug-variables	terminal.txt	/*termdebug-variables*
 termdebug_disasm_window	terminal.txt	/*termdebug_disasm_window*
 termdebug_map_K	terminal.txt	/*termdebug_map_K*
-termdebug_map_minus	terminal.txt	/*termdebug_map_minus*
-termdebug_map_plus	terminal.txt	/*termdebug_map_plus*
 termdebug_popup	terminal.txt	/*termdebug_popup*
 termdebug_shortcuts	terminal.txt	/*termdebug_shortcuts*
-termdebug_signs	terminal.txt	/*termdebug_signs*
 termdebug_use_prompt	terminal.txt	/*termdebug_use_prompt*
-termdebug_variables_window	terminal.txt	/*termdebug_variables_window*
 termdebug_wide	terminal.txt	/*termdebug_wide*
 termdebug_winbar	terminal.txt	/*termdebug_winbar*
 terminal	terminal.txt	/*terminal*
@@ -10756,7 +10702,6 @@ utf-8	mbyte.txt	/*utf-8*
 utf-8-char-arg	mbyte.txt	/*utf-8-char-arg*
 utf-8-in-xwindows	mbyte.txt	/*utf-8-in-xwindows*
 utf-8-typing	mbyte.txt	/*utf-8-typing*
-utf16idx()	builtin.txt	/*utf16idx()*
 utf8	mbyte.txt	/*utf8*
 v	visual.txt	/*v*
 v:	eval.txt	/*v:*
@@ -10826,7 +10771,6 @@ v:prevcount	eval.txt	/*v:prevcount*
 v:profiling	eval.txt	/*v:profiling*
 v:progname	eval.txt	/*v:progname*
 v:progpath	eval.txt	/*v:progpath*
-v:python3_version	eval.txt	/*v:python3_version*
 v:register	eval.txt	/*v:register*
 v:scrollstart	eval.txt	/*v:scrollstart*
 v:searchforward	eval.txt	/*v:searchforward*
@@ -11083,7 +11027,6 @@ vim9-declaration	vim9.txt	/*vim9-declaration*
 vim9-declarations	usr_41.txt	/*vim9-declarations*
 vim9-differences	vim9.txt	/*vim9-differences*
 vim9-export	vim9.txt	/*vim9-export*
-vim9-false-true	vim9.txt	/*vim9-false-true*
 vim9-final	vim9.txt	/*vim9-final*
 vim9-function-defined-later	vim9.txt	/*vim9-function-defined-later*
 vim9-gotchas	vim9.txt	/*vim9-gotchas*
@@ -11101,7 +11044,6 @@ vim9-rationale	vim9.txt	/*vim9-rationale*
 vim9-reload	vim9.txt	/*vim9-reload*
 vim9-s-namespace	vim9.txt	/*vim9-s-namespace*
 vim9-scopes	vim9.txt	/*vim9-scopes*
-vim9-string-index	vim9.txt	/*vim9-string-index*
 vim9-types	vim9.txt	/*vim9-types*
 vim9-unpack-ignore	vim9.txt	/*vim9-unpack-ignore*
 vim9-user-command	vim9.txt	/*vim9-user-command*
@@ -1,4 +1,4 @@
-*tagsrch.txt*   For Vim version 9.0.  Last change: 2023 Feb 13
+*tagsrch.txt*   For Vim version 9.0.  Last change: 2020 Dec 19


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -98,7 +98,7 @@ The ignore-case matches are found when:
 - when 'tagcase' is "followscs" and 'ignorecase' is on or the 'smartcase'
  option is on and the pattern does not contain an upper case character
 - when 'tagcase' is "ignore"
- when 'tagcase' is "smart" and the pattern does not contain an upper case
+- when 'tagcase' is "smart" and the patter does not contain an upper case
  character

 Note that using ignore-case tag searching disables binary searching in the
@@ -1,4 +1,4 @@
-*terminal.txt*	For Vim version 9.0.  Last change: 2023 Aug 23
+*terminal.txt*	For Vim version 9.0.  Last change: 2022 Nov 10


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,15 +30,14 @@ If the result is "1" you have it.
      Using the client-server feature		|terminal-client-server|
 4. Remote testing			|terminal-testing|
 5. Diffing screen dumps			|terminal-diff|
-      Writing a screen dump test for Vim	|terminal-dumptest|
-      Creating a screen dump			|terminal-screendump|
-      Comparing screen dumps			|terminal-diffscreendump|
+      Writing a screen dump test for Vim  	|terminal-dumptest|
+      Creating a screen dump		  	|terminal-screendump|
+      Comparing screen dumps		  	|terminal-diffscreendump|
 6. Debugging				|terminal-debug|
      Starting					|termdebug-starting|
      Example session				|termdebug-example|
      Stepping through code			|termdebug-stepping|
      Inspecting variables			|termdebug-variables|
-      Navigating stack frames			|termdebug-frames|
      Other commands				|termdebug-commands|
      Events					|termdebug-events|
      Prompt mode				|termdebug-prompt|
@@ -241,7 +240,7 @@ Command syntax ~
 					in a session file.
 			++shell		Instead of executing {command}
 					directly, use a shell, like with
-					`:!command`		*E279*
+					`:!command` 		*E279*
 					{only works on Unix and MS-Windows}
 			++kill={how}	When trying to close the terminal
 					window kill the job with {how}.  See
@@ -1377,18 +1376,6 @@ This is similar to using "print" in the gdb window.
 You can usually shorten `:Evaluate` to `:Ev`.


-Navigating stack frames ~
-				*termdebug-frames* *:Frame* *:Up* *:Down*
- `:Frame` [frame]	select frame [frame], which is a frame number,
-			address, or function name (default: current frame)
- `:Up` [count]		go up [count] frames (default: 1; the frame that
-			called the current)
- `+`			same (see |termdebug_map_plus| to disable)
- `:Down` [count]	go down [count] frames (default: 1; the frame called
-			by the current)
- `-`			same (see |termdebug_map_minus| to disable)
-
-
 Other commands ~
 							*termdebug-commands*
 *:Gdb*	     jump to the gdb window
@@ -1397,9 +1384,6 @@ Other commands ~
 	     isn't one
 *:Asm*	     jump to the window with the disassembly, create it if there
 	     isn't one
- *:Var*	     jump to the window with the local and argument variables,
-             create it if there isn't one. This window updates whenever the
-             program is stopped

 Events ~
 							*termdebug-events*
@@ -1462,37 +1446,20 @@ If there is no g:termdebug_config you can use: >
 	let g:termdebug_use_prompt = 1
 <
 						*termdebug_map_K*
-The K key is normally mapped to |:Evaluate|. If you do not want this use: >
+The K key is normally mapped to :Evaluate. If you do not want this use: >
 	let g:termdebug_config['map_K'] = 0
 If there is no g:termdebug_config you can use: >
 	let g:termdebug_map_K = 0
-<
-						*termdebug_map_minus*
-The - key is normally mapped to |:Down|. If you do not want this use: >
-	let g:termdebug_config['map_minus'] = 0
-<
-						*termdebug_map_plus*
-The + key is normally mapped to |:Up|. If you do not want this use: >
-	let g:termdebug_config['map_plus'] = 0
 <
 						*termdebug_disasm_window*
-If you want the Asm window shown by default, set the "disasm_window" flag to
-1.  The "disasm_window_height" entry can be used to set the window height: >
+If you want the Asm window shown by default, set the flag to 1.
+the "disasm_window_height" entry can be used to set the window height: >
 	let g:termdebug_config['disasm_window'] = 1
 	let g:termdebug_config['disasm_window_height'] = 15
 If there is no g:termdebug_config you can use: >
 	let g:termdebug_disasm_window = 15
 Any value greater than 1 will set the Asm window height to that value.

-						*termdebug_variables_window*
-If you want the Var window shown by default, set the flag to 1.
-the "variables_window_height" entry can be used to set the window height: >
-	let g:termdebug_config['variables_window'] = 1
-	let g:termdebug_config['variables_window_height'] = 15
-If there is no g:termdebug_config you can use: >
-	let g:termdebug_variables_window = 15
-Any value greater than 1 will set the Var window height to that value.
-
 Communication ~
 						*termdebug-communication*
 There is another, hidden, buffer, which is used for Vim to communicate with
@@ -1574,20 +1541,6 @@ If there is no g:termdebug_config you can use: >
 	let g:termdebug_popup = 0


-Change default signs ~
-							*termdebug_signs*
-Termdebug uses the last two characters of the breakpoint ID in the
-signcolumn to represent breakpoints. For example, breakpoint ID 133
-will be displayed as `33`.
-
-If you want to customize the breakpoint signs: >
-	let g:termdebug_config['sign'] = '>>'
-If there is no g:terminal_config yet you can use: >
-	let g:termdebug_config = {'sign': '>>'}
-
-After this, breakpoints will be displayed as `>>` in the signcolumn.
-
-
 Window toolbar ~
 							*termdebug_winbar*
 By default the Termdebug plugin creates a window toolbar if the mouse is
--- a/Show More
+++ b/Show More