patch 9.0.1570: some tests are slow

Problem:    Some tests are slow.
Solution:   Make a few test cases faster.

.appveyor.yml

@@ -1,10 +1,31 @@
 version: "{build}"
 
+image: Visual Studio 2015
+
 skip_tags: true
 
 environment:
   matrix:
     - FEATURE: HUGE
+  
+    # Alternate environments, not used right now.  2022 is a lot slower.
+    #
+    # - job_name: VS-2015
+    #   appveyor_build_worker_image: Visual Studio 2015
+    #   FEATURE: HUGE
+
+    # - job_name: VS-2017
+    #   appveyor_build_worker_image: Visual Studio 2017
+    #   FEATURE: HUGE
+
+    # - job_name: VS-2019
+    #   appveyor_build_worker_image: Visual Studio 2019
+    #   FEATURE: HUGE
+
+    # - job_name: VS-2022
+    #   appveyor_build_worker_image: Visual Studio 2022
+    #   FEATURE: HUGE
+
 # disabled
 #    - FEATURE: TINY
 #    - FEATURE: NORMAL
@@ -14,19 +35,19 @@ matrix:
   fast_finish: true
 
 before_build:
-  # Use Visual Studio 2015 compiler tools (default is 2012)
-  - '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64'
+  - call ver
+  - ci\appveyor.bat install
 
 build_script:
-  - ci/appveyor.bat
+  - ci\appveyor.bat build
 
 test_script:
-  - cd src/testdir
-    # Testing with MSVC gvim
-  - path C:\Python35-x64;%PATH%
-  - nmake -f Make_mvc.mak VIMPROG=..\gvim
-  - nmake -f Make_mvc.mak clean
-    # Testing with MSVC console version
-  - nmake -f Make_mvc.mak VIMPROG=..\vim
+  - ci\appveyor.bat test
+
+artifacts:
+  - path: src/vim.exe
+    name: vim
+  - path: src/gvim.exe
+    name: gvim
 
 # vim: sw=2 sts=2 et ts=8 sr

.cirrus.yml

@@ -36,7 +36,7 @@ macos_task:
   timeout_in: 20m
   install_script:
     - brew update
-    - brew install gettext libtool
+    - brew install gettext libtool diffutils
   build_script:
     - NPROC=$(getconf _NPROCESSORS_ONLN)
     - ./configure --with-features=${FEATURES}

.github/CODEOWNERS

@@ -29,17 +29,24 @@ 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
@@ -51,6 +58,7 @@ runtime/compiler/dartanalyser.vim	@dkearns
 runtime/compiler/dartdevc.vim		@dkearns
 runtime/compiler/dartdoc.vim		@dkearns
 runtime/compiler/dartfmt.vim		@dkearns
+runtime/compiler/dotnet.vim		@nickspoons
 runtime/compiler/eruby.vim		@dkearns
 runtime/compiler/fbc.vim		@dkearns
 runtime/compiler/gawk.vim		@dkearns
@@ -181,6 +189,7 @@ runtime/ftplugin/python.vim		@tpict
 runtime/ftplugin/qb64.vim		@dkearns
 runtime/ftplugin/r.vim			@jalvesaq
 runtime/ftplugin/racket.vim		@benknoble
+runtime/ftplugin/readline.vim		@dkearns
 runtime/ftplugin/rhelp.vim		@jalvesaq
 runtime/ftplugin/rmd.vim		@jalvesaq
 runtime/ftplugin/rnoweb.vim		@jalvesaq
@@ -213,6 +222,7 @@ 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
@@ -251,6 +261,7 @@ runtime/indent/julia.vim		@carlobaldassi
 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
@@ -297,6 +308,7 @@ runtime/plugin/tarPlugin.vim		@cecamp
 runtime/plugin/vimballPlugin.vim	@cecamp
 runtime/plugin/zipPlugin.vim		@cecamp
 runtime/plugin/manpager.vim		@Konfekt
+runtime/syntax/shared/hgcommitDiff.vim		@vegerot
 runtime/syntax/abaqus.vim		@costerwi
 runtime/syntax/aidl.vim			@dpelle
 runtime/syntax/amiga.vim		@cecamp
@@ -331,6 +343,7 @@ runtime/syntax/dot.vim			@mmottl
 runtime/syntax/doxygen.vim		@frogonwheels
 runtime/syntax/dtd.vim			@chrisbra
 runtime/syntax/dts.vim			@zonque
+runtime/syntax/editorconfig.vim		@gpanders
 runtime/syntax/eiffel.vim		@jocelyn
 runtime/syntax/elmfilt.vim		@cecamp
 runtime/syntax/erlang.vim		@hcs42
@@ -363,6 +376,7 @@ 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/hollywood.vim		@sodero
 runtime/syntax/html.vim			@dkearns
 runtime/syntax/i3config.vim		@hiqua
@@ -371,6 +385,7 @@ runtime/syntax/indent.vim		@dkearns
 runtime/syntax/j.vim			@glts
 runtime/syntax/jargon.vim		@h3xx
 runtime/syntax/java.vim			@fleiner
+runtime/syntax/javascript.vim		@fleiner
 runtime/syntax/jsonc.vim		@izhakjakov
 runtime/syntax/julia.vim		@carlobaldassi
 runtime/syntax/kconfig.vim		@chrisbra
@@ -378,6 +393,7 @@ 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
@@ -394,6 +410,7 @@ runtime/syntax/n1ql.vim			@pr3d4t0r
 runtime/syntax/netrw.vim		@cecamp
 runtime/syntax/nginx.vim		@chr4
 runtime/syntax/ninja.vim		@nico
+runtime/syntax/nix.vim			@equill
 runtime/syntax/nroff.vim		@jmarshall
 runtime/syntax/nsis.vim			@k-takata
 runtime/syntax/openvpn.vim		@ObserverOfTime
@@ -464,6 +481,7 @@ runtime/syntax/vdf.vim			@ObserverOfTime
 runtime/syntax/vim.vim			@cecamp
 runtime/syntax/vroom.vim		@dbarnett
 runtime/syntax/wast.vim			@rhysd
+runtime/syntax/wdl.vim			@zenmatic
 runtime/syntax/wget.vim			@dkearns
 runtime/syntax/wget2.vim		@dkearns
 runtime/syntax/xbl.vim			@dkearns

.github/workflows/ci.yml

@@ -17,10 +17,12 @@ permissions:
 
 jobs:
   linux:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     env:
       CC: ${{ matrix.compiler }}
+      GCC_VER: 13
+      CLANG_VER: 16
       TEST: test
       SRCDIR: ./src
       LEAK_CFLAGS: -DEXITFREE
@@ -81,37 +83,36 @@ jobs:
               lcov \
               libcanberra-dev \
               libperl-dev \
-              python-dev \
+              python2-dev \
               python3-dev \
-              liblua5.3-dev \
-              lua5.3 \
+              liblua5.4-dev \
+              lua5.4 \
               ruby-dev \
               tcl-dev \
               cscope \
               libsodium-dev \
             )
           fi
-          sudo apt update && sudo apt install -y "${PKGS[@]}"
+          sudo apt-get update && sudo apt-get install -y "${PKGS[@]}"
 
-      - name: Install gcc-11
+      - name: Install gcc-${{ env.GCC_VER }}
         if:  matrix.compiler == 'gcc'
         run: |
-          sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-          sudo apt install -y gcc-11
-          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100
-          sudo update-alternatives --set gcc /usr/bin/gcc-11
+          sudo apt-get install -y gcc-${{ env.GCC_VER }}
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ env.GCC_VER }} 100
+          sudo update-alternatives --set gcc /usr/bin/gcc-${{ env.GCC_VER }}
 
-      - name: Install clang-15
+      - name: Install clang-${{ env.CLANG_VER }}
         if: matrix.compiler == 'clang'
         run: |
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
           . /etc/lsb-release
-          sudo add-apt-repository -y "deb http://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME}-15 main"
-          sudo apt install -y clang-15 llvm-15
-          sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-15 100
-          sudo update-alternatives --set clang /usr/bin/clang-15
-          sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-15 100
-          sudo update-alternatives --install /usr/bin/asan_symbolize asan_symbolize /usr/bin/asan_symbolize-15 100
+          sudo add-apt-repository -y "deb http://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME}-${{ env.CLANG_VER }} main"
+          sudo apt-get install -y clang-${{ env.CLANG_VER }} llvm-${{ env.CLANG_VER }}
+          sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${{ env.CLANG_VER }} 100
+          sudo update-alternatives --set clang /usr/bin/clang-${{ env.CLANG_VER }}
+          sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-${{ env.CLANG_VER }} 100
+          sudo update-alternatives --install /usr/bin/asan_symbolize asan_symbolize /usr/bin/asan_symbolize-${{ env.CLANG_VER }} 100
 
       - name: Set up environment
         run: |
@@ -121,7 +122,6 @@ jobs:
           (
           echo "LINUX_VERSION=$(uname -r)"
           echo "NPROC=$(getconf _NPROCESSORS_ONLN)"
-          echo "SND_DUMMY_DIR=${HOME}/snd-dummy"
           echo "TMPDIR=${{ runner.temp }}"
 
           case "${{ matrix.features }}" in
@@ -174,23 +174,21 @@ jobs:
           sudo usermod -a -G audio "${USER}"
           sudo bash ci/setup-xvfb.sh
 
-      # FIXME: Temporarily disabled because of build errors
-      #- name: Cache snd-dummy
-      #  uses: actions/cache@v3
-      #  with:
-      #    path: ${{ env.SND_DUMMY_DIR }}
-      #    key: linux-${{ env.LINUX_VERSION }}-snd-dummy
-
-      #- name: Set up snd-dummy
-      #  run: |
-      #    if [[ ! -e ${SND_DUMMY_DIR}/snd-dummy.ko ]]; then
-      #      bash ci/build-snd-dummy.sh
-      #    fi
-      #    cd "${SND_DUMMY_DIR}"
-      #    sudo insmod soundcore.ko
-      #    sudo insmod snd.ko
-      #    sudo insmod snd-pcm.ko
-      #    sudo insmod snd-dummy.ko
+      - name: Set up snd-dummy
+        if: (!(contains(matrix.extra, 'unittests') || contains(matrix.extra, 'vimtags')))
+        env:
+          DEST_DIR: ${{ env.TMPDIR }}/linux-modules-extra-${{ env.LINUX_VERSION }}
+        run: |
+          cd /lib/modules/${{ env.LINUX_VERSION }}
+          if apt-cache show linux-modules-extra-${{ env.LINUX_VERSION }} >/dev/null 2>&1 ; then
+          sudo apt-get install -d -y linux-modules-extra-${{ env.LINUX_VERSION }}
+          sudo dpkg -x /var/cache/apt/archives/linux-modules-extra-${{ env.LINUX_VERSION }}*.deb "${DEST_DIR}"
+          tar -cvC "${DEST_DIR}"/lib/modules/${{ env.LINUX_VERSION }} kernel/sound | sudo tar -x
+          sudo depmod --verbose
+          sudo modprobe --verbose snd-dummy
+          else
+          echo "Module " linux-modules-extra-${{ env.LINUX_VERSION }} "doesn't seem to exist, continue anyway"; exit 0
+          fi
 
       - name: Check autoconf
         if: contains(matrix.extra, 'unittests')
@@ -233,19 +231,6 @@ jobs:
           do_test() { sg audio "sg $(id -gn) '$*'"; }
           do_test make ${SHADOWOPT} ${TEST}
 
-      # - name: Coveralls
-      #   if: matrix.coverage && github.event_name != 'pull_request'
-      #   env:
-      #     COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
-      #     COVERALLS_PARALLEL: true
-      #     TRAVIS_JOB_ID: ${{ github.run_id }}
-      #   run: |
-      #     sudo apt-get install -y python3-setuptools python3-wheel
-      #     sudo -H pip3 install pip -U
-      #     # needed for https support for coveralls building cffi only works with gcc, not with clang
-      #     CC=gcc pip3 install --user cpp-coveralls pyopenssl ndg-httpsclient pyasn1
-      #     ~/.local/bin/coveralls -b "${SRCDIR}" -x .xs -e "${SRCDIR}"/if_perl.c -e "${SRCDIR}"/xxd -e "${SRCDIR}"/libvterm --encodings utf-8
-
       - name: Generate gcov files
         if: matrix.coverage
         run: |
@@ -254,7 +239,7 @@ jobs:
 
       - name: Codecov
         if: matrix.coverage
-        uses: codecov/codecov-action@v3.1.1
+        uses: codecov/codecov-action@v3
         with:
           flags: linux,${{ matrix.features }}-${{ matrix.compiler }}-${{ matrix.extra }}
 
@@ -266,19 +251,6 @@ jobs:
             false # in order to fail a job
           done
 
-  # coveralls:
-  #   runs-on: ubuntu-20.04
-  #
-  #   needs: linux
-  #   if: always() && github.event_name != 'pull_request'
-  #
-  #   steps:
-  #     - name: Parallel finished
-  #       env:
-  #         COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
-  #       run: |
-  #         curl -k "https://coveralls.io/webhook?repo_token=${COVERALLS_REPO_TOKEN}" -d "payload[build_num]=${GITHUB_RUN_ID}&payload[status]=done"
-
   macos:
     runs-on: macos-latest
 
@@ -300,8 +272,6 @@ jobs:
 
       - name: Install packages
         if: matrix.features == 'huge'
-        env:
-          HOMEBREW_NO_AUTO_UPDATE: 1
         run: |
           brew install lua
           echo "LUA_PREFIX=/usr/local" >> $GITHUB_ENV
@@ -373,11 +343,17 @@ jobs:
       PYTHON_VER_DOT: '2.7'
       PYTHON_DIR: 'C:\Python27'
       # Python 3
-      PYTHON3_VER: 310
-      PYTHON3_VER_DOT: '3.10'
+      PYTHON3_VER: 311
+      PYTHON3_VER_DOT: '3.11'
       # Other dependencies
       # winpty
       WINPTY_URL: https://github.com/rprichard/winpty/releases/download/0.4.3/winpty-0.4.3-msvc2015.zip
+      # libsodium
+      SODIUM_VER: '1.0.18'
+      SODIUM_MSVC_URL: https://download.libsodium.org/libsodium/releases/libsodium-%SODIUM_VER%-stable-msvc.zip
+      SODIUM_MSVC_VER: v143
+      SODIUM_MINGW_URL: https://download.libsodium.org/libsodium/releases/libsodium-%SODIUM_VER%-stable-mingw.tar.gz
+      SODIUM_MINGW_VER: 23
       # Escape sequences
       COL_RED: "\x1b[31m"
       COL_GREEN: "\x1b[32m"
@@ -407,7 +383,7 @@ jobs:
 
           git config --global core.autocrlf input
 
-          if [ "${{ matrix.arch }}" = "x64" ]; then
+          if ${{ matrix.arch == 'x64' }}; then
             cygreg=registry
             pyreg=
             echo "VCARCH=amd64" >> $GITHUB_ENV
@@ -424,8 +400,8 @@ jobs:
           fi
 
           echo "VCVARSALL=$(vswhere -products \* -latest -property installationPath)\\VC\\Auxiliary\\Build\\vcvarsall.bat" >> $GITHUB_ENV
-          if [ "${{ matrix.features }}" != "TINY" ]; then
-            if [ "${{ matrix.arch }}" = "x86" ]; then
+          if ${{ matrix.features != 'TINY' }}; then
+            if ${{ matrix.arch == 'x86' }}; then
               choco install python2 --no-progress --forcex86
             else
               choco install python2 --no-progress
@@ -434,6 +410,15 @@ jobs:
           python3_dir=$(cat "/proc/$cygreg/HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${PYTHON3_VER_DOT}$pyreg/InstallPath/@")
           echo "PYTHON3_DIR=$python3_dir" >> $GITHUB_ENV
 
+          if ${{ matrix.toolchain == 'msvc' }}; then
+            SODIUM_DIR=D:\\libsodium
+            echo "SODIUM_LIB=${SODIUM_DIR}\\${{ matrix.arch == 'x64' && 'x64' || 'Win32' }}\\Release\\${SODIUM_MSVC_VER}\\dynamic" >> $GITHUB_ENV
+          else
+            SODIUM_DIR=D:\\libsodium-win${{ matrix.arch == 'x64' && '64' || '32' }}
+            echo "SODIUM_LIB=${SODIUM_DIR}\\bin" >> $GITHUB_ENV
+          fi
+          echo "SODIUM_DIR=${SODIUM_DIR}" >> $GITHUB_ENV
+
       - uses: msys2/setup-msys2@v2
         if: matrix.toolchain == 'mingw'
         with:
@@ -453,6 +438,7 @@ jobs:
           type NUL > urls.txt
           echo %LUA_RELEASE%>> urls.txt
           echo %WINPTY_URL%>> urls.txt
+          echo %SODIUM_VER%>> urls.txt
 
       - name: Cache downloaded files
         uses: actions/cache@v3
@@ -476,6 +462,16 @@ jobs:
           copy /Y D:\winpty\%WARCH%\bin\winpty.dll        src\winpty%BITS%.dll
           copy /Y D:\winpty\%WARCH%\bin\winpty-agent.exe  src\
 
+          echo %COL_GREEN%Download libsodium%COL_RESET%
+          if "${{ matrix.toolchain }}"=="msvc" (
+            call :downloadfile %SODIUM_MSVC_URL% downloads\libsodium.zip
+            7z x -y downloads\libsodium.zip -oD:\ > nul || exit 1
+          ) else (
+            call :downloadfile %SODIUM_MINGW_URL% downloads\libsodium.tar.gz
+            7z x -y downloads\libsodium.tar.gz -so | 7z x -si -ttar -oD:\ > nul || exit 1
+            mklink %SODIUM_LIB%\libsodium.dll %SODIUM_LIB%\libsodium-%SODIUM_MINGW_VER%.dll
+          )
+
           goto :eof
 
           :downloadfile
@@ -506,7 +502,8 @@ jobs:
               GUI=%GUI% IME=yes ICONV=yes VIMDLL=${{ matrix.VIMDLL }} ^
               DYNAMIC_LUA=yes LUA=%LUA_DIR% ^
               DYNAMIC_PYTHON=yes PYTHON=%PYTHON_DIR% ^
-              DYNAMIC_PYTHON3=yes PYTHON3=%PYTHON3_DIR%
+              DYNAMIC_PYTHON3=yes PYTHON3=%PYTHON3_DIR% ^
+              DYNAMIC_SODIUM=yes SODIUM=%SODIUM_DIR%
           ) else (
             nmake -nologo -f Make_mvc.mak ^
               FEATURES=${{ matrix.features }} ^
@@ -530,6 +527,7 @@ jobs:
               DYNAMIC_LUA=yes LUA=${LUA_DIR_SLASH} \
               DYNAMIC_PYTHON=yes PYTHON=${PYTHON_DIR} \
               DYNAMIC_PYTHON3=yes PYTHON3=${PYTHON3_DIR} \
+              DYNAMIC_SODIUM=yes SODIUM=${SODIUM_DIR} \
               STATIC_STDCPLUS=yes COVERAGE=${{ matrix.coverage }}
           else
             mingw32-make -f Make_ming.mak -j2 \
@@ -574,7 +572,7 @@ jobs:
         shell: cmd
         timeout-minutes: 15
         run: |
-          PATH %LUA_DIR%;C:\msys64\%MSYSTEM%\bin;%PATH%;%PYTHON3_DIR%
+          PATH %LUA_DIR%;C:\msys64\%MSYSTEM%\bin;%PATH%;%PYTHON3_DIR%;%SODIUM_LIB%
           call "%VCVARSALL%" %VCARCH%
 
           echo %COL_GREEN%Test gVim:%COL_RESET%
@@ -591,7 +589,7 @@ jobs:
         shell: cmd
         timeout-minutes: 15
         run: |
-          PATH %LUA_DIR%;C:\msys64\%MSYSTEM%\bin;%PATH%;%PYTHON3_DIR%
+          PATH %LUA_DIR%;C:\msys64\%MSYSTEM%\bin;%PATH%;%PYTHON3_DIR%;%SODIUM_LIB%
           call "%VCVARSALL%" %VCARCH%
 
           echo %COL_GREEN%Test Vim:%COL_RESET%
@@ -613,7 +611,7 @@ jobs:
 
       - name: Codecov
         if: matrix.coverage
-        uses: codecov/codecov-action@v3.1.1
+        uses: codecov/codecov-action@v3
         with:
           directory: src
           flags: windows,${{ matrix.toolchain }}-${{ matrix.arch }}-${{ matrix.features }}

.github/workflows/coverity.yml

@@ -9,7 +9,7 @@ permissions:
 
 jobs:
   scan:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     env:
       CC: gcc
@@ -32,15 +32,15 @@ jobs:
       - name: Install packages
         if: env.TOKEN
         run: |
-          sudo apt update && sudo apt install -y \
+          sudo apt-get update && sudo apt-get install -y \
             autoconf \
             gettext \
             libcanberra-dev \
             libperl-dev \
-            python-dev \
+            python2-dev \
             python3-dev \
-            liblua5.3-dev \
-            lua5.3 \
+            liblua5.4-dev \
+            lua5.4 \
             ruby-dev \
             tcl-dev \
             libgtk2.0-dev \

.gitignore

@@ -68,6 +68,7 @@ src/tags
 /GPATH
 /GTAGS
 /GRTAGS
+nsis/tags
 
 # Generated by "make test"
 src/po/*.ck

.hgignore

@@ -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,12 +46,15 @@ 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
@@ -62,6 +65,12 @@ 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
@@ -78,14 +87,16 @@ 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
@@ -95,5 +106,10 @@ src/shadow-*
 src/runtime
 src/pixmaps
 
-# other possible files build by tools
+# other files possibly created by tools
 src/cscope.out
+
+# Linter/language server files
+/.cache/clangd/
+/.ccls-cache/
+/compile_commands.json

Filelist

@@ -18,10 +18,8 @@ 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 \
@@ -710,6 +708,7 @@ 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 \

README.md

@@ -1,6 +1,6 @@
 [![Vim Logo](https://github.com/vim/vim/raw/master/runtime/vimlogo.gif)](https://www.vim.org)
 
-[![Github Build status](https://github.com/vim/vim/workflows/GitHub%20CI/badge.svg)](https://github.com/vim/vim/actions?query=workflow%3A%22GitHub+CI%22) [![Appveyor Build status](https://ci.appveyor.com/api/projects/status/o2qht2kjm02sgghk?svg=true)](https://ci.appveyor.com/project/chrisbra/vim) [![Cirrus Build Status](https://api.cirrus-ci.com/github/vim/vim.svg)](https://cirrus-ci.com/github/vim/vim) [![Coverage Status](https://codecov.io/gh/vim/vim/coverage.svg?branch=master)](https://codecov.io/gh/vim/vim?branch=master) [![Coverity Scan](https://scan.coverity.com/projects/241/badge.svg)](https://scan.coverity.com/projects/vim) [![Language Grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/vim/vim.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/vim/vim/context:cpp) [![Debian CI](https://badges.debian.net/badges/debian/testing/vim/version.svg)](https://buildd.debian.org/vim) [![Packages](https://repology.org/badge/tiny-repos/vim.svg)](https://repology.org/metapackage/vim) [![Fossies codespell report](https://fossies.org/linux/test/vim-master.tar.gz/codespell.svg)](https://fossies.org/linux/test/vim-master.tar.gz/codespell.html)
+[![Github Build status](https://github.com/vim/vim/workflows/GitHub%20CI/badge.svg)](https://github.com/vim/vim/actions?query=workflow%3A%22GitHub+CI%22) [![Appveyor Build status](https://ci.appveyor.com/api/projects/status/o2qht2kjm02sgghk?svg=true)](https://ci.appveyor.com/project/chrisbra/vim) [![Cirrus Build Status](https://api.cirrus-ci.com/github/vim/vim.svg)](https://cirrus-ci.com/github/vim/vim) [![Coverage Status](https://codecov.io/gh/vim/vim/coverage.svg?branch=master)](https://codecov.io/gh/vim/vim?branch=master) [![Coverity Scan](https://scan.coverity.com/projects/241/badge.svg)](https://scan.coverity.com/projects/vim) [![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>
 
@@ -101,7 +101,7 @@ for details (do `:help uganda` inside Vim).
 
 Summary of the license: There are no restrictions on using or distributing an
 unmodified copy of Vim.  Parts of Vim may also be distributed, but the license
-text must always be included.  For modified versions a few restrictions apply.
+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.
 
@@ -122,7 +122,7 @@ For the most recent information about sponsoring look on the Vim web site:
 
 ## Contributing ##
 
-If you would like to help making Vim better, see the
+If you would like to help make Vim better, see the
 [CONTRIBUTING.md](/CONTRIBUTING.md) file.
 
 

README.txt

@@ -84,7 +84,7 @@ encouraged to make a donation to help orphans in Uganda.  Please read the file
 
 Summary of the license: There are no restrictions on using or distributing an
 unmodified copy of Vim.  Parts of Vim may also be distributed, but the license
-text must always be included.  For modified versions a few restrictions apply.
+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.
 
@@ -106,7 +106,7 @@ For the most recent information about sponsoring look on the Vim web site:
 
 CONTRIBUTING
 
-If you would like to help making Vim better, see the CONTRIBUTING.md file.
+If you would like to help make Vim better, see the CONTRIBUTING.md file.
 
 
 INFORMATION

README_VIM9.md

@@ -2,18 +2,17 @@
 
 # What is Vim9?
 
-This is an experimental side of [Vim](https://github.com/vim/vim).
-It explores ways of making Vim script faster and better.
+This is a new syntax for Vim script that was introduced with Vim 9.0.
+It intends making Vim script faster and better.
 
-WARNING: The Vim9 script features are still under development, anything can
-break!
 
 # Why Vim9?
 
 ## 1. FASTER VIM SCRIPT
 
 The third item on the poll results of 2018, after popup windows and text
-properties, is faster Vim script.  So how do we do that?
+properties, both of which have been implemented, is faster Vim script.
+So how do we do that?
 
 I have been throwing some ideas around, and soon came to the conclusion
 that the current way functions are called and executed, with
@@ -53,7 +52,7 @@ we can gain, and also that Vim script can be faster than builtin
 interfaces.
 
 LuaJit is much faster at Lua-only instructions.  In practice the script would
-not do something useless as counting but change the text.  For example,
+not do something useless counting, but change the text.  For example,
 reindent all the lines:
 
 ``` vim

ci/appveyor.bat

@@ -1,9 +1,54 @@
 @echo off
 :: Batch file for building/testing Vim on AppVeyor
+set target=%1
 
 setlocal ENABLEDELAYEDEXPANSION
 cd %APPVEYOR_BUILD_FOLDER%
 
+:: Python3
+set PYTHON3_VER=311
+set PYTHON3_RELEASE=3.11.1
+set PYTHON3_URL=https://www.python.org/ftp/python/%PYTHON3_RELEASE%/python-%PYTHON3_RELEASE%-amd64.exe
+set PYTHON3_DIR=C:\python%PYTHON3_VER%-x64
+
+set "VSWHERE=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
+
+if exist "%VSWHERE%" (
+  for /f "usebackq delims=" %%i in (
+    `"%VSWHERE%" -products * -latest -property installationPath`
+  ) do (
+    set "VCVARSALL=%%i\VC\Auxiliary\Build\vcvarsall.bat"
+  )
+)
+
+if not exist "%VCVARSALL%" (
+  set "VCVARSALL=%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
+)
+call "%VCVARSALL%" x64
+
+goto %target%
+echo Unknown build target.
+exit 1
+
+:: ----------------------------------------------------------------------------
+:install
+@echo on
+if not exist downloads mkdir downloads
+
+:: Python 3
+if not exist %PYTHON3_DIR% (
+  call :downloadfile %PYTHON3_URL% downloads\python3.exe
+  cmd /c start /wait downloads\python3.exe /quiet TargetDir=%PYTHON3_DIR% ^
+      Include_pip=0 Include_tcltk=0 Include_test=0 Include_tools=0 ^
+      AssociateFiles=0 Shortcuts=0 Include_doc=0 Include_launcher=0 ^
+      InstallLauncherAllUsers=0
+)
+@echo off
+goto :eof
+
+:: ----------------------------------------------------------------------------
+:build
+
 cd src
 
 echo "Building MSVC 64bit console Version"
@@ -22,7 +67,7 @@ if "%FEATURE%" == "HUGE" (
     nmake -f Make_mvc.mak CPU=AMD64 ^
         OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no POSTSCRIPT=yes ^
         PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 ^
-        PYTHON3_VER=35 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python35-x64 ^
+        PYTHON3_VER=%PYTHON3_VER% DYNAMIC_PYTHON3=yes PYTHON3=%PYTHON3_DIR% ^
         FEATURES=%FEATURE%
 ) ELSE (
     nmake -f Make_mvc.mak CPU=AMD64 ^
@@ -39,4 +84,31 @@ echo "version output MSVC console"
 .\vim --version || exit 1
 echo "version output MSVC GUI"
 type ver_msvc.txt || exit 1
-cd ..
+
+goto :eof
+
+:: ----------------------------------------------------------------------------
+:test
+@echo on
+cd src/testdir
+:: Testing with MSVC gvim
+path %PYTHON3_DIR%;%PATH%
+nmake -f Make_mvc.mak VIMPROG=..\gvim
+nmake -f Make_mvc.mak clean
+:: Testing with MSVC console version
+nmake -f Make_mvc.mak VIMPROG=..\vim
+
+@echo off
+goto :eof
+
+:: ----------------------------------------------------------------------------
+:downloadfile
+:: call :downloadfile <URL> <localfile>
+if not exist %2 (
+	curl -f -L %1 -o %2
+)
+if ERRORLEVEL 1 (
+	rem Retry once.
+	curl -f -L %1 -o %2 || exit 1
+)
+@goto :eof

ci/build-snd-dummy.sh

@@ -1,19 +0,0 @@
-#!/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}"

ci/load-snd-dummy.sh

@@ -1,8 +0,0 @@
-#!/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

nsis/README.txt

@@ -29,12 +29,12 @@ To build the installable .exe:
 
 4.  Get a "diff.exe" program.  If you skip this the built-in diff will always
     be used (which is fine for most users).  If you do have your own
-    "diff.exe" put it in the "../.." directory (above the "vim82" directory,
+    "diff.exe" put it in the "../.." directory (above the "vim90" directory,
     it's the same for all Vim versions).
     You can find one in previous Vim versions or in this archive:
 		http://www.mossbayeng.com/~ron/vim/diffutils.tar.gz
 
-5   Also put winpty32.dll and winpty-agent.exe in "../.." (above the "vim82"
+5   Also put winpty32.dll and winpty-agent.exe in "../.." (above the "vim90"
     directory).  This is required for the terminal window.
 
 6.  Do "make uganda.nsis.txt" in runtime/doc.  This requires sed, you may have

nsis/gvim.nsi

@@ -228,6 +228,28 @@ 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
@@ -520,7 +542,8 @@ SectionGroup $(str_group_plugin) id_group_plugin
 	Section "$(str_section_plugin_home)" id_section_pluginhome
 		SectionIn 1 3
 
-		StrCpy $1 "$1 -create-directories home"
+		# use ShellExecAsUser below instead
+		# StrCpy $1 "$1 -create-directories home"
 	SectionEnd
 
 	Section "$(str_section_plugin_vim)" id_section_pluginvim
@@ -594,6 +617,13 @@ 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
 
 ##########################################################
@@ -1042,15 +1072,8 @@ SectionEnd
 SectionGroup "un.$(str_ungroup_plugin)" id_ungroup_plugin
 	Section /o "un.$(str_unsection_plugin_home)" id_unsection_plugin_home
 		# get the home dir
-		ReadEnvStr $0 "HOME"
-		${If} $0 == ""
-		  ReadEnvStr $0 "HOMEDRIVE"
-		  ReadEnvStr $1 "HOMEPATH"
-		  StrCpy $0 "$0$1"
-		  ${If} $0 == ""
-		    ReadEnvStr $0 "USERPROFILE"
-		  ${EndIf}
-		${EndIf}
+		Call un.GetHomeDir
+		Pop $0
 
 		${If} $0 != ""
 		  !insertmacro RemoveVimfiles $0

nsis/lang/italian.nsi

@@ -3,9 +3,8 @@
 # italian.nsi : Italian language strings for gvim NSIS installer.
 #
 # Locale ID    : 1040
-# Locale Name  : it
 # fileencoding : UTF-8
-# Author       : Antonio Colombo
+# Author       : Antonio Colombo, bovirus - revision: 12.05.2023
 
 !insertmacro MUI_LANGUAGE "Italian"
 
@@ -22,10 +21,10 @@ LangString ^UninstallCaption ${LANG_ITALIAN} \
 ##############################################################################
 
 #LangString str_dest_folder          ${LANG_ITALIAN} \
-#    "Cartella d'installazione (il nome deve finire con $\"vim$\")"
+#    "Cartella installazione (il percorso deve finire con $\"vim$\")"
 
 LangString str_show_readme          ${LANG_ITALIAN} \
-    "Visualizza README al termine dell'installazione"
+    "Visualizza file README a fine installazione"
 
 # Install types:
 LangString str_type_typical         ${LANG_ITALIAN} \
@@ -43,120 +42,119 @@ LangString str_type_full            ${LANG_ITALIAN} \
 ##############################################################################
 
 LangString str_section_old_ver      ${LANG_ITALIAN} \
-    "Disinstalla versione/i esistente/i"
+    "Disinstalla versioni esistenti"
 LangString str_desc_old_ver         ${LANG_ITALIAN} \
-    "Disinstalla versione/i esistente/i di Vim dal vostro sistema."
+    "Disinstalla versioni esistenti di Vim."
 
 LangString str_section_exe          ${LANG_ITALIAN} \
-    "Vim GUI e file di supporto"
+    "GUI e file supporto Vim"
 LangString str_desc_exe             ${LANG_ITALIAN} \
-    "Vim GUI programmi e file di supporto.  Questa componente è indispensabile."
+    "GUI programmi e file di supporto Vim.  Questa componente è indispensabile."
 
 LangString str_section_console      ${LANG_ITALIAN} \
-    "Vim console (vim.exe per MS-DOS)"
+    "Console Vim (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 directory \
+    "Crea file .bat per varianti di Vim nella cartella \
      di Windows, per utilizzo da riga di comando."
 
 LangString str_group_icons          ${LANG_ITALIAN} \
-    "Crea icone per Vim"
+    "Crea icone Vim"
 LangString str_desc_icons           ${LANG_ITALIAN} \
-    "Crea icone per Vim in vari posti, per rendere facile l'accesso."
+    "Crea icone Vim per rendere facile l'accesso."
 
 LangString str_section_desktop      ${LANG_ITALIAN} \
-    "Sul Desktop"
+    "Icone sul Desktop"
 LangString str_desc_desktop         ${LANG_ITALIAN} \
-    "Crea icone per programma gVim sul desktop."
+    "Crea icone programma gVim sul desktop."
 
 LangString str_section_start_menu   ${LANG_ITALIAN} \
-    "Nella cartella del menù START"
+    "Gruppo programmi menù START"
 LangString str_desc_start_menu      ${LANG_ITALIAN} \
-    "Aggiungi Vim alle cartelle del menù START."
+    "Aggiunge gruppo programmi al menù START."
 
 #LangString str_section_quick_launch ${LANG_ITALIAN} \
-#    "Nella barra di Avvio Veloce"
+#    "Barra avvio veloce"
 #LangString str_desc_quick_launch    ${LANG_ITALIAN} \
-#    "Aggiungi un puntatore a Vim nella barra di Avvio Veloce."
+#    "Aggiunge un collegamento 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} \
-    "Aggiungi Vim alla lista contestuale $\"Apri con...$\"."
+    "Aggiunge Vim al menu 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 alla lista contestuale $\"Apri con...$\" \
-#     per applicazioni a 32-bit."
+#    "Aggiungi Vim al menu 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} \
-#    "Aggiungi Vim alla lista contestuale $\"Apri con...$\" \
-#     per applicazioni a 64-bit."
+#    "Aggiunge Vim al menu contestuale $\"Apri con...$\" \
+#     per applicazioni a 64 bit."
 
 LangString str_section_vim_rc       ${LANG_ITALIAN} \
-    "Crea configurazione di default"
+    "Crea configurazione predefinita"
 LangString str_desc_vim_rc          ${LANG_ITALIAN} \
-    "Crea un file configurazione di default (_vimrc) se non \
-     ne esiste già uno."
+    "Crea, se non ne esiste già uno, un file configurazione predefinito (_vimrc) ."
 
 LangString str_group_plugin         ${LANG_ITALIAN} \
-    "Crea directory per plugin"
+    "Crea cartella plugin"
 LangString str_desc_plugin          ${LANG_ITALIAN} \
-    "Crea directory per plugin.  Consentono di aggiungere funzionalità \
-     a Vim mettendo file in una di queste directory."
+    "Crea cartella plugin.  I plugin consentono di aggiungere funzionalità \
+     a Vim copiando i relativi file in una di queste cartelle."
 
 LangString str_section_plugin_home  ${LANG_ITALIAN} \
-    "Private"
+    "Privata"
 LangString str_desc_plugin_home     ${LANG_ITALIAN} \
-    "Crea directory per plugin nella directory HOME."
+    "Crea cartella plugin nella cartella HOME."
 
 LangString str_section_plugin_vim   ${LANG_ITALIAN} \
-    "Condivise"
+    "Condivisa"
 LangString str_desc_plugin_vim      ${LANG_ITALIAN} \
-    "Crea directory per plugin nella directory di installazione di Vim \
+    "Crea cartella plugin nella cartella di installazione di Vim \
      per uso da parte di tutti gli utenti di questo sistema."
 
 LangString str_section_nls          ${LANG_ITALIAN} \
-    "Supporto Multilingue (NLS)"
+    "Supporto nativo lingua (NLS)"
 LangString str_desc_nls             ${LANG_ITALIAN} \
-    "Installa file per supportare messaggi in diverse lingue."
+    "Installa i file per il supporto nativo multilingua."
 
 LangString str_unsection_register   ${LANG_ITALIAN} \
-    "Togli Vim dal Registry"
+    "Rimuovi Vim dal registro"
 LangString str_desc_unregister      ${LANG_ITALIAN} \
-    "Togli Vim dal Registry di configurazione sistema."
+    "Rimuove Vim dal registro di configurazione sistema."
 
 LangString str_unsection_exe        ${LANG_ITALIAN} \
-    "Cancella programmi/file di supporto Vim"
+    "Elimina programmi/file di supporto Vim"
 LangString str_desc_rm_exe          ${LANG_ITALIAN} \
-    "Cancella tutti i programmi/file di supporto di Vim."
+    "Elimina tutti i programmi/file di supporto di Vim."
 
 LangString str_ungroup_plugin       ${LANG_ITALIAN} \
-    "Cancella le directory per plugin"
+    "Elimina cartelle plugin"
 LangString str_desc_rm_plugin       ${LANG_ITALIAN} \
-    "Cancella le directory per plugin se sono vuote."
+    "Elimina le cartelle plugin se sono vuote."
 
 LangString str_unsection_plugin_home ${LANG_ITALIAN} \
     "Private"
 LangString str_desc_rm_plugin_home  ${LANG_ITALIAN} \
-    "Cancella le directory per plugin dalla directory HOME."
+    "Elimina cartelle plugin nella cartella HOME."
 
 LangString str_unsection_plugin_vim ${LANG_ITALIAN} \
     "Condivise"
 LangString str_desc_rm_plugin_vim   ${LANG_ITALIAN} \
-    "Cancella le directory per plugin dalla directory di installazione di Vim."
+    "Elimina cartelle plugin nella cartella di installazione di Vim."
 
 LangString str_unsection_rootdir    ${LANG_ITALIAN} \
-    "Cancella la directory di installazione di Vim"
+    "Elimina la cartella di installazione di Vim"
 LangString str_desc_rm_rootdir      ${LANG_ITALIAN} \
-    "Cancella la directory di installazione di Vim. Contiene i vostri file di configurazione!"
+    "Elimina la cartella di installazione di Vim. Contiene i file di configurazione!"
 
 
 ##############################################################################
@@ -164,75 +162,74 @@ LangString str_desc_rm_rootdir      ${LANG_ITALIAN} \
 ##############################################################################
 
 #LangString str_msg_too_many_ver  ${LANG_ITALIAN} \
-#    "Trovate $vim_old_ver_count versioni di Vim sul vostro sistema.$\r$\n\
+#    "Rilevate nel sistema $vim_old_ver_count versioni di Vim.$\r$\n\
 #     Questo programma di installazione può gestire solo \
 #     ${VIM_MAX_OLD_VER} versioni.$\r$\n\
-#     Disinstallate qualche versione precedente e ricominciate."
+#     Disinstalla qualche versione precedente e ricomincia."
 
 #LangString str_msg_invalid_root  ${LANG_ITALIAN} \
-#    "Nome di directory di installazione non valida: $vim_install_root!$\r$\n\
+#    "Nome cartella di installazione non valida: $vim_install_root!$\r$\n\
 #     Dovrebbe terminare con $\"vim$\"."
 
 #LangString str_msg_bin_mismatch  ${LANG_ITALIAN} \
-#    "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$\"."
+#    "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$\"."
 
 #LangString str_msg_vim_running   ${LANG_ITALIAN} \
-#    "Vim ancora in esecuzione sul vostro sistema.$\r$\n\
-#     Chiudete tutte le sessioni attive di Vim per continuare."
+#    "Vim è ancora in esecuzione nel sistema.$\r$\n\
+#     Per continuare chiudi tutte le sessioni attive di Vim."
 
 #LangString str_msg_register_ole  ${LANG_ITALIAN} \
 #    "Tentativo di registrazione di Vim con OLE. \
-#     Non c'è messaggio che indica se è riuscito o no."
+#     Non ci sono messaggi che indicano se l'operazione è riuscita."
 
 #LangString str_msg_unreg_ole     ${LANG_ITALIAN} \
-#    "Tentativo di togliere dal Registry Vim con OLE. \
-#     Non c'è messaggio che indica se è riuscito o no."
+#    "Tentativo di rimozione di VIM dal registro via OLE. \
+#     Non ci sono messaggi che indicano se l'operazione è riuscita."
 
 #LangString str_msg_rm_start      ${LANG_ITALIAN} \
-#    "Disinstallazione della seguente versione:"
+#    "Disinstallazione della versione:"
 
 #LangString str_msg_rm_fail       ${LANG_ITALIAN} \
-#    "Disinstallazione non riuscita per la seguente versione:"
+#    "Disinstallazione non riuscita per la versione:"
 
 #LangString str_msg_no_rm_key     ${LANG_ITALIAN} \
-#    "Non riesco a trovare chiave di disinstallazione nel Registry."
+#    "Impossibile trovare chiave disinstallazione nel registro."
 
 #LangString str_msg_no_rm_reg     ${LANG_ITALIAN} \
-#    "Non riesco a trovare programma disinstallazione nel Registry."
+#    "Impossibile trovare programma disinstallazione nel registro."
 
 #LangString str_msg_no_rm_exe     ${LANG_ITALIAN} \
-#    "Non riesco a trovare programma disinstallazione."
+#    "Impossibile trovare programma disinstallazione."
 
 #LangString str_msg_rm_copy_fail  ${LANG_ITALIAN} \
-#    "Non riesco a copiare programma disinstallazione a una \
-#     directory temporanea."
+#    "Impossibile copiare il programma disinstallazione in una cartella temporanea."
 
 #LangString str_msg_rm_run_fail   ${LANG_ITALIAN} \
-#    "Non riesco a eseguire programma disinstallazione."
+#    "Impossibile eseguire programma disinstallazione."
 
 #LangString str_msg_abort_install ${LANG_ITALIAN} \
-#    "Il programma di disinstallazione verrà chiuso senza aver fatto nulla."
+#    "Il programma di disinstallazione verrà chiuso senza aver eseguito nessuna modifica."
 
 LangString str_msg_install_fail  ${LANG_ITALIAN} \
-    "Installazione non riuscita. Miglior fortuna alla prossima!"
+    "Installazione non riuscita."
 
 LangString str_msg_rm_exe_fail   ${LANG_ITALIAN} \
-    "Alcuni file in $0 non sono stati cancellati!$\r$\n\
-     Dovreste cancellarli voi stessi."
+    "Alcuni file in $0 non sono stati eliminati!$\r$\n\
+     I file vanno rimossi manualmente."
 
 #LangString str_msg_rm_root_fail  ${LANG_ITALIAN} \
-#    "AVVISO: Non posso cancellare $\"$vim_install_root$\", non è vuota!"
+#    "AVVISO: impossibile eliminare $\"$vim_install_root$\", non è vuota!"
 
 LangString str_msg_uninstalling  ${LANG_ITALIAN} \
-    "Sto disinstallando la vecchia versione..."
+    "Disinstallazione vecchia versione Vim..."
 
 LangString str_msg_registering   ${LANG_ITALIAN} \
-    "Sto aggiungendo Vim al Registry..."
+    "Aggiunta di Vim al registro..."
 
 LangString str_msg_unregistering ${LANG_ITALIAN} \
-    "Sto togliendo Vim dal Registry..."
+    "Rimozione di Vim dal registro..."
 
 
 ##############################################################################
@@ -242,37 +239,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 per funzionalità ulteriori, tastiera e mouse."
+    "Scelta impostazioni funzionalità aggiuntive, 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à ulteriori"
+    "&Compatibilità e funzionalità"
 LangString str_msg_compat_vi       ${LANG_ITALIAN} \
-    "Compatibile con Vi"
+    "Compatibile Vi"
 LangString str_msg_compat_vim      ${LANG_ITALIAN} \
     "Vim originale"
 LangString str_msg_compat_defaults ${LANG_ITALIAN} \
-    "Vim con alcune funzionalità ulteriori (esecuzione defaults.vim)"
+    "Vim con alcune funzionalità aggiuntive (defaults.vim)"
 LangString str_msg_compat_all      ${LANG_ITALIAN} \
-    "Vim con tutte le funzionalità ulteriori (esecuzione vimrc_example.vim) (Default)"
+    "Vim con tutte le funzionalità aggiuntive (vimrc_example.vim) (predefinito)"
 
 LangString str_msg_keymap_title   ${LANG_ITALIAN} \
-    " Mappature "
+    " Mappature tastiera "
 LangString str_msg_keymap_desc    ${LANG_ITALIAN} \
-    "&Rimappatura di alcuni tasti per Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc.)"
+    "&Rimappa alcuni tasti Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc.)"
 LangString str_msg_keymap_default ${LANG_ITALIAN} \
-    "Non effettuare rimappature di tasti (Default)"
+    "Non rimappare i tasti (predefinito)"
 LangString str_msg_keymap_windows ${LANG_ITALIAN} \
-    "Rimappare solo alcuni tasti"
+    "Rimappa solo alcuni tasti"
 
 LangString str_msg_mouse_title   ${LANG_ITALIAN} \
     " Mouse "
 LangString str_msg_mouse_desc    ${LANG_ITALIAN} \
-    "&Comportamento dei pulsanti destro e sinistro"
+    "&Comportamento pulsanti destro/sinistro"
 LangString str_msg_mouse_default ${LANG_ITALIAN} \
-    "Destro: popup menu, Sinistro: modalità visuale (Default)"
+    "Destro: menu popup, Sinistro: modalità visuale (predefinito)"
 LangString str_msg_mouse_windows ${LANG_ITALIAN} \
-    "Destro: popup menu, Sinistro: seleziona modalità (Windows)"
+    "Destro: menu popup, Sinistro: selezione modalità (Windows)"
 LangString str_msg_mouse_unix    ${LANG_ITALIAN} \
-    "Destro: estende selezione, Sinistro: modalità visuale (Unix)"
+    "Destro: estensione selezione, Sinistro: modalità visuale (Unix)"

runtime/autoload/dist/ft.vim

@@ -3,7 +3,7 @@ vim9script
 # Vim functions for file type detection
 #
 # Maintainer:	Bram Moolenaar <Bram@vim.org>
-# Last Change:	2022 Nov 24
+# Last Change:	2023 Apr 22
 
 # These functions are moved here from runtime/filetype.vim to make startup
 # faster.
@@ -307,14 +307,16 @@ export def FTfs()
   if exists("g:filetype_fs")
     exe "setf " .. g:filetype_fs
   else
-    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
+    var n = 1
+    while n < 100 && n <= line("$")
+      # Forth comments and colon definitions
+      if getline(n) =~ "^[:(\\\\] "
+        setf forth
+        return
+      endif
+      n += 1
+    endwhile
+    setf fsharp
   endif
 enddef
 
@@ -468,7 +470,7 @@ 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 l: number = nextnonblank(1)
   while l > 0 && l < line('$') && getline(l) =~ '^\s*%' # LambdaProlog comment
@@ -810,10 +812,13 @@ export def SQL()
 enddef
 
 # This function checks the first 25 lines of file extension "sc" to resolve
-# detection between scala and SuperCollider
+# detection between scala and SuperCollider.
+# NOTE: We don't check for 'Class : Method', as this can easily be confused
+# 	with valid Scala like `val x : Int = 3`. So we instead only rely on
+# 	checks that can't be confused.
 export def FTsc()
   for lnum in range(1, min([line("$"), 25]))
-    if getline(lnum) =~# '[A-Za-z0-9]*\s:\s[A-Za-z0-9]\|var\s<\|classvar\s<\|\^this.*\||\w*|\|+\s\w*\s{\|\*ar\s'
+    if getline(lnum) =~# 'var\s<\|classvar\s<\|\^this.*\||\w\+|\|+\s\w*\s{\|\*ar\s'
       setf supercollider
       return
     endif
@@ -1101,5 +1106,65 @@ 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
+
 # Uncomment this line to check for compilation errors early
 # defcompile

runtime/autoload/dist/script.vim

@@ -4,7 +4,7 @@ vim9script
 # Invoked from "scripts.vim" in 'runtimepath'
 #
 # Maintainer:	Bram Moolenaar <Bram@vim.org>
-# Last Change:	2022 Nov 24
+# Last Change:	2023 May 06
 
 export def DetectFiletype()
   var line1 = getline(1)
@@ -71,131 +71,131 @@ def DetectFromHashBang(firstline: string)
 
     # Z shell scripts
   elseif name =~ '^zsh\>'
-    set ft=zsh
+    setl ft=zsh
 
     # TCL scripts
   elseif name =~ '^\(tclsh\|wish\|expectk\|itclsh\|itkwish\)\>'
-    set ft=tcl
+    setl ft=tcl
 
     # Expect scripts
   elseif name =~ '^expect\>'
-    set ft=expect
+    setl ft=expect
 
     # Gnuplot scripts
   elseif name =~ '^gnuplot\>'
-    set ft=gnuplot
+    setl ft=gnuplot
 
     # Makefiles
   elseif name =~ 'make\>'
-    set ft=make
+    setl ft=make
 
     # Pike
   elseif name =~ '^pike\%(\>\|[0-9]\)'
-    set ft=pike
+    setl ft=pike
 
     # Lua
   elseif name =~ 'lua'
-    set ft=lua
+    setl ft=lua
 
     # Perl
   elseif name =~ 'perl'
-    set ft=perl
+    setl ft=perl
 
     # PHP
   elseif name =~ 'php'
-    set ft=php
+    setl ft=php
 
     # Python
   elseif name =~ 'python'
-    set ft=python
+    setl ft=python
 
     # Groovy
   elseif name =~ '^groovy\>'
-    set ft=groovy
+    setl ft=groovy
 
     # Raku
   elseif name =~ 'raku'
-    set ft=raku
+    setl ft=raku
 
     # Ruby
   elseif name =~ 'ruby'
-    set ft=ruby
+    setl ft=ruby
 
     # JavaScript
   elseif name =~ 'node\(js\)\=\>\|js\>' || name =~ 'rhino\>'
-    set ft=javascript
+    setl ft=javascript
 
     # BC calculator
   elseif name =~ '^bc\>'
-    set ft=bc
+    setl ft=bc
 
     # sed
   elseif name =~ 'sed\>'
-    set ft=sed
+    setl ft=sed
 
     # OCaml-scripts
   elseif name =~ 'ocaml'
-    set ft=ocaml
+    setl ft=ocaml
 
     # Awk scripts; also finds "gawk"
   elseif name =~ 'awk\>'
-    set ft=awk
+    setl ft=awk
 
     # Website MetaLanguage
   elseif name =~ 'wml'
-    set ft=wml
+    setl ft=wml
 
     # Scheme scripts
   elseif name =~ 'scheme'
-    set ft=scheme
+    setl ft=scheme
 
     # CFEngine scripts
   elseif name =~ 'cfengine'
-    set ft=cfengine
+    setl ft=cfengine
 
     # Erlang scripts
   elseif name =~ 'escript'
-    set ft=erlang
+    setl ft=erlang
 
     # Haskell
   elseif name =~ 'haskell'
-    set ft=haskell
+    setl ft=haskell
 
     # Scala
   elseif name =~ 'scala\>'
-    set ft=scala
+    setl ft=scala
 
     # Clojure
   elseif name =~ 'clojure'
-    set ft=clojure
+    setl ft=clojure
 
     # Free Pascal
   elseif name =~ 'instantfpc\>'
-    set ft=pascal
+    setl ft=pascal
 
     # Fennel
   elseif name =~ 'fennel\>'
-    set ft=fennel
+    setl ft=fennel
 
     # MikroTik RouterOS script
   elseif name =~ 'rsc\>'
-    set ft=routeros
+    setl ft=routeros
 
     # Fish shell
   elseif name =~ 'fish\>'
-    set ft=fish
+    setl ft=fish
 
     # Gforth
   elseif name =~ 'gforth\>'
-    set ft=forth
+    setl ft=forth
 
     # Icon
   elseif name =~ 'icon\>'
-    set ft=icon
+    setl ft=icon
 
     # Guile
   elseif name =~ 'guile'
-    set ft=scheme
+    setl ft=scheme
 
   endif
 enddef
@@ -218,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\>'
-    set ft=zsh
+    setl ft=zsh
 
   # ELM Mail files
   elseif line1 =~ '^From \([a-zA-Z][a-zA-Z_0-9\.=-]*\(@[^ ]*\)\=\|-\) .* \(19\|20\)\d\d$'
-    set ft=mail
+    setl ft=mail
 
   # Mason
   elseif line1 =~ '^<[%&].*>'
-    set ft=mason
+    setl ft=mason
 
   # Vim scripts (must have '" vim' as the first line to trigger this)
   elseif line1 =~ '^" *[vV]im$'
-    set ft=vim
+    setl ft=vim
 
   # libcxx and libstdc++ standard library headers like "iostream" do not have
   # an extension, recognize the Emacs file mode.
   elseif line1 =~? '-\*-.*C++.*-\*-'
-    set ft=cpp
+    setl ft=cpp
 
   # MOO
   elseif line1 =~ '^\*\* LambdaMOO Database, Format Version \%([1-3]\>\)\@!\d\+ \*\*$'
-    set ft=moo
+    setl ft=moo
 
     # Diff file:
     # - "diff" in first line (context diff)
@@ -258,11 +258,11 @@ def DetectFromText(line1: string)
 	 || (line1 =~ '^\*\*\* ' && line2 =~ '^--- ')
 	 || (line1 =~ '^=== ' && ((line2 =~ '^=\{66\}' && line3 =~ '^--- ' && line4 =~ '^+++') || (line2 =~ '^--- ' && line3 =~ '^+++ ')))
 	 || (line1 =~ '^=== \(removed\|added\|renamed\|modified\)')
-    set ft=diff
+    setl ft=diff
 
     # PostScript Files (must have %!PS as the first line, like a2ps output)
   elseif line1 =~ '^%![ \t]*PS'
-    set ft=postscr
+    setl ft=postscr
 
     # M4 scripts: Guess there is a line that starts with "dnl".
   elseif line1 =~ '^\s*dnl\>'
@@ -270,64 +270,64 @@ def DetectFromText(line1: string)
 	 || line3 =~ '^\s*dnl\>'
 	 || line4 =~ '^\s*dnl\>'
 	 || line5 =~ '^\s*dnl\>'
-    set ft=m4
+    setl ft=m4
 
     # AmigaDos scripts
   elseif $TERM == "amiga" && (line1 =~ "^;" || line1 =~? '^\.bra')
-    set ft=amiga
+    setl ft=amiga
 
     # SiCAD scripts (must have procn or procd as the first line to trigger this)
   elseif line1 =~? '^ *proc[nd] *$'
-    set ft=sicad
+    setl ft=sicad
 
     # Purify log files start with "****  Purify"
   elseif line1 =~ '^\*\*\*\*  Purify'
-    set ft=purifylog
+    setl ft=purifylog
 
     # XML
   elseif line1 =~ '<?\s*xml.*?>'
-    set ft=xml
+    setl ft=xml
 
     # XHTML (e.g.: PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN")
   elseif line1 =~ '\<DTD\s\+XHTML\s'
-    set ft=xhtml
+    setl 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\>'
-    set ft=html
+    setl ft=html
 
     # PDF
   elseif line1 =~ '^%PDF-'
-    set ft=pdf
+    setl ft=pdf
 
     # XXD output
   elseif line1 =~ '^\x\{7}: \x\{2} \=\x\{2} \=\x\{2} \=\x\{2} '
-    set ft=xxd
+    setl ft=xxd
 
     # RCS/CVS log output
   elseif line1 =~ '^RCS file:' || line2 =~ '^RCS file:'
-    set ft=rcslog
+    setl ft=rcslog
 
     # CVS commit
   elseif line2 =~ '^CVS:' || getline("$") =~ '^CVS: '
-    set ft=cvs
+    setl ft=cvs
 
     # Prescribe
   elseif line1 =~ '^!R!'
-    set ft=prescribe
+    setl ft=prescribe
 
     # Send-pr
   elseif line1 =~ '^SEND-PR:'
-    set ft=sendpr
+    setl ft=sendpr
 
     # SNNS files
   elseif line1 =~ '^SNNS network definition file'
-    set ft=snnsnet
+    setl ft=snnsnet
   elseif line1 =~ '^SNNS pattern definition file'
-    set ft=snnspat
+    setl ft=snnspat
   elseif line1 =~ '^SNNS result file'
-    set ft=snnsres
+    setl ft=snnsres
 
     # Virata
   elseif line1 =~ '^%.\{-}[Vv]irata'
@@ -335,79 +335,81 @@ def DetectFromText(line1: string)
 	 || line3 =~ '^%.\{-}[Vv]irata'
 	 || line4 =~ '^%.\{-}[Vv]irata'
 	 || line5 =~ '^%.\{-}[Vv]irata'
-    set ft=virata
+    setl ft=virata
 
     # Strace
-  elseif line1 =~ '[0-9:.]* *execve(' || line1 =~ '^__libc_start_main'
-    set ft=strace
+    # inaccurate fast match first, then use accurate slow match
+  elseif (line1 =~ 'execve(' && line1 =~ '^[0-9:.]* *execve(')
+	   || line1 =~ '^__libc_start_main'
+    setl ft=strace
 
     # VSE JCL
   elseif line1 =~ '^\* $$ JOB\>' || line1 =~ '^// *JOB\>'
-    set ft=vsejcl
+    setl ft=vsejcl
 
     # TAK and SINDA
   elseif line4 =~ 'K & K  Associates' || line2 =~ 'TAK 2000'
-    set ft=takout
+    setl ft=takout
   elseif line3 =~ 'S Y S T E M S   I M P R O V E D '
-    set ft=sindaout
+    setl ft=sindaout
   elseif getline(6) =~ 'Run Date: '
-    set ft=takcmp
+    setl ft=takcmp
   elseif getline(9) =~ 'Node    File  1'
-    set ft=sindacmp
+    setl ft=sindacmp
 
     # DNS zone files
   elseif line1 .. line2 .. line3 .. line4 =~ '^; <<>> DiG [0-9.]\+.* <<>>\|$ORIGIN\|$TTL\|IN\s\+SOA'
-    set ft=bindzone
+    setl ft=bindzone
 
     # BAAN
   elseif line1 =~ '|\*\{1,80}' && line2 =~ 'VRC '
 	 || line2 =~ '|\*\{1,80}' && line3 =~ 'VRC '
-    set ft=baan
+    setl ft=baan
 
     # Valgrind
   elseif line1 =~ '^==\d\+== valgrind' || line3 =~ '^==\d\+== Using valgrind'
-    set ft=valgrind
+    setl ft=valgrind
 
     # Go docs
   elseif line1 =~ '^PACKAGE DOCUMENTATION$'
-    set ft=godoc
+    setl ft=godoc
 
     # Renderman Interface Bytestream
   elseif line1 =~ '^##RenderMan'
-    set ft=rib
+    setl ft=rib
 
     # Scheme scripts
   elseif line1 =~ 'exec\s\+\S*scheme' || line2 =~ 'exec\s\+\S*scheme'
-    set ft=scheme
+    setl ft=scheme
 
     # Git output
   elseif line1 =~ '^\(commit\|tree\|object\) \x\{40,\}\>\|^tag \S\+$'
-    set ft=git
+    setl ft=git
 
     # Gprof (gnu profiler)
   elseif line1 == 'Flat profile:'
 	&& line2 == ''
 	&& line3 =~ '^Each sample counts as .* seconds.$'
-    set ft=gprof
+    setl ft=gprof
 
     # Erlang terms
     # (See also: http://www.gnu.org/software/emacs/manual/html_node/emacs/Choosing-Modes.html#Choosing-Modes)
   elseif line1 =~? '-\*-.*erlang.*-\*-'
-    set ft=erlang
+    setl ft=erlang
 
     # YAML
   elseif line1 =~ '^%YAML'
-    set ft=yaml
+    setl ft=yaml
 
     # MikroTik RouterOS script
   elseif line1 =~ '^#.*by RouterOS.*$'
-    set ft=routeros
+    setl 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\)'
-    set ft=sed
+    setl ft=sed
 
   else
     var lnum = 1
@@ -416,7 +418,7 @@ def DetectFromText(line1: string)
     endwhile
     if getline(lnum) =~ '^Index:\s\+\f\+$'
       # CVS diff
-      set ft=diff
+      setl ft=diff
 
       # locale input files: Formal Definitions of Cultural Conventions
       # filename must be like en_US, fr_FR@euro or en_US.UTF-8

runtime/autoload/dist/vimindent.vim

@@ -2,12 +2,12 @@ vim9script
 
 # Language:     Vim script
 # Maintainer:   github user lacygoill
-# Last Change:  2022 Oct 15
+# Last Change:  2023 Feb 01
 
 # NOTE: Whenever you change the code, make sure the tests are still passing:
 #
 #     $ cd runtime/indent/
-#     $ make clean; make test || vimdiff testdir/vim.{fail,ok}
+#     $ make clean; make test || vimdiff testdir/vim.{ok,fail}
 
 # Config {{{1
 
@@ -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}\)'
@@ -144,19 +148,43 @@ const HEREDOC_OPERATOR: string = '\s=<<\s\@=\%(\s\+\%(trim\|eval\)\)\{,2}'
 #
 # But sometimes, it can be too costly and cause `E363` to be given.
 const PATTERN_DELIMITER: string = '[-+*/%]\%(=\s\)\@!'
-
-# QUOTE {{{3
-
-const QUOTE: string = '["'']'
 # }}}2
 # Syntaxes {{{2
-# ASSIGNS_HEREDOC {{{3
+# BLOCKS {{{3
 
-const ASSIGNS_HEREDOC: string = $'^\%({COMMENT}\)\@!.*\%({HEREDOC_OPERATOR}\)\s\+\zs[A-Z]\+{END_OF_LINE}'
+const BLOCKS: list<list<string>> = [
+    ['if', 'el\%[se]', 'elseif\=', 'en\%[dif]'],
+    ['for', 'endfor\='],
+    ['wh\%[ile]', 'endw\%[hile]'],
+    ['try', 'cat\%[ch]', 'fina\|finally\=', 'endt\%[ry]'],
+    ['def', 'enddef'],
+    ['fu\%[nction](\@!', 'endf\%[unction]'],
+    ['class', 'endclass'],
+    ['interface', 'endinterface'],
+    ['enum', 'endenum'],
+    ['aug\%[roup]\%(\s\+[eE][nN][dD]\)\@!\s\+\S\+', 'aug\%[roup]\s\+[eE][nN][dD]'],
+]
 
-# CD_COMMAND {{{3
+# MODIFIERS {{{3
 
-const CD_COMMAND: string = $'\<[lt]\=cd!\=\s\+-{END_OF_COMMAND}'
+# some keywords can be prefixed by modifiers (e.g. `def` can be prefixed by `export`)
+const MODIFIERS: dict<string> = {
+    def: ['export', 'static'],
+    class: ['export', 'abstract', 'export abstract'],
+    interface: ['export'],
+}
+#     ...
+#     class: ['export', 'abstract', 'export abstract'],
+#     ...
+#     →
+#     ...
+#     class: '\%(export\|abstract\|export\s\+abstract\)\s\+',
+#     ...
+->map((_, mods: list<string>): string =>
+    '\%(' .. mods
+    ->join('\|')
+    ->substitute('\s\+', '\\s\\+', 'g')
+    .. '\)' .. '\s\+')
 
 # HIGHER_ORDER_COMMAND {{{3
 
@@ -174,56 +202,102 @@ patterns =<< trim eval END
     g\%[lobal]!\={PATTERN_DELIMITER}.*
     v\%[global]!\={PATTERN_DELIMITER}.*
 END
-const HIGHER_ORDER_COMMAND: string = $'\%(^\|{BAR_SEPARATION}\)\s*\<\%(' .. patterns->join('\|') .. '\):\@!'
 
-# MAPPING_COMMAND {{{3
+const HIGHER_ORDER_COMMAND: string = $'\%(^\|{BAR_SEPARATION}\)\s*\<\%({patterns->join('\|')}\){NOT_A_DICT_KEY}'
 
-const MAPPING_COMMAND: string = '\%(\<sil\%[ent]!\=\s\+\)\=\<[nvxsoilct]\=\%(nore\|un\)map!\=\s'
+# START_MIDDLE_END {{{3
 
-# NORMAL_COMMAND {{{3
+# Let's derive this constant from `BLOCKS`:
+#
+#     [['if', 'el\%[se]', 'elseif\=', 'en\%[dif]'],
+#      ['for', 'endfor\='],
+#      ...,
+#      [...]]
+#     →
+#     {
+#      'for': ['for', '', 'endfor\='],
+#      'endfor': ['for', '', 'endfor\='],
+#      'if': ['if', 'el\%[se]\|elseif\=', 'en\%[dif]'],
+#      'else': ['if', 'el\%[se]\|elseif\=', 'en\%[dif]'],
+#      'elseif': ['if', 'el\%[se]\|elseif\=', 'en\%[dif]'],
+#      'endif': ['if', 'el\%[se]\|elseif\=', 'en\%[dif]'],
+#      ...
+#     }
+var START_MIDDLE_END: dict<list<string>>
 
-const NORMAL_COMMAND: string = '\<norm\%[al]!\=\s*\S\+$'
+def Unshorten(kwd: string): string
+    return BlockStartKeyword(kwd)
+enddef
 
-# PLUS_MINUS_COMMAND {{{3
+def BlockStartKeyword(line: string): string
+    var kwd: string = line->matchstr('\l\+')
+    return fullcommand(kwd, false)
+enddef
 
-# In legacy, the `:+` and `:-` commands are not required to be preceded by a colon.
-# As a result, when `+` or `-` is alone on a line, there is ambiguity.
-# It might be an operator or a command.
-# To not break the indentation in legacy scripts, we might need to consider such
-# lines as commands.
-const PLUS_MINUS_COMMAND: string = '^\s*[+-]\s*$'
+{
+    for kwds: list<string> in BLOCKS
+        var [start: string, middle: string, end: string] = [kwds[0], '', kwds[-1]]
+        if MODIFIERS->has_key(start->Unshorten())
+            start = $'\%({MODIFIERS[start]}\)\={start}'
+        endif
+        if kwds->len() > 2
+            middle = kwds[1 : -2]->join('\|')
+        endif
+        for kwd: string in kwds
+            START_MIDDLE_END->extend({[kwd->Unshorten()]: [start, middle, end]})
+        endfor
+    endfor
+}
+
+START_MIDDLE_END = START_MIDDLE_END
+    ->map((_, kwds: list<string>) =>
+        kwds->map((_, kwd: string) => kwd == ''
+        ? ''
+        : $'\%(^\|{BAR_SEPARATION}\|\<sil\%[ent]\|{HIGHER_ORDER_COMMAND}\)\s*'
+        .. $'\<\%({kwd}\)\>\%(\s*{OPERATOR}\)\@!'))
+
+lockvar! START_MIDDLE_END
 
 # ENDS_BLOCK {{{3
 
 const ENDS_BLOCK: string = '^\s*\%('
-    .. 'en\%[dif]'
-    .. '\|' .. 'endfor\='
-    .. '\|' .. 'endw\%[hile]'
-    .. '\|' .. 'endt\%[ry]'
-    .. '\|' .. 'enddef'
-    .. '\|' .. 'endf\%[unction]'
-    .. '\|' .. 'aug\%[roup]\s\+[eE][nN][dD]'
+    .. BLOCKS
+    ->copy()
+    ->map((_, kwds: list<string>): string => kwds[-1])
+    ->join('\|')
     .. '\|' .. CLOSING_BRACKET
     .. $'\){END_OF_COMMAND}'
 
 # ENDS_BLOCK_OR_CLAUSE {{{3
 
-patterns =<< trim END
-    en\%[dif]
-    el\%[se]
-    endfor\=
-    endw\%[hile]
-    endt\%[ry]
-    fina\|finally\=
-    enddef
-    endf\%[unction]
-    aug\%[roup]\s\+[eE][nN][dD]
-END
+patterns = BLOCKS
+    ->copy()
+    ->map((_, kwds: list<string>) => kwds[1 :])
+    ->flattennew()
+    # `catch` and `elseif` need to be handled as special cases
+    ->filter((_, pat: string): bool => pat->Unshorten() !~ '^\%(catch\|elseif\)\>')
 
 const ENDS_BLOCK_OR_CLAUSE: string = '^\s*\%(' .. patterns->join('\|') .. $'\){END_OF_COMMAND}'
     .. $'\|^\s*cat\%[ch]\%(\s\+\({PATTERN_DELIMITER}\).*\1\)\={END_OF_COMMAND}'
     .. $'\|^\s*elseif\=\>\%({OPERATOR}\)\@!'
 
+# STARTS_NAMED_BLOCK {{{3
+
+patterns = []
+{
+    for kwds: list<string> in BLOCKS
+        for kwd: string in kwds[0 : -2]
+            if MODIFIERS->has_key(kwd->Unshorten())
+                patterns += [$'\%({MODIFIERS[kwd]}\)\={kwd}']
+            else
+                patterns += [kwd]
+            endif
+        endfor
+    endfor
+}
+
+const STARTS_NAMED_BLOCK: string = $'^\s*\%(sil\%[ent]\s\+\)\=\%({patterns->join('\|')}\)\>{NOT_A_DICT_KEY}'
+
 # STARTS_CURLY_BLOCK {{{3
 
 # TODO: `{` alone on a line is not necessarily the start of a block.
@@ -236,70 +310,57 @@ const STARTS_CURLY_BLOCK: string = '\%('
     .. '\|' ..  $'^\%(\s*\|.*{BAR_SEPARATION}\s*\)\%(com\%[mand]\|au\%[tocmd]\).*\zs\s{{'
     .. '\)' .. END_OF_COMMAND
 
-# STARTS_NAMED_BLOCK {{{3
-
-# All of these will be used at the start of a line (or after a bar).
-# NOTE: Don't replace `\%x28` with `(`.{{{
-#
-# Otherwise, the paren would be unbalanced which might cause syntax highlighting
-# issues much  later in the  code of the  current script (sometimes,  the syntax
-# highlighting plugin fails  to correctly recognize a heredoc which  is far away
-# and/or not displayed because inside a fold).
-# }}}
-patterns =<< trim END
-    if
-    el\%[se]
-    elseif\=
-    for
-    wh\%[ile]
-    try
-    cat\%[ch]
-    fina\|finally\=
-    fu\%[nction]\%x28\@!
-    \%(export\s\+\)\=def
-    aug\%[roup]\%(\s\+[eE][nN][dD]\)\@!\s\+\S\+
-END
-const STARTS_NAMED_BLOCK: string = '^\s*\%(sil\%[ent]\s\+\)\=\%(' .. patterns->join('\|') .. '\)\>:\@!'
-
 # STARTS_FUNCTION {{{3
 
-const STARTS_FUNCTION: string = '^\s*\%(export\s\+\)\=def\>:\@!'
+const STARTS_FUNCTION: string = $'^\s*\%({MODIFIERS.def}\)\=def\>{NOT_A_DICT_KEY}'
 
 # ENDS_FUNCTION {{{3
 
-const ENDS_FUNCTION: string = $'^\s*enddef\>:\@!{END_OF_COMMAND}'
+const ENDS_FUNCTION: string = $'^\s*enddef\>{END_OF_COMMAND}'
 
-# START_MIDDLE_END {{{3
+# ASSIGNS_HEREDOC {{{3
 
-const START_MIDDLE_END: dict<list<string>> = {
-    if: ['if', 'el\%[se]\|elseif\=', 'en\%[dif]'],
-    else: ['if', 'el\%[se]\|elseif\=', 'en\%[dif]'],
-    elseif: ['if', 'el\%[se]\|elseif\=', 'en\%[dif]'],
-    endif: ['if', 'el\%[se]\|elseif\=', 'en\%[dif]'],
-    for: ['for', '', 'endfor\='],
-    endfor: ['for', '', 'endfor\='],
-    while: ['wh\%[ile]', '', 'endw\%[hile]'],
-    endwhile: ['wh\%[ile]', '', 'endw\%[hile]'],
-    try: ['try', 'cat\%[ch]\|fina\|finally\=', 'endt\%[ry]'],
-    catch: ['try', 'cat\%[ch]\|fina\|finally\=', 'endt\%[ry]'],
-    finally: ['try', 'cat\%[ch]\|fina\|finally\=', 'endt\%[ry]'],
-    endtry: ['try', 'cat\%[ch]\|fina\|finally\=', 'endt\%[ry]'],
-    def: ['\%(export\s\+\)\=def', '', 'enddef'],
-    enddef: ['\%(export\s\+\)\=def', '', 'enddef'],
-    function: ['fu\%[nction]', '', 'endf\%[unction]'],
-    endfunction: ['fu\%[nction]', '', 'endf\%[unction]'],
-    augroup: ['aug\%[roup]\%(\s\+[eE][nN][dD]\)\@!\s\+\S\+', '', 'aug\%[roup]\s\+[eE][nN][dD]'],
-}->map((_, kwds: list<string>) =>
-    kwds->map((_, kwd: string) => kwd == ''
-    ? ''
-    : $'\%(^\|{BAR_SEPARATION}\|\<sil\%[ent]\|{HIGHER_ORDER_COMMAND}\)\s*'
-    .. $'\%({printf('\C\<\%%(%s\)\>:\@!\%%(\s*%s\)\@!', kwd, OPERATOR)}\)'))
+const ASSIGNS_HEREDOC: string = $'^\%({COMMENT}\)\@!.*\%({HEREDOC_OPERATOR}\)\s\+\zs[A-Z]\+{END_OF_LINE}'
+
+# PLUS_MINUS_COMMAND {{{3
+
+# In legacy, the `:+` and `:-` commands are not required to be preceded by a colon.
+# As a result, when `+` or `-` is alone on a line, there is ambiguity.
+# It might be an operator or a command.
+# To not break the indentation in legacy scripts, we might need to consider such
+# lines as commands.
+const PLUS_MINUS_COMMAND: string = '^\s*[+-]\s*$'
+
+# TRICKY_COMMANDS {{{3
+
+# Some  commands  are tricky  because  they  accept  an  argument which  can  be
+# conflated with an operator.  Examples:
+#
+#     argdelete *
+#     cd -
+#     normal! ==
+#     nunmap <buffer> (
+#
+# TODO: Other commands might accept operators as argument.  Handle them too.
+patterns =<< trim eval END
+    {'\'}<argd\%[elete]\s\+\*\s*$
+    \<[lt]\=cd!\=\s\+-\s*$
+    \<norm\%[al]!\=\s*\S\+$
+    \%(\<sil\%[ent]!\=\s\+\)\=\<[nvxsoilct]\=\%(nore\|un\)map!\=\s
+    {PLUS_MINUS_COMMAND}
+END
+
+const TRICKY_COMMANDS: string = patterns->join('\|')
 # }}}2
 # EOL {{{2
 # OPENING_BRACKET_AT_EOL {{{3
 
 const OPENING_BRACKET_AT_EOL: string = OPENING_BRACKET .. END_OF_VIM9_LINE
 
+# CLOSING_BRACKET_AT_EOL {{{3
+
+const CLOSING_BRACKET_AT_EOL: string = CLOSING_BRACKET .. END_OF_VIM9_LINE
+
 # COMMA_AT_EOL {{{3
 
 const COMMA_AT_EOL: string = $',{END_OF_VIM9_LINE}'
@@ -387,6 +448,7 @@ export def Expr(lnum = v:lnum): number # {{{2
     endif
 
     if line_A->AtStartOf('FuncHeader')
+            && !IsInInterface()
         line_A.lnum->CacheFuncHeader()
     elseif line_A.lnum->IsInside('FuncHeader')
         return b:vimindent.startindent + 2 * shiftwidth()
@@ -425,6 +487,7 @@ export def Expr(lnum = v:lnum): number # {{{2
     if line_A.text->ContinuesBelowBracketBlock(line_B, past_bracket_block)
             && line_A.text !~ CLOSING_BRACKET_AT_SOL
         return past_bracket_block.startindent
+            + (past_bracket_block.startline =~ STARTS_NAMED_BLOCK ? 2 * shiftwidth() : 0)
     endif
 
     # Problem: If we press `==` on the line right below the start of a multiline
@@ -433,6 +496,18 @@ export def Expr(lnum = v:lnum): number # {{{2
     if line_B->EndsWithLambdaArrow()
         return Indent(line_B.lnum) + shiftwidth() + IndentMoreInBracketBlock()
     endif
+    # FIXME: Similar issue here:
+    #
+    #     var x = []
+    #         ->filter((_, _) =>
+    #             true)
+    #         ->items()
+    #
+    # Press `==` on last line.
+    # Expected: The `->items()` line is indented like `->filter(...)`.
+    # Actual: It's indented like `true)`.
+    # Is it worth fixing? `=ip` gives  the correct indentation, because then the
+    # cache is used.
 
     # Don't move this block before the heredoc one.{{{
     #
@@ -531,8 +606,13 @@ def Offset( # {{{2
         line_B: dict<any>,
         ): number
 
+    if line_B->AtStartOf('FuncHeader')
+            && IsInInterface()
+        return 0
+
     # increase indentation inside a block
-    if line_B.text =~ STARTS_NAMED_BLOCK || line_B->EndsWithCurlyBlock()
+    elseif line_B.text =~ STARTS_NAMED_BLOCK
+            || line_B->EndsWithCurlyBlock()
         # But don't indent if the line starting the block also closes it.
         if line_B->AlsoClosesBlock()
             return 0
@@ -802,11 +882,6 @@ def Indent(lnum: number): number # {{{3
     return indent(lnum)
 enddef
 
-def BlockStartKeyword(line: string): string # {{{3
-    var kwd: string = line->matchstr('\l\+')
-    return fullcommand(kwd, false)
-enddef
-
 def MatchingOpenBracket(line: dict<any>): number # {{{3
     var end: string = line.text->matchstr(CLOSING_BRACKET)
     var start: string = {']': '[', '}': '{', ')': '('}[end]
@@ -903,7 +978,8 @@ def SearchPair( # {{{3
     if end == '[' || end == ']'
         e = e->escape('[]')
     endif
-    return searchpair(s, middle, e, flags, (): bool => InCommentOrString(), stopline, TIMEOUT)
+    return searchpair('\C' .. s, (middle == '' ? '' : '\C' .. middle), '\C' .. e,
+        flags, (): bool => InCommentOrString(), stopline, TIMEOUT)
 enddef
 
 def SearchPairStart( # {{{3
@@ -1011,6 +1087,10 @@ def IsInThisBlock(line_A: dict<any>, lnum: number): bool # {{{3
     return line_A.lnum <= end
 enddef
 
+def IsInInterface(): bool # {{{3
+    return SearchPair('interface', '', 'endinterface', 'nW') > 0
+enddef
+
 def IsFirstLineOfCommand(line_1: dict<any>, line_2: dict<any>): bool # {{{3
     if line_1.text->Is_IN_KeywordForLoop(line_2.text)
         return false
@@ -1041,13 +1121,8 @@ def Is_IN_KeywordForLoop(line_1: string, line_2: string): bool # {{{3
 enddef
 
 def InCommentOrString(): bool # {{{3
-    for synID: number in synstack('.', col('.'))
-        if synIDattr(synID, 'name') =~ '\ccomment\|string\|heredoc'
-            return true
-        endif
-    endfor
-
-    return false
+    return synstack('.', col('.'))
+        ->indexof((_, id: number): bool => synIDattr(id, 'name') =~ '\ccomment\|string\|heredoc') >= 0
 enddef
 
 def AlsoClosesBlock(line_B: dict<any>): bool # {{{3
@@ -1091,6 +1166,10 @@ def EndsWithOpeningBracket(line: dict<any>): bool # {{{3
     return NonCommentedMatch(line, OPENING_BRACKET_AT_EOL)
 enddef
 
+def EndsWithClosingBracket(line: dict<any>): bool # {{{3
+    return NonCommentedMatch(line, CLOSING_BRACKET_AT_EOL)
+enddef
+
 def NonCommentedMatch(line: dict<any>, pat: string): bool # {{{3
     # Could happen if there is no code above us, and we're not on the 1st line.
     # In that case, `PrevCodeLine()` returns `{lnum: 0, line: ''}`.
@@ -1098,16 +1177,6 @@ def NonCommentedMatch(line: dict<any>, pat: string): bool # {{{3
         return false
     endif
 
-    if line.text =~ PLUS_MINUS_COMMAND
-        return false
-    endif
-
-    # In `argdelete *`, `*` is not a multiplication operator.
-    # TODO: Other commands can accept `*` as an argument.  Handle them too.
-    if line.text =~ '\<argd\%[elete]\s\+\*\s*$'
-        return false
-    endif
-
     # Technically, that's wrong.  A  line might start with a range  and end with a
     # line continuation symbol.  But it's unlikely.  And it's useful to assume the
     # opposite because it  prevents us from conflating a mark  with an operator or
@@ -1174,24 +1243,7 @@ def NonCommentedMatch(line: dict<any>, pat: string): bool # {{{3
         return false
     endif
 
-    # `:help cd-`
-    if line.text =~ CD_COMMAND
-        return false
-    endif
-
-    # At the end of a mapping, any character might appear; e.g. a paren:
-    #
-    #     nunmap <buffer> (
-    #
-    # Don't conflate this with a line continuation symbol.
-    if line.text =~ MAPPING_COMMAND
-        return false
-    endif
-
-    #             not a comparison operator
-    #             vv
-    #     normal! ==
-    if line.text =~ NORMAL_COMMAND
+    if line.text =~ TRICKY_COMMANDS
         return false
     endif
 

runtime/autoload/netrw.vim

@@ -1,7 +1,7 @@
 " netrw.vim: Handles file transfer and remote directory listing across
 "            AUTOLOAD SECTION
-" Date:		Aug 16, 2021
-" Version:	171
+" Date:		May 03, 2023
+" Version:	173
 " 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 = "v171"
+let g:loaded_netrw = "v173"
 if !exists("s:NOTE")
  let s:NOTE    = 0
  let s:WARNING = 1
@@ -208,7 +208,6 @@ 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
@@ -1186,6 +1185,11 @@ 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()
@@ -1202,6 +1206,8 @@ 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
@@ -1276,7 +1282,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 mis-use :Lex is warranted.
+   " effort to prevent mis-use of :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"))
@@ -1680,7 +1686,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    = &l:go           " guioptions
+  let {a:vt}netrw_gokeep    = &go             " guioptions
   let {a:vt}netrw_hidkeep   = &l:hidden
   let {a:vt}netrw_imkeep    = &l:im
   let {a:vt}netrw_iskkeep   = &l:isk
@@ -1751,8 +1757,9 @@ 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
-  " call s:NetrwSetSafeSetting("&go","begmr")
-  if &go =~ '\ca' | call s:NetrwSetSafeSetting("&go",substitute(&go,'\ca','','g')) | endif
+  if &go =~ 'a' | set go-=a | endif
+  if &go =~ 'A' | set go-=A | endif
+  if &go =~ 'P' | set go-=P | endif
   call s:NetrwSetSafeSetting("&l:hid",0)
   call s:NetrwSetSafeSetting("&l:im",0)
   setl isk+=@ isk+=* isk+=/
@@ -1791,11 +1798,13 @@ 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 !isdirectory(expand('%'))
+   if filereadable(expand("%"))
 "    call Decho("..doing filetype detect anyway")
-     filetype detect
+    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
    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
@@ -1835,7 +1844,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"   ,"&l:go")
+  call s:NetrwRestoreSetting(a:vt."netrw_gokeep"   ,"&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")
@@ -1906,11 +1915,9 @@ fun! s:NetrwOptionsRestore(vt)
   " were having their filetype detect-generated settings overwritten by
   " NetrwOptionRestore.
   if &ft != "netrw"
-    if !isdirectory(expand('%'))
-"     call Decho("before: filetype detect  (ft=".&ft.")",'~'.expand("<slnum>"))
-      filetype detect
-"     call Decho("after : filetype detect  (ft=".&ft.")",'~'.expand("<slnum>"))
-    endif
+"   call Decho("before: filetype detect  (ft=".&ft.")",'~'.expand("<slnum>"))
+   filetype detect
+"   call Decho("after : filetype detect  (ft=".&ft.")",'~'.expand("<slnum>"))
   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>"))
@@ -2985,13 +2992,19 @@ 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",'~'.expand("<slnum>"))
-   let iskkeep= &l:isk
+"   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
    setl isk-=/
-   let &l:isk= iskkeep
+   filetype detect
+"   call Decho("..local filetype<".&ft."> for buf#".bufnr()."<".bufname().">")
+   let &isk= iskkeep
 "   call Dredir("ls!","NetrwGetFile (renamed buffer back to remote filename<".rfile."> : expand(%)<".expand("%").">)")
    let line1 = 1
    let line2 = line("$")
@@ -4272,7 +4285,7 @@ fun! s:NetrwGetBuffer(islocal,dirname)
   endif
 "  call Decho("  bufnum#".bufnum,'~'.expand("<slnum>"))
 
-  " hijack the current buffer
+  " highjack the current buffer
   "   IF the buffer already has the desired name
   "   AND it is empty
   let curbuf = bufname("%")
@@ -4280,7 +4293,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 hijack the current buffer#".bufnr("%")."<".curbuf.">",'~'.expand("<slnum>"))
+"  call Decho("deciding if netrw may highjack 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>"))
@@ -4289,7 +4302,7 @@ fun! s:NetrwGetBuffer(islocal,dirname)
 "   call Dret("s:NetrwGetBuffer 0<cleared buffer> : highjacking buffer#".bufnr("%"))
    return 0
   else  " DEBUG
-"   call Decho("..did NOT hijack buffer",'~'.expand("<slnum>"))
+"   call Decho("..did NOT highjack 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
 
@@ -4325,19 +4338,25 @@ 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 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
+
+   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")
    else
-"    call Decho("  getline(2)<".getline(2).'> does not match "Netrw Directory Listing" : using b '.bufnum,'~'.expand("<slnum>"))
-    exe "sil! NetrwKeepj noswapfile keepalt b ".bufnum
+"    call Decho("buffer type is not netrw; using keepalt with b ".bufnum)
+    call s:NetrwEditBuf(bufnum)
+"    call Dredir("ls!","two")
    endif
 "   call Decho("  line($)=".line("$"),'~'.expand("<slnum>"))
    if bufname("%") == '.'
     call s:NetrwBufRename(getcwd())
    endif
+
+   " restore ei
    let &ei= eikeep
 
    if line("$") <= 1 && getline(1) == ""
@@ -4988,7 +5007,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
-    " no keepalt to support  :e #  to return to a directory listing
+    " use 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
@@ -4999,12 +5018,8 @@ 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.
-     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>"))
+     call s:NetrwEditFile("e","",dirname)
+"     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"
@@ -5345,8 +5360,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
@@ -5419,6 +5434,8 @@ 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>"))
 
@@ -5708,6 +5725,35 @@ 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)
@@ -7814,8 +7860,16 @@ 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)
@@ -8573,21 +8627,28 @@ 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.")")
+"  call Dfunc("s:NetrwPrevWinOpen(islocal=".a:islocal.") win#".winnr())
 
   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("$")
-  let curword   = s:NetrwGetWord()
-  let choice    = 0
-  let s:prevwinopen= 1	" lets s:NetrwTreeDir() know that NetrwPrevWinOpen called it
+"  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 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
@@ -8610,11 +8671,26 @@ 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
@@ -8624,8 +8700,10 @@ 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
@@ -8635,6 +8713,7 @@ 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
@@ -8642,6 +8721,7 @@ 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
@@ -8674,6 +8754,7 @@ 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
@@ -9361,19 +9442,23 @@ 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 -->.*$",'','')
@@ -9389,6 +9474,7 @@ 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>"))
@@ -9404,10 +9490,12 @@ 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))
@@ -9421,10 +9509,12 @@ 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
@@ -10795,7 +10885,8 @@ 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>"))
-"  call Dredir("ls!","netrw#LocalBrowseCheck")
+  " getting E930: Cannot use :redir inside execute
+""  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>"))
 
@@ -11089,12 +11180,15 @@ fun! s:LocalListing()
 
    if w:netrw_liststyle == s:LONGLIST
     let sz   = getfsize(filename)
-    let fsz  = strpart("               ",1,15-strlen(sz)).sz
+	let szlen = 15 - (strdisplaywidth(longfile) - g:netrw_maxfilenamelen)
+    let szlen = (szlen > 0) ? szlen : 0
+    let fsz  = printf("%".szlen."S",sz)
+
     if g:netrw_sizestyle =~# "[hH]"
      let sz= s:NetrwHumanReadable(sz)
     endif
-    let longfile= printf("%-".(g:netrw_maxfilenamelen+1)."s",pfile)
-    let pfile   = longfile.sz." ".strftime(g:netrw_timefmt,getftime(filename))
+	let longfile= printf("%-".g:netrw_maxfilenamelen."S",pfile)
+    let pfile   = longfile."  ".sz." ".strftime(g:netrw_timefmt,getftime(filename))
 "    call Decho("longlist support: sz=".sz." fsz=".fsz,'~'.expand("<slnum>"))
    endif
 
@@ -11393,34 +11487,8 @@ fun! s:NetrwLocalRmFile(path,fname,all)
    let rmfile= substitute(rmfile,'[\/]$','','e')
 
    if all || ok =~# 'y\%[es]' || ok == ""
-    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
+    if delete(rmfile,"d")
+     call netrw#ErrorMsg(s:ERROR,"unable to delete directory <".rmfile.">!",103)
     endif
    endif
   endif
@@ -12015,13 +12083,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 keepalt enew!",'~'.expand("<slnum>"))
+"  call Decho("generate a buffer with NetrwKeepj 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
-  noswapfile NetrwKeepj keepalt enew!
+  call s:NetrwEditFile("enew!","","")
   let &l:diff= netrw_keepdiff
 "  call Decho("bufnr($)=".bufnr("$")."<".bufname(bufnr("$"))."> winnr($)=".winnr("$"),'~'.expand("<slnum>"))
   NetrwKeepj call s:NetrwOptionsSave("w:")
@@ -12070,7 +12138,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' && !g:netrw_cygwin
+  if has("win32") && &shell !~? 'cmd\|pwsh\|powershell' && !g:netrw_cygwin
 "    call Decho("using win32:",expand("<slnum>"))
     let savedShell=[&shell,&shellcmdflag,&shellxquote,&shellxescape,&shellquote,&shellpipe,&shellredir,&shellslash]
     set shell& shellcmdflag& shellxquote& shellxescape&
@@ -12739,3 +12807,54 @@ 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

runtime/autoload/netrwSettings.vim

@@ -1,7 +1,7 @@
 " netrwSettings.vim: makes netrw settings simpler
-" Date:		Aug 12, 2021
+" Date:		Nov 15, 2021
 " Maintainer:	Charles E Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
-" Version:	17	ASTRO-ONLY
+" Version:	18
 " 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 = "v17"
+let g:loaded_netrwSettings = "v18"
 if v:version < 700
  echohl WarningMsg
  echo "***warning*** this version of netrwSettings needs vim 7.0"
@@ -159,8 +159,6 @@ 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

runtime/autoload/python.vim

@@ -22,8 +22,7 @@ let s:maxoff = 50       " maximum number of lines to look backwards for ()
 function s:SearchBracket(fromlnum, flags)
   return searchpairpos('[[({]', '', '[])}]', a:flags,
           \ {-> synstack('.', col('.'))
-          \   ->map({_, id -> id->synIDattr('name')})
-          \   ->match('\%(Comment\|Todo\|String\)$') >= 0},
+          \ ->indexof({_, id -> synIDattr(id, 'name') =~ '\%(Comment\|Todo\|String\)$'}) >= 0},
           \ [0, a:fromlnum - s:maxoff]->max(), g:python_indent.searchpair_timeout)
 endfunction
 
@@ -157,15 +156,13 @@ 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)
-    \ ->map({_, id -> id->synIDattr('name')})
-    \ ->match('\%(Comment\|Todo\)$') >= 0
+    \ ->indexof({_, id -> synIDattr(id, 'name') =~ '\%(Comment\|Todo\)$'}) >= 0
       let min = 1
       let max = pline_len
       while min < max
 	let col = (min + max) / 2
         if synstack(plnum, col)
-        \ ->map({_, id -> id->synIDattr('name')})
-        \ ->match('\%(Comment\|Todo\)$') >= 0
+        \ ->indexof({_, id -> synIDattr(id, 'name') =~ '\%(Comment\|Todo\)$'}) >= 0
 	  let max = col
 	else
 	  let min = col + 1

runtime/autoload/tohtml.vim

@@ -1,6 +1,6 @@
 " Vim autoload file for the tohtml plugin.
 " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
-" Last Change: 2019 Aug 16
+" Last Change: 2023 Jan 01
 "
 " Additional contributors:
 "
@@ -351,63 +351,65 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
   let s:old_magic = &magic
   set magic
 
-  if s:settings.use_xhtml
-    if s:settings.encoding != ""
-      let xml_line = "<?xml version=\"1.0\" encoding=\"" . s:settings.encoding . "\"?>"
-    else
-      let xml_line = "<?xml version=\"1.0\"?>"
-    endif
-    let tag_close = ' />'
-  endif
-
-  let style = [s:settings.use_xhtml ? "" : '-->']
-  let body_line = ''
-
   let html = []
-  let s:html5 = 0
-  if s:settings.use_xhtml
-    call add(html, xml_line)
-  endif
-  if s:settings.use_xhtml
-    call add(html, "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">")
-    call add(html, '<html xmlns="http://www.w3.org/1999/xhtml">')
-  elseif s:settings.use_css && !s:settings.no_pre
-    call add(html, "<!DOCTYPE html>")
-    call add(html, '<html>')
-    let s:html5 = 1
-  else
-    call add(html, '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"')
-    call add(html, '  "http://www.w3.org/TR/html4/loose.dtd">')
-    call add(html, '<html>')
-  endif
-  call add(html, '<head>')
-
-  " include encoding as close to the top as possible, but only if not already
-  " 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)
-    else
-      call add(html, "<meta http-equiv=\"content-type\" content=\"text/html; charset=" . s:settings.encoding . '"' . tag_close)
+  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 . "\"?>"
+      else
+	let xml_line = "<?xml version=\"1.0\"?>"
+      endif
+      let tag_close = ' />'
     endif
+
+    let style = [s:settings.use_xhtml ? "" : '-->']
+    let body_line = ''
+
+    let s:html5 = 0
+    if s:settings.use_xhtml
+      call add(html, xml_line)
+    endif
+    if s:settings.use_xhtml
+      call add(html, "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">")
+      call add(html, '<html xmlns="http://www.w3.org/1999/xhtml">')
+    elseif s:settings.use_css && !s:settings.no_pre
+      call add(html, "<!DOCTYPE html>")
+      call add(html, '<html>')
+      let s:html5 = 1
+    else
+      call add(html, '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"')
+      call add(html, '  "http://www.w3.org/TR/html4/loose.dtd">')
+      call add(html, '<html>')
+    endif
+    call add(html, '<head>')
+
+    " include encoding as close to the top as possible, but only if not already
+    " 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)
+      else
+	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="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)
+    call add(html, '<meta name="colorscheme" content="'.
+	  \ (exists('g:colors_name')
+	  \ ? g:colors_name
+	  \ : 'none'). '"'.tag_close)
+
+    call add(html, '</head>')
+    let body_line_num = len(html)
+    call add(html, '<body'.(s:settings.line_ids ? ' onload="JumpToLine();"' : '').'>')
   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="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)
-  call add(html, '<meta name="colorscheme" content="'.
-	\ (exists('g:colors_name')
-	\ ? g:colors_name
-	\ : '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, "<table ".(s:settings.use_css? "" : "border='1' width='100%' ")."id='vimCodeElement".s:settings.id_suffix."'>")
 
   call add(html, '<tr>')
@@ -430,47 +432,53 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
     " When not using CSS or when using xhtml, the <body> line can be important.
     " Assume it will be the same for all buffers and grab it from the first
     " buffer. Similarly, need to grab the body end line as well.
-    if body_line == ''
+    if !s:settings.no_doc
+      if body_line == ''
+	1
+	call search('<body')
+	let body_line = getline('.')
+	$
+	call search('</body>', 'b')
+	let s:body_end_line = getline('.')
+      endif
+
+      " Grab the style information. Some of this will be duplicated so only insert
+      " it if it's not already there. {{{
       1
-      call search('<body')
-      let body_line = getline('.')
-      $
-      call search('</body>', 'b')
-      let s:body_end_line = getline('.')
-    endif
-
-    " Grab the style information. Some of this will be duplicated so only insert
-    " it if it's not already there. {{{
-    1
-    let style_start = search('^<style\( type="text/css"\)\?>')
-    1
-    let style_end = search('^</style>')
-    if style_start > 0 && style_end > 0
-      let buf_styles = getline(style_start + 1, style_end - 1)
-      for a_style in buf_styles
-	if index(style, a_style) == -1
-	  if diff_style_start == 0
-	    if a_style =~ '\<Diff\(Change\|Text\|Add\|Delete\)'
-	      let diff_style_start = len(style)-1
+      let style_start = search('^<style\( type="text/css"\)\?>')
+      1
+      let style_end = search('^</style>')
+      if style_start > 0 && style_end > 0
+	let buf_styles = getline(style_start + 1, style_end - 1)
+	for a_style in buf_styles
+	  if index(style, a_style) == -1
+	    if diff_style_start == 0
+	      if a_style =~ '\<Diff\(Change\|Text\|Add\|Delete\)'
+		let diff_style_start = len(style)-1
+	      endif
 	    endif
+	    call insert(style, a_style, insert_index)
+	    let insert_index += 1
 	  endif
-	  call insert(style, a_style, insert_index)
-	  let insert_index += 1
-	endif
-      endfor
-    endif " }}}
+	endfor
+      endif " }}}
 
-    " everything new will get added before the diff styles so diff highlight
-    " properly overrides normal highlight
-    if diff_style_start != 0
-      let insert_index = diff_style_start
+      " everything new will get added before the diff styles so diff highlight
+      " properly overrides normal highlight
+      if diff_style_start != 0
+	let insert_index = diff_style_start
+      endif
+
+      " Delete those parts that are not needed so we can include the rest into the
+      " resulting table.
+      1,/^<body.*\%(\n<!--.*-->\_s\+.*id='oneCharWidth'.*\_s\+.*id='oneInputWidth'.*\_s\+.*id='oneEmWidth'\)\?\zs/d_
+      $
+      ?</body>?,$d_
+    elseif !s:settings.no_modeline
+      " remove modeline from source files if it is included and we haven't deleted
+      " due to removing html footer already
+      $d
     endif
-
-    " Delete those parts that are not needed so we can include the rest into the
-    " resulting table.
-    1,/^<body.*\%(\n<!--.*-->\_s\+.*id='oneCharWidth'.*\_s\+.*id='oneInputWidth'.*\_s\+.*id='oneEmWidth'\)\?\zs/d_
-    $
-    ?</body>?,$d_
     let temp = getline(1,'$')
     " clean out id on the main content container because we already set it on
     " the table
@@ -478,7 +486,11 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
     " undo deletion of start and end part
     " so we can later save the file as valid html
     " TODO: restore using grabbed lines if undolevel is 1?
-    normal! 2u
+    if !s:settings.no_doc
+      normal! 2u
+    elseif !s:settings.no_modeline
+      normal! u
+    endif
     if s:settings.use_css
       call add(html, '<td><div>')
     elseif s:settings.use_xhtml
@@ -495,17 +507,23 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
     quit!
   endfor
 
-  let html[body_line_num] = body_line
+  if !s:settings.no_doc
+    let html[body_line_num] = body_line
+  endif
 
   call add(html, '</tr>')
   call add(html, '</table>')
-  call add(html, s:body_end_line)
-  call add(html, '</html>')
+  if !s:settings.no_doc
+    call add(html, s:body_end_line)
+    call add(html, '</html>')
+  endif
 
   " The generated HTML is admittedly ugly and takes a LONG time to fold.
   " Make sure the user doesn't do syntax folding when loading a generated file,
   " using a modeline.
-  call add(html, '<!-- vim: set foldmethod=manual : -->')
+  if !s:settings.no_modeline
+    call add(html, '<!-- vim: set foldmethod=manual : -->')
+  endif
 
   let i = 1
   let name = "Diff" . (s:settings.use_xhtml ? ".xhtml" : ".html")
@@ -542,129 +560,131 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
 
   call append(0, html)
 
-  if len(style) > 0
-    1
-    let style_start = search('^</head>')-1
+  if !s:settings.no_doc
+    if len(style) > 0
+      1
+      let style_start = search('^</head>')-1
 
-    " add required javascript in reverse order so we can just call append again
-    " and again without adjusting {{{
+      " add required javascript in reverse order so we can just call append again
+      " and again without adjusting {{{
 
-    let s:uses_script = s:settings.dynamic_folds || s:settings.line_ids
+      let s:uses_script = s:settings.dynamic_folds || s:settings.line_ids
 
-    " insert script closing tag if needed
-    if s:uses_script
-      call append(style_start, [
-	    \ '',
-	    \ s:settings.use_xhtml ? '//]]>' : '-->',
-	    \ "</script>"
-	    \ ])
-    endif
-
-    " insert javascript to get IDs from line numbers, and to open a fold before
-    " jumping to any lines contained therein
-    if s:settings.line_ids
-      call append(style_start, [
-	    \ "  /* Always jump to new location even if the line was hidden inside a fold, or",
-	    \ "   * we corrected the raw number to a line ID.",
-	    \ "   */",
-	    \ "  if (lineElem) {",
-	    \ "    lineElem.scrollIntoView(true);",
-	    \ "  }",
-	    \ "  return true;",
-	    \ "}",
-	    \ "if ('onhashchange' in window) {",
-	    \ "  window.onhashchange = JumpToLine;",
-	    \ "}"
-	    \ ])
-
-      if s:settings.dynamic_folds
+      " insert script closing tag if needed
+      if s:uses_script
 	call append(style_start, [
-	      \ "",
-	      \ "  /* 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."')",
-	      \ "  {",
-	      \ "    if (node.className == 'closed-fold')",
-	      \ "    {",
-	      \ "      /* toggle open the fold ID (remove window ID) */",
-	      \ "      toggleFold(node.id.substr(4));",
-	      \ "    }",
-	      \ "    node = node.parentNode;",
-	      \ "  }",
+	      \ '',
+	      \ s:settings.use_xhtml ? '//]]>' : '-->',
+	      \ "</script>"
 	      \ ])
       endif
-    endif
 
-    if s:settings.line_ids
-      call append(style_start, [
-	    \ "",
-	    \ "/* function to open any folds containing a jumped-to line before jumping to it */",
-	    \ "function JumpToLine()",
-	    \ "{",
-	    \ "  var lineNum;",
-	    \ "  lineNum = window.location.hash;",
-	    \ "  lineNum = lineNum.substr(1); /* strip off '#' */",
-	    \ "",
-	    \ "  if (lineNum.indexOf('L') == -1) {",
-	    \ "    lineNum = 'L'+lineNum;",
-	    \ "  }",
-	    \ "  if (lineNum.indexOf('W') == -1) {",
-	    \ "    lineNum = 'W1'+lineNum;",
-	    \ "  }",
-	    \ "  var lineElem = document.getElementById(lineNum);"
-	    \ ])
-    endif
+      " insert javascript to get IDs from line numbers, and to open a fold before
+      " jumping to any lines contained therein
+      if s:settings.line_ids
+	call append(style_start, [
+	      \ "  /* Always jump to new location even if the line was hidden inside a fold, or",
+	      \ "   * we corrected the raw number to a line ID.",
+	      \ "   */",
+	      \ "  if (lineElem) {",
+	      \ "    lineElem.scrollIntoView(true);",
+	      \ "  }",
+	      \ "  return true;",
+	      \ "}",
+	      \ "if ('onhashchange' in window) {",
+	      \ "  window.onhashchange = JumpToLine;",
+	      \ "}"
+	      \ ])
 
-    " Insert javascript to toggle matching folds open and closed in all windows,
-    " if dynamic folding is active.
-    if s:settings.dynamic_folds
-      call append(style_start, [
-	    \  "  function toggleFold(objID)",
-	    \  "  {",
-	    \  "    for (win_num = 1; win_num <= ".len(a:buf_list)."; win_num++)",
-	    \  "    {",
-	    \  "      var fold;",
-	    \  '      fold = document.getElementById("win"+win_num+objID);',
-	    \  "      if(fold.className == 'closed-fold')",
-	    \  "      {",
-	    \  "        fold.className = 'open-fold';",
-	    \  "      }",
-	    \  "      else if (fold.className == 'open-fold')",
-	    \  "      {",
-	    \  "        fold.className = 'closed-fold';",
-	    \  "      }",
-	    \  "    }",
-	    \  "  }",
-	    \ ])
-    endif
+	if s:settings.dynamic_folds
+	  call append(style_start, [
+		\ "",
+		\ "  /* 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."')",
+		\ "  {",
+		\ "    if (node.className == 'closed-fold')",
+		\ "    {",
+		\ "      /* toggle open the fold ID (remove window ID) */",
+		\ "      toggleFold(node.id.substr(4));",
+		\ "    }",
+		\ "    node = node.parentNode;",
+		\ "  }",
+		\ ])
+	endif
+      endif
 
-    if s:uses_script
-      " insert script tag if needed
-      call append(style_start, [
-	    \ "<script" . (s:html5 ? "" : " type='text/javascript'") . ">",
-	    \ s:settings.use_xhtml ? '//<![CDATA[' : "<!--"])
-    endif
+      if s:settings.line_ids
+	call append(style_start, [
+	      \ "",
+	      \ "/* function to open any folds containing a jumped-to line before jumping to it */",
+	      \ "function JumpToLine()",
+	      \ "{",
+	      \ "  var lineNum;",
+	      \ "  lineNum = window.location.hash;",
+	      \ "  lineNum = lineNum.substr(1); /* strip off '#' */",
+	      \ "",
+	      \ "  if (lineNum.indexOf('L') == -1) {",
+	      \ "    lineNum = 'L'+lineNum;",
+	      \ "  }",
+	      \ "  if (lineNum.indexOf('W') == -1) {",
+	      \ "    lineNum = 'W1'+lineNum;",
+	      \ "  }",
+	      \ "  var lineElem = document.getElementById(lineNum);"
+	      \ ])
+      endif
 
-    " Insert styles from all the generated html documents and additional styles
-    " for the table-based layout of the side-by-side diff. The diff should take
-    " up the full browser window (but not more), and be static in size,
-    " horizontally scrollable when the lines are too long. Otherwise, the diff
-    " is pretty useless for really long lines. {{{
-    if s:settings.use_css
-      call append(style_start,
-	    \ ['<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)).'%; }',
-	    \   'td div { overflow: auto; }',
-	    \   s:settings.use_xhtml ? '' : '-->',
-	    \   '</style>'
-	    \])
-    endif "}}}
+      " Insert javascript to toggle matching folds open and closed in all windows,
+      " if dynamic folding is active.
+      if s:settings.dynamic_folds
+	call append(style_start, [
+	      \  "  function toggleFold(objID)",
+	      \  "  {",
+	      \  "    for (win_num = 1; win_num <= ".len(a:buf_list)."; win_num++)",
+	      \  "    {",
+	      \  "      var fold;",
+	      \  '      fold = document.getElementById("win"+win_num+objID);',
+	      \  "      if(fold.className == 'closed-fold')",
+	      \  "      {",
+	      \  "        fold.className = 'open-fold';",
+	      \  "      }",
+	      \  "      else if (fold.className == 'open-fold')",
+	      \  "      {",
+	      \  "        fold.className = 'closed-fold';",
+	      \  "      }",
+	      \  "    }",
+	      \  "  }",
+	      \ ])
+      endif
+
+      if s:uses_script
+	" insert script tag if needed
+	call append(style_start, [
+	      \ "<script" . (s:html5 ? "" : " type='text/javascript'") . ">",
+	      \ s:settings.use_xhtml ? '//<![CDATA[' : "<!--"])
+      endif
+
+      " Insert styles from all the generated html documents and additional styles
+      " for the table-based layout of the side-by-side diff. The diff should take
+      " up the full browser window (but not more), and be static in size,
+      " horizontally scrollable when the lines are too long. Otherwise, the diff
+      " is pretty useless for really long lines. {{{
+      if s:settings.use_css
+	call append(style_start,
+	      \ ['<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)).'%; }',
+	      \   'td div { overflow: auto; }',
+	      \   s:settings.use_xhtml ? '' : '-->',
+	      \   '</style>'
+	      \])
+      endif "}}}
+    endif
   endif
 
   let &paste = s:old_paste

runtime/autoload/zig/fmt.vim

@@ -0,0 +1,100 @@
+" Adapted from fatih/vim-go: autoload/go/fmt.vim
+"
+" Copyright 2011 The Go Authors. All rights reserved.
+" Use of this source code is governed by a BSD-style
+" license that can be found in the LICENSE file.
+"
+" Upstream: https://github.com/ziglang/zig.vim
+
+function! zig#fmt#Format() abort
+  " Save cursor position and many other things.
+  let view = winsaveview()
+
+  if !executable('zig')
+    echohl Error | echomsg "no zig binary found in PATH" | echohl None
+    return
+  endif
+
+  let cmdline = 'zig fmt --stdin --ast-check'
+  let current_buf = bufnr('')
+
+  " The formatted code is output on stdout, the errors go on stderr.
+  if exists('*systemlist')
+    silent let out = systemlist(cmdline, current_buf)
+  else
+    silent let out = split(system(cmdline, current_buf))
+  endif
+  if len(out) == 1
+    if out[0] == "error: unrecognized parameter: '--ast-check'"
+      let cmdline = 'zig fmt --stdin'
+      if exists('*systemlist')
+        silent let out = systemlist(cmdline, current_buf)
+      else
+        silent let out = split(system(cmdline, current_buf))
+      endif
+    endif
+  endif
+  let err = v:shell_error
+
+
+  if err == 0
+    " remove undo point caused via BufWritePre.
+    try | silent undojoin | catch | endtry
+
+    " Replace the file content with the formatted version.
+    if exists('*deletebufline')
+      call deletebufline(current_buf, len(out), line('$'))
+    else
+      silent execute ':' . len(out) . ',' . line('$') . ' delete _'
+    endif
+    call setline(1, out)
+
+    " No errors detected, close the loclist.
+    call setloclist(0, [], 'r')
+    lclose
+  elseif get(g:, 'zig_fmt_parse_errors', 1)
+    let errors = s:parse_errors(expand('%'), out)
+
+    call setloclist(0, [], 'r', {
+        \ 'title': 'Errors',
+        \ 'items': errors,
+        \ })
+
+    let max_win_height = get(g:, 'zig_fmt_max_window_height', 5)
+    " Prevent the loclist from becoming too long.
+    let win_height = min([max_win_height, len(errors)])
+    " Open the loclist, but only if there's at least one error to show.
+    execute 'silent! lwindow ' . win_height
+  endif
+
+  call winrestview(view)
+
+  if err != 0
+    echohl Error | echomsg "zig fmt returned error" | echohl None
+    return
+  endif
+
+  " Run the syntax highlighter on the updated content and recompute the folds if
+  " needed.
+  syntax sync fromstart
+endfunction
+
+" parse_errors parses the given errors and returns a list of parsed errors
+function! s:parse_errors(filename, lines) abort
+  " list of errors to be put into location list
+  let errors = []
+  for line in a:lines
+    let tokens = matchlist(line, '^\(.\{-}\):\(\d\+\):\(\d\+\)\s*\(.*\)')
+    if !empty(tokens)
+      call add(errors,{
+            \"filename": a:filename,
+            \"lnum":     tokens[2],
+            \"col":      tokens[3],
+            \"text":     tokens[4],
+            \ })
+    endif
+  endfor
+
+  return errors
+endfunction
+" vim: sw=2 ts=2 et

runtime/autoload/zip.vim

@@ -1,7 +1,7 @@
 " zip.vim: Handles browsing zipfiles
 "            AUTOLOAD PORTION
-" Date:		Nov 08, 2021
-" Version:	32
+" Date:		Mar 12, 2023
+" Version:	33
 " 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= "v32"
+let g:loaded_zip= "v33"
 if v:version < 702
  echohl WarningMsg
  echo "***warning*** this version of zip needs vim 7.2 or later"
@@ -160,10 +160,14 @@ endfun
 " ---------------------------------------------------------------------
 " ZipBrowseSelect: {{{2
 fun! s:ZipBrowseSelect()
-"  call Dfunc("ZipBrowseSelect() zipfile<".b:zipfile."> curfile<".expand("%").">")
+  "  call Dfunc("ZipBrowseSelect() zipfile<".((exists("b:zipfile"))? b:zipfile : "n/a")."> 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 =~ '^"'

runtime/colors/habamax.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Maxim Kim <habamax@gmail.com>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Fri 02 Sep 2022 09:45:11 MSK
+" Last Updated: Fri 24 Mar 2023 20:28:06 AEDT
 
 " Generated by Colortemplate v2.2.0
 
@@ -36,38 +36,6 @@ 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
@@ -88,10 +56,14 @@ hi SpecialKey guifg=#585858 guibg=NONE gui=NONE cterm=NONE
 hi FoldColumn guifg=#585858 guibg=NONE gui=NONE cterm=NONE
 hi Visual guifg=#1c1c1c guibg=#87afaf gui=NONE cterm=NONE
 hi VisualNOS guifg=#1c1c1c guibg=#5f8787 gui=NONE cterm=NONE
-hi Pmenu guifg=NONE guibg=#262626 gui=NONE cterm=NONE
+hi Pmenu guifg=NONE guibg=#3a3a3a 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
@@ -100,7 +72,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=#5f8787 guibg=#1c1c1c gui=reverse cterm=reverse
+hi MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold
 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
@@ -112,7 +84,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=#262626 gui=NONE cterm=NONE
+hi ColorColumn guifg=NONE guibg=#3a3a3a 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
@@ -132,13 +104,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=#000000 guibg=#87af87 gui=NONE cterm=NONE
+hi DiffAdd guifg=#dadada guibg=#5f875f gui=NONE cterm=NONE
 hi DiffDelete guifg=#af875f guibg=NONE gui=NONE cterm=NONE
 hi diffAdded guifg=#87af87 guibg=NONE gui=NONE cterm=NONE
 hi diffRemoved guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE
 hi diffSubname guifg=#af87af guibg=NONE gui=NONE cterm=NONE
-hi DiffText guifg=#000000 guibg=#d7d7d7 gui=NONE cterm=NONE
-hi DiffChange guifg=#000000 guibg=#afafaf gui=NONE cterm=NONE
+hi DiffText guifg=#dadada guibg=#878787 gui=NONE cterm=NONE
+hi DiffChange guifg=#bcbcbc guibg=#5f5f5f gui=NONE cterm=NONE
 
 if s:t_Co >= 256
   hi! link Terminal Normal
@@ -159,38 +131,6 @@ 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
@@ -211,10 +151,14 @@ 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=235 cterm=NONE
+  hi Pmenu ctermfg=NONE ctermbg=237 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
@@ -223,7 +167,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=66 ctermbg=234 cterm=reverse
+  hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold
   hi Search ctermfg=234 ctermbg=108 cterm=NONE
   hi IncSearch ctermfg=234 ctermbg=215 cterm=NONE
   hi CurSearch ctermfg=234 ctermbg=144 cterm=NONE
@@ -233,7 +177,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=235 cterm=NONE
+  hi ColorColumn ctermfg=NONE ctermbg=237 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
@@ -253,27 +197,18 @@ 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=16 ctermbg=108 cterm=NONE
+  hi DiffAdd ctermfg=253 ctermbg=65 cterm=NONE
   hi DiffDelete ctermfg=137 ctermbg=NONE cterm=NONE
   hi diffAdded ctermfg=108 ctermbg=NONE cterm=NONE
   hi diffRemoved ctermfg=167 ctermbg=NONE cterm=NONE
   hi diffSubname ctermfg=139 ctermbg=NONE cterm=NONE
-  hi DiffText ctermfg=16 ctermbg=188 cterm=NONE
-  hi DiffChange ctermfg=16 ctermbg=145 cterm=NONE
+  hi DiffText ctermfg=253 ctermbg=102 cterm=NONE
+  hi DiffChange ctermfg=250 ctermbg=59 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
@@ -294,10 +229,14 @@ 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=NONE ctermbg=darkgrey cterm=NONE
-  hi PmenuThumb ctermfg=NONE ctermbg=darkgray cterm=NONE
-  hi PmenuSbar ctermfg=NONE ctermbg=NONE 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 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
@@ -306,7 +245,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=darkcyan ctermbg=black cterm=reverse
+  hi MatchParen ctermfg=magenta ctermbg=NONE cterm=bold
   hi Search ctermfg=black ctermbg=darkgreen cterm=NONE
   hi IncSearch ctermfg=black ctermbg=red cterm=NONE
   hi CurSearch ctermfg=black ctermbg=darkyellow cterm=NONE
@@ -336,13 +275,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=black ctermbg=darkgreen cterm=NONE
+  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
   hi DiffDelete ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi diffAdded ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi diffRemoved ctermfg=darkred ctermbg=NONE cterm=NONE
   hi diffSubname ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi DiffText ctermfg=black ctermbg=lightgrey cterm=NONE
-  hi DiffChange ctermfg=black ctermbg=darkgray cterm=NONE
+  hi DiffText ctermfg=white ctermbg=lightgrey cterm=NONE
+  hi DiffChange ctermfg=white ctermbg=darkgray cterm=NONE
   unlet s:t_Co
   finish
 endif
@@ -366,12 +305,16 @@ 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=NONE ctermbg=NONE cterm=reverse
-  hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Visual ctermfg=black ctermbg=darkcyan 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 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
@@ -380,7 +323,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=darkcyan ctermbg=black cterm=reverse
+  hi MatchParen ctermfg=magenta ctermbg=NONE cterm=bold
   hi Search ctermfg=black ctermbg=darkgreen cterm=NONE
   hi IncSearch ctermfg=black ctermbg=darkyellow cterm=NONE
   hi CurSearch ctermfg=black ctermbg=darkyellow cterm=NONE
@@ -410,7 +353,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=black ctermbg=darkgreen cterm=NONE
+  hi DiffAdd ctermfg=white 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
@@ -507,17 +450,19 @@ endif
 " Color: color07          #9E9E9E        247            gray
 " Color: color15          #BCBCBC        250            white
 " Color: colorLine        #303030        236            darkgrey
-" Color: colorB           #262626        235            darkgrey
+" Color: colorB           #3a3a3a        237            darkgrey
+" Color: colorF           #262626        235            darkgrey
 " Color: colorNonT        #585858        240            darkgrey
 " Color: colorC           #FFAF5F        215            red
 " Color: colorlC          #5FFF00        82             green
 " Color: colorV           #1F3F5F        109            cyan
-" Color: diffAdd          #87AF87        108            darkgreen
+" Color: colorMP          #ff00af        199            magenta
+" Color: diffAdd          #5f875f        65             darkgreen
 " Color: diffDelete       #af875f        137            darkyellow
-" Color: diffChange       #AFAFAF        145            darkgray
-" Color: diffText         #D7D7D7        188            lightgrey
+" Color: diffChange       #5f5f5f        59             darkgray
+" Color: diffText         #878787        102            lightgrey
 " Color: black            #000000        16             black
-" Color: white            #FFFFFF        231            white
+" Color: white            #dadada        253            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

runtime/colors/lists/default.vim

@@ -1,5 +1,5 @@
 " Maintainer:  Drew Vogel <dvogel@sidejump.org>
-" Last Change: 2022 Mar 20
+" Last Change: 2023 Apr 19
 "
 " 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,7 +7,8 @@
 " these colors by introducing a new colors/lists/default.vim file earlier in
 " the runtimepath.
 
-let s:keepcpo= &cpo
+" make sure line continuation works
+let s:keepcpo = &cpo
 set cpo&vim
 
 call extend(v:colornames, {
@@ -801,7 +802,7 @@ call extend(v:colornames, {
 			\ 'teal': '#008080'
 			\ }, 'keep')
 
-let &cpo= s:keepcpo
+let &cpo = s:keepcpo
 unlet s:keepcpo
 
 "vim: sw=4

runtime/colors/lunaperche.vim

@@ -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: Fri 16 Sep 2022 13:15:33 MSK
+" Last Updated: Sun 26 Mar 2023 23:04:18 AEDT
 
 " Generated by Colortemplate v2.2.0
 
@@ -16,24 +16,8 @@ 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
@@ -51,30 +35,6 @@ 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
@@ -134,12 +94,16 @@ 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 EndOfBuffer guifg=#585858 guibg=NONE 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 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 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
@@ -161,8 +125,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=#1c1c1c gui=NONE cterm=NONE
-  hi ColorColumn guifg=NONE guibg=#1c1c1c 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 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
@@ -180,9 +144,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=#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 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 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
@@ -222,10 +186,14 @@ 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=#eeeeee gui=NONE cterm=NONE
+  hi Pmenu guifg=NONE guibg=#e4e4e4 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
@@ -245,10 +213,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=#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 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 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
@@ -294,24 +262,8 @@ 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
@@ -329,30 +281,6 @@ 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
@@ -409,12 +337,16 @@ 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 EndOfBuffer ctermfg=240 ctermbg=NONE 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 EndOfBuffer ctermfg=240 ctermbg=NONE cterm=NONE
+    hi Pmenu ctermfg=NONE ctermbg=236 cterm=NONE
+    hi PmenuSel ctermfg=NONE ctermbg=239 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
@@ -434,8 +366,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=234 cterm=NONE
-    hi ColorColumn ctermfg=NONE ctermbg=234 cterm=NONE
+    hi Folded ctermfg=243 ctermbg=236 cterm=NONE
+    hi ColorColumn ctermfg=NONE ctermbg=236 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
@@ -453,9 +385,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=16 ctermbg=139 cterm=NONE
-    hi DiffChange ctermfg=16 ctermbg=252 cterm=NONE
-    hi DiffText ctermfg=16 ctermbg=80 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 DiffDelete ctermfg=174 ctermbg=NONE cterm=NONE
     hi diffAdded ctermfg=77 ctermbg=NONE cterm=NONE
     hi diffRemoved ctermfg=174 ctermbg=NONE cterm=NONE
@@ -492,10 +424,14 @@ 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=255 cterm=NONE
+    hi Pmenu ctermfg=NONE ctermbg=254 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
@@ -513,10 +449,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=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 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 SpellBad ctermfg=124 ctermbg=NONE cterm=underline
     hi SpellCap ctermfg=23 ctermbg=NONE cterm=underline
     hi SpellLocal ctermfg=28 ctermbg=NONE cterm=underline
@@ -577,12 +513,16 @@ 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 Pmenu ctermfg=black ctermbg=darkgrey cterm=NONE
-    hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
-    hi PmenuThumb ctermfg=NONE ctermbg=grey 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=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=white ctermbg=red cterm=NONE
     hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
@@ -621,8 +561,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=black ctermbg=darkmagenta cterm=NONE
-    hi DiffChange ctermfg=black ctermbg=lightgray cterm=NONE
+    hi DiffAdd ctermfg=white ctermbg=darkmagenta cterm=NONE
+    hi DiffChange ctermfg=white ctermbg=darkgreen 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
@@ -661,9 +601,13 @@ 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 PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
-    hi PmenuThumb ctermfg=NONE ctermbg=darkgrey 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=white ctermbg=red cterm=NONE
     hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
@@ -743,14 +687,18 @@ 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=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 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 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
@@ -788,8 +736,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=black ctermbg=darkmagenta cterm=NONE
-    hi DiffChange ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi DiffAdd ctermfg=white ctermbg=darkmagenta cterm=NONE
+    hi DiffChange ctermfg=white ctermbg=darkgreen cterm=NONE
     hi DiffText ctermfg=black ctermbg=grey cterm=NONE
     hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=NONE
   else
@@ -810,10 +758,14 @@ 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=NONE ctermbg=black 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=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
@@ -948,20 +900,21 @@ endif
 " Color: color15                 #FFFFFF        231            white
 " Color: colorDimWhite           #E4E4E4        254            grey
 " Color: colorLine               #262626        235            darkgrey
-" Color: colorB                  #1C1C1C        234            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: colorV                  #005F87        24             darkblue
 " Color: colorMP                 #C5E7C5        30             darkcyan
-" Color: colorPMenuSel           #444444        238            darkcyan
+" Color: colorPMenuSel           #4e4e4e        239            darkcyan
 " Color: colorDim                #878787        102            grey
-" Color: diffAdd                 #AF87AF        139            darkmagenta
+" Color: diffAdd                 #875f87        96             darkmagenta
 " Color: diffDelete              #D78787        174            darkred
-" Color: diffChange              #D0D0D0        252            lightgray
-" Color: diffText                #5FD7D7        80             cyan
-" Color: fgDiff                  #000000        16             black
+" Color: diffChange              #5f5f5f        59             darkgreen
+" Color: diffText                #5f8787        66             cyan
+" Color: fgDiffText              #afffff        159            black
+" Color: fgDiff                  #C6C6C6        251            white
 " Term colors: color00 color01 color02 color03 color04 color05 color06 color07
 " Term colors: color08 color09 color10 color11 color12 color13 color14 color15
 " Background: light
@@ -981,8 +934,8 @@ endif
 " Color: color14                 #008787        30             cyan
 " Color: color07                 #808080        244            grey
 " Color: color15                 #FFFFFF        231            white
-" Color: colorLine               #E4E4E4        254            grey
-" Color: colorB                  #EEEEEE        255            grey
+" Color: colorLine               #EEEEEE        255            grey
+" Color: colorB                  #E4E4E4        254            grey
 " Color: colorNonT               #9E9E9E        247            darkgrey
 " Color: colorTab                #BCBCBC        250            lightgrey
 " Color: colorC                  #000000        16             black

runtime/colors/quiet.vim

@@ -1,10 +1,10 @@
 " Name:         quiet
-" Description:  `monochrome`, but less ugly, with diffs, searches, a few other niceties, and both light and dark versions.
-" Author:       neutaaaaan <neutaaaaan-gh@protonmail.com>
-" Maintainer:   neutaaaaan <neutaaaaan-gh@protonmail.com>
+" Description:  A mostly monochrome colorscheme, with a few niceties.
+" 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: Fri 16 Sep 2022 09:52:50 MSK
+" Last Updated: Wed 15 Mar 2023 06:45:06 PM CET
 
 " Generated by Colortemplate v2.2.0
 
@@ -48,57 +48,62 @@ hi! link debugPC CursorLine
 
 if &background ==# 'dark'
   if (has('termguicolors') && &termguicolors) || has('gui_running')
-    let g:terminal_ansi_colors = ['#080808', '#d7005f', '#00af5f', '#d78700', '#0087d7', '#d787d7', '#00afaf', '#dadada', '#707070', '#ff005f', '#00d75f', '#ffaf00', '#5fafff', '#ff87ff', '#00d7d7', '#ffffff']
+    let g:terminal_ansi_colors = ['#000000', '#d7005f', '#00af5f', '#d78700', '#0087d7', '#d787d7', '#00afaf', '#dadada', '#707070', '#ff005f', '#00d75f', '#ffaf00', '#5fafff', '#ff87ff', '#00d7d7', '#ffffff']
   endif
-  hi Normal guifg=#dadada guibg=#080808 gui=NONE cterm=NONE
+  hi Normal guifg=#dadada guibg=#000000 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=#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 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 Directory guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-  hi EndOfBuffer guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-  hi ErrorMsg guifg=#dadada guibg=#080808 gui=reverse cterm=reverse
+  hi EndOfBuffer guifg=#707070 guibg=NONE gui=NONE cterm=NONE
+  hi ErrorMsg guifg=#dadada guibg=#000000 gui=reverse cterm=reverse
   hi FoldColumn guifg=#707070 guibg=NONE gui=NONE cterm=NONE
-  hi Folded guifg=#707070 guibg=#080808 gui=NONE cterm=NONE
-  hi IncSearch guifg=#ffaf00 guibg=#080808 gui=reverse cterm=reverse
-  hi LineNr guifg=#444444 guibg=NONE gui=NONE cterm=NONE
+  hi 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 MatchParen guifg=#ff00af guibg=NONE gui=bold cterm=bold
   hi ModeMsg guifg=#dadada guibg=NONE gui=bold cterm=bold
   hi MoreMsg guifg=#dadada guibg=NONE gui=NONE cterm=NONE
   hi NonText guifg=#707070 guibg=NONE gui=NONE cterm=NONE
-  hi Pmenu guifg=#080808 guibg=#87afd7 gui=NONE cterm=NONE
-  hi PmenuSbar guifg=#dadada guibg=#707070 gui=NONE cterm=NONE
-  hi PmenuSel guifg=#080808 guibg=#d787d7 gui=NONE cterm=NONE
-  hi PmenuThumb guifg=#dadada guibg=#d787d7 gui=NONE cterm=NONE
+  hi 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 Question guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-  hi QuickFixLine guifg=#d787d7 guibg=#080808 gui=reverse cterm=reverse
-  hi Search guifg=#00afff guibg=#080808 gui=reverse cterm=reverse
+  hi 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=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi SpecialKey guifg=#707070 guibg=NONE gui=bold cterm=bold
   hi SpellBad guifg=#d7005f guibg=NONE guisp=#d7005f gui=undercurl cterm=underline
   hi SpellCap guifg=#0087d7 guibg=NONE guisp=#0087d7 gui=undercurl cterm=underline
   hi SpellLocal guifg=#d787d7 guibg=NONE guisp=#d787d7 gui=undercurl cterm=underline
   hi SpellRare guifg=#00afaf guibg=NONE guisp=#00afaf gui=undercurl cterm=underline
-  hi StatusLine guifg=#080808 guibg=#dadada gui=bold cterm=bold
-  hi StatusLineNC guifg=#707070 guibg=#080808 gui=reverse cterm=reverse
-  hi TabLine guifg=#707070 guibg=#080808 gui=reverse cterm=reverse
+  hi 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 TabLineFill guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-  hi TabLineSel guifg=#080808 guibg=#dadada gui=bold cterm=bold
+  hi TabLineSel guifg=#000000 guibg=#dadada gui=bold cterm=bold
   hi Title guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi VertSplit guifg=#707070 guibg=#080808 gui=NONE cterm=NONE
-  hi Visual guifg=#ffaf00 guibg=#080808 gui=reverse cterm=reverse
+  hi VertSplit guifg=#707070 guibg=#000000 gui=NONE cterm=NONE
+  hi Visual guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse
   hi VisualNOS guifg=NONE guibg=#303030 gui=NONE cterm=NONE
   hi WarningMsg guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-  hi WildMenu guifg=#00afff guibg=#080808 gui=bold cterm=bold
+  hi WildMenu guifg=#00afff guibg=#000000 gui=bold cterm=bold
   hi Comment guifg=#707070 guibg=NONE gui=bold cterm=bold
   hi Constant guifg=#dadada guibg=NONE gui=NONE cterm=NONE
-  hi Error guifg=#ff005f guibg=#080808 gui=bold,reverse cterm=bold,reverse
+  hi Error guifg=#ff005f guibg=#000000 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
@@ -107,127 +112,137 @@ 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=#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
+  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
 else
   " Light background
   if (has('termguicolors') && &termguicolors) || has('gui_running')
-    let g:terminal_ansi_colors = ['#080808', '#af0000', '#005f00', '#af5f00', '#005faf', '#870087', '#008787', '#d7d7d7', '#626262', '#d70000', '#008700', '#d78700', '#0087d7', '#af00af', '#00afaf', '#ffffff']
+    let g:terminal_ansi_colors = ['#000000', '#af0000', '#005f00', '#af5f00', '#005faf', '#870087', '#008787', '#d7d7d7', '#626262', '#d70000', '#008700', '#d78700', '#0087d7', '#af00af', '#00afaf', '#ffffff']
   endif
-  hi Normal guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
+  hi Normal guifg=#000000 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=#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 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 FoldColumn guifg=#626262 guibg=NONE gui=NONE cterm=NONE
   hi Folded guifg=#626262 guibg=#d7d7d7 gui=NONE cterm=NONE
-  hi IncSearch guifg=#ffaf00 guibg=#080808 gui=reverse cterm=reverse
+  hi IncSearch guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse
   hi LineNr guifg=#a8a8a8 guibg=NONE gui=NONE cterm=NONE
   hi MatchParen guifg=#ff00af guibg=#d7d7d7 gui=bold cterm=bold
-  hi ModeMsg guifg=#080808 guibg=NONE gui=bold cterm=bold
-  hi MoreMsg guifg=#080808 guibg=NONE gui=NONE cterm=NONE
+  hi ModeMsg guifg=#000000 guibg=NONE gui=bold cterm=bold
+  hi MoreMsg guifg=#000000 guibg=NONE gui=NONE cterm=NONE
   hi NonText guifg=#626262 guibg=NONE gui=NONE cterm=NONE
-  hi Pmenu guifg=#080808 guibg=#afafd7 gui=NONE cterm=NONE
-  hi PmenuSbar guifg=#080808 guibg=#626262 gui=NONE cterm=NONE
-  hi PmenuSel guifg=#080808 guibg=#d787d7 gui=NONE cterm=NONE
-  hi PmenuThumb guifg=#080808 guibg=#d787d7 gui=NONE cterm=NONE
-  hi Question guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi QuickFixLine guifg=#d787d7 guibg=#080808 gui=reverse cterm=reverse
-  hi Search guifg=#00afff guibg=#080808 gui=reverse cterm=reverse
-  hi SignColumn guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi SpecialKey guifg=#080808 guibg=NONE gui=NONE cterm=NONE
+  hi 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 SpellBad guifg=#af0000 guibg=#d7d7d7 guisp=#af0000 gui=undercurl cterm=underline
   hi SpellCap guifg=#005faf guibg=#d7d7d7 guisp=#005faf gui=undercurl cterm=underline
   hi SpellLocal guifg=#870087 guibg=#d7d7d7 guisp=#870087 gui=undercurl cterm=underline
   hi SpellRare guifg=#008787 guibg=#d7d7d7 guisp=#008787 gui=undercurl cterm=underline
-  hi StatusLine guifg=#eeeeee guibg=#080808 gui=bold cterm=bold
-  hi StatusLineNC guifg=#080808 guibg=#a8a8a8 gui=NONE cterm=NONE
-  hi TabLine guifg=#080808 guibg=#a8a8a8 gui=NONE cterm=NONE
-  hi TabLineFill guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
-  hi TabLineSel guifg=#eeeeee guibg=#080808 gui=bold cterm=bold
+  hi 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 Title guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi VertSplit guifg=#626262 guibg=#d7d7d7 gui=NONE cterm=NONE
-  hi Visual guifg=#ffaf00 guibg=#080808 gui=reverse cterm=reverse
+  hi Visual guifg=#ffaf00 guibg=#000000 gui=reverse cterm=reverse
   hi VisualNOS guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
-  hi WarningMsg guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi WildMenu guifg=#080808 guibg=#eeeeee gui=bold cterm=bold
-  hi Comment guifg=#080808 guibg=NONE gui=bold cterm=bold
-  hi Constant guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi Error guifg=#ff005f guibg=#080808 gui=bold,reverse cterm=bold,reverse
-  hi Identifier guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi Ignore guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi PreProc guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi Special guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi Statement guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi Todo guifg=#00ffaf guibg=#080808 gui=bold,reverse cterm=bold,reverse
-  hi Type guifg=#080808 guibg=NONE gui=NONE cterm=NONE
-  hi Underlined guifg=#080808 guibg=NONE gui=underline cterm=underline
-  hi CursorIM guifg=#080808 guibg=#afff00 gui=NONE cterm=NONE
+  hi 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 ToolbarLine guifg=NONE guibg=#d7d7d7 gui=NONE cterm=NONE
-  hi ToolbarButton guifg=#080808 guibg=#d7d7d7 gui=bold cterm=bold
+  hi ToolbarButton guifg=#000000 guibg=#d7d7d7 gui=bold cterm=bold
 endif
 
 if s:t_Co >= 256
   if &background ==# 'dark'
-    hi Normal ctermfg=253 ctermbg=232 cterm=NONE
+    hi Normal ctermfg=253 ctermbg=16 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=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 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 Directory ctermfg=253 ctermbg=NONE cterm=NONE
-    hi EndOfBuffer ctermfg=253 ctermbg=NONE cterm=NONE
-    hi ErrorMsg ctermfg=253 ctermbg=232 cterm=reverse
+    hi EndOfBuffer ctermfg=242 ctermbg=NONE cterm=NONE
+    hi ErrorMsg ctermfg=253 ctermbg=16 cterm=reverse
     hi FoldColumn ctermfg=242 ctermbg=NONE cterm=NONE
-    hi Folded ctermfg=242 ctermbg=232 cterm=NONE
-    hi IncSearch ctermfg=214 ctermbg=232 cterm=reverse
-    hi LineNr ctermfg=238 ctermbg=NONE cterm=NONE
+    hi Folded ctermfg=242 ctermbg=16 cterm=NONE
+    hi IncSearch ctermfg=214 ctermbg=16 cterm=reverse
+    hi LineNr ctermfg=240 ctermbg=NONE cterm=NONE
     hi MatchParen ctermfg=199 ctermbg=NONE cterm=bold
     hi ModeMsg ctermfg=253 ctermbg=NONE cterm=bold
     hi MoreMsg ctermfg=253 ctermbg=NONE cterm=NONE
     hi NonText ctermfg=242 ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=232 ctermbg=110 cterm=NONE
-    hi PmenuSbar ctermfg=253 ctermbg=242 cterm=NONE
-    hi PmenuSel ctermfg=232 ctermbg=176 cterm=NONE
-    hi PmenuThumb ctermfg=253 ctermbg=176 cterm=NONE
+    hi 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 Question ctermfg=253 ctermbg=NONE cterm=NONE
-    hi QuickFixLine ctermfg=176 ctermbg=232 cterm=reverse
-    hi Search ctermfg=39 ctermbg=232 cterm=reverse
+    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=253 ctermbg=NONE cterm=NONE
+    hi SpecialKey ctermfg=242 ctermbg=NONE cterm=bold
     hi SpellBad ctermfg=161 ctermbg=NONE cterm=underline
     hi SpellCap ctermfg=32 ctermbg=NONE cterm=underline
     hi SpellLocal ctermfg=176 ctermbg=NONE cterm=underline
     hi SpellRare ctermfg=37 ctermbg=NONE cterm=underline
-    hi StatusLine ctermfg=232 ctermbg=253 cterm=bold
-    hi StatusLineNC ctermfg=242 ctermbg=232 cterm=reverse
-    hi TabLine ctermfg=242 ctermbg=232 cterm=reverse
+    hi StatusLine ctermfg=16 ctermbg=253 cterm=bold
+    hi StatusLineNC ctermfg=242 ctermbg=16 cterm=reverse
+    hi TabLine ctermfg=242 ctermbg=16 cterm=reverse
     hi TabLineFill ctermfg=253 ctermbg=NONE cterm=NONE
-    hi TabLineSel ctermfg=232 ctermbg=253 cterm=bold
+    hi TabLineSel ctermfg=16 ctermbg=253 cterm=bold
     hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi VertSplit ctermfg=242 ctermbg=232 cterm=NONE
-    hi Visual ctermfg=214 ctermbg=232 cterm=reverse
+    hi VertSplit ctermfg=242 ctermbg=16 cterm=NONE
+    hi Visual ctermfg=214 ctermbg=16 cterm=reverse
     hi VisualNOS ctermfg=NONE ctermbg=236 cterm=NONE
     hi WarningMsg ctermfg=253 ctermbg=NONE cterm=NONE
-    hi WildMenu ctermfg=39 ctermbg=232 cterm=bold
+    hi WildMenu ctermfg=39 ctermbg=16 cterm=bold
     hi Comment ctermfg=242 ctermbg=NONE cterm=bold
     hi Constant ctermfg=253 ctermbg=NONE cterm=NONE
-    hi Error ctermfg=197 ctermbg=232 cterm=bold,reverse
+    hi Error ctermfg=197 ctermbg=16 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
@@ -236,71 +251,76 @@ 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=232 ctermbg=154 cterm=NONE
-    hi ToolbarLine ctermfg=NONE ctermbg=232 cterm=NONE
-    hi ToolbarButton ctermfg=253 ctermbg=232 cterm=bold
+    hi CursorIM ctermfg=16 ctermbg=154 cterm=NONE
+    hi ToolbarLine ctermfg=NONE ctermbg=16 cterm=NONE
+    hi ToolbarButton ctermfg=253 ctermbg=16 cterm=bold
   else
     " Light background
-    hi Normal ctermfg=232 ctermbg=188 cterm=NONE
+    hi Normal ctermfg=16 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=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 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 FoldColumn ctermfg=241 ctermbg=NONE cterm=NONE
     hi Folded ctermfg=241 ctermbg=188 cterm=NONE
-    hi IncSearch ctermfg=214 ctermbg=232 cterm=reverse
+    hi IncSearch ctermfg=214 ctermbg=16 cterm=reverse
     hi LineNr ctermfg=248 ctermbg=NONE cterm=NONE
     hi MatchParen ctermfg=199 ctermbg=188 cterm=bold
-    hi ModeMsg ctermfg=232 ctermbg=NONE cterm=bold
-    hi MoreMsg ctermfg=232 ctermbg=NONE cterm=NONE
+    hi ModeMsg ctermfg=16 ctermbg=NONE cterm=bold
+    hi MoreMsg ctermfg=16 ctermbg=NONE cterm=NONE
     hi NonText ctermfg=241 ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=232 ctermbg=146 cterm=NONE
-    hi PmenuSbar ctermfg=232 ctermbg=241 cterm=NONE
-    hi PmenuSel ctermfg=232 ctermbg=176 cterm=NONE
-    hi PmenuThumb ctermfg=232 ctermbg=176 cterm=NONE
-    hi Question ctermfg=232 ctermbg=NONE cterm=NONE
-    hi QuickFixLine ctermfg=176 ctermbg=232 cterm=reverse
-    hi Search ctermfg=39 ctermbg=232 cterm=reverse
-    hi SignColumn ctermfg=232 ctermbg=NONE cterm=NONE
-    hi SpecialKey ctermfg=232 ctermbg=NONE cterm=NONE
+    hi 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 SpellBad ctermfg=124 ctermbg=188 cterm=underline
     hi SpellCap ctermfg=25 ctermbg=188 cterm=underline
     hi SpellLocal ctermfg=90 ctermbg=188 cterm=underline
     hi SpellRare ctermfg=30 ctermbg=188 cterm=underline
-    hi StatusLine ctermfg=255 ctermbg=232 cterm=bold
-    hi StatusLineNC ctermfg=232 ctermbg=248 cterm=NONE
-    hi TabLine ctermfg=232 ctermbg=248 cterm=NONE
-    hi TabLineFill ctermfg=232 ctermbg=188 cterm=NONE
-    hi TabLineSel ctermfg=255 ctermbg=232 cterm=bold
+    hi 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 Title ctermfg=NONE ctermbg=NONE cterm=NONE
     hi VertSplit ctermfg=241 ctermbg=188 cterm=NONE
-    hi Visual ctermfg=214 ctermbg=232 cterm=reverse
+    hi Visual ctermfg=214 ctermbg=16 cterm=reverse
     hi VisualNOS ctermfg=NONE ctermbg=255 cterm=NONE
-    hi WarningMsg ctermfg=232 ctermbg=NONE cterm=NONE
-    hi WildMenu ctermfg=232 ctermbg=255 cterm=bold
-    hi Comment ctermfg=232 ctermbg=NONE cterm=bold
-    hi Constant ctermfg=232 ctermbg=NONE cterm=NONE
-    hi Error ctermfg=197 ctermbg=232 cterm=bold,reverse
-    hi Identifier ctermfg=232 ctermbg=NONE cterm=NONE
-    hi Ignore ctermfg=232 ctermbg=NONE cterm=NONE
-    hi PreProc ctermfg=232 ctermbg=NONE cterm=NONE
-    hi Special ctermfg=232 ctermbg=NONE cterm=NONE
-    hi Statement ctermfg=232 ctermbg=NONE cterm=NONE
-    hi Todo ctermfg=49 ctermbg=232 cterm=bold,reverse
-    hi Type ctermfg=232 ctermbg=NONE cterm=NONE
-    hi Underlined ctermfg=232 ctermbg=NONE cterm=underline
-    hi CursorIM ctermfg=232 ctermbg=154 cterm=NONE
+    hi 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 ToolbarLine ctermfg=NONE ctermbg=188 cterm=NONE
-    hi ToolbarButton ctermfg=232 ctermbg=188 cterm=bold
+    hi ToolbarButton ctermfg=16 ctermbg=188 cterm=bold
   endif
   unlet s:t_Co
   finish
@@ -308,6 +328,19 @@ 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
@@ -320,43 +353,35 @@ 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 PmenuSbar 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 Search ctermfg=darkcyan ctermbg=black cterm=reverse
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
     hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
     hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
     hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
     hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
     hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-    hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
-    hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
     hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse
     hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
     hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
     hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
-    hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
     hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Error ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Error ctermfg=darkred ctermbg=black 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
@@ -370,6 +395,18 @@ 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
@@ -382,43 +419,36 @@ 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 PmenuSbar 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 Search ctermfg=darkcyan ctermbg=black cterm=reverse
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
     hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
     hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
     hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
     hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
     hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-    hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
-    hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
     hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse
     hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
     hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
     hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
     hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
     hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Error ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Error ctermfg=darkred ctermbg=black 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
@@ -437,6 +467,19 @@ 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
@@ -449,43 +492,35 @@ 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 PmenuSbar 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 Search ctermfg=darkcyan ctermbg=black cterm=reverse
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
     hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
     hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
     hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
     hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
     hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-    hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
-    hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
     hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse
     hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
     hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
     hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
-    hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
     hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Error ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Error ctermfg=darkred ctermbg=black 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
@@ -499,6 +534,18 @@ 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
@@ -511,43 +558,36 @@ 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 PmenuSbar 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 Search ctermfg=darkcyan ctermbg=black cterm=reverse
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=reverse
-    hi SpecialKey ctermfg=NONE ctermbg=NONE cterm=bold
     hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
     hi SpellCap ctermfg=darkblue ctermbg=NONE cterm=underline
     hi SpellLocal ctermfg=darkmagenta ctermbg=NONE cterm=underline
     hi SpellRare ctermfg=darkcyan ctermbg=NONE cterm=underline
     hi StatusLine ctermfg=NONE ctermbg=NONE cterm=bold,reverse
-    hi StatusLineNC ctermfg=NONE ctermbg=NONE cterm=bold,underline
-    hi TabLine ctermfg=NONE ctermbg=NONE cterm=bold,underline
     hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
     hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse
     hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
     hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
     hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
     hi Comment ctermfg=NONE ctermbg=NONE cterm=bold
     hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Error ctermfg=NONE ctermbg=NONE cterm=bold,reverse
+    hi Error ctermfg=darkred ctermbg=black 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
@@ -633,7 +673,7 @@ if s:t_Co >= 0
 endif
 
 " Background: dark
-" Color: dark0         #080808           232               black
+" Color: dark0         #000000           16                black
 " Color: dark1         #d7005f           161               darkred
 " Color: dark2         #00af5f           35                darkgreen
 " Color: dark3         #d78700           172               darkyellow
@@ -661,13 +701,15 @@ endif
 " Color: uiamber       #ffaf00           214               darkyellow
 " Color: uiblack       #303030           236               darkgrey
 " Color: yasogrey      #1c1c1c           234               black
-" Color: linenrblack   #444444           238               darkgrey
+" Color: linenrblack   #585858           240               darkgrey
+" Color: uicursearch   #ff5fff           207               magenta
+" Color: invisigrey    #a8a8a8           248               darkgrey
 " Color: errorred      #ff005f           197               red
 " Term colors: dark0 dark1 dark2 dark3 dark4 dark5 dark6 dark7
 " Term colors: dark8 dark9 dark10 dark11 dark12 dark13 dark14 dark15
 " Background: light
 " Color: brightwhite   #eeeeee           255               grey
-" Color: light0        #080808           232               black
+" Color: light0        #000000           16                black
 " Color: light1        #af0000           124               darkred
 " Color: light2        #005f00           22                darkgreen
 " Color: light3        #af5f00           130               darkyellow
@@ -695,6 +737,7 @@ 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

runtime/colors/retrobox.vim

@@ -0,0 +1,874 @@
+" 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

runtime/colors/sorbet.vim

@@ -0,0 +1,444 @@
+" 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

runtime/colors/wildcharm.vim

@@ -0,0 +1,753 @@
+" 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

runtime/colors/zaibatsu.vim

@@ -0,0 +1,563 @@
+" 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

runtime/defaults.vim

@@ -1,7 +1,7 @@
 " The default vimrc file.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2022 Mar 03
+" Last change:	2023 May 10
 "
 " This is loaded if no vimrc file was found.
 " Except when Vim is run with "-u NONE" or "-C".
@@ -120,7 +120,7 @@ if 1
     au!
     autocmd CmdwinEnter *
 	  \ echohl Todo | 
-	  \ echo 'You discovered the command-line window! You can close it with ":q".' |
+	  \ echo gettext('You discovered the command-line window! You can close it with ":q".') |
 	  \ echohl None
   augroup END
 

runtime/doc/autocmd.txt

@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 9.0.  Last change: 2022 Nov 22
+*autocmd.txt*   For Vim version 9.0.  Last change: 2023 Feb 18
 
 
 		  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()'
 		    \ })
@@ -97,7 +97,7 @@ If the `:autocmd` is in Vim9 script (a script that starts with `:vim9script`
 and in a `:def` function) then {cmd} will be executed as in Vim9
 script.  Thus this depends on where the autocmd is defined, not where it is
 triggered.
-
+							*:autocmd-block*
 {cmd} can be a block, like with `:command`, see |:command-repl|.  Example: >
 	au BufReadPost *.xml {
 		  setlocal matchpairs+=<:>
@@ -398,7 +398,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
 
@@ -611,9 +611,11 @@ 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

runtime/doc/builtin.txt

@@ -1,4 +1,4 @@
-*builtin.txt*	For Vim version 9.0.  Last change: 2022 Dec 05
+*builtin.txt*	For Vim version 9.0.  Last change: 2023 May 12
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -81,8 +81,10 @@ 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})		Number	byte index of {nr}'th char in {expr}
-byteidxcomp({expr}, {nr})	Number	byte index of {nr}'th char in {expr}
+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}
 call({func}, {arglist} [, {dict}])
 				any	call {func} with arguments {arglist}
 ceil({expr})			Float	round {expr} up
@@ -117,7 +119,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}])
+charidx({string}, {idx} [, {countcc} [, {utf16}]])
 				Number	char index of byte {idx} in {string}
 chdir({dir})			String	change current working directory
 cindent({lnum})			Number	C indent for line {lnum}
@@ -211,6 +213,7 @@ getbufline({buf}, {lnum} [, {end}])
 getbufoneline({buf}, {lnum})	String	line {lnum} of buffer {buf}
 getbufvar({buf}, {varname} [, {def}])
 				any	variable {varname} in buffer {buf}
+getcellwidths()			List	get character cell width overrides
 getchangelist([{buf}])		List	list of change list items
 getchar([expr])			Number or String
 					get one character from the user
@@ -265,7 +268,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 the Vim window
+getwinpos([{timeout}])		List	X and Y coord in pixels of 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}])
@@ -381,7 +384,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} [, {path} [, {prot}]])
+mkdir({name} [, {flags} [, {prot}]])
 				Number	create directory {name}
 mode([expr])			String	current editing mode
 mzeval({expr})			any	evaluate |MzScheme| expression
@@ -481,7 +484,8 @@ 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({list})			List	reverse {list} in-place
+reverse({obj})			List/Blob/String
+					reverse {obj}
 round({expr})			Float	round off {expr}
 rubyeval({expr})		any	evaluate |Ruby| expression
 screenattr({row}, {col})	Number	attribute at screen position
@@ -603,6 +607,8 @@ 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()
@@ -666,6 +672,8 @@ test_garbagecollect_soon()	none	free memory soon for testing
 test_getvalue({string})		any	get value of an internal variable
 test_gui_event({event}, {args})	bool	generate a GUI event for testing
 test_ignore_error({expr})	none	ignore a specific error
+test_mswin_event({event}, {args})
+				bool	generate MS-Windows event for testing
 test_null_blob()		Blob	null value for testing
 test_null_channel()		Channel	null value for testing
 test_null_dict()		Dict	null value for testing
@@ -701,6 +709,8 @@ undofile({name})		String	undo file name for {name}
 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}])	Number or List
 					screen column of cursor or mark
@@ -1360,7 +1370,7 @@ byte2line({byte})					*byte2line()*
 <		{not available when compiled without the |+byte_offset|
 		feature}
 
-byteidx({expr}, {nr})					*byteidx()*
+byteidx({expr}, {nr} [, {utf16}])			*byteidx()*
 		Return byte index of the {nr}'th character in the String
 		{expr}.  Use zero for the first character, it then returns
 		zero.
@@ -1370,6 +1380,13 @@ byteidx({expr}, {nr})					*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
@@ -1381,11 +1398,17 @@ byteidx({expr}, {nr})					*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})					*byteidxcomp()*
+byteidxcomp({expr}, {nr} [, {utf16}])			*byteidxcomp()*
 		Like byteidx(), except that a composing character is counted
 		as a separate character.  Example: >
 			let s = 'e' .. nr2char(0x301)
@@ -1490,27 +1513,36 @@ charcol({expr} [, {winid}])				*charcol()*
 			GetPos()->col()
 <
 							*charidx()*
-charidx({string}, {idx} [, {countcc}])
+charidx({string}, {idx} [, {countcc} [, {utf16}]])
 		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 {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.
+		from the character index and |utf16idx()| for getting the
+		UTF-16 index from the character index.
+		Refer to |string-offset-encoding| for more information.
 		Examples: >
 			echo charidx('áb́ć', 3)		returns 1
 			echo charidx('áb́ć', 6, 1)	returns 4
 			echo charidx('áb́ć', 16)		returns -1
+			echo charidx('a😊😊', 4, 0, 1)	returns 2
 <
 		Can also be used as a |method|: >
 			GetName()->charidx(idx)
@@ -2228,11 +2260,12 @@ 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 equivalent to: >
+		This is more or less 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
@@ -2243,7 +2276,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
@@ -2566,8 +2599,7 @@ 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.  Items can still be changed by {expr2}, if you
-		don't want that use |deepcopy()| first.
+		unchanged.
 
 
 feedkeys({string} [, {mode}])				*feedkeys()*
@@ -2992,7 +3024,7 @@ funcref({name} [, {arglist}] [, {dict}])
 		Can also be used as a |method|: >
 			GetFuncname()->funcref([arg])
 <
-				*function()* *partial* *E700* *E922* *E923*
+				*function()* *partial* *E700* *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
@@ -3260,6 +3292,13 @@ getbufvar({buf}, {varname} [, {def}])				*getbufvar()*
 <		Can also be used as a |method|: >
 			GetBufnr()->getbufvar(varname)
 <
+getcellwidths()						*getcellwidths()*
+		Returns a |List| of cell widths of character ranges overridden
+		by |setcellwidths()|.  The format is equal to the argument of
+		|setcellwidths()|.  If no character ranges have their cell
+		widths overridden, an empty List is returned.
+
+
 getchangelist([{buf}])					*getchangelist()*
 		Returns the |changelist| for the buffer {buf}. For the use
 		of {buf}, see |bufname()| above. If buffer {buf} doesn't
@@ -3518,6 +3557,7 @@ getcompletion({pat}, {type} [, {filtered}])		*getcompletion()*
 		messages	|:messages| suboptions
 		option		options
 		packadd		optional package |pack-add| names
+		runtime		|:runtime| completion
 		scriptnames	sourced script names |:scriptnames|
 		shellcmd	Shell command
 		sign		|:sign| suboptions
@@ -4105,7 +4145,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.
@@ -4114,7 +4154,7 @@ getscriptinfo([{opts})					*getscriptinfo()*
 		optional items:
 		    name	Script name match pattern. If specified,
 				and "sid" is not specified, information about
-				scripts with name that match the pattern
+				scripts with a name that match the pattern
 				"name" are returned.
 		    sid		Script ID |<SID>|.  If specified, only
 				information about the script with ID "sid" is
@@ -4135,7 +4175,7 @@ getscriptinfo([{opts})					*getscriptinfo()*
 				this script name links to, if any, otherwise
 				zero
 		    variables   A dictionary with the script-local variables.
-				Present only when the a particular script is
+				Present only when a particular script is
 				specified using the "sid" item in {opts}.
 				Note that this is a copy, the value of
 				script-local variables cannot be changed using
@@ -5656,7 +5696,7 @@ maparg({name} [, {mode} [, {abbr} [, {dict}]]])			*maparg()*
 			     "!"     Insert and Commandline mode
 				     (|mapmode-ic|)
 		  "sid"	     The script local ID, used for <sid> mappings
-			     (|<SID>|).
+			     (|<SID>|).  Negative for special contexts.
 		  "scriptversion"  The version of the script.  999999 for
 				   |Vim9| script.
 		  "lnum"     The line number in "sid", zero if unknown.
@@ -6250,17 +6290,20 @@ min({expr})	Return the minimum value of all items in {expr}. Example:  >
 			mylist->min()
 
 <							*mkdir()* *E739*
-mkdir({name} [, {path} [, {prot}]])
+mkdir({name} [, {flags} [, {prot}]])
 		Create directory {name}.
 
-		If {path} contains "p" then intermediate directories are
-		created as necessary.  Otherwise it must be "".
+		When {flags} is present it must be a string.  An empty string
+		has no effect.
 
-		If {path} contains "D" then {name} is deleted at the end of
+		If {flags} contains "p" then intermediate directories are
+		created as necessary.
+
+		If {flags} contains "D" then {name} is deleted at the end of
 		the current function, as with: >
 			defer delete({name}, 'd')
 <
-		If {path} contains "R" then {name} is deleted recursively at
+		If {flags} 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
@@ -6724,17 +6767,20 @@ 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)
@@ -7088,7 +7134,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
-		list<any> can be used.
+		the type 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(): >
@@ -7137,7 +7183,8 @@ 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.
+		The accuracy depends on the system. Use reltimefloat() for the
+		greatest accuracy which is nanoseconds on some systems.
 		Leading spaces are used to make the string align nicely.  You
 		can use split() to remove it. >
 			echo split(reltimestr(reltime(start)))[0]
@@ -7269,8 +7316,9 @@ remote_send({server}, {string} [, {idvar}])
 <
 					*remote_startserver()* *E941* *E942*
 remote_startserver({name})
-		Become the server {name}.  This fails if already running as a
-		server, when |v:servername| is not empty.
+		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.
 
 		Can also be used as a |method|: >
 			ServerName()->remote_startserver()
@@ -7360,11 +7408,13 @@ resolve({filename})					*resolve()* *E655*
 			GetName()->resolve()
 
 reverse({object})					*reverse()*
-		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: >
+		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: >
 			:let revlist = reverse(copy(mylist))
 <		Can also be used as a |method|: >
 			mylist->reverse()
@@ -7947,7 +7997,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],
 				\ ])
 
@@ -7956,12 +8006,12 @@ setcellwidths({list})					*setcellwidths()*
 		{low} and {high} can be the same, in which case this refers to
 		one character.  Otherwise it is the range of characters from
 		{low} to {high} (inclusive).		*E1111* *E1114*
-		Only characters with value 0x100 and higher can be used.
+		Only characters with value 0x80 and higher can be used.
 
 		{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.
@@ -8628,8 +8678,9 @@ 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).
+		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!
 
 		When {how} is given and it is 'N' then all items will be
 		sorted numerical. This is like 'n' but a string containing
@@ -9111,6 +9162,8 @@ string({expr})	Return {expr} converted to a String.  If {expr} is a Number,
 			Blob		0z00112233.44556677.8899
 			List		[item, item]
 			Dictionary	{key: value, key: value}
+			Class		class SomeName
+			Object		object of SomeName {lnum: 1, col: 3}
 
 		When a |List| or |Dictionary| has a recursive reference it is
 		replaced by "[...]" or "{...}".  Using eval() on the result
@@ -9226,6 +9279,28 @@ 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('ą́')		returns 1
+		    echo strutf16len('ą́', 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
@@ -9795,6 +9870,8 @@ 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
@@ -9943,6 +10020,8 @@ type({expr})	The result is a Number representing the type of {expr}.
 			Job:	    8  |v:t_job|
 			Channel:    9  |v:t_channel|
 			Blob:	   10  |v:t_blob|
+			Class	   12  |v:t_class|
+			Object	   13  |v:t_object|
 		For backward compatibility, this method can be used: >
 			:if type(myvar) == type(0)
 			:if type(myvar) == type("")
@@ -9963,7 +10042,7 @@ typename({expr})					*typename()*
 		Return a string representation of the type of {expr}.
 		Example: >
 			echo typename([1, 2, 3])
-			list<number>
+<			list<number> ~
 
 
 undofile({name})					*undofile()*
@@ -10037,6 +10116,34 @@ 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 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 upwards
+		to the end of that sequence.
+
+		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('aą́c', 6)		returns 2
+			echo utf16idx('aą́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
@@ -10155,7 +10262,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
@@ -10536,7 +10643,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
@@ -10733,6 +10840,7 @@ 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|

runtime/doc/change.txt

@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 9.0.  Last change: 2022 Nov 20
+*change.txt*    For Vim version 9.0.  Last change: 2023 Mar 07
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -296,7 +296,9 @@ 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|.
+			{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.
 
 						*digraph-arg*
 The argument for Normal mode commands like |r| and |t| is a single character.
@@ -453,6 +455,12 @@ 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.
 
@@ -1033,7 +1041,7 @@ inside of strings can change!  Also see 'softtabstop' option. >
 <			to display registers '1' and 'a'.  Spaces are allowed
 			in {arg}.
 
-							*:di* *:display*
+							*:di* *:dis* *:display*
 :di[splay] [arg]	Same as :registers.
 
 							*y* *yank*

runtime/doc/cmdline.txt

@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 9.0.  Last change: 2022 Nov 11
+*cmdline.txt*   For Vim version 9.0.  Last change: 2023 Feb 08
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -617,6 +617,7 @@ followed by another Vim command:
     :read !
     :scscope
     :sign
+    :tabdo
     :tcl
     :tcldo
     :tclfile

runtime/doc/diff.txt

@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 9.0.  Last change: 2022 Oct 01
+*diff.txt*      For Vim version 9.0.  Last change: 2023 Apr 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -109,6 +109,7 @@ 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: >
 
@@ -136,7 +137,7 @@ file for a moment and come back to the same file and be in diff mode again.
 		buffers.
 
 The `:diffoff` command resets the relevant options to the values they had when
-using `:diffsplit`, `:diffpatch` , `:diffthis`. or starting Vim in diff mode.
+using `:diffsplit`, `:diffpatch`, `:diffthis`. or starting Vim in diff mode.
 When using `:diffoff` twice the last saved values are restored.
 Otherwise they are set to their default value:
 
@@ -148,6 +149,10 @@ Otherwise they are set to their default value:
 	'foldmethod'	"manual"
 	'foldcolumn'	0
 
+'foldenable' will most-likely be reset to off.  That is when 'foldmethod' is
+is restored to "manual".  The folds themselves are not cleared but they should
+not show up, resetting 'foldenable' is the best way to do that.
+
 ==============================================================================
 2. Viewing diffs						*view-diffs*
 
@@ -177,7 +182,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.
 

runtime/doc/digraph.txt

@@ -1,4 +1,4 @@
-*digraph.txt*   For Vim version 9.0.  Last change: 2022 Nov 22
+*digraph.txt*   For Vim version 9.0.  Last change: 2023 Mar 21
 
 
 		  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
+Λ	L*	039B	0923	GREEK CAPITAL LETTER LAMDA (aka LAMBDA)
 Μ	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
+λ	l*	03BB	0955	GREEK SMALL LETTER LAMDA (aka LAMBDA)
 μ	m*	03BC	0956	GREEK SMALL LETTER MU
 ν	n*	03BD	0957	GREEK SMALL LETTER NU
 ξ	c*	03BE	0958	GREEK SMALL LETTER XI

runtime/doc/editing.txt

@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 9.0.  Last change: 2022 Nov 02
+*editing.txt*   For Vim version 9.0.  Last change: 2023 Apr 23
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1533,9 +1533,10 @@ 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
-	:setlocal cm=blowfish2  " medium strong method
+	: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
 
 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

runtime/doc/eval.txt

@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 9.0.  Last change: 2022 Dec 03
+*eval.txt*	For Vim version 9.0.  Last change: 2023 Apr 24
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -163,9 +163,10 @@ Note that " " and "0" are also non-empty strings, thus considered to be TRUE.
 A List, Dictionary or Float is not a Number or String, thus evaluate to FALSE.
 
 		*E611* *E745* *E728* *E703* *E729* *E730* *E731* *E908* *E910*
-		*E913* *E974* *E975* *E976*
-|List|, |Dictionary|, |Funcref|, |Job|, |Channel| and |Blob| types are not
-automatically converted.
+		*E913* *E974* *E975* *E976* *E1319* *E1320* *E1321* *E1322*
+		*E1323* *E1324*
+|List|, |Dictionary|, |Funcref|, |Job|, |Channel|, |Blob|, |Class| and
+|object| types are not automatically converted.
 
 							*E805* *E806* *E808*
 When mixing Number and Float the Number is converted to Float.  Otherwise
@@ -1371,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.
 
@@ -1579,6 +1580,33 @@ 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*
 ------
@@ -1653,7 +1681,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
@@ -1787,6 +1815,8 @@ 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
@@ -2503,6 +2533,10 @@ v:t_number	Value of |Number| type.  Read-only.  See: |type()|
 v:t_string	Value of |String| type.  Read-only.  See: |type()|
 					*v:t_blob* *t_blob-variable*
 v:t_blob	Value of |Blob| type.  Read-only.  See: |type()|
+					*v:t_class* *t_class-variable*
+v:t_class	Value of |class| type.  Read-only.  See: |type()|
+					*v:t_object* *t_object-variable*
+v:t_object	Value of |object| type.  Read-only.  See: |type()|
 
 				*v:termresponse* *termresponse-variable*
 v:termresponse	The escape sequence returned by the terminal for the |t_RV|
@@ -2969,6 +3003,8 @@ text...
 			deleted when the script ends).  Function-local
 			variables are automatically deleted when the function
 			ends.
+			In |Vim9| script variables declared in a function or
+			script cannot be removed.
 
 :unl[et] ${env-name} ...			*:unlet-environment* *:unlet-$*
 			Remove environment variable {env-name}.
@@ -4574,31 +4610,21 @@ 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 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
+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: >
 
-    " 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
+    # 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
 
 ==============================================================================
 10. Vim script versions		*vimscript-version* *vimscript-versions*

runtime/doc/filetype.txt

@@ -1,4 +1,4 @@
-*filetype.txt*  For Vim version 9.0.  Last change: 2022 Apr 09
+*filetype.txt*  For Vim version 9.0.  Last change: 2023 Apr 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -164,6 +164,7 @@ variables can be used to overrule the filetype used for certain extensions:
 	*.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|
 
 For a few filetypes the global variable is used only when the filetype could
@@ -659,8 +660,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, ...)
 
@@ -679,7 +680,10 @@ 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*
 

runtime/doc/fold.txt

@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 9.0.  Last change: 2022 Nov 26
+*fold.txt*      For Vim version 9.0.  Last change: 2023 Mar 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -202,7 +202,7 @@ non-matching marker pairs.  Example: >
 
 	/* funcB() {{{2 */
 	void funcB() {}
-
+<							*{{{* *}}}*
 A fold starts at a "{{{" marker.  The following number specifies the fold
 level.  What happens depends on the difference between the current fold level
 and the level given by the marker:
@@ -353,7 +353,8 @@ zC		Close all folds under the cursor recursively.  Folds that
 		'foldenable' will be set.
 
 							*za*
-za		When on a closed fold: open it.  When folds are nested, you
+za		Summary: Toggle the fold under the cursor.
+		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

runtime/doc/ft_context.txt

@@ -48,7 +48,7 @@ typesetting command. That must be a function that takes a path and returns the
 command as a List. For example:
 >
 	def ConTeXtCustomCommand(path: string): list<string>
-	  return ['mtxrun', '--script', 'context', '--nonstopmode, path]
+	  return ['mtxrun', '--script', 'context', '--nonstopmode', path]
 	enddef
 
 	context.ConTeXtTypeset("%", v:none, ConTeXtCustomCommand)

runtime/doc/ft_mp.txt

@@ -84,7 +84,7 @@ METAFONT buffers, and it is set to 0 by default in MetaPost buffers.
 Define additional keywords that end indented blocks. For instance, if you
 define:
 >
-	g:mp_end_tag = ['\<endfoo\>']
+	g:mp_close_tag = ['\<endfoo\>']
 <
 any line starting with `endfoo` will be de-indented compared to its previous
 line.

runtime/doc/gui.txt

@@ -1,4 +1,4 @@
-*gui.txt*       For Vim version 9.0.  Last change: 2022 Nov 17
+*gui.txt*       For Vim version 9.0.  Last change: 2023 Apr 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -95,11 +95,11 @@ terminal version.
 
 Recommended place for your personal GUI initializations:
 	Unix		    $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.
@@ -144,7 +144,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).
 
-						    *:win* *:winsize* *E465*
+					    *:wi* *: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,
@@ -856,7 +856,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.
@@ -1181,7 +1181,7 @@ When 'guifont' is set and a valid font is found in it and 'guifontwide' is
 empty Vim will attempt to find a matching double-width font and set
 'guifontwide' to it.
 
-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".
@@ -1226,10 +1226,9 @@ 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_gtk2")
+	    if has("gui_gtk")
 		: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

runtime/doc/gui_w32.txt

@@ -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.
 
 
 ==============================================================================

runtime/doc/helphelp.txt

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

runtime/doc/if_perl.txt

@@ -1,4 +1,4 @@
-*if_perl.txt*   For Vim version 9.0.  Last change: 2022 Mar 13
+*if_perl.txt*   For Vim version 9.0.  Last change: 2023 May 14
 
 
 		  VIM REFERENCE MANUAL    by Sven Verdoolaege
@@ -254,23 +254,14 @@ $main::curbuf
 
 							*script-here*
 When using a script language in-line, you might want to skip this when the
-language isn't supported.  But this mechanism doesn't work: >
+language isn't supported.  >
    if has('perl')
      perl << EOF
-       this will NOT work!
+       print 'perl works'
    EOF
    endif
-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.
+Note that "EOF" must be at the start of the line without preceding white
+space.
 
 ==============================================================================
 4. Dynamic loading					*perl-dynamic*

runtime/doc/if_pyth.txt

@@ -857,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
 
@@ -874,7 +874,7 @@ 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'

runtime/doc/index.txt

@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 9.0.  Last change: 2022 Oct 15
+*index.txt*     For Vim version 9.0.  Last change: 2023 Jan 09
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -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
@@ -1239,6 +1239,7 @@ tag		command		action ~
 |:checkpath|	:che[ckpath]	list included files
 |:checktime|	:checkt[ime]	check timestamp of loaded buffers
 |:chistory|	:chi[story]	list the error lists
+|:class|	:class		start of a class specification
 |:clast|	:cla[st]	go to the specified error, default last one
 |:clearjumps|	:cle[arjumps]	clear the jump list
 |:clist|	:cl[ist]	list all errors
@@ -1313,6 +1314,7 @@ tag		command		action ~
 |:else|		:el[se]		part of an :if command
 |:elseif|	:elsei[f]	part of an :if command
 |:emenu|	:em[enu]	execute a menu by name
+|:endclass|	:endclass	end of a class specification
 |:enddef|	:enddef		end of a user function started with :def
 |:endif|	:en[dif]	end previous :if
 |:endfor|	:endfo[r]	end previous :for
@@ -1529,6 +1531,7 @@ tag		command		action ~
 |:ptprevious|	:ptp[revious]	|:tprevious| in preview window
 |:ptrewind|	:ptr[ewind]	|:trewind| in preview window
 |:ptselect|	:pts[elect]	|:tselect| and show tag in preview window
+|:public|	:public		prefix for a class or object member
 |:put|		:pu[t]		insert contents of register in the text
 |:pwd|		:pw[d]		print current directory
 |:py3|		:py3		execute Python 3 command
@@ -1639,6 +1642,7 @@ tag		command		action ~
 |:startinsert|	:star[tinsert]	start Insert mode
 |:startgreplace|  :startg[replace] start Virtual Replace mode
 |:startreplace|	:startr[eplace]	start Replace mode
+|:static|	:static		prefix for a class member or function
 |:stopinsert|	:stopi[nsert]	stop Insert mode
 |:stjump|	:stj[ump]	do ":tjump" and split window
 |:stselect|	:sts[elect]	do ":tselect" and split window

runtime/doc/insert.txt

@@ -877,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 = ''
@@ -1118,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:
@@ -1176,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
 

runtime/doc/map.txt

@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 9.0.  Last change: 2022 Dec 01
+*map.txt*       For Vim version 9.0.  Last change: 2023 May 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -20,9 +20,10 @@ manual.
    1.8 Examples					|map-examples|
    1.9 Using mappings				|map-typing|
    1.10 Mapping alt-keys			|:map-alt-keys|
-   1.11 Mapping in modifyOtherKeys mode		|modifyOtherKeys|
-   1.12 Mapping with Kitty keyboard protocol	|kitty-keyboard-protocol|
-   1.13 Mapping an operator			|:map-operator|
+   1.11 Mapping meta-keys			|:map-meta-keys|
+   1.12 Mapping in modifyOtherKeys mode		|modifyOtherKeys|
+   1.13 Mapping with Kitty keyboard protocol	|kitty-keyboard-protocol|
+   1.14 Mapping an operator			|:map-operator|
 2. Abbreviations		|abbreviations|
 3. Local mappings and functions	|script-local|
 4. User-defined commands	|user-commands|
@@ -407,10 +408,6 @@ 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*
@@ -777,8 +774,8 @@ To avoid mapping of the characters you type in insert or Command-line mode,
 type a CTRL-V first.  The mapping in Insert mode is disabled if the 'paste'
 option is on.
 							*map-error*
-Note that when an error is encountered (that causes an error message or beep)
-the rest of the mapping is not executed.  This is Vi-compatible.
+Note that when an error is encountered (that causes an error message or might
+cause a beep) the rest of the mapping is not executed.  This is Vi-compatible.
 
 Note that the second character (argument) of the commands @zZtTfF[]rm'`"v
 and CTRL-X is not mapped.  This was done to be able to use all the named
@@ -794,8 +791,8 @@ otherwise you would not be able to use those commands anymore.  Here are a few
 suggestions:
 - Function keys <F2>, <F3>, etc..  Also the shifted function keys <S-F1>,
   <S-F2>, etc.  Note that <F1> is already used for the help command.
-- Meta-keys (with the ALT key pressed).  Depending on your keyboard accented
-  characters may be used as well. |:map-alt-keys|
+- Any key with the Alt or Meta key pressed.  Depending on your keyboard
+  accented characters may be used as well. |:map-alt-keys|
 - Use the '_' or ',' character and then any other character.  The "_" and ","
   commands do exist in Vim (see |_| and |,|), but you probably never use them.
 - Use a key that is a synonym for another command.  For example: CTRL-P and
@@ -844,7 +841,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
@@ -922,12 +919,19 @@ 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.
 
 If the terminal supports the modifyOtherKeys mode and it has been enabled,
 then Vim can recognize more key combinations, see |modifyOtherKeys| below.
+The Kitty keyboard protocol works in a similar way, see
+|kitty-keyboard-protocol|.
 
 By default Vim assumes that pressing the ALT key sets the 8th bit of a typed
 character.  Most decent terminals can work that way, such as xterm, aterm and
@@ -966,7 +970,21 @@ on the terminal; that's a good last resource in case you want to send ESC when
 using other applications but not when inside Vim.
 
 
-1.11 MAPPING IN modifyOtherKeys mode			*modifyOtherKeys*
+1.11 MAPPING META-KEYS					*:map-meta-keys*
+
+Mapping keys with the Meta modifier works very similar to using the Alt key.
+What key on your keyboard produces the Meta modifier depends on your keyboard
+and configuration.
+
+Note that mapping <M-a> actually is for using the Alt key.  That can be
+confusing!  It cannot be changed, it would not be backwards compatible.
+
+For the Meta modifier the "T" character is used.  For example, to map Meta-b
+in Insert mode: >
+	:imap <T-b> terrible
+
+
+1.12 MAPPING IN modifyOtherKeys mode			*modifyOtherKeys*
 
 Xterm and a few other terminals can be put in a mode where keys with modifiers
 are sent with a special escape code.  Vim recognizes these codes and can then
@@ -1011,7 +1029,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.
@@ -1028,7 +1046,7 @@ When the 'esckeys' option is off, then modifyOtherKeys will be disabled in
 Insert mode to avoid every key with a modifier causing Insert mode to end.
 
 
-1.12 MAPPING WITH KITTY KEYBOARD PROTOCOL	 *kitty-keyboard-protocol*
+1.13 MAPPING WITH KITTY KEYBOARD PROTOCOL	 *kitty-keyboard-protocol*
 
 If the value of 'term' contains "kitty" then Vim will send out an escape
 sequence to enable the Kitty keyboard protocol.  This can be changed with the
@@ -1051,11 +1069,11 @@ 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 beeen disabled by 't_TE',
-			previous state is unknown 
+	Cleared		protocol expected to have been disabled by 't_TE',
+			previous state is unknown
 
 
-1.13 MAPPING AN OPERATOR				*:map-operator*
+1.14 MAPPING AN OPERATOR				*:map-operator*
 
 An operator is used before a {motion} command.  To define your own operator
 you must create a mapping that first sets the 'operatorfunc' option and then
@@ -1195,7 +1213,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
@@ -1399,12 +1417,13 @@ 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'.
+'<' 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.
    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
-could define a mapping "<SNR>23_Add".
+would 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
@@ -1543,6 +1562,11 @@ 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.
@@ -1706,7 +1730,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
@@ -1758,6 +1782,11 @@ 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.
@@ -1844,8 +1873,14 @@ 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
@@ -1892,14 +1927,5 @@ 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:

runtime/doc/options.txt

@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 9.0.  Last change: 2022 Nov 30
+*options.txt*	For Vim version 9.0.  Last change: 2023 May 04
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -34,6 +34,8 @@ achieve special effects.  These options come in three forms:
 			key codes are not shown, because they are generated
 			internally and can't be changed.  Changing the terminal
 			codes in the GUI is not useful either...
+			The options have the form t_AB, see
+			|terminal-options|.
 
 :se[t]! termcap		Idem, but don't use multiple columns.
 
@@ -923,6 +925,9 @@ 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)
@@ -1249,7 +1254,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		\ ' on word "' .. v:beval_text .. '"'
     endfunction
     set bexpr=MyBalloonExpr()
-    set ballooneval
+    set ballooneval balloonevalterm
 <
 	Also see |balloon_show()|, it can be used if the content of the balloon
 	is to be fetched asynchronously.  In that case evaluating
@@ -1545,7 +1550,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'*
+				*'cdhome'* *'cdh'* *'nocdhome'* *'nocdh'*
 'cdhome' 'cdh'		boolean	(default: off)
 			global
 	When on, |:cd|, |:tcd| and |:lcd| without an argument changes the
@@ -1897,7 +1902,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 	'allowrevins'	+ off		no CTRL-_ command
 	'antialias'	+ off		don't use antialiased fonts
-	'arabic'	+ off	 	reset arabic-related options
+	'arabic'	+ off		reset arabic-related options
 	'arabicshape'	+ on		correct character shapes
 	'backspace'	+ ""		normal backspace
 	'backup'	+ off		no backup file
@@ -2509,12 +2514,14 @@ 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
@@ -2536,11 +2543,21 @@ 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.
-			CURRENTLY EXPERIMENTAL: Files written with this method
+			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
 			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.
+	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.
 
 	When reading an encrypted file 'cryptmethod' will be set automatically
 	to the detected method of the file being read.  Thus if you write it
@@ -4196,6 +4213,8 @@ 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,
@@ -4252,6 +4271,10 @@ 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
 
@@ -4909,7 +4932,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"
@@ -4936,6 +4959,12 @@ A jump table for the options with a short description can be found at |Q_op|.
 			    CSI ?u	request kitty keyboard protocol state
 			    CSI >c	request the termresponse
 
+	If you notice problems, such as characters being displayed that
+	disappear after `CTRL-L`, you might want to try making this option
+	empty.  Then set the 'term' option to have it take effect: >
+		set keyprotocol=
+		let &term = &term
+<
 
 					*'keywordprg'* *'kp'*
 'keywordprg' 'kp'	string	(default "man" or "man -s",  DOS: ":help",
@@ -5193,8 +5222,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 			are left blank.
 							*lcs-multispace*
 	  multispace:c...
-	 		One or more characters to use cyclically to show for
-	 		multiple consecutive spaces.  Overrides the "space"
+			One or more characters to use cyclically to show for
+			multiple consecutive spaces.  Overrides the "space"
 			setting, except for single spaces.  When omitted, the
 			"space" setting is used.  For example,
 			`:set listchars=multispace:---+` shows ten consecutive
@@ -5657,7 +5686,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'*
+	      *'mousemoveevent'* *'mousemev'* *'nomousemoveevent'* *'nomousemev'*
 'mousemoveevent' 'mousemev'  boolean	(default off)
 			global
 			{only works in the GUI}
@@ -7112,51 +7141,55 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'shortmess'* *'shm'*
 'shortmess' 'shm'	string	(Vim default "filnxtToOS", Vi default: "S",
 							POSIX default: "AS")
-			global
+			global					*E1336*
 	This option helps to avoid all the |hit-enter| prompts caused by file
 	messages, for example  with CTRL-G, and to avoid some other messages.
 	It is a list of flags:
 	 flag	meaning when present	~
-	  f	use "(3 of 5)" instead of "(file 3 of 5)"
-	  i	use "[noeol]" instead of "[Incomplete last line]"
-	  l	use "999L, 888B" instead of "999 lines, 888 bytes"
-	  m	use "[+]" instead of "[Modified]"
-	  n	use "[New]" instead of "[New File]"
-	  r	use "[RO]" instead of "[readonly]"
-	  w	use "[w]" instead of "written" for file write message
+	  f	use "(3 of 5)" instead of "(file 3 of 5)"		*shm-f*
+	  i	use "[noeol]" instead of "[Incomplete last line]"	*shm-i*
+	  l	use "999L, 888B" instead of "999 lines, 888 bytes"	*shm-l*
+	  m	use "[+]" instead of "[Modified]"			*shm-m*
+	  n	use "[New]" instead of "[New File]"			*shm-n*
+	  r	use "[RO]" instead of "[readonly]"			*shm-r*
+	  w	use "[w]" instead of "written" for file write message	*shm-w*
 		and "[a]" instead of "appended" for ':w >> file' command
-	  x	use "[dos]" instead of "[dos format]", "[unix]" instead of
-		"[unix format]" and "[mac]" instead of "[mac format]".
-	  a	all of the above abbreviations
+	  x	use "[dos]" instead of "[dos format]", "[unix]"		*shm-x*
+		instead of "[unix format]" and "[mac]" instead of "[mac
+		format]"
+	  a	all of the above abbreviations				*shm-a*
 
-	  o	overwrite message for writing a file with subsequent message
-		for reading a file (useful for ":wn" or when 'autowrite' on)
-	  O	message for reading a file overwrites any previous message.
-		Also for quickfix message (e.g., ":cn").
-	  s	don't give "search hit BOTTOM, continuing at TOP" or "search
-		hit TOP, continuing at BOTTOM" messages; when using the search
-		count do not show "W" after the count message (see S below)
-	  t	truncate file message at the start if it is too long to fit
-		on the command-line, "<" will appear in the left most column.
-		Ignored in Ex mode.
-	  T	truncate other messages in the middle if they are too long to
-		fit on the command line.  "..." will appear in the middle.
-		Ignored in Ex mode.
-	  W	don't give "written" or "[w]" when writing a file
-	  A	don't give the "ATTENTION" message when an existing swap file
-		is found.
-	  I	don't give the intro message when starting Vim |:intro|.
-	  c	don't give |ins-completion-menu| messages.  For example,
-		"-- XXX completion (YYY)", "match 1 of 2", "The only match",
-		"Pattern not found", "Back at original", etc.
-	  C	don't give messages while scanning for ins-completion items,
-		for instance "scanning tags"
-	  q	use "recording" instead of "recording @a"
-	  F	don't give the file info when editing a file, like `: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.
-	        "[1/5]"
+	  o	overwrite message for writing a file with subsequent	*shm-o*
+		message for reading a file (useful for ":wn" or when
+		'autowrite' on)
+	  O	message for reading a file overwrites any previous	*shm-O*
+		message;  also for quickfix message (e.g., ":cn")
+	  s	don't give "search hit BOTTOM, continuing at TOP" or	*shm-s*
+		"search hit TOP, continuing at BOTTOM" messages; when using
+		the search count do not show "W" after the count message (see
+		S below)
+	  t	truncate file message at the start if it is too long	*shm-t*
+		to fit on the command-line, "<" will appear in the left most
+		column; ignored in Ex mode
+	  T	truncate other messages in the middle if they are too	*shm-T*
+		long to fit on the command line; "..." will appear in the
+		middle; ignored in Ex mode
+	  W	don't give "written" or "[w]" when writing a file	*shm-W*
+	  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|
+	  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.
+	  C	don't give messages while scanning for ins-completion	*shm-C*
+		items, for instance "scanning tags"
+	  q	use "recording" instead of "recording @a"		*shm-q*
+	  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]"
 
 	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
@@ -7216,9 +7249,26 @@ A jump table for the options with a short description can be found at |Q_op|.
 	- When selecting more than one line, the number of lines.
 	- When selecting a block, the size in screen characters:
 	  {lines}x{columns}.
+	This information can be displayed in an alternative location using the
+	'showcmdloc' option.
 	NOTE: This option is set to the Vi default value when 'compatible' is
 	set and to the Vim default value when 'compatible' is reset.
 
+			*'showcmdloc'* *'sloc'*
+'showcmdloc' 'sloc'	string	(default "last")
+			global
+	This option can be used to display the (partially) entered command in
+	another location.  Possible values are:
+	  last		Last line of the screen (default).
+	  statusline	Status line of the current window.
+	  tabline	First line of the screen if 'showtabline' is enabled.
+	Setting this option to "statusline" or "tabline" means that these will
+	be redrawn whenever the command changes, which can be on every key
+	pressed.
+	The %S 'statusline' item can be used in 'statusline' or 'tabline' to
+	place the text.  Without a custom 'statusline' or 'tabline' it will be
+	displayed in a convenient location.
+
 			*'showfulltag'* *'sft'* *'noshowfulltag'* *'nosft'*
 'showfulltag' 'sft'	boolean (default off)
 			global
@@ -7316,9 +7366,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".
 
@@ -7622,11 +7672,12 @@ 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, 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 ":+".
+	(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 ":+".
 	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.
@@ -7657,6 +7708,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 	When there is error while evaluating the option then it will be made
 	empty to avoid further errors.  Otherwise screen updating would loop.
+	When the result contains unprintable characters the result is
+	unpredictable.
 
 	Note that the only effect of 'ruler' when this option is set (and
 	'laststatus' is 2) is controlling the output of |CTRL-G|.
@@ -7716,6 +7769,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	P S   Percentage through file of displayed window.  This is like the
 	      percentage described for 'ruler'.  Always 3 in length, unless
 	      translated.
+	S S   'showcmd' content, see 'showcmdloc'.
 	a S   Argument list status as in default title.  ({current} of {max})
 	      Empty if the argument file count is zero or one.
 	{ NF  Evaluate expression between '%{' and '}' and substitute result.
@@ -7744,7 +7798,10 @@ 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 left and right aligned items.
+	= -   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.
 	      No width fields allowed.
 	# -   Set highlight group.  The name must follow and then a # again.
 	      Thus use %#HLname# for highlight group HLname.  The same
@@ -7752,8 +7809,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	      windows.
 	* -   Set highlight group to User{N}, where {N} is taken from the
 	      minwid field, e.g. %1*.  Restore normal highlight with %* or %0*.
-	      The difference between User{N} and StatusLine  will be applied
-	      to StatusLineNC for the statusline of non-current windows.
+	      The difference between User{N} and StatusLine will be applied to
+	      StatusLineNC for the statusline of non-current windows.
 	      The number N must be between 1 and 9.  See |hl-User1..9|
 
 	When displaying a flag, Vim removes the leading comma, if any, when
@@ -7874,16 +7931,18 @@ 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.
-	Mostly for |quickfix| commands some values are also used for other
-	commands, as mentioned below.
+	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|).
 	Possible values (comma-separated list):
-	   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".
+	   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.
 	   usetab	Like "useopen", but also consider windows in other tab
 			pages.
 	   split	If included, split the current window before loading
@@ -8199,7 +8258,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'* *E954*
+		*'termguicolors'* *'tgc'* *'notermguicolors'* *'notgc'* *E954*
 'termguicolors' 'tgc'	boolean (default off)
 			global
 			{not available when compiled without the
@@ -8647,6 +8706,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	set to a name that starts with "xterm", "mlterm", "screen", "tmux",
 	"st" (full match only), "st-" or "stterm", and 'ttymouse' is not set
 	already.
+	If the terminfo/termcap entry "XM" exists and the first number is
+	"1006" then 'ttymouse' will be set to "sgr".  This works for many
+	modern terminals.
 	Additionally, if vim is compiled with the |+termresponse| feature and
 	|t_RV| is set to the escape sequence to request the xterm version
 	number, more intelligent detection is done.

runtime/doc/os_390.txt

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

runtime/doc/os_vms.txt

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

runtime/doc/pattern.txt

@@ -1,4 +1,4 @@
-*pattern.txt*   For Vim version 9.0.  Last change: 2022 Sep 24
+*pattern.txt*   For Vim version 9.0.  Last change: 2023 Feb 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -101,6 +101,8 @@ 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
@@ -1142,21 +1144,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

runtime/doc/pi_getscript.txt

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

runtime/doc/pi_netrw.txt

@@ -1,4 +1,4 @@
-*pi_netrw.txt*  For Vim version 9.0.  Last change: 2022 Apr 06
+*pi_netrw.txt*  For Vim version 9.0.  Last change: 2023 May 14
 
 	    ------------------------------------------------
 	    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,17 +2864,13 @@ 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
@@ -2900,10 +2896,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
@@ -2951,7 +2947,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"
@@ -3008,7 +3004,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
@@ -3266,7 +3262,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
@@ -3275,7 +3271,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
@@ -3843,7 +3839,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
 <
@@ -3885,7 +3881,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: >
@@ -3911,6 +3907,8 @@ 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
@@ -3995,8 +3993,10 @@ 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

runtime/doc/pi_zip.txt

@@ -1,4 +1,4 @@
-*pi_zip.txt*	For Vim version 9.0.  Last change: 2022 Oct 17
+*pi_zip.txt*	For Vim version 9.0.  Last change: 2023 Mar 12
 
 				+====================+
 				| Zip File Interface |
@@ -102,6 +102,7 @@ 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.

runtime/doc/popup.txt

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

runtime/doc/quickfix.txt

@@ -1,4 +1,4 @@
-*quickfix.txt*  For Vim version 9.0.  Last change: 2022 Sep 26
+*quickfix.txt*  For Vim version 9.0.  Last change: 2023 Jan 18
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -365,8 +365,6 @@ processing a quickfix or location list command, it will be aborted.
 			If numbers [from] and/or [to] are given, the respective
 			range of errors is listed.  A negative number counts
 			from the last error backwards, -1 being the last error.
-			The 'switchbuf' settings are respected when jumping
-			to a buffer.
 			The |:filter| command can be used to display only the
 			quickfix entries matching a supplied pattern. The
 			pattern is matched against the filename, module name,
@@ -1273,6 +1271,21 @@ not "b:current_compiler".  What the command actually does is the following:
 For writing a compiler plugin, see |write-compiler-plugin|.
 
 
+DOTNET							*compiler-dotnet*
+
+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 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: >
+	let dotnet_errors_only = v:true
+	let dotnet_show_project_file = v:false
+	compiler dotnet
+<
+
 GCC					*quickfix-gcc*	*compiler-gcc*
 
 There's one variable you can set for the GCC compiler:

runtime/doc/quickref.txt

@@ -1,4 +1,4 @@
-*quickref.txt*  For Vim version 9.0.  Last change: 2022 Nov 23
+*quickref.txt*  For Vim version 9.0.  Last change: 2022 Dec 16
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -902,7 +902,8 @@ Short explanation of each option:		*option-list*
 'shortmess'	  'shm'     list of flags, reduce length of messages
 'shortname'	  'sn'	    Filenames assumed to be 8.3 chars
 'showbreak'	  'sbr'     string to use at the start of wrapped lines
-'showcmd'	  'sc'	    show (partial) command in status line
+'showcmd'	  'sc'	    show (partial) command somewhere
+'showcmdloc'	  'sloc'    where to show (partial) command
 'showfulltag'	  'sft'     show full tag pattern when completing tag
 'showmatch'	  'sm'	    briefly jump to matching bracket if insert one
 'showmode'	  'smd'     message on status line to show current mode

runtime/doc/recover.txt

@@ -1,4 +1,4 @@
-*recover.txt*   For Vim version 9.0.  Last change: 2020 Aug 15
+*recover.txt*   For Vim version 9.0.  Last change: 2023 Apr 22
 
 
 		  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*
+						*E312* *E309* *E310* *E1364*
 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

runtime/doc/remote.txt

@@ -64,7 +64,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*

runtime/doc/repeat.txt

@@ -1,4 +1,4 @@
-*repeat.txt*    For Vim version 9.0.  Last change: 2022 Sep 22
+*repeat.txt*    For Vim version 9.0.  Last change: 2023 May 01
 
 
 		  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
@@ -423,6 +423,7 @@ 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}
 
@@ -729,15 +730,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
@@ -1147,9 +1148,10 @@ 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() system
-  function.  It may only be as accurate as 1/100 second, even though the times
-  are displayed in micro seconds.
+- 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")`.
 
 - 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

runtime/doc/sign.txt

@@ -1,4 +1,4 @@
-*sign.txt*      For Vim version 9.0.  Last change: 2021 Dec 05
+*sign.txt*      For Vim version 9.0.  Last change: 2023 Feb 21
 
 
 		  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 {expr} 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
+		    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
 				placed on a line, the sign with the highest
 				priority is used. If not specified, the
 				default value of 10 is used. See

runtime/doc/spell.txt

@@ -1,4 +1,4 @@
-*spell.txt*	For Vim version 9.0.  Last change: 2020 Aug 15
+*spell.txt*	For Vim version 9.0.  Last change: 2023 Apr 21
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -216,7 +216,8 @@ 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.
+checking works.  For example, "camel" splits CamelCased words so that each
+part of the word is spell-checked separately.
 
 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,

runtime/doc/sponsor.txt

@@ -1,4 +1,4 @@
-*sponsor.txt*   For Vim version 9.0.  Last change: 2022 May 26
+*sponsor.txt*   For Vim version 9.0.  Last change: 2023 Mar 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -58,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/en_US/mrb/pal=XAC62PML3GF8Q
+			https://www.paypal.com/
 		The e-mail address for sending sponsorship money is:
 			donate@vim.org
 		The e-mail address for Vim registration is:

runtime/doc/syntax.txt

@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 9.0.  Last change: 2022 Nov 24
+*syntax.txt*	For Vim version 9.0.  Last change: 2023 Apr 24
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1307,18 +1307,32 @@ When not set 4 is used.
 
 DOSBATCH				*dosbatch.vim* *ft-dosbatch-syntax*
 
-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 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.
 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.
+Windows 2000 and later.
 
-A second option covers whether *.btm files should be detected as type
+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
 "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: >
 
@@ -2777,17 +2791,25 @@ For highlighted doctests and code inside: >
 	:let python_no_doctest_highlight = 1
 or >
 	:let python_no_doctest_code_highlight = 1
-(first option implies second one).
+The first option implies the 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 (the same as setting the
-preceding last option and unsetting all other ones): >
+If you want all possible Python highlighting:
 	: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*
 
@@ -3726,11 +3748,12 @@ 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 '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 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.
 
 2. Match
    This is a match with a single regexp pattern.
@@ -3836,7 +3859,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,$,_
@@ -4906,7 +4929,7 @@ is mostly used, because it looks better.
 ==============================================================================
 13. Colorschemes				*color-schemes*
 
-In the next section you can find information about indivisual highlight groups
+In the next section you can find information about individual 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: >
 
@@ -5003,7 +5026,7 @@ in their own color.
 
 						*highlight-clear* *:hi-clear*
 :hi[ghlight] clear	Reset all highlighting to the defaults.  Removes all
-			highlighting for groups added by the user!
+			highlighting for groups added by the user.
 			Uses the current value of 'background' to decide which
 			default colors to use.
 			If there was a default link, restore it. |:hi-link|
@@ -5283,7 +5306,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)
+		NONE		no color (transparent)		*E1361*
 		bg		use normal background color
 		background	use normal background color
 		fg		use normal foreground color
@@ -5356,7 +5379,7 @@ ColorColumn	Used for the columns set with 'colorcolumn'.
 							*hl-Conceal*
 Conceal		Placeholder characters substituted for concealed
 		text (see 'conceallevel').
-							*hl-Cursor*
+						*hl-Cursor* *hl-lCursor*
 Cursor		Character under the cursor.
 lCursor		Character under the cursor when |language-mapping|
 		is used (see 'guicursor').
@@ -5430,6 +5453,14 @@ 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*

runtime/doc/tags

@@ -568,6 +568,8 @@ $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'*
@@ -676,6 +678,8 @@ $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'*
@@ -745,10 +749,12 @@ $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'*
@@ -926,6 +932,7 @@ $quote	eval.txt	/*$quote*
 'shortname'	options.txt	/*'shortname'*
 'showbreak'	options.txt	/*'showbreak'*
 'showcmd'	options.txt	/*'showcmd'*
+'showcmdloc'	options.txt	/*'showcmdloc'*
 'showfulltag'	options.txt	/*'showfulltag'*
 'showmatch'	options.txt	/*'showmatch'*
 'showmode'	options.txt	/*'showmode'*
@@ -938,6 +945,7 @@ $quote	eval.txt	/*$quote*
 'siso'	options.txt	/*'siso'*
 'sj'	options.txt	/*'sj'*
 'slm'	options.txt	/*'slm'*
+'sloc'	options.txt	/*'sloc'*
 'slow'	vi_diff.txt	/*'slow'*
 'slowopen'	vi_diff.txt	/*'slowopen'*
 'sm'	options.txt	/*'sm'*
@@ -1082,6 +1090,7 @@ $quote	eval.txt	/*$quote*
 't_VS'	term.txt	/*'t_VS'*
 't_WP'	term.txt	/*'t_WP'*
 't_WS'	term.txt	/*'t_WS'*
+'t_XM'	term.txt	/*'t_XM'*
 't_ZH'	term.txt	/*'t_ZH'*
 't_ZR'	term.txt	/*'t_ZR'*
 't_al'	term.txt	/*'t_al'*
@@ -2201,6 +2210,7 @@ $quote	eval.txt	/*$quote*
 :aun	gui.txt	/*:aun*
 :aunmenu	gui.txt	/*:aunmenu*
 :autocmd	autocmd.txt	/*:autocmd*
+:autocmd-block	autocmd.txt	/*:autocmd-block*
 :autocmd-verbose	autocmd.txt	/*:autocmd-verbose*
 :b	windows.txt	/*:b*
 :bN	windows.txt	/*:bN*
@@ -2449,6 +2459,7 @@ $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*
@@ -2838,6 +2849,7 @@ $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*
@@ -3017,6 +3029,7 @@ $quote	eval.txt	/*$quote*
 :pts	tagsrch.txt	/*:pts*
 :ptselect	tagsrch.txt	/*:ptselect*
 :pu	change.txt	/*:pu*
+:public	vim9class.txt	/*:public*
 :put	change.txt	/*:put*
 :pw	editing.txt	/*:pw*
 :pwd	editing.txt	/*:pwd*
@@ -3550,6 +3563,7 @@ $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*
@@ -3988,6 +4002,7 @@ CTRL-{char}	intro.txt	/*CTRL-{char}*
 Channel	eval.txt	/*Channel*
 Channels	eval.txt	/*Channels*
 Chinese	mbyte.txt	/*Chinese*
+Class	vim9class.txt	/*Class*
 Cmd-event	autocmd.txt	/*Cmd-event*
 CmdUndefined	autocmd.txt	/*CmdUndefined*
 Cmdline	cmdline.txt	/*Cmdline*
@@ -4140,7 +4155,6 @@ 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*
@@ -4172,7 +4186,6 @@ 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*
@@ -4300,7 +4313,6 @@ 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*
@@ -4368,11 +4380,61 @@ E1311	map.txt	/*E1311*
 E1312	windows.txt	/*E1312*
 E1313	eval.txt	/*E1313*
 E1314	vim9class.txt	/*E1314*
+E1315	vim9class.txt	/*E1315*
+E1316	vim9class.txt	/*E1316*
+E1317	vim9class.txt	/*E1317*
+E1318	vim9class.txt	/*E1318*
+E1319	eval.txt	/*E1319*
 E132	userfunc.txt	/*E132*
+E1320	eval.txt	/*E1320*
+E1321	eval.txt	/*E1321*
+E1322	eval.txt	/*E1322*
+E1323	eval.txt	/*E1323*
+E1324	eval.txt	/*E1324*
+E1325	vim9class.txt	/*E1325*
+E1326	vim9class.txt	/*E1326*
+E1327	vim9class.txt	/*E1327*
+E1328	vim9class.txt	/*E1328*
+E1329	vim9class.txt	/*E1329*
 E133	userfunc.txt	/*E133*
+E1330	vim9class.txt	/*E1330*
+E1331	vim9class.txt	/*E1331*
+E1332	vim9class.txt	/*E1332*
+E1333	vim9class.txt	/*E1333*
+E1334	vim9class.txt	/*E1334*
+E1335	vim9class.txt	/*E1335*
+E1336	options.txt	/*E1336*
+E1337	vim9class.txt	/*E1337*
+E1338	vim9class.txt	/*E1338*
+E1339	textprop.txt	/*E1339*
 E134	change.txt	/*E134*
+E1340	vim9class.txt	/*E1340*
+E1341	vim9class.txt	/*E1341*
+E1342	vim9class.txt	/*E1342*
+E1343	vim9class.txt	/*E1343*
+E1344	vim9class.txt	/*E1344*
+E1345	vim9class.txt	/*E1345*
+E1346	vim9class.txt	/*E1346*
+E1347	vim9class.txt	/*E1347*
+E1348	vim9class.txt	/*E1348*
+E1349	vim9class.txt	/*E1349*
 E135	autocmd.txt	/*E135*
+E1350	vim9class.txt	/*E1350*
+E1351	vim9class.txt	/*E1351*
+E1352	vim9class.txt	/*E1352*
+E1353	vim9class.txt	/*E1353*
+E1354	vim9class.txt	/*E1354*
+E1355	vim9class.txt	/*E1355*
+E1356	vim9class.txt	/*E1356*
+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*
 E138	starting.txt	/*E138*
 E139	message.txt	/*E139*
@@ -5215,7 +5277,6 @@ 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*
@@ -5427,6 +5488,7 @@ OS390-bugs	os_390.txt	/*OS390-bugs*
 OS390-has-ebcdic	os_390.txt	/*OS390-has-ebcdic*
 OS390-limitations	os_390.txt	/*OS390-limitations*
 OS390-open-source	os_390.txt	/*OS390-open-source*
+Object	vim9class.txt	/*Object*
 OffTheSpot	mbyte.txt	/*OffTheSpot*
 OnTheSpot	mbyte.txt	/*OnTheSpot*
 Operator-pending	intro.txt	/*Operator-pending*
@@ -5588,6 +5650,7 @@ View	starting.txt	/*View*
 Vim9	vim9.txt	/*Vim9*
 Vim9-abstract-class	vim9class.txt	/*Vim9-abstract-class*
 Vim9-class	vim9class.txt	/*Vim9-class*
+Vim9-class-member	vim9class.txt	/*Vim9-class-member*
 Vim9-class-overview	vim9class.txt	/*Vim9-class-overview*
 Vim9-enum	vim9class.txt	/*Vim9-enum*
 Vim9-script	vim9.txt	/*Vim9-script*
@@ -6264,8 +6327,8 @@ cino-w	indent.txt	/*cino-w*
 cino-{	indent.txt	/*cino-{*
 cino-}	indent.txt	/*cino-}*
 cinoptions-values	indent.txt	/*cinoptions-values*
-class-member	vim9class.txt	/*class-member*
-class-method	vim9class.txt	/*class-method*
+class	vim9class.txt	/*class*
+class-function	vim9class.txt	/*class-function*
 clear-undo	undo.txt	/*clear-undo*
 clearmatches()	builtin.txt	/*clearmatches()*
 client-server	remote.txt	/*client-server*
@@ -6322,6 +6385,7 @@ compile-changes-8	version8.txt	/*compile-changes-8*
 compile-changes-9	version9.txt	/*compile-changes-9*
 compiler-compaqada	ft_ada.txt	/*compiler-compaqada*
 compiler-decada	ft_ada.txt	/*compiler-decada*
+compiler-dotnet	quickfix.txt	/*compiler-dotnet*
 compiler-gcc	quickfix.txt	/*compiler-gcc*
 compiler-gnat	ft_ada.txt	/*compiler-gnat*
 compiler-hpada	ft_ada.txt	/*compiler-hpada*
@@ -7358,7 +7422,6 @@ 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*
@@ -7511,6 +7574,7 @@ getbufinfo()	builtin.txt	/*getbufinfo()*
 getbufline()	builtin.txt	/*getbufline()*
 getbufoneline()	builtin.txt	/*getbufoneline()*
 getbufvar()	builtin.txt	/*getbufvar()*
+getcellwidths()	builtin.txt	/*getcellwidths()*
 getchangelist()	builtin.txt	/*getchangelist()*
 getchar()	builtin.txt	/*getchar()*
 getcharmod()	builtin.txt	/*getcharmod()*
@@ -7810,6 +7874,10 @@ 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*
@@ -7834,6 +7902,8 @@ 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*
@@ -7845,6 +7915,7 @@ 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()*
@@ -8183,6 +8254,7 @@ keypad-point	intro.txt	/*keypad-point*
 keys()	builtin.txt	/*keys()*
 keytrans()	builtin.txt	/*keytrans()*
 kitty-keyboard-protocol	map.txt	/*kitty-keyboard-protocol*
+kitty-terminal	term.txt	/*kitty-terminal*
 known-bugs	todo.txt	/*known-bugs*
 l	motion.txt	/*l*
 l:	eval.txt	/*l:*
@@ -8460,6 +8532,7 @@ motion-count-multiplied	motion.txt	/*motion-count-multiplied*
 motion.txt	motion.txt	/*motion.txt*
 mouse-mode-table	term.txt	/*mouse-mode-table*
 mouse-overview	term.txt	/*mouse-overview*
+mouse-reporting	term.txt	/*mouse-reporting*
 mouse-scrolling-off	scroll.txt	/*mouse-scrolling-off*
 mouse-swap-buttons	term.txt	/*mouse-swap-buttons*
 mouse-using	term.txt	/*mouse-using*
@@ -8878,6 +8951,14 @@ nr2char()	builtin.txt	/*nr2char()*
 nroff.vim	syntax.txt	/*nroff.vim*
 null	vim9.txt	/*null*
 null-variable	eval.txt	/*null-variable*
+null_blob	vim9.txt	/*null_blob*
+null_channel	vim9.txt	/*null_channel*
+null_dict	vim9.txt	/*null_dict*
+null_function	vim9.txt	/*null_function*
+null_job	vim9.txt	/*null_job*
+null_list	vim9.txt	/*null_list*
+null_partial	vim9.txt	/*null_partial*
+null_string	vim9.txt	/*null_string*
 number_relativenumber	options.txt	/*number_relativenumber*
 numbered-function	eval.txt	/*numbered-function*
 numbermax-variable	eval.txt	/*numbermax-variable*
@@ -8887,6 +8968,7 @@ o	insert.txt	/*o*
 o_CTRL-V	motion.txt	/*o_CTRL-V*
 o_V	motion.txt	/*o_V*
 o_v	motion.txt	/*o_v*
+object	vim9class.txt	/*object*
 object-motions	motion.txt	/*object-motions*
 object-select	motion.txt	/*object-select*
 objects	index.txt	/*objects*
@@ -9545,6 +9627,28 @@ shellescape()	builtin.txt	/*shellescape()*
 shift	intro.txt	/*shift*
 shift-left-right	change.txt	/*shift-left-right*
 shiftwidth()	builtin.txt	/*shiftwidth()*
+shm-A	options.txt	/*shm-A*
+shm-C	options.txt	/*shm-C*
+shm-F	options.txt	/*shm-F*
+shm-I	options.txt	/*shm-I*
+shm-O	options.txt	/*shm-O*
+shm-S	options.txt	/*shm-S*
+shm-T	options.txt	/*shm-T*
+shm-W	options.txt	/*shm-W*
+shm-a	options.txt	/*shm-a*
+shm-c	options.txt	/*shm-c*
+shm-f	options.txt	/*shm-f*
+shm-i	options.txt	/*shm-i*
+shm-l	options.txt	/*shm-l*
+shm-m	options.txt	/*shm-m*
+shm-n	options.txt	/*shm-n*
+shm-o	options.txt	/*shm-o*
+shm-q	options.txt	/*shm-q*
+shm-r	options.txt	/*shm-r*
+shm-s	options.txt	/*shm-s*
+shm-t	options.txt	/*shm-t*
+shm-w	options.txt	/*shm-w*
+shm-x	options.txt	/*shm-x*
 short-name-changed	version4.txt	/*short-name-changed*
 showing-menus	gui.txt	/*showing-menus*
 sign-column	sign.txt	/*sign-column*
@@ -9781,6 +9885,7 @@ 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()*
@@ -9790,6 +9895,7 @@ 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*
@@ -9948,6 +10054,7 @@ t_Us	term.txt	/*t_Us*
 t_VS	term.txt	/*t_VS*
 t_WP	term.txt	/*t_WP*
 t_WS	term.txt	/*t_WS*
+t_XM	term.txt	/*t_XM*
 t_ZH	term.txt	/*t_ZH*
 t_ZR	term.txt	/*t_ZR*
 t_al	term.txt	/*t_al*
@@ -9961,6 +10068,7 @@ t_channel-variable	eval.txt	/*t_channel-variable*
 t_ci	version4.txt	/*t_ci*
 t_cil	version4.txt	/*t_cil*
 t_cl	term.txt	/*t_cl*
+t_class-variable	eval.txt	/*t_class-variable*
 t_cm	term.txt	/*t_cm*
 t_cri	version4.txt	/*t_cri*
 t_cs	term.txt	/*t_cs*
@@ -10025,6 +10133,7 @@ t_ms	term.txt	/*t_ms*
 t_nd	term.txt	/*t_nd*
 t_none-variable	eval.txt	/*t_none-variable*
 t_number-variable	eval.txt	/*t_number-variable*
+t_object-variable	eval.txt	/*t_object-variable*
 t_op	term.txt	/*t_op*
 t_se	term.txt	/*t_se*
 t_sf1	version4.txt	/*t_sf1*
@@ -10264,6 +10373,7 @@ test_garbagecollect_soon()	testing.txt	/*test_garbagecollect_soon()*
 test_getvalue()	testing.txt	/*test_getvalue()*
 test_gui_event()	testing.txt	/*test_gui_event()*
 test_ignore_error()	testing.txt	/*test_ignore_error()*
+test_mswin_event()	testing.txt	/*test_mswin_event()*
 test_null_blob()	testing.txt	/*test_null_blob()*
 test_null_channel()	testing.txt	/*test_null_channel()*
 test_null_dict()	testing.txt	/*test_null_dict()*
@@ -10448,6 +10558,7 @@ 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:*
@@ -10532,6 +10643,7 @@ v:t_TYPE	eval.txt	/*v:t_TYPE*
 v:t_blob	eval.txt	/*v:t_blob*
 v:t_bool	eval.txt	/*v:t_bool*
 v:t_channel	eval.txt	/*v:t_channel*
+v:t_class	eval.txt	/*v:t_class*
 v:t_dict	eval.txt	/*v:t_dict*
 v:t_float	eval.txt	/*v:t_float*
 v:t_func	eval.txt	/*v:t_func*
@@ -10539,6 +10651,7 @@ v:t_job	eval.txt	/*v:t_job*
 v:t_list	eval.txt	/*v:t_list*
 v:t_none	eval.txt	/*v:t_none*
 v:t_number	eval.txt	/*v:t_number*
+v:t_object	eval.txt	/*v:t_object*
 v:t_string	eval.txt	/*v:t_string*
 v:termblinkresp	eval.txt	/*v:termblinkresp*
 v:termrbgresp	eval.txt	/*v:termrbgresp*
@@ -11020,6 +11133,7 @@ xterm-cursor-keys	term.txt	/*xterm-cursor-keys*
 xterm-end-home-keys	term.txt	/*xterm-end-home-keys*
 xterm-focus-event	term.txt	/*xterm-focus-event*
 xterm-function-keys	term.txt	/*xterm-function-keys*
+xterm-kitty	term.txt	/*xterm-kitty*
 xterm-modifier-keys	term.txt	/*xterm-modifier-keys*
 xterm-mouse	options.txt	/*xterm-mouse*
 xterm-mouse-wheel	scroll.txt	/*xterm-mouse-wheel*
@@ -11028,6 +11142,7 @@ xterm-save-screen	tips.txt	/*xterm-save-screen*
 xterm-screens	tips.txt	/*xterm-screens*
 xterm-scroll-region	term.txt	/*xterm-scroll-region*
 xterm-shifted-keys	term.txt	/*xterm-shifted-keys*
+xterm-terminfo-entries	term.txt	/*xterm-terminfo-entries*
 xterm-true-color	term.txt	/*xterm-true-color*
 y	change.txt	/*y*
 yaml.vim	syntax.txt	/*yaml.vim*
@@ -11124,6 +11239,8 @@ zz	scroll.txt	/*zz*
 {rhs}	map.txt	/*{rhs}*
 {server}	remote.txt	/*{server}*
 {subject}	helphelp.txt	/*{subject}*
+{{{	fold.txt	/*{{{*
 {}	intro.txt	/*{}*
 }	motion.txt	/*}*
+}}}	fold.txt	/*}}}*
 ~	change.txt	/*~*

runtime/doc/tagsrch.txt

@@ -1,4 +1,4 @@
-*tagsrch.txt*   For Vim version 9.0.  Last change: 2020 Dec 19
+*tagsrch.txt*   For Vim version 9.0.  Last change: 2023 Feb 13
 
 
 		  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 patter does not contain an upper case
+- when 'tagcase' is "smart" and the pattern does not contain an upper case
   character
 
 Note that using ignore-case tag searching disables binary searching in the

runtime/doc/term.txt

@@ -1,4 +1,4 @@
-*term.txt*      For Vim version 9.0.  Last change: 2022 Dec 01
+*term.txt*      For Vim version 9.0.  Last change: 2023 Jan 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -88,7 +88,8 @@ Output resumes when you hit <BS>.
 
 Note: When 't_ti' is not empty, Vim assumes that it causes switching to the
 alternate screen.  This may slightly change what happens when executing a
-shell command or exiting Vim.  To avoid this use 't_TI' and 't_TE'.
+shell command or exiting Vim.  To avoid this use 't_TI' and 't_TE' (but make
+sure to add to them, not overwrite).
 
 Vim will try to detect what keyboard protocol the terminal is using with the
 't_RK' termcap entry.  This is sent after 't_TI', but only when there is no
@@ -117,6 +118,10 @@ have a problem with this, disable bracketed paste by putting this in your
 If this is done while Vim is running the 't_BD' will be sent to the terminal
 to disable bracketed paste.
 
+If |t_PS| or |t_PE| is not set, then |t_BE| will not be used.  This is to make
+sure that bracketed paste is not enabled when the escape codes surrounding
+pasted text cannot be recognized.
+
 If your terminal supports bracketed paste, but the options are not set
 automatically, you can try using something like this: >
 
@@ -126,7 +131,11 @@ automatically, you can try using something like this: >
 	  exec "set t_PS=\e[200~"
 	  exec "set t_PE=\e[201~"
 	endif
-<
+
+The terminfo entries "BE", "BD", "PS" and "PE" were added in ncurses version
+6.4, early 2023, for some terminals.  If you have this version then you may
+not have to manually configure your terminal.
+
 							*tmux-integration*
 If you experience issues when running Vim inside tmux, here are a few hints.
 You can comment-out parts if something doesn't work (it may depend on the
@@ -294,6 +303,58 @@ When Vim receives a response to the |t_RV| (request version) sequence and it
 starts with CSI, it assumes that the terminal is in 8-bit mode and will
 convert all key sequences to their 8-bit variants.
 
+						*xterm-terminfo-entries*
+For some time the terminfo entries were insufficient to describe all the
+features tht Vim can use.  The builtin xterm termcap entries did have these,
+with the result that several terminals that were similar enough to xterm took
+advantage of these by prefixing "xterm-" to the terminal name in $TERM.
+
+This leads to problems, because quite often these terminals are not 100%
+compatible with xterm.  At the start of 2023 several entries have been added
+to the terminfo database to make it possible to use these features without
+using the "xterm" workaround.  These are the relevant entries (so far):
+
+	name	xterm value	description ~
+	RV	"\033[>c"	Request version |t_RV|
+
+	BE	"\033[?2004h"	enable bracketed paste mode |t_BE|
+	BD	"\033[?2004l"	disable bracketed paste mode |t_BD|
+	PS	"\033[200~"	pasted text start |t_PS|
+	PE	"\033[201~"	pasted text end |t_PE|
+
+	XM	"\033[?1006;1004;1000%?%p1%{1}%=%th%el%;"
+				mouse enable / disable |t_XM|
+
+The "XM" entry includes "1006" to enable SGR style mouse reporting.  This
+supports columns above 223.  It also includes "1004" which enables focus
+reporting.  The t_fe and t_fd entries can be left empty (they don't have
+entries in terminfo/termcap anyway).
+
+						*xterm-kitty* *kitty-terminal*
+The Kitty terminal is a special case.  Mainly because it works differently
+from most other terminals, but also because, instead of trying the fit in and
+make it behave like other terminals by default, it dictates how applications
+need to work when using Kitty.  This makes it very difficult for Vim to work
+in a Kitty terminal.  Some exceptions have been hard coded, but it is not at
+all nice to have to make exceptions for one specific terminal.
+
+One of the problems is that the value for $TERM is set to "xterm-kitty".  For
+Vim this is an indication that the terminal is xterm-compatible and the
+builtin xterm termcap entries should be used.  Many other terminals depend on
+this.  However, Kitty is not fully xterm compatible.  The author suggested to
+ignore the "xterm-" prefix and use the terminfo entry anyway, so that is what
+happens now, the builtin xterm termcap entries are not used.  However, the
+t_RV is set, otherwise other things would not work, such as automatically
+setting 'ttymouse' to "sgr" (at least until |t_XM| is being used for this).
+
+It is not clear why kitty sets $TERM to "xterm-kitty", the terminal isn't
+really xterm compatible.  "kitty" would be more appropriate, but a terminfo
+entry with that name is not widespread.
+
+Note that using the kitty keyboard protocol is a separate feature, see
+|kitty-keyboard-protocol|.
+
+
 ==============================================================================
 2. Terminal options		*terminal-options* *termcap-options* *E436*
 
@@ -393,6 +454,8 @@ Added by Vim (there are no standard codes for these):
 		xterm and other terminal emulators)  The
 		response is stored in |v:termresponse| |xterm-8bit|
 		|'ttymouse'| |xterm-codes|
+	t_XM	enable/disable mouse reporting,			*t_XM* *'t_XM'*
+		see |mouse-reporting| below
 	t_RK	request terminal keyboard protocol state;	*t_RK* *'t_RK'*
 		sent after |t_TI|
 	t_u7	request cursor position (for xterm)		*t_u7* *'t_u7'*
@@ -423,10 +486,10 @@ Added by Vim (there are no standard codes for these):
 	t_Si	save icon text to stack				*t_Si* *'t_Si'*
 	t_Ri	restore icon text from stack			*t_Ri* *'t_Ri'*
 	t_TE	end of "raw" mode				*t_TE* *'t_TE'*
-	t_TI	put terminal into "raw" mode 			*t_TI* *'t_TI'*
-	t_fe	enable focus-event tracking 			*t_fe* *'t_fe'*
+	t_TI	put terminal into "raw" mode			*t_TI* *'t_TI'*
+	t_fe	enable focus-event tracking			*t_fe* *'t_fe'*
 		|xterm-focus-event|
-	t_fd	disable focus-event tracking 			*t_fd* *'t_fd'*
+	t_fd	disable focus-event tracking			*t_fd* *'t_fd'*
 		|xterm-focus-event|
 
 Some codes have a start, middle and end part.  The start and end are defined
@@ -436,8 +499,8 @@ by the termcap option, the middle part is text.
 	set cursor color:   t_SC  {color name}  t_EC
 
 t_SH must take one argument:
-	0, 1 or none  	blinking block cursor
-	2	      	block cursor
+	0, 1 or none	blinking block cursor
+	2		block cursor
 	3		blinking underline cursor
 	4		underline cursor
 	5		blinking vertical bar cursor
@@ -446,6 +509,21 @@ t_SH must take one argument:
 t_RS is sent only if the response to t_RV has been received.  It is not used
 on Mac OS when Terminal.app could be recognized from the termresponse.
 
+							*mouse-reporting*
+Many terminals can report mouse clicks and some can report mouse movement and
+dragging.  Vim needs to know what codes are being used for this.
+
+The "XM" terminfo/termcap entry is used for this.  Vim also has the 'ttymouse'
+option to specify the mouse protocol being used.  See the option for the
+possible values.
+
+If Vim can read the "XM" terminfo/termcap entry then it will be used for
+enabling and disabling the mouse reporting.  If it is missing, then the value
+from 'ttymouse' is used to decide how to do this.
+
+If the "XM" entry exists and the first number is "1006" then 'ttymouse' will
+be set to "sgr", unless it was already set earlier.
+
 
 KEY CODES						*terminal-key-codes*
 Note: Use the <> form if possible
@@ -506,6 +584,7 @@ Note: Use the <> form if possible
 	t_%1	<Help>		help key			*t_%1* *'t_%1'*
 	t_&8	<Undo>		undo key			*t_&8* *'t_&8'*
 	t_kI	<Insert>	insert key			*t_kI* *'t_kI'*
+		<kInsert>	keypad insert key
 	t_kD	<Del>		delete key			*t_kD* *'t_kD'*
 	t_kb	<BS>		backspace key			*t_kb* *'t_kb'*
 	t_kB	<S-Tab>		back-tab (shift-tab)  *<S-Tab>*	*t_kB* *'t_kB'*
@@ -538,9 +617,13 @@ Note: Use the <> form if possible
 	t_KK	<k8>		keypad 8		 *<k8>*	*t_KK* *'t_KK'*
 	t_KL	<k9>		keypad 9		 *<k9>*	*t_KL* *'t_KL'*
 		<Mouse>		leader of mouse code		*<Mouse>*
-								*t_PS* *'t_PS'*
-	t_PS	start of bracketed paste |xterm-bracketed-paste|
-	t_PE	end of bracketed paste |xterm-bracketed-paste|  *t_PE* *'t_PE'*
+
+	t_PS	<PasteStart>	start of bracketed paste	*t_PS* *'t_PS'*
+				|xterm-bracketed-paste|
+	t_PE	<PasteEnd>	end of bracketed paste		*t_PE* *'t_PE'*
+				|xterm-bracketed-paste|
+		<FocusGained>	Vim window got focus (internal only)
+		<FocusLost>	Vim window lost focus (internal only)
 
 Note about t_so and t_mr: When the termcap entry "so" is not present the
 entry for "mr" is used.  And vice versa.  The same is done for "se" and "me".
@@ -579,12 +662,15 @@ work the 'termguicolors' option needs to be set.
 See https://github.com/termstandard/colors for a list of terminals that
 support true colors.
 
-Sometimes setting 'termguicolors' is not enough and one has to set the |t_8f|
-and |t_8b| options explicitly. Default values of these options are
-"^[[38;2;%lu;%lu;%lum" and "^[[48;2;%lu;%lu;%lum" respectively, but it is only
-set when `$TERM` is `xterm`. Some terminals accept the same sequences, but
-with all semicolons replaced by colons (this is actually more compatible, but
-less widely supported): >
+For telling the terminal what RGB color to use the |t_8f| and |t_8b| termcap
+entries are used.  These are set by default to values that work for most
+terminals.  If that does not work for your terminal you can set them manually.
+The default values are set like this: >
+	 let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
+	 let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
+
+Some terminals accept the same sequences, but with all semicolons replaced by
+colons (this is actually more compatible, but less widely supported): >
 	 let &t_8f = "\<Esc>[38:2:%lu:%lu:%lum"
 	 let &t_8b = "\<Esc>[48:2:%lu:%lu:%lum"
 
@@ -602,7 +688,7 @@ is actually the case.
 To overrule the default, put this line in your ~/.Xdefaults or
 ~/.Xresources:
 >
-	XTerm*allowWindowOps: 		true
+	XTerm*allowWindowOps:		true
 
 And run "xrdb -merge .Xresources" to make it effective.  You can check the
 value with the context menu (right mouse button while CTRL key is pressed),

runtime/doc/terminal.txt

@@ -30,9 +30,9 @@ 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|
@@ -240,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

runtime/doc/testing.txt

@@ -1,4 +1,4 @@
-*testing.txt*	For Vim version 9.0.  Last change: 2022 Nov 28
+*testing.txt*	For Vim version 9.0.  Last change: 2023 May 04
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -94,7 +94,7 @@ test_gui_event({event}, {args})
 		    "findrepl"  search and replace text.
 		    "mouse"	mouse button click event.
 		    "scrollbar" move or drag the scrollbar.
-		    "sendevent" send a low-level GUI event.
+		    "key"	send a low-level keyboard event.
 		    "tabline"	select a tab page by mouse click.
 		    "tabmenu"	select a tabline menu entry.
 
@@ -178,8 +178,8 @@ test_gui_event({event}, {args})
 		    dragging:	1 to drag the scrollbar and 0 to click in the
 				scrollbar.
 
-		"sendevent":
-		  Send a low-level GUI event (e.g. key-up or down).
+		"key":
+		  Send a low-level keyboard event (e.g. key-up or down).
 		  Currently only supported on MS-Windows.
 		  The supported items in {args} are:
 		    event:	The supported string values are:
@@ -197,7 +197,7 @@ test_gui_event({event}, {args})
 		  Inject an event to select a tabline menu entry. The
 		  supported items in {args} are:
 		    tabnr:	tab page number
-		    item: 	tab page menu item number. 1 for the first
+		    item:	tab page menu item number. 1 for the first
 				menu item, 2 for the second item and so on.
 
 		After injecting the GUI events you probably should call
@@ -224,6 +224,77 @@ test_ignore_error({expr})			 *test_ignore_error()*
 			GetErrorText()->test_ignore_error()
 
 
+test_mswin_event({event}, {args})		*test_mswin_event()*
+		Generate a low-level MS-Windows {event} with arguments {args}
+		for testing Vim functionality.  It works for MS-Windows GUI
+		and for the console.
+
+		{event} is a String and the supported values are:
+		    "mouse"	mouse event.
+		    "key"	keyboard event.
+
+		"mouse":
+		  Inject either a mouse button click, or a mouse move, event.
+		  The supported items in {args} are:
+		    button:	mouse button.  The supported values are:
+				    0	right mouse button
+				    1	middle mouse button
+				    2	left mouse button
+				    3	mouse button release
+				    4	scroll wheel down
+				    5	scroll wheel up
+				    6	scroll wheel left
+				    7	scroll wheel right
+		    row:	mouse click row number.  The first row of the
+				Vim window is 1 and the last row is 'lines'.
+		    col:	mouse click column number.  The maximum value
+				of {col} is 'columns'.
+				Note: row and col are always interpreted as
+				screen cells for the console application.
+				But, they may be interpreted as pixels
+				for the GUI, depending on "cell".
+		    multiclick:	set to 1 to inject a double-click mouse event.
+		    modifiers:	key modifiers.  The supported values are:
+				    4	shift is pressed
+				    8	alt is pressed
+				   16	ctrl is pressed
+		    move:	Optional; if used and TRUE then a mouse move
+			        event can be generated.
+				Only {args} row: and col: are used and
+				required.
+				Only results in an event when 'mousemoveevent'
+				is set or a popup uses mouse move events.
+		    cell:	Optional for the GUI: when present and TRUE
+				then "move" uses screen cells instead of pixel
+				positions.  Not used by the console.
+
+		"key":
+		  Send a low-level keyboard event (e.g. keyup or keydown).
+		  The supported items in {args} are:
+		    event:	The supported string values are:
+				    keyup   generate a keyup event
+				    keydown generate a keydown event
+		    keycode:	Keycode to use for a keyup or a keydown event.
+		    modifiers:	Optional; key modifiers.
+				The supported values are:
+				    2	shift is pressed
+				    4	ctrl is pressed
+				    8	alt is pressed
+				Note: These values are different from the
+				mouse modifiers.
+		    execute:	Optional. Similar to |feedkeys()| mode x.
+				When this is included and set to true
+				(non-zero) then Vim will process any buffered
+				unprocessed key events.  All other {args}
+				items are optional when this is set and true.
+
+		Returns TRUE if the event is successfully added or executed,
+		FALSE if there is a failure.
+
+		Can also be used as a |method|: >
+			GetEvent()->test_mswin_event({args})
+<
+
 test_null_blob()					*test_null_blob()*
 		Return a |Blob| that is null. Only useful for testing.
 
@@ -298,7 +369,8 @@ test_override({name}, {val})				*test_override()*
 			     string is detected
 		ui_delay     time in msec to use in ui_delay(); overrules a
 			     wait time of up to 3 seconds for messages
-		uptime 	     overrules sysinfo.uptime
+		unreachable  no error for code after `:throw` and `:return`
+		uptime	     overrules sysinfo.uptime
 		vterm_title  setting the window title by a job running in a
 			     terminal window
 		ALL	     clear all overrides, except alloc_lines ({val} is
@@ -307,13 +379,18 @@ test_override({name}, {val})				*test_override()*
 		"starting" is to be used when a test should behave like
 		startup was done.  Since the tests are run by sourcing a
 		script the "starting" variable is non-zero. This is usually a
-		good thing (tests run faster), but sometimes changes behavior
-		in a way that the test doesn't work properly.
+		good thing (tests run faster), but sometimes this changes
+		behavior in a way that the test doesn't work properly.
 		When using: >
 			call test_override('starting', 1)
 <		The value of "starting" is saved.  It is restored by: >
 			call test_override('starting', 0)
 
+<		To make sure the flag is reset later using `:defer` can be
+		useful: >
+			call test_override('unreachable', 1)
+			defer call test_override('unreachable', 0)
+
 <		Can also be used as a |method|: >
 			GetOverrideVal()-> test_override('starting')
 
@@ -377,13 +454,14 @@ assert_beeps({cmd})					*assert_beeps()*
 assert_equal({expected}, {actual} [, {msg}])
 		When {expected} and {actual} are not equal an error message is
 		added to |v:errors| and 1 is returned.  Otherwise zero is
-		returned |assert-return|.
+		returned. |assert-return|
+		The error is in the form "Expected {expected} but got
+		{actual}".  When {msg} is present it is prefixed to that.
+
 		There is no automatic conversion, the String "4" is different
 		from the Number 4.  And the number 4 is different from the
 		Float 4.0.  The value of 'ignorecase' is not used here, case
 		always matters.
-		When {msg} is omitted an error in the form "Expected
-		{expected} but got {actual}" is produced.
 		Example: >
 	assert_equal('foo', 'bar')
 <		Will result in a string to be added to |v:errors|:
@@ -462,11 +540,12 @@ assert_fails({cmd} [, {error} [, {msg} [, {lnum} [, {context}]]]])
 assert_false({actual} [, {msg}])			*assert_false()*
 		When {actual} is not false an error message is added to
 		|v:errors|, like with |assert_equal()|.
+		The error is in the form "Expected False but got {actual}".
+		When {msg} is present it is prepended to that.
 		Also see |assert-return|.
+
 		A value is false when it is zero. When {actual} is not a
 		number the assert fails.
-		When {msg} is omitted an error in the form
-		"Expected False but got {actual}" is produced.
 
 		Can also be used as a |method|: >
 			GetResult()->assert_false()
@@ -475,14 +554,16 @@ assert_inrange({lower}, {upper}, {actual} [, {msg}])	 *assert_inrange()*
 		This asserts number and |Float| values.  When {actual}  is lower
 		than {lower} or higher than {upper} an error message is added
 		to |v:errors|.  Also see |assert-return|.
-		When {msg} is omitted an error in the form
-		"Expected range {lower} - {upper}, but got {actual}" is
-		produced.
+		The error is in the form "Expected range {lower} - {upper},
+		but got {actual}".  When {msg} is present it is prefixed to
+		that.
 
 								*assert_match()*
 assert_match({pattern}, {actual} [, {msg}])
 		When {pattern} does not match {actual} an error message is
 		added to |v:errors|.  Also see |assert-return|.
+		The error is in the form "Pattern {pattern} does not match
+		{actual}".  When {msg} is present it is prefixed to that.
 
 		{pattern} is used as with |=~|: The matching is always done
 		like 'magic' was set and 'cpoptions' is empty, no matter what
@@ -492,8 +573,6 @@ assert_match({pattern}, {actual} [, {msg}])
 		Use "^" and "$" to match with the start and end of the text.
 		Use both to match the whole text.
 
-		When {msg} is omitted an error in the form
-		"Pattern {pattern} does not match {actual}" is produced.
 		Example: >
 	assert_match('^f.*o$', 'foobar')
 <		Will result in a string to be added to |v:errors|:
@@ -543,8 +622,7 @@ assert_true({actual} [, {msg}])				*assert_true()*
 		Also see |assert-return|.
 		A value is TRUE when it is a non-zero number.  When {actual}
 		is not a number the assert fails.
-		When {msg} is omitted an error in the form "Expected True but
-		got {actual}" is produced.
+		When {msg} is given it precedes the default message.
 
 		Can also be used as a |method|: >
 			GetResult()->assert_true()

runtime/doc/textprop.txt

@@ -1,4 +1,4 @@
-*textprop.txt*  For Vim version 9.0.  Last change: 2022 Nov 18
+*textprop.txt*  For Vim version 9.0.  Last change: 2023 Apr 23
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -56,7 +56,7 @@ how to highlight the text.  The property type can have these entries:
 			priority will be used.
 	"start_incl"	when TRUE inserts at the start position will be
 			included in the text property
-	"end_incl"    	when TRUE inserts at the end position will be
+	"end_incl"	when TRUE inserts at the end position will be
 			included in the text property
 
 
@@ -107,14 +107,14 @@ prop_type_list([{props}])		get list of property types
 
 Manipulating text properties:
 
-prop_add({lnum}, {col}, {props})  	add a text property
-prop_add_list({props}, [[{lnum}, {col}, {end-lnum}, {end-col}], ...])
+prop_add({lnum}, {col}, {props})	add a text property
+prop_add_list({props}, [{item}, ...])
 					add a text property at multiple
 					positions.
 prop_clear({lnum} [, {lnum-end} [, {bufnr}]])
 					remove all text properties
 prop_find({props} [, {direction}])	search for a text property
-prop_list({lnum} [, {props}])  		text properties in {lnum}
+prop_list({lnum} [, {props}])		text properties in {lnum}
 prop_remove({props} [, {lnum} [, {lnum-end}]])
 					remove a text property
 
@@ -149,7 +149,7 @@ prop_add({lnum}, {col}, {props})
 				highlighting; cannot be used with "length",
 				"end_lnum" and "end_col"
 				See |virtual-text| for more information.
-		   					*E1294*
+							*E1294*
 		   text_align	when "text" is present and {col} is zero;
 				specifies where to display the text:
 				   after   after the end of the line
@@ -165,14 +165,14 @@ prop_add({lnum}, {col}, {props})
 		   text_padding_left				*E1296*
 				used when "text" is present and {col} is zero;
 				padding between the end of the text line
-				(leftmost column for "below") and the virtual
-				text, not highlighted
+				(leftmost column for "above" and "below") and
+				the virtual text, not highlighted
 		   text_wrap	when "text" is present and {col} is zero,
 				specifies what happens if the text doesn't
 				fit:
 				   wrap      wrap the text to the next line
 				   truncate  truncate the text to make it fit
-		   		When omitted "truncate" is used.
+				When omitted "truncate" is used.
 				Note that this applies to the individual text
 				property, the 'wrap' option sets the overall
 				behavior
@@ -220,10 +220,16 @@ prop_add({lnum}, {col}, {props})
 		Any Tab and other control character in the text will be
 		changed to a space (Rationale: otherwise the size of the text
 		is difficult to compute).
-		A negative "id" will be chosen and is returned.  Once a
-		property with "text" has been added for a buffer then using a
-		negative "id" for any other property will give an error:
-		*E1293*
+		A negative "id" will be chosen and is returned.
+
+		Before text properties with text were supported it was
+		possible to use a negative "id", even though this was very
+		rare.  Now that negative "id"s are reserved for text
+		properties with text an error is given when using a negative
+		"id".  When a text property with text already exists using a
+		negative "id" results in *E1293* .  If a negative "id" was
+		used and later a text property with text is added results in
+		*E1339* .
 
 		Can also be used as a |method|: >
 			GetLnum()->prop_add(col, props)
@@ -257,12 +263,12 @@ prop_add_list({props}, [{item}, ...])
 		It is not possible to add a text property with a "text" field
 		here.
 
-		Example:
+		Example: >
 			call prop_add_list(#{type: 'MyProp', id: 2},
 					\ [[1, 4, 1, 7],
 					\  [1, 15, 1, 20],
 					\  [2, 30, 3, 30]]
-
+<
 		Can also be used as a |method|: >
 			GetProp()->prop_add_list([[1, 1, 1, 2], [1, 4, 1, 8]])
 

runtime/doc/todo.txt

@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 9.0.  Last change: 2022 Dec 05
+*todo.txt*      For Vim version 9.0.  Last change: 2023 May 13
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -38,30 +38,200 @@ browser use: https://github.com/vim/vim/issues/1234
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+Crash when splitting window: #11961.  Set RedrawingDisabled in
+win_split_ins().
+
+CTRL-J mapping is not used if halfway another mapping. #12002
+Is simplified mapping not used but escape code has been simplified?
+
+Windows scroll when using the autocmd window.  #12085
+in restore_snapshot_rec() restore more values from the snapshot, instead of
+calling frame_new_height() and frame_new_width(), especially w_topline and
+w_skipcol.
+
+Check places that source "path/*.vim" to not match other extensions, e.g.
+.vim9, on MS-Windows (short file name match, gets expanded to long file name).
+E.g. for startup files, plugins, packs, etc.
+
+When a help item can't be found, then open 'helpfile'.  Search for the tag in
+that file and gtive E149 only when not found.  Helps for a tiny Vim installed
+without all the help files.
+
+Virtual text problems:
+-  Deleting character before a wrapping virtual text, causes for the following
+   lines to dissapear (Issue #12244)
+-  If 'list' is on, 'below' virtual text which includes 1 or 2 characters are
+   gone (Issue #12028)
+-  Virtual text aligned "above": Wrong indentation when using tabs  (Issue
+   #12232)
+-  Virtual text to the right of the line that fits exactly on screen causes
+   that line and all lines below it not to be displayed (Issue #12213)
+-  Window screen gets wrong when a virtual text is placed on 'above' or
+   'below' on an empty line (Issue #11959)
+
+include #12140: positional arguments in printf(), fixes #10577
+
+Include #11818: attach custom data to quickfix items.
+
+Include #12292: buffer argument for undotree()?
+
+When 'virtualedit' is "all" and 'cursorcolumn' is set, the wrong column may be
+highlighted. (van-de-bugger, 2018 Jan 23, #2576)
+
+Improve profiling by caching matching functions:  PR  #12192
+
+Add filecopy() ?  #12346
+
+Implement foreach()  PR  #12166
+
+Errors when running tests with valgrind:
+- test_codestyle.vim:  e.g.:
+    command line..script /home/mool/vim/vim90/src/testdir/runtest.vim[569]..function RunTheTest[52]..Test_test_files line 6: keycode_check.vim: space before tab: Expected 0 but got 7
+    command line..script /home/mool/vim/vim90/src/testdir/runtest.vim[569]..function RunTheTest[52]..Test_test_files line 10: setup.vim: trailing white space: Expected 0 but got 23
+- test_gui.vim:
+    Found errors in Test_gui_mouse_event():
+
 Upcoming larger works:
 - Make spell checking work with recent .dic/.aff files, e.g. French.  #4916
     Make Vim understand the format somehow?   Search for "spell" below.
     Make sure suggestions are speedy, also with composed words (German).
-- Discuss alternatives for using other grammars (treesitter, TextMate).
+- Make syntax highlighting faster and better.  Discuss alternatives for using
+  other grammars (treesitter, TextMate).
    - Possibly conversion to Vim syntax rules.
    - Other mechanism than group and cluster to nest syntax items, to be used
      for grammars.
    - Possibly keeping the parsed syntax tree and incremental updates.
    - tree-sitter doesn't handle incorrect syntax (while typing) properly.
+   - NeoVim uses treesitter, what can we learn from that?
+   - Vscode is asked to switch to treesitter:
+      https://github.com/microsoft/vscode/issues/50140
+   - Vscode uses TextMate.  #9087 - Other people don't like it.
+      https://github.com/icedman/vim-textmate
+   - sublime grammar?  Hugo mentions it's a moving target  #9087
    - Make clear how it relates to LSP.
    - example plugin: https://github.com/uga-rosa/dps-vsctm.vim
 
 
 Further Vim9 improvements, possibly after launch:
-- implement :class and :interface: See |vim9-classes|  #11544
+- implement :class and :interface: See |vim9-classes
+  - Change access: public by default, private by prefixing "_".
+	Check for error: can't have same name twice (ignoring "_" prefix).
+  - Cannot use class type of itself in the method (Issue #12369)
+  - class members initialized during definition (Issue #12041)
+  - cannot call class member of funcref type  (Issue #12324)
+  - nested function unable to directly modify private member (Issue #12076)
+      And: can't use "this" keyword in lambda function (Issue #12336)
+  - "return this" required for early return from constructor (inconsistent)
+    (Issue #12040)
+  - class/method confusion inside ":def" when using "class extends" (Issue
+    #12089)
+  - null_object - constant type 17 not supported (Issue #12043)
+  - problem compiling object method call as function call argument (Issue
+    #12081)
+  - Make ":defcompile ClassName" compile all functions and methods in the
+    class.
+  - object's method in stacktrace missing information (Issue #12078)
+  - Forward declaration of a class?  E.g. for Clone() function.
+	email lifepillar 2023 Mar 26
+  - Getting member of variable with "any" type should be handled at runtime.
+    Remove temporary solution from #12096 / patch 9.0.1375.
+  - Private methods?
+	either: private def Func()
+	    or: def _Func()
+    Perhaps use "private" keyword instead of "_" prefix?
+  - "final" object members - can only be set in the constructor.
+  - "obj.Method()" does not always work in a compiled function, assumes "obj"
+    is a dictionary.  #12196  Issue #12024 might be the same problem.
+    Issue #11822: any.Func() can be a dict or an object call, need to handle
+    this at runtime.  Also see #12198 for an example.
+    Possibly issue #11981 can be fixed at the same time (has two examples).
+  - accept line breaks in member initialization.  #11957
+  - object empty(), len() - can class define a method to be used for them?
+  - add to help: when using a default new() method then reordering object
+    members may cause trouble.  Can define new() without arguments to avoid.
+  - TODO items: check types for "implements" - members and methods
+  - When "Meta" is a class, is "const MetaAlias = Meta" allowed?  It should
+    either work or given an error. possibly give an error now and implement it
+    later (using a typedef).  #12006
+  - how about lock/unlock?
+  - When checking "implements" also check types of members and function args.
+  - For chaining, allow using the class name as type for function return
+    value.
+  - Implement generics
+  - Add "instanceof" (exact class name).  And "assignable" (class or child)?
+  - More efficient way for interface member index than iterating over list?
+  - a variant of type() that returns a different type for each class?
+      list<number> and list<string> should also differ.
 - implement :type
 - implement :enum
+- Promise class, could be used to wait on a popup close callback?
+- class local to a function
 - Use Vim9 for more runtime files.
 - Inline call to map() and filter(), better type checking.
 - When evaluating constants for script variables, some functions could work:
     has(featureName), len(someString)
 - Implement as part of an expression: ++expr, --expr, expr++, expr--.
 
+Information missing in terminfo:
+- Accept "hyper" and "meta" modifiers (16 and 32) from Kitty like Meta?
+    8 is actually "super".
+- t_RV	request terminal version string; xterm:	"\033[>c"
+    change in terminfo for "RV" uses the wrong escape sequence 7 - 14 Jan only
+- Codes for <PasteStart> t_PS and <PasteEnd> t_PE; with bracketed paste:
+    t_BE and t_BD.
+- Codes used for focus gained and lost (currently using use_xterm_like_mouse())
+  termcodes are hard-coded in set_termname(), not named.
+    Use the XF flag?  enables recognizing the focus in/out events.
+    Check if t_fe is not empty.
+    Check for "1004" in t_XM. (disadvantage: only focus events when mouse is
+    used)
+- t_fe	enable focus-event tracking
+- t_fd	disable focus-event tracking
+Modifiers for various keys
+- flag to indicate "xterm compatible modifiers" ?
+Underline and similar:
+- t_AU - Set underline color: like "AF" and "AB" entries.
+- t_Ce	undercurl and underline end
+- t_Cs	undercurl (curly underline) mode
+- t_Us	double underline mode
+- t_ds	dotted underline mode
+- t_Ds	dashed underline mode
+- t_Te	strikethrough end
+- t_Ts	strikethrough mode
+Cursor codes: |termcap-cursor-shape|
+- t_RC	request terminal cursor blinking
+- t_RS	request terminal cursor style
+- t_VS	cursor normally visible (no blink)
+- t_SI	start insert mode (bar cursor shape)
+- t_SR	start replace mode (underline cursor shape)
+- t_EI	end insert or replace mode (block cursor shape)
+- t_SC	set cursor color start
+- t_EC	set cursor color end
+- t_SH	set cursor shape
+State requests:
+- t_RF	request terminal foreground color
+- t_RB	request terminal background color
+Less important (not needed for regular editing):
+- t_IS	set icon text start
+- t_IE	set icon text end
+- t_ST	save window title to stack
+- t_RT	restore window title from stack
+- t_Si	save icon text to stack
+- t_Ri	restore icon text from stack
+- t_WP	set window position (Y, X) in pixels
+- t_GP	get window position (Y, X) in pixels
+- t_WS	set window size (height, width in cells)
+Vim internal, but there should be a terminfo entry for these:
+- t_8f	set foreground color (R, G, B) in printf() format
+- t_8b	set background color (R, G, B) in printf() format
+- t_8u	set underline color (R, G, B) in printf() format
+Probably Vim internal, not in terminfo:
+- t_TE	end of "raw" mode
+- t_TI	put terminal into "raw" mode
+- t_RK	request terminal keyboard protocol state; sent after |t_TI|
+Already working, not properly documented:
+- t_u7	request cursor position
+
 Popup windows:
 - Add a function to redraw a specific popup window.  Esp. to be used when
   editing the command line, when screen updating doesn't happen. (Shougo)
@@ -134,6 +304,11 @@ Terminal emulator window:
 - When in terminal-Normal mode when the job finishes, the cursor jumps to the
   end but the window is not updated.  This only happens when typing "a".
       :term bash -c "for V in {0..5}; do echo $V; sleep 1; done"
+- GUI: cursor color is not updated when going to Terminal-Job mode.  #12328
+- GUI: cursor color is not updated when switching between tabs with a key.
+  #12329
+- GUI: cursor color is not updated when switching between tabs with a mouse
+  click.  #12330
 - When started with ":terminal ++close" and the shell exits but there is a
   background process, the window remains open, because the channel still
   exists (and output still shows).  Perhaps close the window when an explicit
@@ -169,6 +344,10 @@ Terminal emulator window:
 - When 'encoding' is not utf-8, or the job is using another encoding, setup
   conversions.
 
+Patch adds showcmd() function  #11708
+
+Cursor is after the end of the line:  #12137.
+
 Crash when a variable is removed while listing variables (Issue #11435)
 
 Autoconf: must use autoconf 2.69, later version generates lots of warnings
@@ -177,15 +356,38 @@ Autoconf: must use autoconf 2.69, later version generates lots of warnings
 Problem with Visual highlight when 'linebreak' and 'showbreak' are set.
 #11272
 
+Selected index returned by complete_info() does not match the index in the
+list of items.  #12230
+
+Support dark mode for MS-Windows: #12282
+
+Remote command escapes single quote with backslash, should be doubling the
+single quote in vim_strsave_escaped_ext()  #12202.
+
+PR to add custom and customlist completion types.  #12228
+
 Can deref_func_name() and deref_function_name() be merged?
 
+Using :global with a pattern containing \zs doesn't use the line where \zs
+matches but the start of the pattern.  #3695  If there is a useful application
+for this, it can be made to work by changing the call to ml_setmarked():
+		ml_setmarked(lnum + regmatch.startpos[0].lnum);
+
 After patch 8.2.4915 w_botline is computed much more often. Can this be
 reduced?
 
+When 'delcombine' is set a put after "x" includes the base character and all
+combining characters. (Ron Aaron, 2023 Apr 10)
+
 Add BufDeletePost.  #11041
 
 Add winid arg to col() and charcol()  #11466 (request #11461)
 
+When :argument has a non-number argument, use it like :buffer to find the
+argument by name.  #12272
+
+Fold unexpectedly closed when inserting fold marker with CTRL-V (Issue #12320)
+
 Can we make 'noendofline' and 'endoffile' visible?  Should show by default,
 since it's an unusual situation.
 - Show 'noendofline' when it would be used for writing ('fileformat' "dos")
@@ -204,14 +406,26 @@ https://github.com/vim/vim/pull/5566
 
 PR #11579 to add visualtext(), return Visually selected text.
 
+PR #12032: Support Python 3 stable ABI.
+
+Stray characters in the shell #11719, caused by requesting a response for:
+- XT key sequences
+- Whether modifyOtherKeys is active
+- Whether kitty keyboard protocol is active
+Can we not request XT key sequences, or reduce them drastically?
+
 Issue #10512: Dynamic loading broken with Perl 5.36
 Damien has a patch (2022 Dec 4)
 
+Request #11965: Allow several "%=" items in 'statusline', makes it possible
+to have text in the center.
+
 Add some kind of ":whathappend" command and functions to make visible what the
 last few typed keys and executed commands are.  To be used when the user
-wonders what went wrong.
+wonders what went wrong.  Could also be used for statistics #12046.
 - typed keys - Normal mode command - like what is recorded in a register and
   displayed by 'showcmd'.
+- register used - #12063
 - executed command lines
 - with more verbosity: what scripts/functions/autocommands were executed
 
@@ -246,7 +460,7 @@ Better terminal emulator support:
     "xterm" and then add "kitty" entries.
 
 Using "A" and "o" in manually created fold (in empty buffer) does not behave
-consistenly (James McCoy, #10698)
+consistently (James McCoy, #10698)
 
 In a timer callback, when using ":echo" and then input() the message is
 overwritten.  Could use ":echowin" and call redraw_cmd() in get_user_input().
@@ -291,8 +505,6 @@ IDEA: when drawing the text, store the text byte index in ScreenLinesIdx[].
 When converting screen column to text position use this.
 The line number can be obtained from win->w_lines[].
 
-MS-Windows: did path modifier :p:8 stop working?  #8600
-
 Version of getchar() that does not move the cursor - #10603 Use a separate
 argument for the new flag.
 
@@ -329,6 +541,12 @@ New English spell files also have very slow suggestions.
 When 'spelloptions' is "camel" then zG doesn't work on some words.
 (Gary Johnson, 17 Oct 2022)
 
+'cdpath' problems:
+- Adding "~" to 'cdpath' doesn't work for completion?  (Davido, 2013 Aug 19)
+- Problem with 'cdpath' on MS-Windows when a directory is equal to $HOME.
+  (2006 Jul 26, Gary Johnson)
+- Completion of ":cd" doesn't use 'cdpath'. #374.
+
 Make "g>" and "g<" in Visual mode move the text right or left.
 Also for a block selection.  #8558
 
@@ -364,6 +582,8 @@ won't work.  At least give an error.  Is there a way to make it work?
 Completion for ":runtime" should show valid values, not what's in the current
 directory. (#11447)
 
+Add a "description" property to mappings.  #12205
+
 Add an option to start_timer() to return from the input loop with K_IGNORE.
 This is useful e.g. when a popup was created that disables mappings, we need
 to return from vgetc() to make this happen.  #7011
@@ -374,6 +594,9 @@ Any way to convert "$" back by using a special value? (#6901)
 Can we detect true color support?  https://gist.github.com/XVilka/8346728
 Try setting a color then request the current color, like using t_u7.
 
+Add a v:register_used variable, which has the name of the register used for
+the last command, e.g. put.  #12003
+
 Make the jumplist behave like a tag stack. (#7738)  Should there be a more
 time bound navigation, like with undo?
 
@@ -418,6 +641,10 @@ work.
 Using "au!" after "filetype on" is a bit slow.  Can the matching of
 autocommands be made faster?  (#7056)
 
+Using a search pattern containing "\%V" and 'hlsearch' set keeps old matches
+when the Visual area changes.  #11694.  Do a redraw when starting a Visual
+selection?
+
 Append in Visual block mode inserts the wrong character.
 Test_visual_block_mode() already has the proper check, which is commented out.
 (#8288)
@@ -579,12 +806,16 @@ Improve fallback for menu translations, to avoid having to create lots of
 files that source the actual file.  E.g. menu_da_de -> menu_da
 Include part of #3242?
 
+Patch for different behavior of text objects with quotes: #11976
+Is this actually better?
+
 Patch to have text objects defined by arbitrary single characters. (Daniel
 Thau, 2013 Nov 20, 2014 Jan 29, 2014 Jan 31)
 Added tests (James McCoy, 2016 Aug 3, #958).  Still needs more work.
 
 Would be nice to set tab-local values for 'diffexpr' and 'diffopt'.  Use
 t:diffexpr_option t:diffopt_option? (#4782)
+Also make 'scrollopt' tab-local, remove "hor" only for the current tab page.
 
 Internal diff doesn't handle binary file like external diff does. (Mike
 Williams, 2018 Oct 30)
@@ -846,9 +1077,6 @@ option_save({list})					*option_save()*
 directory (Paulo Marcel Coelho Arabic, 2017 Oct 30, #2266)
 Also see #1689.
 
-When 'virtualedit' is "all" and 'cursorcolumn' is set, the wrong column may be
-highlighted. (van-de-bugger, 2018 Jan 23, #2576)
-
 No profile information for function that executes ":quit". (Daniel Hahler,
 2017 Dec 26, #2501)
 
@@ -1075,9 +1303,6 @@ Avoids exceptions, e.g. when using the b: namespace as a dict.
 Patch to make v:shell_error writable. (Christian Brabandt, 2016 Sep 27)
 Useful to restore it.  Is there another solution?
 
-"ci[" does not look for next [ like ci" does look for next ".
-(J.F. 2017 Jan 7)
-
 Patch for wrong cursor position on wrapped line, involving breakindent.
 (Ozaki Kiichi, 2016 Nov 25)
 
@@ -1101,9 +1326,6 @@ Should :vmap in matchit.vim be :xmap?  (Tony Mechelynck)
 
 Problem with whitespace in errorformat. (Gerd Wachsmuth, 2016 May 15, #807)
 
-Add "unicode true" to NSIS installer.  Doesn't work with Windows 95, which we
-no longer support.
-
 Support sort(l, 'F'), convert strings to float. (#7857)
 
 sort() is not stable when using numeric/float sort (Nikolay Pavlov, 2016 Sep
@@ -1248,7 +1470,7 @@ No test, needs some work to include.
 Patch to improve indenting for C++ constructor with initializer list.
 (Hirohito Higashi, 2016 Mar 31)
 
-Zero-out krypt key information when no longer in use. (Ben Fritz, 2017 May 15)
+Zero-out crypt key information when no longer in use. (Ben Fritz, 2017 May 15)
 
 Add stronger encryption.  Could use libsodium (NaCl).
 https://github.com/jedisct1/libsodium/
@@ -1289,9 +1511,6 @@ Do not include the linebreak at the start?
 Feature request: add the "al" text object, to manipulate a screen line.
 Especially useful when using 'linebreak'
 
-":cd C:\Windows\System32\drivers\etc*" does not work, even though the
-directory exists. (Sergio Gallelli, 2013 Dec 29)
-
 Patch to avoid redrawing tabline when the popup menu is visible.
 (Christian Brabandt, 2016 Jan 28)
 
@@ -1408,6 +1627,8 @@ Doesn't work completely (Dominique Orban)
 Patch to add a "literal" argument to bufnr().  (Olaf Dabrunz, 2015 Aug 4)
 
 Extended file attributes lost on write (backupcopy=no).  Issue 306.
+Would require reading attributes from the original file with listxattr() and
+getxattr() and adding them to the new file.
 
 Patch to add :lockjumps. (Carlo Baldassi, 2015 May 25)
 OK to not block marks?
@@ -1425,8 +1646,6 @@ Result of systemlist() does not show whether text ended in line break.
 When in 'comments' "n:x" follows after three-part comment directly it repeats
 any one-character from the previous line. (Kartik Agaram, 2014 Sep 19)
 
-Adding "~" to 'cdpath' doesn't work for completion?  (Davido, 2013 Aug 19)
-
 Patch: Let rare word highlighting overrule good word highlighting.
 (Jakson A. Aquino, 2010 Jul 30, again 2011 Jul 2)
 
@@ -2501,9 +2720,6 @@ the cursor line.  It works OK after some other commands.
 
 Win32: Is it possible to have both postscript and Win32 printing?
 
-Problem with 'cdpath' on MS-Windows when a directory is equal to $HOME. (2006
-Jul 26, Gary Johnson)
-
 Using UTF-8 character with ":command" does not work properly. (Matt Wozniski,
 2008 Sep 29)
 
@@ -2876,10 +3092,6 @@ Win32 GUI known bugs:
     console, go back to Vim and click "reload" in the dialog for the changed
     file: Window moves with the cursor!
     Put focus event in input buffer and let generic Vim code handle it?
-8   Win32 GUI: With maximized window, ":set go-=r" doesn't use the space that
-    comes available. (Poucet)  It works OK on Win 98 but doesn't work on Win
-    NT 4.0.  Leaves a grey area where the scrollbar was.  ":set go+=r" also
-    doesn't work properly.
 8   When Vim is minimized and when maximizing it a file-changed dialog pops
     up, Vim isn't maximized.  It should be done before the dialog, so that it
     appears in the right position. (Webb)
@@ -3403,8 +3615,6 @@ Problems that will (probably) not be solved:
     input method called from GDK code.  Without Perl it doesn't crash.
 -   VMS: Vimdiff doesn't work with the VMS diff, because the output looks
     different.  This makes test 47 fail.  Install a Unix-compatible diff.
--   Win32 GUI: mouse wheel always scrolls rightmost window.  The events arrive
-    in Vim as if the rightmost scrollbar was used.
 -   GTK with Gnome: Produces an error message when starting up:
 	Gdk-WARNING **: locale not supported by C library
     This is caused by the gnome library gnome_init() setting $LC_CTYPE to
@@ -3799,14 +4009,6 @@ Printing:
 
 
 Syntax highlighting:
-    Long term goal: faster, better, etc.  Options:
-    - use treesitter, NeoVim uses it - Many people don't like it.
-	After changes requires rebuilding the library.
-    - use TextMate, vscode uses it.  #9087 - Other people don't like it.
-	    https://github.com/icedman/vim-textmate
-      Vscode is asked to switch to treesitter:
-      https://github.com/microsoft/vscode/issues/50140
-    - sublime grammar?
 8   Make ":syn off" use 'runtimepath' instead of $VIMRUNTIME. (Gary Johnson)
     Should do the same for ":syn on" and ":syn manual".
 8   Support "containedin" argument for ":syn include", so that the defined
@@ -4361,8 +4563,6 @@ Tags:
 Win32 GUI:
 8   Make debug mode work while starting up (vim -D).  Open console window for
     the message and input?
-7   GvimExt: when there are several existing Vims, move the list to a submenu.
-    (Mike McCollister)
 8   When using "Edit with Vim" for one file it changes directory, when several
     files are selected and using "Edit with single Vim" the directory isn't
     changed.  At least change directory when the path is the same for all
@@ -5301,8 +5501,10 @@ Undo:
     Also see #1635.
 -   When using ":diffput" through a mapping, undo in the target buffer isn't
     synced.  (Ryan Carney, 2016 Sep 14)
--   The undo file name can get too long. (Issue 346)
+-   The undo file name can get too long. (Issue #346)
     For the path use a hash instead of dir%dir%dir%name  hash%name.
+    Check both for some time for backwards compatibility.
+    Alternatively: create the directory structure under 'undodir'.
 -   Patch to add ":undorecover", get as much text out of the undo file as
     possible. (Christian Brabandt, 2014 Mar 12, update Aug 22)
 -   Patch to support :undo absolute jump to file save number. (Christian
@@ -5907,7 +6109,7 @@ Various improvements:
     many percent down the windows).
 -   Make it possible for the 'showbreak' to be displayed at the end of the
     line.  Use a comma to separate the part at the end and the start of the
-    line?  Highlight the linebreak characters, add flag in 'highlight'.
+    line?  #754  Highlight the linebreak characters, add flag in 'highlight'.
     Make 'showbreak' local to a window.
 -   Some string options should be expanded if they have wildcards, e.g.
     'dictionary' when it is "*.h".

runtime/doc/uganda.txt

@@ -250,7 +250,7 @@ Credit Card:	You can use PayPal to send money with a Credit card.  This is
 		    Bram@iccf-holland.org
 
 Others:		Transfer to this account if possible:
-		    ING bank: 	IBAN: NL95 INGB 0004 5487 74
+		    ING bank:	IBAN: NL95 INGB 0004 5487 74
 				Swift code: INGBNL2A
 		    under the name "stichting ICCF Holland", Amersfoort
 		Checks are not accepted.

runtime/doc/userfunc.txt

@@ -1,4 +1,4 @@
-*userfunc.txt*	For Vim version 9.0.  Last change: 2022 Nov 17
+*userfunc.txt*	For Vim version 9.0.  Last change: 2023 Feb 02
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -187,12 +187,21 @@ See |:verbose-cmd| for more information.
 			If "[expr]" is not given, the number 0 is returned.
 			When a function ends without an explicit ":return",
 			the number 0 is returned.
+
 			In a :def function *E1095* is given if unreachable
 			code follows after the `:return`.
 			In legacy script there is no check for unreachable
 			lines, thus there is no warning if commands follow
-			`:return`.
-
+			`:return`.  Also, there is no check if the following
+			line contains a valid command.  Forgetting the line
+			continuation backslash may go unnoticed: >
+				return 'some text'
+				       .. ' some more text'
+<			Will happily return "some text" without an error.  It
+			should have been: >
+				return 'some text'
+				       \ .. ' some more text'
+<
 			If the ":return" is used after a |:try| but before the
 			matching |:finally| (if present), the commands
 			following the ":finally" up to the matching |:endtry|
@@ -202,7 +211,8 @@ See |:verbose-cmd| for more information.
 
 						*function-argument* *a:var*
 An argument can be defined by giving its name.  In the function this can then
-be used as "a:name" ("a:" for argument).
+be used as "a:name" ("a:" for argument) (in a `:def` function "a:" is not
+used).
 					*a:0* *a:1* *a:000* *E740* *...*
 Up to 20 arguments can be given, separated by commas.  After the named
 arguments an argument "..." can be specified, which means that more arguments
@@ -237,9 +247,10 @@ Example: >
   call Something('key', 20)	"key: 20"
 
 The argument default expressions are evaluated at the time of the function
-call, not definition.  Thus it is possible to use an expression which is
-invalid the moment the function is defined.  The expressions are also only
-evaluated when arguments are not specified during a call.
+call, not when the function is defined.  Thus it is possible to use an
+expression which is invalid the moment the function is defined.  The
+expressions are also only evaluated when arguments are not specified during a
+call.
 						*none-function_argument*
 You can pass |v:none| to use the default expression.  Note that this means you
 cannot pass v:none as an ordinary value when an argument has a default

runtime/doc/usr_01.txt

@@ -1,4 +1,4 @@
-*usr_01.txt*	For Vim version 9.0.  Last change: 2019 Nov 21
+*usr_01.txt*	For Vim version 9.0.  Last change: 2023 May 12
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -161,7 +161,7 @@ filename.  For French:
 ==============================================================================
 *01.4*	Copyright					*manual-copyright*
 
-The Vim user manual and reference manual are Copyright (c) 1988-2003 by Bram
+The Vim user manual and reference manual are Copyright (c) 1988 by Bram
 Moolenaar.  This material may be distributed only subject to the terms and
 conditions set forth in the Open Publication License, v1.0 or later.  The
 latest version is presently available at:

runtime/doc/usr_02.txt

@@ -505,7 +505,7 @@ You can use the error ID at the start to find help about it: >
 	:help E37
 
 
-Summary: 					*help-summary*  >
+Summary:					*help-summary*  >
 
 1) Use Ctrl-D after typing a topic and let Vim show all available topics.
    Or press Tab to complete: >

runtime/doc/usr_03.txt

@@ -1,4 +1,4 @@
-*usr_03.txt*	For Vim version 9.0.  Last change: 2022 Oct 30
+*usr_03.txt*	For Vim version 9.0.  Last change: 2023 Mar 13
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -173,6 +173,8 @@ one.  Thus if the cursor is at the start of the line of the previous example,
 		---+---------------->
 			   %
 
+Other ways to move around code can be found in |usr_29.txt|.
+
 ==============================================================================
 *03.5*	Moving to a specific line
 

runtime/doc/usr_05.txt

@@ -409,7 +409,7 @@ an archive or as a repository.  For an archive you can follow these steps:
 	   package.
 	2. unpack the archive in that directory.  This assumes the top
 	   directory in the archive is "start": >
-	   	cd ~/.vim/pack/fancy
+		cd ~/.vim/pack/fancy
 		unzip /tmp/fancy.zip
 <	   If the archive layout is different make sure that you end up with a
 	   path like this:

runtime/doc/usr_22.txt

@@ -77,25 +77,25 @@ browser.  This is what you get: >
     9. Directory Browsing	 netrw-browse   netrw-dir   netrw-list   netrw-help
 
     MAPS								 netrw-maps
-     	 <F1>.............Help.......................................|netrw-help|
-     	 <cr>.............Browsing...................................|netrw-cr|
-     	 <del>............Deleting Files or Directories..............|netrw-delete|
-     	 -................Going Up...................................|netrw--|
-     	 a................Hiding Files or Directories................|netrw-a|
-     	 mb...............Bookmarking a Directory....................|netrw-mb|
-     	 gb...............Changing to a Bookmarked Directory.........|netrw-gb|
-     	 cd...............Make Browsing Directory The Current Dir....|netrw-c|
-     	 d................Make A New Directory.......................|netrw-d|
-     	 D................Deleting Files or Directories..............|netrw-D|
-     	 <c-h>............Edit File/Directory Hiding List............|netrw-ctrl-h|
-     	 i................Change Listing Style.......................|netrw-i|
-     	 <c-l>............Refreshing the Listing.....................|netrw-ctrl-l|
-     	 o................Browsing with a Horizontal Split...........|netrw-o|
-     	 p................Use Preview Window.........................|netrw-p|
-     	 P................Edit in Previous Window....................|netrw-p|
-     	 q................Listing Bookmarks and History..............|netrw-qb|
-     	 r................Reversing Sorting Order....................|netrw-r|
-<    	(etc)
+	 <F1>.............Help.......................................|netrw-help|
+	 <cr>.............Browsing...................................|netrw-cr|
+	 <del>............Deleting Files or Directories..............|netrw-delete|
+	 -................Going Up...................................|netrw--|
+	 a................Hiding Files or Directories................|netrw-a|
+	 mb...............Bookmarking a Directory....................|netrw-mb|
+	 gb...............Changing to a Bookmarked Directory.........|netrw-gb|
+	 cd...............Make Browsing Directory The Current Dir....|netrw-c|
+	 d................Make A New Directory.......................|netrw-d|
+	 D................Deleting Files or Directories..............|netrw-D|
+	 <c-h>............Edit File/Directory Hiding List............|netrw-ctrl-h|
+	 i................Change Listing Style.......................|netrw-i|
+	 <c-l>............Refreshing the Listing.....................|netrw-ctrl-l|
+	 o................Browsing with a Horizontal Split...........|netrw-o|
+	 p................Use Preview Window.........................|netrw-p|
+	 P................Edit in Previous Window....................|netrw-p|
+	 q................Listing Bookmarks and History..............|netrw-qb|
+	 r................Reversing Sorting Order....................|netrw-r|
+<	(etc)
 
 The <F1> key thus brings you to a netrw directory browsing contents help page.
 It's a regular help page; use the usual |CTRL-]| to jump to tagged help items
@@ -106,7 +106,7 @@ To select files for display and editing: (with the cursor is atop a filename)
 	<enter>		Open the file in the current window.	   |netrw-cr|
 	o		Horizontally split window and display file |netrw-o|
 	v		Vertically split window and display file   |netrw-v|
-	p		Use the |preview-window| 		   |netrw-p|
+	p		Use the |preview-window|		   |netrw-p|
 	P		Edit in the previous window		   |netrw-P|
 	t		Open file in a new tab			   |netrw-t|
 

runtime/doc/usr_41.txt

@@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 9.0.  Last change: 2022 Dec 05
+*usr_41.txt*	For Vim version 9.0.  Last change: 2023 May 06
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -754,9 +754,12 @@ String manipulation:					*string-functions*
 	strlen()		length of a string in bytes
 	strcharlen()		length of a string in characters
 	strchars()		number of characters in a string
+	strutf16len()		number of UTF-16 code units in a string
 	strwidth()		size of string when displayed
 	strdisplaywidth()	size of string when displayed, deals with tabs
 	setcellwidths()		set character cell width overrides
+	getcellwidths()		get character cell width overrides
+	reverse()		reverse the order of characters in a string
 	substitute()		substitute a pattern match with a string
 	submatch()		get a specific match in ":s" and substitute()
 	strpart()		get part of a string using byte index
@@ -770,6 +773,7 @@ String manipulation:					*string-functions*
 	byteidx()		byte index of a character in a string
 	byteidxcomp()		like byteidx() but count composing characters
 	charidx()		character index of a byte in a string
+	utf16idx()		UTF-16 index of a byte in a string
 	repeat()		repeat a string multiple times
 	eval()			evaluate a string expression
 	execute()		execute an Ex command and get the output
@@ -794,7 +798,7 @@ List manipulation:					*list-functions*
 	reduce()		reduce a List to a value
 	slice()			take a slice of a List
 	sort()			sort a List
-	reverse()		reverse the order of a List or Blob
+	reverse()		reverse the order of items in a List
 	uniq()			remove copies of repeated adjacent items
 	split()			split a String into a List
 	join()			join List items into a String
@@ -861,6 +865,7 @@ Floating point computation:				*float-functions*
 Blob manipulation:					*blob-functions*
 	blob2list()		get a list of numbers from a blob
 	list2blob()		get a blob from a list of numbers
+	reverse()		reverse the order of numbers in a blob
 
 Other computation:					*bitwise-function*
 	and()			bitwise AND
@@ -1186,6 +1191,7 @@ Testing:				    *test-functions*
 	test_getvalue()		get value of an internal variable
 	test_gui_event()	generate a GUI event for testing
 	test_ignore_error()	ignore a specific error message
+	test_mswin_event()	generate an MS-Windows event
 	test_null_blob()	return a null Blob
 	test_null_channel()	return a null Channel
 	test_null_dict()	return a null Dict

runtime/doc/various.txt

@@ -1,4 +1,4 @@
-*various.txt*   For Vim version 9.0.  Last change: 2022 Nov 04
+*various.txt*   For Vim version 9.0.  Last change: 2022 Dec 13
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -496,7 +496,7 @@ T  *+visualextra*	extra Visual mode commands |blockwise-operators|
 T  *+vreplace*		|gR| and |gr|
    *+vtp*		on MS-Windows console: support for 'termguicolors'
 T  *+wildignore*	|'wildignore'|  Always enabled since 9.0.0278
-T  *+wildmenu*		|'wildmenu'||  Always enabled since 9.0.0279
+T  *+wildmenu*		|'wildmenu'|  Always enabled since 9.0.0279
 T  *+windows*		more than one window; Always enabled since 8.0.1118.
 m  *+writebackup*	|'writebackup'| is default on
 m  *+xim*		X input method |xim|

runtime/doc/version7.txt

@@ -8123,7 +8123,7 @@ Files:	    src/message.c
 
 Patch 7.2.119
 Problem:    Status line is redrawn too often.
-Solution:   Check ScreeenLinesUC[] properly. (Yukihiro Nakadaira)
+Solution:   Check ScreenLinesUC[] properly. (Yukihiro Nakadaira)
 Files:	    src/screen.c
 
 Patch 7.2.120
@@ -9782,8 +9782,8 @@ Files:	    src/syntax.c
 
 Patch 7.2.406
 Problem:    Patch 7.2.119 introduces uninit mem read. (Dominique Pelle)
-Solution:   Only used ScreeenLinesC when ScreeenLinesUC is not zero. (Yukihiro
-	    Nakadaira)  Also clear ScreeenLinesC when allocating.
+Solution:   Only used ScreenLinesC when ScreenLinesUC is not zero. (Yukihiro
+	    Nakadaira)  Also clear ScreenLinesC when allocating.
 Files:	    src/screen.c
 
 Patch 7.2.407

runtime/doc/version8.txt

@@ -342,11 +342,11 @@ New Vim variables: ~
 |v:mouse_winid|		Window ID for a mouse click obtained with |getchar()|
 |v:none|		an empty String, used for JSON
 |v:null|		an empty String, used for JSON
-|v:option_new|    	new value of the option, used by |OptionSet|
-|v:option_old|    	old value of the option, used by |OptionSet|
+|v:option_new|		new value of the option, used by |OptionSet|
+|v:option_old|		old value of the option, used by |OptionSet|
 |v:option_oldlocal|	old local value of the option, used by |OptionSet|
 |v:option_oldglobal|	old global value of the option, used by |OptionSet|
-|v:option_type|   	scope of the set command, used by |OptionSet|
+|v:option_type|		scope of the set command, used by |OptionSet|
 |v:option_command|	command used to set the option, used by |OptionSet|
 |v:progpath|		the command with which Vim was invoked
 |v:t_bool|		value of Boolean type

runtime/doc/version9.txt

@@ -29816,7 +29816,7 @@ Files:      src/testdir/test_vim9_script.vim
 Patch 8.2.4863
 Problem:    Accessing freed memory in test without the +channel feature.
             (Dominique Pellé)
-Solution:   Do not generted PUSHCHANNEL or PUSHJOB if they are not
+Solution:   Do not generate PUSHCHANNEL or PUSHJOB if they are not
             implemented. (closes #10350)
 Files:      src/vim9instr.c, src/errors.h, src/vim9compile.c,
             src/testdir/test_vim9_script.vim

runtime/doc/vim9.txt

@@ -1,4 +1,4 @@
-*vim9.txt*	For Vim version 9.0.  Last change: 2022 Dec 03
+*vim9.txt*	For Vim version 9.0.  Last change: 2023 Mar 07
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -105,7 +105,7 @@ script and `:def` functions; details are below:
 	`:open`
 	`:s`  with only flags
 	`:t`
-  	`:xit`
+	`:xit`
 - Some commands, especially those used for flow control, cannot be shortened.
   E.g., `:throw` cannot be written as `:th`.  *vim9-no-shorten*
 - You cannot use curly-braces names.
@@ -113,7 +113,7 @@ script and `:def` functions; details are below:
 	:%s/this/that
 - Executing a register with "@r" does not work, you can prepend a colon or use
   `:exe`: >
-  	:exe @a
+	:exe @a
 - Unless mentioned specifically, the highest |scriptversion| is used.
 - When defining an expression mapping, the expression will be evaluated in the
   context of the script where it was defined.
@@ -265,7 +265,7 @@ Detail: this is because "Inner" will actually become a function reference to a
 function with a generated name.
 
 It is not possible to define a script-local function in a function.  You can
-define a local function and assign it to a script-local funcref (it must have
+define a local function and assign it to a script-local Funcref (it must have
 been declared at the script level).  It is possible to define a global
 function by using the "g:" prefix.
 
@@ -340,7 +340,7 @@ function, the function does not need to be defined more than once: >
 
 Variable declarations with :var, :final and :const ~
 				*vim9-declaration* *:var* *E1079*
-				*E1017* *E1020* *E1054* *E1087* *E1108* *E1124*
+				*E1017* *E1020* *E1054* *E1087* *E1124*
 Local variables need to be declared with `:var`.  Local constants need to be
 declared with `:final` or `:const`.  We refer to both as "variables" in this
 section.
@@ -388,7 +388,6 @@ used: >
 	echo temp  # Error!
 
 This is especially useful in a user command: >
-
 	command -range Rename {
 		 var save = @a
 		 @a = 'some expression'
@@ -397,7 +396,6 @@ This is especially useful in a user command: >
 	    }
 
 And with autocommands: >
-
    au BufWritePre *.go {
 		 var save = winsaveview()
 		 silent! exe ':%! some formatting command'
@@ -624,7 +622,7 @@ Additionally, a lambda can contain statements in {}: >
 	    }
 This can be useful for a timer, for example: >
 	var count = 0
- 	var timer = timer_start(500, (_) => {
+	var timer = timer_start(500, (_) => {
 		 count += 1
 		 echom 'Handler called ' .. count
 	     }, {repeat: 3})
@@ -746,7 +744,7 @@ continuation is used without a backslash and a line starts with a bar: >
 							*E1050*
 To make it possible for the operator at the start of the line to be
 recognized, it is required to put a colon before a range.  This example will
-add "start" and print: >
+add "start" and "print": >
 	var result = start
 	+ print
 Like this: >
@@ -805,7 +803,7 @@ Notes:
 	echo [1, 2]
 		[3, 4]
 - In some cases it is difficult for Vim to parse a command, especially when
-  commands are used as an argument to another command, such as `windo`.  In
+  commands are used as an argument to another command, such as `:windo`.  In
   those cases the line continuation with a backslash has to be used.
 
 
@@ -826,7 +824,7 @@ White space is required around most operators.
 
 White space is required in a sublist (list slice) around the ":", except at
 the start and end: >
-	otherlist = mylist[v : count]  	# v:count has a different meaning
+	otherlist = mylist[v : count]	# v:count has a different meaning
 	otherlist = mylist[:]		# make a copy of the List
 	otherlist = mylist[v :]
 	otherlist = mylist[: v]
@@ -881,7 +879,7 @@ This works for alphanumeric characters, underscore and dash.  If you want to
 use another character, use a single or double quoted string: >
 	var dict = {'key with space': value}
 	var dict = {"key\twith\ttabs": value}
-	var dict = {'': value}  		# empty key
+	var dict = {'': value}			# empty key
 <							*E1139*
 In case the key needs to be an expression, square brackets can be used, just
 like in JavaScript: >
@@ -916,7 +914,7 @@ Thus "=~" works like "=~#".
 "is" and "isnot" (|expr-is| and |expr-isnot|) when used on strings now return
 false.  In legacy script they just compare the strings, in |Vim9| script they
 check identity, and strings are copied when used, thus two strings are never
-the same (this might change some day if strings are not copied but reference
+the same (this might change someday if strings are not copied but reference
 counted).
 
 
@@ -1023,7 +1021,9 @@ always converted to string: >
 
 Simple types are Number, Float, Special and Bool.  For other types |string()|
 should be used.
-						*false* *true* *null* *E1034*
+			*false* *true* *null* *null_blob* *null_channel*
+			*null_dict* *null_function* *null_job* *null_list*
+			*null_partial* *null_string* *E1034*
 In Vim9 script one can use the following predefined values: >
 	true
 	false
@@ -1254,6 +1254,7 @@ level.  They cannot be created in a function, also not in a legacy function.
 :defc[ompile]		Compile functions defined in the current script that
 			were not compiled yet.
 			This will report any errors found during compilation.
+			This excludes functions defined inside a class.
 
 :defc[ompile] {func}
 :defc[ompile] debug {func}
@@ -1261,6 +1262,10 @@ level.  They cannot be created in a function, also not in a legacy function.
 			Compile function {func}, if needed.  Use "debug" and
 			"profile" to specify the compilation mode.
 			This will report any errors found during compilation.
+			{func} call also be "ClassName.functionName" to
+			compile a function or method in a class.
+			{func} call also be "ClassName" to compile all
+			functions and methods in a class.
 
 						*:disa* *:disassemble*
 :disa[ssemble] {func}	Show the instructions generated for {func}.
@@ -1309,7 +1314,7 @@ Closures defined in a loop will share the same context.  For example: >
 <							*E1271*
 A closure must be compiled in the context that it is defined in, so that
 variables in that context can be found.  This mostly happens correctly, except
-when a function is marked for debugging with `breakadd` after it was compiled.
+when a function is marked for debugging with `:breakadd` after it was compiled.
 Make sure to define the breakpoint before compiling the outer function.
 
 The "inloop" variable will exist only once, all closures put in the list refer
@@ -1351,7 +1356,7 @@ closure: >
 	}
 	endfor
 
-Using `echowindow` is useful in a timer, the messages go into a popup and will
+Using `:echowindow` is useful in a timer, the messages go into a popup and will
 not interfere with what the user is doing when it triggers.
 
 
@@ -1402,7 +1407,7 @@ to a Vim9 function:
 	  echo line(1) .. line(2)
 
 - line continuation does not always require a backslash: >
-  	echo ['one',
+	echo ['one',
 		\ 'two',
 		\ 'three'
 		\ ]
@@ -1456,8 +1461,8 @@ have the "void" type.  Trying to use a void (e.g. a function without a
 return value) results in error *E1031*  *E1186* .
 
 There is no array type, use list<{type}> instead.  For a list constant an
-efficient implementation is used that avoids allocating lot of small pieces of
-memory.
+efficient implementation is used that avoids allocating a lot of small pieces
+of memory.
 							*E1005* *E1007*
 A partial and function can be declared in more or less specific ways:
 func				any kind of function reference, no type
@@ -1547,6 +1552,8 @@ string to a number.
 
 If a type is given where it is not expected you can get *E1272* .
 
+If a type is incomplete you get *E1363*, e.g. when you have an object for
+which the class is not known (usually that is a null object).
 
 Type inference ~
 							*type-inference*
@@ -1592,7 +1599,7 @@ That is because the declaration looks like a list of numbers, thus is
 equivalent to: >
 	var ll: list<number> = [1, 2, 3]
 If you do want a more permissive list you need to declare the type: >
-	var ll: list<any = [1, 2, 3]
+	var ll: list<any> = [1, 2, 3]
 	ll->extend(['x'])  # OK
 
 
@@ -1659,8 +1666,8 @@ type, it can not be used in Vim9 script.
 
 			 *E1211* *E1217* *E1218* *E1219* *E1220* *E1221*
 			 *E1222* *E1223* *E1224* *E1225* *E1226* *E1227*
-			 *E1228* *E1238* *E1250* *E1251* *E1252* *E1253*
-			 *E1256* *E1297* *E1298* *E1301*
+			 *E1228* *E1238* *E1250* *E1251* *E1252* *E1256*
+			 *E1297* *E1298* *E1301*
 Types are checked for most builtin functions to make it easier to spot
 mistakes.
 

runtime/doc/vim9class.txt

@@ -1,21 +1,22 @@
-*vim9class.txt*	For Vim version 9.0.  Last change: 2022 Dec 04
+*vim9class.txt*	For Vim version 9.0.  Last change: 2023 Mar 22
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
 
 
-NOTE - This is under development, anything can still change! - NOTE
+NOTE - This is not finished yet, anything can still change! - NOTE
 
 
 Vim9 classes, objects, interfaces, types and enums.
 
 1.  Overview			|Vim9-class-overview|
 2.  A simple class		|Vim9-simple-class|
-3.  Using an abstract class	|Vim9-abstract-class|
-4.  Using an interface		|Vim9-using-interface|
-5.  More class details		|Vim9-class|
-6.  Type definition		|Vim9-type|
-7.  Enum			|Vim9-enum|
+3.  Class members and functions	|Vim9-class-member|
+4.  Using an abstract class	|Vim9-abstract-class|
+5.  Using an interface		|Vim9-using-interface|
+6.  More class details		|Vim9-class|
+7.  Type definition		|Vim9-type|
+8.  Enum			|Vim9-enum|
 
 9.  Rationale
 10. To be done later
@@ -25,25 +26,25 @@ Vim9 classes, objects, interfaces, types and enums.
 1. Overview					*Vim9-class-overview*
 
 The fancy term is "object-oriented programming".  You can find lots of study
-material about this subject.  Here we document what |Vim9| script provides,
-assuming you know the basics already.  Added are helpful hints about how
-to use this functionality effectively.
+material on this subject.  Here we document what |Vim9| script provides,
+assuming you know the basics already.  Added are helpful hints about how to
+use this functionality effectively.
 
 The basic item is an object:
 - An object stores state.  It contains one or more variables that can each
   have a value.
-- An object usually provides functions that manipulate its state.  These
+- An object provides functions that use and manipulate its state.  These
   functions are invoked "on the object", which is what sets it apart from the
   traditional separation of data and code that manipulates the data.
 - An object has a well defined interface, with typed member variables and
   member functions.
-- Objects are created by a class and all objects have the same interface.
-  This never changes, it is not dynamic.
+- Objects are created from a class and all objects have the same interface.
+  This does not change at runtime, it is not dynamic.
 
 An object can only be created by a class.  A class provides:
 - A new() method, the constructor, which returns an object for the class.
   This method is invoked on the class name: MyClass.new().
-- State shared by all objects of the class: class variables and constants.
+- State shared by all objects of the class: class variables (class members).
 - A hierarchy of classes, with super-classes and sub-classes, inheritance.
 
 An interface is used to specify properties of an object:
@@ -62,17 +63,18 @@ teachers use real-world objects to explain class relations and you might think
 your model should therefore reflect the real world.  It doesn't!  The model
 should match your purpose.
 
-You will soon find that composition is often better than inheritance.  Don't
-waste time trying to find the optimal class model.  Or waste time discussing
-whether a square is a rectangle or that a rectangle is a square.  It doesn't
-matter.
+Keep in mind that composition (an object contains other objects) is often
+better than inheritance (an object extends another object).  Don't waste time
+trying to find the optimal class model.  Or waste time discussing whether a
+square is a rectangle or that a rectangle is a square.  It doesn't matter.
 
 
 ==============================================================================
 
 2.  A simple class				*Vim9-simple-class*
 
-Let's start with a simple example: a class that stores a text position: >
+Let's start with a simple example: a class that stores a text position (see
+below for how to do this more efficiently): >
 
 	class TextPosition
 	   this.lnum: number
@@ -96,7 +98,7 @@ Let's start with a simple example: a class that stores a text position: >
 	      this.col = col
 	   enddef
 	 endclass
-
+<							*object* *Object*
 You can create an object from this class with the new() method: >
 
 	var pos = TextPosition.new(1, 1)
@@ -104,10 +106,10 @@ You can create an object from this class with the new() method: >
 The object members "lnum" and "col" can be accessed directly: >
 
 	echo $'The text position is ({pos.lnum}, {pos.col})'
-
+<							*E1317* *E1327*
 If you have been using other object-oriented languages you will notice that
 in Vim the object members are consistently referred to with the "this."
-prefix.  This is different from languages like Java and TypeScript.  This
+prefix.  This is different from languages like Java and TypeScript.  The
 naming convention makes the object members easy to spot.  Also, when a
 variable does not have the "this." prefix you know it is not an object member.
 
@@ -117,9 +119,9 @@ Member write access ~
 Now try to change an object member directly: >
 
 	pos.lnum = 9
-
+<							*E1335*
 This will give you an error!  That is because by default object members can be
-read but not set.  That's why the class provides a method for it: >
+read but not set.  That's why the TextPosition class provides a method for it: >
 
 	pos.SetLnum(9)
 
@@ -128,19 +130,23 @@ way.  Most often there is no problem using a value, while setting a value may
 have side effects that need to be taken care of.  In this case, the SetLnum()
 method could check if the line number is valid and either give an error or use
 the closest valid value.
-
+							*:public* *E1331*
 If you don't care about side effects and want to allow the object member to be
 changed at any time, you can make it public: >
 
 	public this.lnum: number
-	public this.col number
+	public this.col: number
 
 Now you don't need the SetLnum(), SetCol() and SetPosition() methods, setting
 "pos.lnum" directly above will no longer give an error.
+							*E1334*
+If you try to set an object member that doesn't exist you get an error: >
+	pos.other = 9
+<	E1334: Object member not found: other ~
 
 
 Private members ~
-
+							*E1332* *E1333*
 On the other hand, if you do not want the object members to be read directly,
 you can make them private.  This is done by prefixing an underscore to the
 name: >
@@ -149,7 +155,7 @@ name: >
 	this._col number
 
 Now you need to provide methods to get the value of the private members.
-These are commonly call getters.  We recommend using a name that starts with
+These are commonly called getters.  We recommend using a name that starts with
 "Get": >
 
 	def GetLnum(): number
@@ -177,6 +183,7 @@ Simplifying the new() method ~
 Many constructors take values for the object members.  Thus you very often see
 this pattern: >
 
+	 class SomeClass
 	   this.lnum: number
 	   this.col: number
 
@@ -184,6 +191,7 @@ this pattern: >
 	      this.lnum = lnum
 	      this.col = col
 	   enddef
+	 endclass
 
 Not only is this text you need to write, it also has the type of each member
 twice.  Since this is so common a shorter way to write new() is provided: >
@@ -193,8 +201,24 @@ twice.  Since this is so common a shorter way to write new() is provided: >
 
 The semantics are easy to understand: Providing the object member name,
 including "this.", as the argument to new() means the value provided in the
-new() call is assigned to that object member.  This mechanism is coming from
-the Dart language.
+new() call is assigned to that object member.  This mechanism comes from the
+Dart language.
+
+Putting together this way of using new() and making the members public results
+in a much shorter class definition than what we started with: >
+
+	class TextPosition
+	   public this.lnum: number
+	   public this.col: number
+
+	   def new(this.lnum, this.col)
+	   enddef
+
+	   def SetPosition(lnum: number, col: number)
+	      this.lnum = lnum
+	      this.col = col
+	   enddef
+	 endclass
 
 The sequence of constructing a new object is:
 1. Memory is allocated and cleared.  All values are zero/false/empty.
@@ -204,22 +228,69 @@ The sequence of constructing a new object is:
 3. Arguments in the new() method in the "this.name" form are assigned.
 4. The body of the new() method is executed.
 
-TODO: for a sub-class the constructor of the parent class will be invoked
-somewhere.
-
+If the class extends a parent class, the same thing happens.  In the second
+step the members of the parent class are done first.  There is no need to call
+"super()" or "new()" on the parent.
 
 ==============================================================================
 
-3.  Using an abstract class			*Vim9-abstract-class*
+3.  class members and functions			*Vim9-class-member*
+
+						*:static* *E1337* *E1338*
+Class members are declared with "static".  They are used by the name without a
+prefix: >
+
+	class OtherThing
+	   this.size: number
+	   static totalSize: number
+
+	   def new(this.size)
+	      totalSize += this.size
+	   enddef
+	endclass
+<							*E1340* *E1341*
+Since the name is used as-is, shadowing the name by a function argument name
+or local variable name is not allowed.
+
+Just like object members the access can be made private by using an underscore
+as the first character in the name, and it can be made public by prefixing
+"public": >
+
+    class OtherThing
+	static total: number	      # anybody can read, only class can write
+	static _sum: number	      # only class can read and write
+	public static result: number  # anybody can read and write
+    endclass
+<
+							*class-function*
+Class functions are also declared with "static".  They have no access to
+object members, they cannot use the "this" keyword. >
+
+	class OtherThing
+	   this.size: number
+	   static totalSize: number
+
+	   # Clear the total size and return the value it had before.
+	   static def ClearTotalSize(): number
+	      var prev = totalSize
+	      totalSize = 0
+	      return prev
+	   enddef
+	endclass
+
+Inside the class the function can be called by name directly, outside the
+class the class name must be prefixed: `OtherThing.ClearTotalSize()`.
+
+==============================================================================
+
+4.  Using an abstract class			*Vim9-abstract-class*
 
 An abstract class forms the base for at least one sub-class.  In the class
 model one often finds that a few classes have the same properties that can be
-shared, but a class with those properties does not have enough state to create
+shared, but a class with these properties does not have enough state to create
 an object from.  A sub-class must extend the abstract class and add the
 missing state and/or methods before it can be used to create objects for.
 
-An abstract class does not have a new() method.
-
 For example, a Shape class could store a color and thickness.  You cannot
 create a Shape object, it is missing the information about what kind of shape
 it is.  The Shape class functions as the base for a Square and a Triangle
@@ -245,39 +316,13 @@ class, for which objects can be created.  Example: >
 	   enddef
 	endclass
 <
-						*class-member* *:static*
-Class members are declared with "static".  They are used by the name without a
-prefix: >
-
-	class OtherThing
-	   this.size: number
-	   static totalSize: number
-
-	   def new(this.size)
-	      totalSize += this.size
-	   enddef
-	endclass
-<
-						*class-method*
-Class methods are also declared with "static".  They have no access to object
-members, they cannot use the "this" keyword. >
-
-	class OtherThing
-	   this.size: number
-	   static totalSize: number
-
-	   " Clear the total size and return the value it had before. 
-	   static def ClearTotalSize(): number
-	      var prev = totalSize
-	      totalSize = 0
-	      return prev
-	   enddef
-	endclass
+An abstract class is defined the same way as a normal class, except that it
+does not have any new() method. *E1359*
 
 
 ==============================================================================
 
-4.  Using an interface				*Vim9-using-interface*
+5.  Using an interface				*Vim9-using-interface*
 
 The example above with Shape, Square and Triangle can be made more useful if
 we add a method to compute the surface of the object.  For that we create the
@@ -316,6 +361,9 @@ a number.  This example extends the one above: >
 	   enddef
 	endclass
 
+If a class declares to implement an interface, all the items specified in the
+interface must appear in the class, with the same types. *E1348* *E1349*
+
 The interface name can be used as a type: >
 
 	var shapes: list<HasSurface> = [
@@ -329,14 +377,14 @@ The interface name can be used as a type: >
 
 ==============================================================================
 
-5.  More class details					*Vim9-class*
+6.  More class details				*Vim9-class* *Class* *class*
 
 Defining a class ~
 					*:class* *:endclass* *:abstract*
 A class is defined between `:class` and `:endclass`.  The whole class is
 defined in one script file.  It is not possible to add to a class later.
 
-A class can only be defined in a |Vim9| script file.  *E1315*
+A class can only be defined in a |Vim9| script file.  *E1316*
 A class cannot be defined inside a function.
 
 It is possible to define more than one class in a script file.  Although it
@@ -361,22 +409,89 @@ these variants: >
 							*E1314*
 The class name should be CamelCased.  It must start with an uppercase letter.
 That avoids clashing with builtin types.
-
+							*E1315*
 After the class name these optional items can be used.  Each can appear only
 once.  They can appear in any order, although this order is recommended: >
 	extends ClassName
 	implements InterfaceName, OtherInterface
 	specifies SomeInterface
-<							*extends*
-A class can extend one other class.
-							*implements*
-A class can implement one or more interfaces.
+<							*E1355*
+Each member and function name can be used only once.  It is not possible to
+define a function with the same name and different type of arguments.
+
+
+Extending a class ~
+							*extends*
+A class can extend one other class. *E1352* *E1353* *E1354*
+The basic idea is to build on top of an existing class, add properties to it.
+
+The extended class is called the "base class" or "super class".  The new class
+is called the "child class".
+
+Object members from the base class are all taken over by the child class.  It
+is not possible to override them (unlike some other languages).
+
+						*E1356* *E1357* *E1358*
+Object methods of the base class can be overruled.  The signature (arguments,
+argument types and return type) must be exactly the same.  The method of the
+base class can be called by prefixing "super.".
+
+Other object methods of the base class are taken over by the child class.
+
+Class functions, including functions starting with "new", can be overruled,
+like with object methods.  The function on the base class can be called by
+prefixing the name of the class (for class functions) or "super.".
+
+Unlike other languages, the constructor of the base class does not need to be
+invoked.  In fact, it cannot be invoked.  If some initialization from the base
+class also needs to be done in a child class, put it in an object method and
+call that method from every constructor().
+
+If the base class did not specify a new() function then one was automatically
+created.  This function will not be taken over by the child class.  The child
+class can define its own new() function, or, if there isn't one, a new()
+function will be added automatically.
+
+
+A class implementing an interface ~
+						*implements* *E1346* *E1347*
+A class can implement one or more interfaces.  The "implements" keyword can
+only appear once *E1350* .  Multiple interfaces can be specified, separated by
+commas.  Each interface name can appear only once. *E1351*
+
+
+A class defining an interface ~
 							*specifies*
 A class can declare its interface, the object members and methods, with a
 named interface.  This avoids the need for separately specifying the
 interface, which is often done in many languages, especially Java.
 
 
+Items in a class ~
+						*E1318* *E1325* *E1326*
+Inside a class, in between `:class` and `:endclass`, these items can appear:
+- An object member declaration: >
+	this._memberName: memberType
+	this.memberName: memberType
+	public this.memberName: memberType
+- A constructor method: >
+	def new(arguments)
+	def newName(arguments)
+- An object method: >
+	def SomeMethod(arguments)
+<							*E1329*
+For the object member the type must be specified.  The best way is to do this
+explicitly with ": {type}".  For simple types you can also use an initializer,
+such as "= 123", and Vim will see that the type is a number.  Avoid doing this
+for more complex types and when the type will be incomplete.  For example: >
+	this.nameList = []
+This specifies a list, but the item type is unknown.  Better use: >
+	this.nameList: list<string>
+The initialization isn't needed, the list is empty by default.
+							*E1330*
+Some types cannot be used, such as "void", "null" and "v:none".
+
+
 Defining an interface ~
 						*:interface* *:endinterface*
 An interface is defined between `:interface` and `:endinterface`.  It may be
@@ -387,10 +502,10 @@ prefixed with `:export`: >
 
 	export interface InterfaceName
 	endinterface
-
+<							*E1344*
 An interface can declare object members, just like in a class but without any
 initializer.
-
+							*E1345*
 An interface can declare methods with `:def`, including the arguments and
 return type, but without the body and without `:enddef`.  Example: >
 
@@ -399,8 +514,19 @@ return type, but without the body and without `:enddef`.  Example: >
 	   def Surface(): number
 	endinterface
 
+An interface name must start with an uppercase letter. *E1343*
 The "Has" prefix can be used to make it easier to guess this is an interface
 name, with a hint about what it provides.
+An interface can only be defined in a |Vim9| script file.  *E1342*
+
+
+null object ~
+
+When a variable is declared to have the type of an object, but it is not
+initialized, the value is null.  When trying to use this null object Vim often
+does not know what class was supposed to be used.  Vim then cannot check if
+a member name is correct and you will get an "Using a null object" error,
+even when the member name is invalid. *E1360* *E1362* *E1363*
 
 
 Default constructor ~
@@ -417,10 +543,35 @@ members, in the order they were specified.  Thus if your class looks like: >
 
 Then The default constructor will be: >
 
-	def new(this.name, this.age, this.gender)
+	def new(this.name = v:none, this.age = v:none, this.gender = v:none)
 	enddef
 
-All object members will be used, also private access ones.
+The "= v:none" default values make the arguments optional.  Thus you can also
+call `new()` without any arguments.  No assignment will happen and the default
+value for the object members will be used.  This is a more useful example,
+with default values: >
+
+	class TextPosition
+	   this.lnum: number = 1
+	   this.col: number = 1
+	endclass
+
+If you want the constructor to have mandatory arguments, you need to write it
+yourself.  For example, if for the AutoNew class above you insist on getting
+the name, you can define the constructor like this: >
+
+	def new(this.name, this.age = v:none, this.gender = v:none)
+	enddef
+<							*E1328*
+Note that you cannot use another default value than "v:none" here.  If you
+want to initialize the object members, do it where they are declared.  This
+way you only need to look in one place for the default values.
+
+All object members will be used in the default constructor, also private
+access ones.
+
+If the class extends another one, the object members of that class will come
+first.
 
 
 Multiple constructors ~
@@ -455,7 +606,7 @@ constructor methods.
 
 ==============================================================================
 
-6.  Type definition					*Vim9-type* *:type*
+7.  Type definition					*Vim9-type* *:type*
 
 A type definition is giving a name to a type specification.  For Example: >
 
@@ -466,7 +617,7 @@ TODO: more explanation
 
 ==============================================================================
 
-7.  Enum					*Vim9-enum* *:enum* *:endenum*
+8.  Enum					*Vim9-enum* *:enum* *:endenum*
 
 An enum is a type that can have one of a list of values.  Example: >
 
@@ -560,6 +711,22 @@ type checking will make sure it works as you intended.  This rules out
 polymorphism, which we don't really need anyway.
 
 
+Single inheritance and interfaces ~
+
+Some languages support multiple inheritance.  Although that can be useful in
+some cases, it makes the rules of how a class works quite complicated.
+Instead, using interfaces to declare what is supported is much simpler.  The
+very popular Java language does it this way, and it should be good enough for
+Vim.  The "keep it simple" rule applies here.
+
+Explicitly declaring that a class supports an interface makes it easy to see
+what a class is intended for.  It also makes it possible to do proper type
+checking.  When an interface is changed any class that declares to implement
+it will be checked if that change was also changed.  The mechanism to assume a
+class implements an interface just because the methods happen to match is
+brittle and leads to obscure problems, let's not do that.
+
+
 Using "this.member" everywhere ~
 
 The object members in various programming languages can often be accessed in
@@ -578,22 +745,6 @@ also directly clear which variable references are object members and which
 aren't.
 
 
-Single inheritance and interfaces ~
-
-Some languages support multiple inheritance.  Although that can be useful in
-some cases, it makes the rules of how a class works quite complicated.
-Instead, using interfaces to declare what is supported is much simpler.  The
-very popular Java language does it this way, and it should be good enough for
-Vim.  The "keep it simple" rule applies here.  
-
-Explicitly declaring that a class supports an interface makes it easy to see
-what a class is intended for.  It also makes it possible to do proper type
-checking.  When an interface is changed any class that declares to implement
-it will be checked if that change was also changed.  The mechanism to assume a
-class implements an interface just because the methods happen to match is
-brittle and leads to obscure problems, let's not do that.
-
-
 Using class members ~
 
 Using "static member" to declare a class member is very common, nothing new
@@ -608,6 +759,55 @@ quite a bit of space, and when the class is renamed all these places need to
 be changed too.
 
 
+Declaring object and class members ~
+
+The main choice is whether to use "var" as with variable declarations.
+TypeScript does not use it: >
+	class Point {
+	  x: number;
+	  y = 0;
+	}
+
+Following that Vim object members could be declared like this: >
+	class Point
+	  this.x: number
+	  this.y = 0
+	endclass
+
+Some users pointed out that this looks more like an assignment than a
+declaration.  Adding "var" changes that: >
+	class Point
+	  var this.x: number
+	  var this.y = 0
+	endclass
+
+We also need to be able to declare class members using the "static" keyword.
+There we can also choose to leave out "var": >
+	class Point
+	  var this.x: number
+	  static count = 0
+	endclass
+
+Or do use it, before "static": >
+	class Point
+	  var this.x: number
+	  var static count = 0
+	endclass
+
+Or after "static": >
+	class Point
+	  var this.x: number
+	  static var count = 0
+	endclass
+
+This is more in line with "static def Func()".
+
+There is no clear preference whether to use "var" or not.  The two main
+reasons to leave it out are:
+1. TypeScript, Java and other popular languages do not use it.
+2. Less clutter.
+
+
 Using "ClassName.new()" to construct an object ~
 
 Many languages use the "new" operator to create an object, which is actually
@@ -672,8 +872,8 @@ Especially when refactoring or other changes to the class model.
 
 The Vim scripts are expected to be used in a plugin, with just one person or a
 small team working on it.  Complex rules then only make it more complicated,
-the extra safety provide by the rules isn't really needed.  Let's just keep it
-simple and not specify access details.
+the extra safety provided by the rules isn't really needed.  Let's just keep
+it simple and not specify access details.
 
 
 ==============================================================================

runtime/doc/vimtutor.1

@@ -47,7 +47,7 @@ The
 was originally written for Vi by Michael C. Pierce and Robert K. Ware,
 Colorado School of Mines using ideas supplied by Charles Smith,
 Colorado State University.
-E-mail: bware@mines.colorado.edu.
+E-mail: bware@mines.colorado.edu (now invalid).
 .br
 It was modified for
 .B Vim

runtime/doc/vimtutor.man

@@ -1,4 +1,4 @@
-VIMTUTOR(1)                                                        VIMTUTOR(1)
+VIMTUTOR(1)                 General Commands Manual                VIMTUTOR(1)
 
 
 
@@ -38,7 +38,7 @@ AUTHOR
        The  Vimtutor  was  originally  written for Vi by Michael C. Pierce and
        Robert K. Ware, Colorado  School  of  Mines  using  ideas  supplied  by
        Charles  Smith,  Colorado  State  University.  E-mail: bware@mines.col‐
-       orado.edu.
+       orado.edu (now invalid).
        It was modified for Vim by Bram Moolenaar.  For the names of the trans‐
        lators see the tutor files.
 

runtime/filetype.vim

@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2022 Dec 05
+" Last Change:	2023 May 10
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -110,9 +110,11 @@ au BufNewFile,BufRead *.a65			setf a65
 " Applescript
 au BufNewFile,BufRead *.scpt			setf applescript
 
+" Automake (must be before the *.am pattern)
+au BufNewFile,BufRead [mM]akefile.am,GNUmakefile.am	setf automake
+
 " Applix ELF
-au BufNewFile,BufRead *.am
-	\ if expand("<afile>") !~? 'Makefile.am\>' | setf elf | endif
+au BufNewFile,BufRead *.am			setf elf
 
 " ALSA configuration
 au BufNewFile,BufRead .asoundrc,*/usr/share/alsa/alsa.conf,*/etc/asound.conf setf alsaconf
@@ -187,9 +189,6 @@ au BufNewFile,BufRead *.au3			setf autoit
 " Autohotkey
 au BufNewFile,BufRead *.ahk			setf autohotkey
 
-" Automake
-au BufNewFile,BufRead [mM]akefile.am,GNUmakefile.am	setf automake
-
 " Autotest .at files are actually m4
 au BufNewFile,BufRead *.at			setf m4
 
@@ -206,6 +205,9 @@ au BufNewFile,BufRead *.mch,*.ref,*.imp		setf b
 au BufNewFile,BufRead *.bas			call dist#ft#FTbas()
 au BufNewFile,BufRead *.bi,*.bm			call dist#ft#FTbas()
 
+" Bass
+au BufNewFile,BufRead *.bass			setf bass
+
 " Visual Basic Script (close to Visual Basic) or Visual Basic .NET
 au BufNewFile,BufRead *.vb,*.vbs,*.dsm,*.ctl	setf vb
 
@@ -265,19 +267,28 @@ au BufNewFile,BufRead */etc/blkid.tab,*/etc/blkid.tab.old   setf xml
 au BufNewFile,BufRead *.bsd,*.bsdl			setf bsdl
 
 " Bazel (http://bazel.io)
-autocmd BufRead,BufNewFile *.bzl,*.bazel,WORKSPACE	setf bzl
+autocmd BufRead,BufNewFile *.bzl,*.bazel,WORKSPACE,WORKSPACE.bzlmod	setf bzl
 if has("fname_case")
   " There is another check for BUILD further below.
   autocmd BufRead,BufNewFile *.BUILD,BUILD		setf bzl
 endif
 
+" Busted (Lua unit testing framework - configuration files)
+au BufNewFile,BufRead .busted			setf lua
+
 " C or lpc
 au BufNewFile,BufRead *.c			call dist#ft#FTlpc()
 au BufNewFile,BufRead *.lpc,*.ulpc		setf lpc
 
+" Cairo
+au BufNewFile,BufRead *.cairo			setf cairo
+
 " Calendar
 au BufNewFile,BufRead calendar			setf calendar
 
+" Cap'n Proto
+au BufNewFile,BufRead *.capnp			setf capnp
+
 " C#
 au BufNewFile,BufRead *.cs,*.csx		setf cs
 
@@ -308,6 +319,9 @@ au BufNewFile,BufRead *.cdl			setf cdl
 " Conary Recipe
 au BufNewFile,BufRead *.recipe			setf conaryrecipe
 
+" ChainPack Object Notation (CPON)
+au BufNewFile,BufRead *.cpon			setf cpon
+
 " Controllable Regex Mutilator
 au BufNewFile,BufRead *.crm			setf crm
 
@@ -327,6 +341,10 @@ if has("fname_case")
   au BufNewFile,BufRead *.C,*.H setf cpp
 endif
 
+" C++ 20 modules (clang)
+" https://clang.llvm.org/docs/StandardCPlusPlusModules.html#file-name-requirement
+au BufNewFile,BufRead *.cppm,*.ccm,*.cxxm,*.c++m setf cpp
+
 " .h files can be C, Ch C++, ObjC or ObjC++.
 " Set c_syntax_for_h if you want C, ch_syntax_for_h if you want Ch. ObjC is
 " detected automatically.
@@ -369,6 +387,9 @@ au BufNewFile,BufRead *.ch			call dist#ft#FTchange()
 " ChordPro
 au BufNewFile,BufRead *.chopro,*.crd,*.cho,*.crdpro,*.chordpro	setf chordpro
 
+" Clangd
+au BufNewFile,BufRead .clangd			setf yaml
+
 " Clang-format
 au BufNewFile,BufRead .clang-format		setf yaml
 
@@ -425,12 +446,18 @@ au BufNewFile,BufRead *.cook			setf cook
 " needs to be inspected.
 au BufNewFile,BufRead *.cql			setf cqlang
 
+" Crystal
+au BufNewFile,BufRead *.cr			setf crystal
+
 " CSV Files
 au BufNewFile,BufRead *.csv			setf csv
 
 " CUDA Compute Unified Device Architecture
 au BufNewFile,BufRead *.cu,*.cuh		setf cuda
 
+" Cue
+au BufNewFile,BufRead *.cue			setf cue
+
 " Dockerfile; Podman uses the same syntax with name Containerfile
 " Also see Dockerfile.* below.
 au BufNewFile,BufRead Containerfile,Dockerfile,dockerfile,*.[dD]ockerfile	setf dockerfile
@@ -514,6 +541,9 @@ au BufNewFile,BufRead */etc/apt/sources.list.d/*.list	setf debsources
 " Deny hosts
 au BufNewFile,BufRead denyhosts.conf		setf denyhosts
 
+" Dhall
+au BufNewFile,BufRead *.dhall			setf dhall
+
 " dnsmasq(8) configuration files
 au BufNewFile,BufRead */etc/dnsmasq.conf	setf dnsmasq
 
@@ -606,8 +636,8 @@ au BufNewFile,BufRead *.edn
 	\   setf clojure |
 	\ endif
 
-" EditorConfig (close enough to dosini)
-au BufNewFile,BufRead .editorconfig		setf dosini
+" EditorConfig
+au BufNewFile,BufRead .editorconfig		setf editorconfig
 
 " Embedix Component Description
 au BufNewFile,BufRead *.ecd			setf ecd
@@ -627,6 +657,12 @@ au BufNewFile,BufRead *.elm			setf elm
 " Elm Filter Rules file
 au BufNewFile,BufRead filter-rules		setf elmfilt
 
+" Elsa - https://github.com/ucsd-progsys/elsa
+au BufNewFile,BufRead *.lc			setf elsa
+
+" EdgeDB Schema Definition Language
+au BufNewFile,BufRead *.esdl			setf esdl
+
 " ESMTP rc file
 au BufNewFile,BufRead *esmtprc			setf esmtprc
 
@@ -663,6 +699,9 @@ autocmd BufRead,BufNewFile *.fnl		setf fennel
 " Fetchmail RC file
 au BufNewFile,BufRead .fetchmailrc		setf fetchmail
 
+" FIRRTL - Flexible Internal Representation for RTL
+au BufNewFile,BufRead *.fir			setf firrtl
+
 " Fish shell
 au BufNewFile,BufRead *.fish			setf fish
 
@@ -695,12 +734,18 @@ au BufNewFile,BufRead *.fsl			setf framescript
 " FStab
 au BufNewFile,BufRead fstab,mtab		setf fstab
 
+" Func
+au BufNewFile,BufRead *.fc			setf func
+
 " Fusion
 au BufRead,BufNewFile *.fusion			setf fusion
 
 " F# or Forth
 au BufNewFile,BufRead *.fs			call dist#ft#FTfs()
 
+" FHIR Shorthand (FSH)
+au BufNewFile,BufRead *.fsh			setf fsh
+
 " F#
 au BufNewFile,BufRead *.fsi,*.fsx		setf fsharp
 
@@ -803,7 +848,7 @@ au BufNewFile,BufRead *.graphql,*.graphqls,*.gql			setf graphql
 au BufNewFile,BufRead *.gretl			setf gretl
 
 " Groovy
-au BufNewFile,BufRead *.gradle,*.groovy		setf groovy
+au BufNewFile,BufRead *.gradle,*.groovy,Jenkinsfile		setf groovy
 
 " GNU Server Pages
 au BufNewFile,BufRead *.gsp			setf gsp
@@ -847,6 +892,9 @@ au BufNewFile,BufRead *.htpp			setf hastepreproc
 " HCL
 au BufRead,BufNewFile *.hcl			setf hcl
 
+" Go checksum file (must be before *.sum Hercules)
+au BufNewFile,BufRead go.sum,go.work.sum	setf gosum
+
 " Hercules
 au BufNewFile,BufRead *.vc,*.ev,*.sum,*.errsum	setf hercules
 
@@ -993,23 +1041,30 @@ au BufNewFile,BufRead *.jgr			setf jgraph
 " Jovial
 au BufNewFile,BufRead *.jov,*.j73,*.jovial	setf jovial
 
-" JSON
-au BufNewFile,BufRead *.json,*.jsonp,*.webmanifest	setf json
+" Jq
+au BufNewFile,BufRead *.jq			setf jq
 
 " JSON5
 au BufNewFile,BufRead *.json5			setf json5
 
 " JSON Patch (RFC 6902)
-au BufNewFile,BufRead *.json-patch			setf json
+au BufNewFile,BufRead *.json-patch		setf json
 
 " Jupyter Notebook is also json
-au BufNewFile,BufRead *.ipynb				setf json
+au BufNewFile,BufRead *.ipynb			setf json
 
 " Other files that look like json
-au BufNewFile,BufRead .babelrc,.eslintrc,.prettierrc,.firebaserc  setf json
+au BufNewFile,BufRead .prettierrc,.firebaserc,.stylelintrc	setf json
 
-" JSONC
-au BufNewFile,BufRead *.jsonc			setf jsonc
+" JSONC (JSON with comments)
+au BufNewFile,BufRead *.jsonc,.babelrc,.eslintrc,.jsfmtrc	setf jsonc
+au BufNewFile,BufRead .jshintrc,.hintrc,.swrc,[jt]sconfig*.json	setf jsonc
+
+" JSON
+au BufNewFile,BufRead *.json,*.jsonp,*.webmanifest	setf json
+
+" JSON Lines
+au BufNewFile,BufRead *.jsonl			setf jsonl
 
 " Jsonnet
 au BufNewFile,BufRead *.jsonnet,*.libsonnet	setf jsonnet
@@ -1017,6 +1072,9 @@ au BufNewFile,BufRead *.jsonnet,*.libsonnet	setf jsonnet
 " Julia
 au BufNewFile,BufRead *.jl			setf julia
 
+" KDL
+au BufNewFile,BufRead *.kdl			setf kdl
+
 " Kixtart
 au BufNewFile,BufRead *.kix			setf kix
 
@@ -1064,6 +1122,9 @@ au BufNewFile,BufRead *.ldif			setf ldif
 " Ld loader
 au BufNewFile,BufRead *.ld			setf ld
 
+" Lean
+au BufNewFile,BufRead *.lean			setf lean
+
 " Ledger
 au BufRead,BufNewFile *.ldg,*.ledger,*.journal			setf ledger
 
@@ -1111,6 +1172,9 @@ au BufNewFile,BufRead *.lite,*.lt		setf lite
 " LiteStep RC files
 au BufNewFile,BufRead */LiteStep/*/*.rc		setf litestep
 
+" Livebook
+au BufNewFile,BufRead *.livemd			setf livebook
+
 " Login access
 au BufNewFile,BufRead */etc/login.access	setf loginaccess
 
@@ -1129,6 +1193,9 @@ au BufNewFile,BufRead *.lou,*.lout		setf lout
 " Lua
 au BufNewFile,BufRead *.lua			setf lua
 
+" Luau
+au BufNewFile,BufRead *.luau		setf luau
+
 " Luacheck
 au BufNewFile,BufRead .luacheckrc		setf lua
 
@@ -1240,6 +1307,9 @@ au BufNewFile,BufRead *.[mi][3g]		setf modula3
 " Larch/Modula-3
 au BufNewFile,BufRead *.lm3			setf modula3
 
+" Modconf
+au BufNewFile,BufRead */etc/modules.conf,*/etc/modules,*/etc/conf.modules setf modconf
+
 " Monk
 au BufNewFile,BufRead *.isc,*.monk,*.ssc,*.tsc	setf monk
 
@@ -1249,8 +1319,8 @@ au BufNewFile,BufRead *.moo			setf moo
 " Moonscript
 au BufNewFile,BufRead *.moon			setf moonscript
 
-" Modconf
-au BufNewFile,BufRead */etc/modules.conf,*/etc/modules,*/etc/conf.modules setf modconf
+" Move language
+au BufNewFile,BufRead *.move			setf move
 
 " MPD is based on XML
 au BufNewFile,BufRead *.mpd			setf xml
@@ -1345,6 +1415,9 @@ au BufNewFile,BufRead *.nse			setf lua
 " NSIS
 au BufNewFile,BufRead *.nsi,*.nsh		setf nsis
 
+" Nu
+au BufNewFile,BufRead {env,config}.nu		setf nu
+
 " Oblivion Language and Oblivion Script Extender
 au BufNewFile,BufRead *.obl,*.obse,*.oblivion,*.obscript  setf obse
 
@@ -1357,6 +1430,9 @@ au BufNewFile,BufRead *.occ			setf occam
 " Octave
 au BufNewFile,BufRead octave.conf,.octaverc,octaverc	setf octave
 
+" Odin
+au BufNewFile,BufRead *.odin			setf odin
+
 " Omnimark
 au BufNewFile,BufRead *.xom,*.xin		setf omnimark
 
@@ -1387,6 +1463,7 @@ au BufNewFile,BufRead pf.conf				setf pf
 " ini style config files, using # comments
 au BufNewFile,BufRead */etc/pacman.conf,mpv.conf	setf confini
 au BufNewFile,BufRead */.aws/config,*/.aws/credentials	setf confini
+au BufNewFile,BufRead *.nmconnection			setf confini
 
 " Pacman hooks
 au BufNewFile,BufRead *.hook
@@ -1490,8 +1567,11 @@ au BufNewFile,BufRead *.plp			setf plp
 " PO and PO template (GNU gettext)
 au BufNewFile,BufRead *.po,*.pot		setf po
 
+" Pony
+au BufNewFile,BufRead *.pony			setf pony
+
 " Postfix main config
-au BufNewFile,BufRead main.cf			setf pfmain
+au BufNewFile,BufRead main.cf,main.cf.proto	setf pfmain
 
 " PostScript (+ font files, encapsulated PostScript, Adobe Illustrator)
 au BufNewFile,BufRead *.ps,*.pfa,*.afm,*.eps,*.epsf,*.epsi,*.ai	  setf postscr
@@ -1600,8 +1680,14 @@ au BufNewFile,BufRead *.ptl,*.pyi,SConstruct		   setf python
 " QL
 au BufRead,BufNewFile *.ql,*.qll		setf ql
 
+" QMLdir
+au BufRead,BufNewFile qmldir			setf qmldir
+
 " Quarto
-au BufRead,BufNewFile *.qmd     setf quarto
+au BufRead,BufNewFile *.qmd			setf quarto
+
+" Racket (formerly detected as "scheme")
+au BufNewFile,BufRead *.rkt,*.rktd,*.rktl	setf racket
 
 " Radiance
 au BufNewFile,BufRead *.rad,*.mat		setf radiance
@@ -1683,6 +1769,9 @@ au BufNewFile,BufRead *.rnc			setf rnc
 " Relax NG XML
 au BufNewFile,BufRead *.rng			setf rng
 
+" ILE RPG
+au BufNewFile,BufRead *.rpgle,*.rpgleinc	setf rpgle
+
 " RPL/2
 au BufNewFile,BufRead *.rpl			setf rpl
 
@@ -1692,12 +1781,15 @@ au BufNewFile,BufRead *.robot,*.resource	setf robot
 " Robots.txt
 au BufNewFile,BufRead robots.txt		setf robots
 
-" Rpcgen
-au BufNewFile,BufRead *.x			setf rpcgen
+" RON (Rusty Object Notation)
+au BufNewFile,BufRead *.ron			setf ron
 
 " MikroTik RouterOS script
 au BufRead,BufNewFile *.rsc			setf routeros
 
+" Rpcgen
+au BufNewFile,BufRead *.x			setf rpcgen
+
 " reStructuredText Documentation Format
 au BufNewFile,BufRead *.rst			setf rst
 
@@ -1735,6 +1827,9 @@ au BufNewFile,BufRead Cargo.lock,*/.cargo/config,*/.cargo/credentials	setf toml
 " S-lang (or shader language, or SmallLisp)
 au BufNewFile,BufRead *.sl			setf slang
 
+" Sage
+au BufNewFile,BufRead *.sage			setf sage
+
 " Samba config
 au BufNewFile,BufRead smb.conf			setf samba
 
@@ -1864,8 +1959,8 @@ au BufNewFile,BufRead .zprofile,*/etc/zprofile,.zfbfmarks  setf zsh
 au BufNewFile,BufRead .zshrc,.zshenv,.zlogin,.zlogout,.zcompdump setf zsh
 au BufNewFile,BufRead *.zsh			setf zsh
 
-" Scheme
-au BufNewFile,BufRead *.scm,*.ss,*.sld,*.rkt,*.rktd,*.rktl	setf scheme
+" Scheme ("racket" patterns are now separate, see above)
+au BufNewFile,BufRead *.scm,*.ss,*.sld		setf scheme
 
 " Screen RC
 au BufNewFile,BufRead .screenrc,screenrc	setf screen
@@ -1886,10 +1981,16 @@ au BufNewFile,BufRead *.sst.meta,*.-sst.meta,*._sst.meta setf sisu
 " SKILL
 au BufNewFile,BufRead *.il,*.ils,*.cdf		setf skill
 
+" Cadence
+au BufNewFile,BufRead *.cdc			setf cdc
+
 " SLRN
 au BufNewFile,BufRead .slrnrc			setf slrnrc
 au BufNewFile,BufRead *.score			setf slrnsc
 
+" Smali
+au BufNewFile,BufRead *.smali			setf smali
+
 " Smalltalk
 au BufNewFile,BufRead *.st			setf st
 
@@ -1918,6 +2019,9 @@ au BufNewFile,BufRead *.smi
 " SMITH
 au BufNewFile,BufRead *.smt,*.smith		setf smith
 
+" Smithy
+au BufNewFile,BufRead *.smithy			setf smithy
+
 " Snobol4 and spitbol
 au BufNewFile,BufRead *.sno,*.spt		setf snobol4
 
@@ -1957,7 +2061,10 @@ au BufNewFile,BufRead *.spy,*.spi		setf spyce
 au BufNewFile,BufRead squid.conf		setf squid
 
 " SQL for Oracle Designer
-au BufNewFile,BufRead *.tyb,*.typ,*.tyc,*.pkb,*.pks	setf sql
+au BufNewFile,BufRead *.tyb,*.tyc,*.pkb,*.pks	setf sql
+
+" *.typ can be either SQL or Typst files
+au BufNewFile,BufRead *.typ			call dist#ft#FTtyp()
 
 " SQL
 au BufNewFile,BufRead *.sql			call dist#ft#SQL()
@@ -1965,6 +2072,9 @@ au BufNewFile,BufRead *.sql			call dist#ft#SQL()
 " SQLJ
 au BufNewFile,BufRead *.sqlj			setf sqlj
 
+" PRQL
+au BufNewFile,BufRead *.prql			setf prql
+
 " SQR
 au BufNewFile,BufRead *.sqr,*.sqi		setf sqr
 
@@ -1979,6 +2089,9 @@ au BufNewFile,BufRead */etc/ssh/ssh_config.d/*.conf		setf sshconfig
 au BufNewFile,BufRead sshd_config			setf sshdconfig
 au BufNewFile,BufRead */etc/ssh/sshd_config.d/*.conf	setf sshdconfig
 
+" Starlark
+au BufNewFile,BufRead *.ipd,*.star,*.starlark	setf starlark
+
 " OpenVPN configuration
 au BufNewFile,BufRead *.ovpn			setf openvpn
 au BufNewFile,BufRead */openvpn/*/*.conf	setf openvpn
@@ -2035,6 +2148,9 @@ au BufNewFile,BufRead *.svg			setf svg
 " Surface
 au BufRead,BufNewFile *.sface			setf surface
 
+" LLVM TableGen
+au BufNewFile,BufRead *.td			setf tablegen
+
 " Tads (or Nroff or Perl test file)
 au BufNewFile,BufRead *.t
 	\ if !dist#ft#FTnroff() && !dist#ft#FTperl() | setf tads | endif
@@ -2045,6 +2161,9 @@ au BufNewFile,BufRead tags			setf tags
 " TAK
 au BufNewFile,BufRead *.tak			setf tak
 
+" Unx Tal
+au BufNewFile,BufRead *.tal			setf tal
+
 " Task
 au BufRead,BufNewFile {pending,completed,undo}.data  setf taskdata
 au BufRead,BufNewFile *.task			setf taskedit
@@ -2088,6 +2207,9 @@ au BufNewFile,BufRead *.texinfo,*.texi,*.txi	setf texinfo
 " TeX configuration
 au BufNewFile,BufRead texmf.cnf			setf texmf
 
+" Thrift (Apache)
+au BufNewFile,BufRead *.thrift			setf thrift
+
 " Tidy config
 au BufNewFile,BufRead .tidyrc,tidyrc,tidy.conf	setf tidy
 
@@ -2156,6 +2278,9 @@ au BufNewFile,BufRead */etc/udev/permissions.d/*.permissions setf udevperm
 " Udev symlinks config
 au BufNewFile,BufRead */etc/udev/cdsymlinks.conf	setf sh
 
+" Ungrammar, AKA Un-grammar
+au BufNewFile,BufRead *.ungram			setf ungrammar
+
 " UnrealScript
 au BufNewFile,BufRead *.uc			setf uc
 
@@ -2187,8 +2312,8 @@ au BufNewFile,BufRead *.vr,*.vri,*.vrh		setf vera
 " Vagrant (uses Ruby syntax)
 au BufNewFile,BufRead Vagrantfile		setf ruby
 
-" Verilog HDL
-au BufNewFile,BufRead *.v			setf verilog
+" Verilog HDL, V or Coq
+au BufNewFile,BufRead *.v			call dist#ft#FTv()
 
 " Verilog-AMS HDL
 au BufNewFile,BufRead *.va,*.vams		setf verilogams
@@ -2237,7 +2362,11 @@ au BufNewFile,BufRead *.vroom			setf vroom
 au BufNewFile,BufRead *.vue			setf vue
 
 " WebAssembly
-au BufNewFile,BufRead *.wast,*.wat		setf wast
+au BufNewFile,BufRead *.wat			setf wat
+au BufNewFile,BufRead *.wast		setf wast
+
+" WebAssembly Interface Type (WIT)
+au BufNewFile,BufRead *.wit			setf wit
 
 " Webmacro
 au BufNewFile,BufRead *.wm			setf webmacro
@@ -2392,6 +2521,9 @@ au BufNewFile,BufRead */etc/yum.conf		setf dosini
 " YANG
 au BufRead,BufNewFile *.yang			setf yang
 
+" Yuck
+au BufNewFile,BufRead *.yuck			setf yuck
+
 " Zimbu
 au BufNewFile,BufRead *.zu			setf zimbu
 " Zimbu Templates
@@ -2617,6 +2749,9 @@ au BufNewFile,BufRead .login*,.cshrc*  call dist#ft#CSH()
 " tmux configuration with arbitrary extension
 au BufNewFile,BufRead {.,}tmux*.conf*		setf tmux
 
+" Universal Scene Description
+au BufNewFile,BufRead *.usda,*.usd		setf usd
+
 " VHDL
 au BufNewFile,BufRead *.vhdl_[0-9]*		call s:StarSetf('vhdl')
 

runtime/ftplugin/debchangelog.vim

@@ -3,9 +3,9 @@
 " Maintainer:   Debian Vim Maintainers <team+vim@tracker.debian.org>
 " Former Maintainers:   Michael Piefel <piefel@informatik.hu-berlin.de>
 "                       Stefano Zacchiroli <zack@debian.org>
-" Last Change:  2022 Jul 25
+" Last Change:  2023 Jan 16
 " License:      Vim License
-" URL:          https://salsa.debian.org/vim-team/vim-debian/blob/master/ftplugin/debchangelog.vim
+" URL:          https://salsa.debian.org/vim-team/vim-debian/blob/main/ftplugin/debchangelog.vim
 
 " Bug completion requires apt-listbugs installed for Debian packages or
 " python-launchpadlib installed for Ubuntu packages
@@ -35,14 +35,14 @@ if exists('g:did_changelog_ftplugin')
   finish
 endif
 
+" Don't load another plugin (this is global)
+let g:did_changelog_ftplugin = 1
+
 " Make sure the '<' and 'C' flags are not included in 'cpoptions', otherwise
 " <CR> would not be recognized.  See ":help 'cpoptions'".
 let s:cpo_save = &cpo
 set cpo&vim
 
-" Don't load another plugin (this is global)
-let g:did_changelog_ftplugin = 1
-
 " {{{1 GUI menu
 
 " Helper functions returning various data.

runtime/ftplugin/debcontrol.vim

@@ -2,8 +2,8 @@
 " Language:     Debian control files
 " Maintainer:   Debian Vim Maintainers
 " Former Maintainer:    Pierre Habouzit <madcoder@debian.org>
-" Last Change:  2018-01-28
-" URL:          https://salsa.debian.org/vim-team/vim-debian/blob/master/ftplugin/debcontrol.vim
+" Last Change:  2023 Jan 16
+" URL:          https://salsa.debian.org/vim-team/vim-debian/blob/main/ftplugin/debcontrol.vim
 
 " Do these settings once per buffer
 if exists('b:did_ftplugin')

runtime/ftplugin/dosbatch.vim

@@ -1,7 +1,10 @@
 " Vim filetype plugin file
-" Language:    MS-DOS .bat files
-" Maintainer:  Mike Williams <mrw@eandem.co.uk>
-" Last Change: 7th May 2020
+" Language:    MS-DOS/Windows .bat files
+" Maintainer:  Mike Williams <mrmrdubya@gmail.com>
+" Last Change: 12th February 2023
+"
+" Options Flags:
+" dosbatch_colons_comment       - any value to treat :: as comment line
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -15,8 +18,13 @@ let s:cpo_save = &cpo
 set cpo&vim
 
 " BAT comment formatting
-setlocal comments=b:rem,b:@rem,b:REM,b:@REM,:::
-setlocal commentstring=::\ %s
+setlocal comments=b:rem,b:@rem,b:REM,b:@REM
+if exists("dosbatch_colons_comment")
+  setlocal comments+=:::
+  setlocal commentstring=::\ %s
+else
+  setlocal commentstring=REM\ %s
+endif
 setlocal formatoptions-=t formatoptions+=rol
 
 " Lookup DOS keywords using Windows command help.

runtime/ftplugin/fish.vim

@@ -0,0 +1,15 @@
+" Vim filetype plugin file
+" Language:     fish
+" Maintainer:   Nicholas Boyle (github.com/nickeb96)
+" Repository:   https://github.com/nickeb96/fish.vim
+" Last Change:  February 1, 2023
+
+if exists("b:did_ftplugin")
+    finish
+endif
+let b:did_ftplugin = 1
+
+setlocal iskeyword=@,48-57,_,192-255,-,.
+setlocal comments=:#
+setlocal commentstring=#%s
+setlocal formatoptions+=crjq