patch 9.1.0752: can set 'cedit' to an invalid value

Problem:  can set cedit to an invalid value
Solution: Check that the value is a valid key name
          (Milly)

closes: #15778

Signed-off-by: Milly <milly.ca@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

.cirrus.yml

@@ -21,3 +21,10 @@ freebsd_task:
     - pw useradd cirrus -m
     - chown -R cirrus:cirrus .
     - sudo -u cirrus make test
+  on_failure:
+    screendump_artifacts:
+      name: "Cirrus-CI-freebsd-failed-tests"
+      path: |
+        "runtime/syntax/testdir/failed/*"
+        "src/testdir/failed/*"
+      type: application/octet-stream

.github/MAINTAINERS

@@ -13,11 +13,13 @@ nsis/lang/russian.nsi			@RestorerZ
 runtime/autoload/freebasic.vim		@dkearns
 runtime/autoload/hare.vim		@selenebun
 runtime/autoload/haskell.vim		@alx741
+runtime/autoload/hcl.vim		@gpanders
 runtime/autoload/javascript.vim		@jsit
 runtime/autoload/modula2.vim		@dkearns
 runtime/autoload/php.vim		@david-szabo97
 runtime/autoload/rubycomplete.vim	@segfault @dkearns
 runtime/autoload/rust.vim		@lilyball
+runtime/autoload/typst.vim		@gpanders
 runtime/autoload/xmlformat.vim		@chrisbra
 runtime/autoload/dist/json.vim		@habamax
 runtime/colors/blue.vim			@habamax @romainl @neutaaaaan
@@ -63,6 +65,7 @@ runtime/compiler/gawk.vim		@dkearns
 runtime/compiler/gjs.vim		@dkearns
 runtime/compiler/gm2.vim		@dkearns
 runtime/compiler/go.vim			@dbarnett
+runtime/compiler/groff.vim		@Konfekt
 runtime/compiler/haml.vim		@tpope
 runtime/compiler/hare.vim		@selenebun
 runtime/compiler/icon.vim		@dkearns
@@ -73,6 +76,7 @@ runtime/compiler/jshint.vim		@dkearns
 runtime/compiler/jsonlint.vim		@dkearns
 runtime/compiler/jq.vim                 @vito-c
 runtime/compiler/lazbuild.vim		@dkearns
+runtime/compiler/pandoc.vim		@Konfekt
 runtime/compiler/perl.vim		@petdance @heptite
 runtime/compiler/perlcritic.vim		@petdance @dkearns
 runtime/compiler/php.vim		@dkearns
@@ -100,6 +104,7 @@ runtime/compiler/tidy.vim		@dkearns
 runtime/compiler/ts-node.vim		@dkearns
 runtime/compiler/tsc.vim		@dkearns
 runtime/compiler/typedoc.vim		@dkearns
+runtime/compiler/typst.vim		@gpanders
 runtime/compiler/xmllint.vim		@dkearns
 runtime/compiler/xo.vim			@dkearns
 runtime/compiler/yamllint.vim		@romainl
@@ -111,6 +116,8 @@ runtime/ftplugin/antlr4.vim		@jiangyinzuo
 runtime/ftplugin/apache.vim		@dubgeiser
 runtime/ftplugin/arduino.vim		@k-takata
 runtime/ftplugin/astro.vim		@romainl
+runtime/ftplugin/asy.vim		@avidseeker
+runtime/ftplugin/autohotkey.vim		@telemachus
 runtime/ftplugin/awk.vim		@dkearns
 runtime/ftplugin/basic.vim		@dkearns
 runtime/ftplugin/bst.vim		@tpope
@@ -156,19 +163,22 @@ runtime/ftplugin/gitconfig.vim		@tpope
 runtime/ftplugin/gitignore.vim		@ObserverOfTime
 runtime/ftplugin/gitrebase.vim		@tpope
 runtime/ftplugin/gitsendemail.vim	@tpope
-runtime/ftplugin/graphql.vim	@ribru17
-runtime/ftplugin/gyp.vim		@ObserverOfTime
 runtime/ftplugin/go.vim			@dbarnett
+runtime/ftplugin/goaccess.vim		@meonkeys
 runtime/ftplugin/gomod.vim		@yu-yk
 runtime/ftplugin/gprof.vim		@dpelle
+runtime/ftplugin/graphql.vim	@ribru17
+runtime/ftplugin/gyp.vim		@ObserverOfTime
 runtime/ftplugin/haml.vim		@tpope
 runtime/ftplugin/hare.vim		@selenebun
 runtime/ftplugin/haredoc.vim		@selenebun
 runtime/ftplugin/heex.vim		@cvincent
+runtime/ftplugin/hcl.vim		@gpanders
 runtime/ftplugin/hgcommit.vim		@k-takata
 runtime/ftplugin/hlsplaylist.vim		@avidseeker
 runtime/ftplugin/hog.vim		@wtfbbqhax
 runtime/ftplugin/html.vim		@dkearns
+runtime/ftplugin/http.vim		@ribru17
 runtime/ftplugin/hyprlang.vim		@ribru17
 runtime/ftplugin/i3config.vim		@hiqua
 runtime/ftplugin/icon.vim		@dkearns
@@ -199,6 +209,7 @@ runtime/ftplugin/lynx.vim		@dkearns
 runtime/ftplugin/m3build.vim		@dkearns
 runtime/ftplugin/m3quake.vim		@dkearns
 runtime/ftplugin/markdown.vim		@tpope
+runtime/ftplugin/mediawiki.vim		@avidseeker
 runtime/ftplugin/meson.vim		@Liambeguin
 runtime/ftplugin/modula2.vim		@dkearns
 runtime/ftplugin/modula3.vim		@dkearns
@@ -207,7 +218,9 @@ runtime/ftplugin/nginx.vim		@chr4
 runtime/ftplugin/nim.vim		@ribru17
 runtime/ftplugin/nroff.vim		@a-vrma
 runtime/ftplugin/nsis.vim		@k-takata
+runtime/ftplugin/nu.vim		@mrcjkb
 runtime/ftplugin/octave.vim		@dkearns
+runtime/ftplugin/ondir.vim		@jparise
 runtime/ftplugin/openvpn.vim		@ObserverOfTime
 runtime/ftplugin/pascal.vim		@dkearns
 runtime/ftplugin/pbtxt.vim		@lakshayg
@@ -256,13 +269,14 @@ runtime/ftplugin/tap.vim		@petdance
 runtime/ftplugin/tcsh.vim		@dkearns
 runtime/ftplugin/terraform.vim		@JannoTjarks
 runtime/ftplugin/tf.vim			@ribru17
+runtime/ftplugin/thrift.vim		@jiangyinzuo
 runtime/ftplugin/tidy.vim		@dkearns
 runtime/ftplugin/tmux.vim		@ericpruitt
 runtime/ftplugin/toml.vim		@averms
 runtime/ftplugin/tt2html.vim		@petdance
 runtime/ftplugin/typescript.vim		@dkearns
 runtime/ftplugin/typescriptreact.vim	@dkearns
-runtime/ftplugin/typst.vim		@ribru17
+runtime/ftplugin/typst.vim		@gpanders
 runtime/ftplugin/unison.vim		@chuwy
 runtime/ftplugin/v.vim			@ribru17
 runtime/ftplugin/vdf.vim		@ObserverOfTime
@@ -302,10 +316,12 @@ runtime/indent/freebasic.vim		@dkearns
 runtime/indent/gdscript.vim		@habamax
 runtime/indent/gitconfig.vim		@tpope
 runtime/indent/gitolite.vim		@sitaramc
+runtime/indent/glsl.vim		@gpanders
 runtime/indent/go.vim			@dbarnett
 runtime/indent/gyp.vim			@ObserverOfTime
 runtime/indent/haml.vim			@tpope
 runtime/indent/hare.vim			@selenebun
+runtime/indent/hcl.vim			@gpanders
 runtime/indent/hog.vim			@wtfbbqhax
 runtime/indent/idlang.vim		@dkearns
 runtime/indent/j.vim			@glts
@@ -332,6 +348,7 @@ runtime/indent/perl.vim			@petdance
 runtime/indent/php.vim			@2072
 runtime/indent/postscr.vim		@mrdubya
 runtime/indent/prolog.vim		@dkearns
+runtime/indent/proto.vim		@Limero
 runtime/indent/ps1.vim			@heaths
 runtime/indent/qb64.vim			@dkearns
 runtime/indent/qml.vim			@ChaseKnowlden
@@ -349,7 +366,10 @@ runtime/indent/systemverilog.vim	@Kocha
 runtime/indent/tcl.vim			@dkearns
 runtime/indent/tcsh.vim			@dkearns
 runtime/indent/teraterm.vim		@k-takata
+runtime/indent/terraform.vim		@gpanders
+runtime/indent/thrift.vim		@jiangyinzuo
 runtime/indent/typescript.vim		@HerringtonDarkholme
+runtime/indent/typst.vim		@gpanders
 runtime/indent/vroom.vim		@dbarnett
 runtime/indent/wast.vim			@rhysd
 runtime/indent/xml.vim			@chrisbra
@@ -378,6 +398,7 @@ runtime/syntax/asm.vim			@dkearns
 runtime/syntax/asmh8300.vim		@dkearns
 runtime/syntax/asterisk.vim		@jaunis
 runtime/syntax/astro.vim		@wuelnerdotexe
+runtime/syntax/asy.vim		@avidseeker
 runtime/syntax/autohotkey.vim		@mmikeww
 runtime/syntax/awk.vim			@dkearns
 runtime/syntax/basic.vim		@dkearns
@@ -433,7 +454,9 @@ runtime/syntax/gitconfig.vim		@tpope
 runtime/syntax/gitignore.vim		@ObserverOfTime
 runtime/syntax/gitolite.vim		@sitaramc
 runtime/syntax/gitrebase.vim		@tpope
+runtime/syntax/glsl.vim		@gpanders
 runtime/syntax/go.vim			@bhcleek
+runtime/syntax/goaccess.vim		@meonkeys
 runtime/syntax/godoc.vim		@dbarnett
 runtime/syntax/gp.vim			@KBelabas
 runtime/syntax/gprof.vim		@dpelle
@@ -443,12 +466,14 @@ runtime/syntax/haml.vim			@tpope
 runtime/syntax/hare.vim			@selenebun
 runtime/syntax/haredoc.vim		@selenebun
 runtime/syntax/haskell.vim		@coot
+runtime/syntax/hcl.vim			@gpanders
 runtime/syntax/help_ru.vim		@RestorerZ
 runtime/syntax/hgcommit.vim		@k-takata
 runtime/syntax/hitest.vim		@lacygoill
 runtime/syntax/hog.vim			@wtfbbqhax
 runtime/syntax/hollywood.vim		@sodero
 runtime/syntax/html.vim			@dkearns
+runtime/syntax/htmlangular.vim @dlvandenberg
 runtime/syntax/i3config.vim		@hiqua
 runtime/syntax/icon.vim			@dkearns
 runtime/syntax/indent.vim		@dkearns
@@ -456,12 +481,14 @@ runtime/syntax/j.vim			@glts
 runtime/syntax/jargon.vim		@h3xx
 runtime/syntax/java.vim			@zzzyxwvut
 runtime/syntax/javascript.vim		@fleiner
+runtime/syntax/jinja.vim		@gpanders
 runtime/syntax/jj.vim			@gpanders
 runtime/syntax/json.vim		        @vito-c
 runtime/syntax/jsonc.vim		@izhakjakov
 runtime/syntax/julia.vim		@carlobaldassi
 runtime/syntax/jq.vim		        @vito-c
 runtime/syntax/kconfig.vim		@chrisbra
+runtime/syntax/kivy.vim		@prophittcorey
 runtime/syntax/kotlin.vim		@udalov
 runtime/syntax/kdl.vim			@imsnif @jiangyinzuo
 runtime/syntax/krl.vim			@KnoP-01
@@ -477,6 +504,7 @@ runtime/syntax/make.vim			@rohieb
 runtime/syntax/mallard.vim		@jhradilek
 runtime/syntax/markdown.vim		@tpope
 runtime/syntax/mason.vim		@petdance
+runtime/syntax/mediawiki.vim		@avidseeker
 runtime/syntax/meson.vim		@Liambeguin
 runtime/syntax/modula2.vim		@dkearns
 runtime/syntax/modula2/opt/iso.vim	@trijezdci
@@ -489,6 +517,7 @@ runtime/syntax/ninja.vim		@nico
 runtime/syntax/nix.vim			@equill
 runtime/syntax/nroff.vim		@jmarshall
 runtime/syntax/nsis.vim			@k-takata
+runtime/syntax/ondir.vim		@jparise
 runtime/syntax/openvpn.vim		@ObserverOfTime
 runtime/syntax/pacmanlog.vim		@rpigott
 runtime/syntax/pascal.vim		@dkearns
@@ -501,6 +530,7 @@ runtime/syntax/pod.vim			@petdance
 runtime/syntax/poefilter.vim		@ObserverOfTime
 runtime/syntax/postscr.vim		@mrdubya
 runtime/syntax/privoxy.vim		@dkearns
+runtime/syntax/progress.vim		@rdnlsmith
 runtime/syntax/prolog.vim		@XVilka
 runtime/syntax/ps1.vim			@heaths
 runtime/syntax/ps1xml.vim		@heaths
@@ -522,6 +552,7 @@ runtime/syntax/rng.vim			@jhradilek
 runtime/syntax/routeros.vim		@zainin
 runtime/syntax/rst.vim			@marshallward
 runtime/syntax/ruby.vim			@dkearns
+runtime/syntax/salt.vim			@gpanders
 runtime/syntax/sass.vim			@tpope
 runtime/syntax/scala.vim		@derekwyatt
 runtime/syntax/scheme.vim		@evhan
@@ -545,6 +576,8 @@ runtime/syntax/systemverilog.vim	@Kocha
 runtime/syntax/tap.vim			@petdance
 runtime/syntax/tcsh.vim			@dkearns
 runtime/syntax/teraterm.vim		@k-takata
+runtime/syntax/terraform.vim		@gpanders
+runtime/syntax/thrift.vim		@jiangyinzuo
 runtime/syntax/tidy.vim			@dkearns
 runtime/syntax/tmux.vim			@ericpruitt
 runtime/syntax/toml.vim			@averms
@@ -553,6 +586,7 @@ runtime/syntax/tt2html.vim		@petdance
 runtime/syntax/tt2js.vim		@petdance
 runtime/syntax/typescript.vim		@HerringtonDarkholme @rhysd
 runtime/syntax/typescriptreact.vim	@HerringtonDarkholme @rhysd
+runtime/syntax/typst.vim		@gpanders
 runtime/syntax/shared/typescriptcommon.vim	@HerringtonDarkholme @rhysd
 runtime/syntax/unison.vim		@chuwy
 runtime/syntax/vdf.vim			@ObserverOfTime

.github/actions/screendump/action.yml

@@ -1,13 +1,13 @@
 name: 'screendump'
-description: "Upload failed syntax tests"
+description: "Upload failed screendump tests"
 runs:
   using: "composite"
   steps:
-    - name: Upload failed syntax tests
+    - name: Upload failed tests
       uses: actions/upload-artifact@v4
       with:
         # Name of the artifact to upload.
-        name: ${{ github.workflow }}-${{ github.job }}-${{ join(matrix.*, '-') }}-failed-syntax-tests
+        name: ${{ github.workflow }}-${{ github.job }}-${{ join(matrix.*, '-') }}-failed-tests
 
         # A file, directory or wildcard pattern that describes what
         # to upload.

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
     env:
       CC: ${{ matrix.compiler }}
       GCC_VER: 13
-      CLANG_VER: 18
+      CLANG_VER: 19
       TEST: test
       SRCDIR: ./src
       LEAK_CFLAGS: -DEXITFREE
@@ -105,6 +105,7 @@ jobs:
             libtool-bin \
             libncurses-dev:${{ matrix.architecture }} \
             libxt-dev:${{ matrix.architecture }} \
+            locales-all \
           )
           if ${{ matrix.features == 'huge' }}; then
             LUA_VER=${{ matrix.lua_ver || '5.4' }}

.gitignore

@@ -8,6 +8,8 @@ src/auto/gui_gtk_gresources.h
 src/auto/os_haiku.rdef
 src/objects/.dirstamp
 src/objects
+src/po/big5corr
+src/po/sjiscorr
 src/types.vim
 
 # We do need src/auto/configure.

.hgignore

@@ -10,6 +10,8 @@ src/auto/gui_gtk_gresources.h
 src/auto/os_haiku.rdef
 src/objects/.dirstamp
 src/objects
+src/po/big5corr
+src/po/sjiscorr
 src/types.vim
 
 # We do need src/auto/configure.

Filelist

@@ -185,6 +185,7 @@ SRC_ALL =	\
 		src/testdir/sautest/autoload/*.vim \
 		src/testdir/testluaplugin/lua/testluaplugin/*.lua \
 		src/testdir/check.vim \
+		src/testdir/commondumps.vim \
 		src/testdir/gui_init.vim \
 		src/testdir/gui_preinit.vim \
 		src/testdir/mouse.vim \
@@ -198,6 +199,7 @@ SRC_ALL =	\
 		src/testdir/summarize.vim \
 		src/testdir/term_util.vim \
 		src/testdir/view_util.vim \
+		src/testdir/viewdumps.vim \
 		src/testdir/test[0-9]*.ok \
 		src/testdir/test77a.ok \
 		src/testdir/test77a.com \
@@ -218,6 +220,8 @@ SRC_ALL =	\
 		src/testdir/samples/*.txt \
 		src/testdir/samples/*.vim \
 		src/testdir/samples/test000 \
+		src/testdir/samples/test.zip \
+		src/testdir/samples/testa.zip \
 		src/testdir/color_ramp.vim \
 		src/testdir/silent.wav \
 		src/testdir/popupbounce.vim \
@@ -835,6 +839,7 @@ RT_SCRIPTS =	\
 		runtime/syntax/Makefile \
 		runtime/syntax/testdir/README.txt \
 		runtime/syntax/testdir/runtest.vim \
+		runtime/syntax/testdir/viewdumps.vim \
 		runtime/syntax/testdir/ftplugin/*.* \
 		runtime/syntax/testdir/input/*.* \
 		runtime/syntax/testdir/input/selftestdir/* \

Makefile

@@ -153,7 +153,7 @@ MINOR = 1
 # - > make dossrc
 #   > make dosrt
 #   Unpack dist/vim##rt.zip and dist/vim##src.zip on an MS-Windows PC.
-#   This creates the directory vim/vim90 and puts all files in there.
+#   This creates the directory vim/vim91 and puts all files in there.
 # Win32 console version build:
 # - See src/INSTALLpc.txt for installing the compiler and SDK.
 # - Set environment for Visual C++ 2015:
@@ -209,7 +209,7 @@ MINOR = 1
 #	gvimext64.dll in src/GvimExt
 #   gvimext64.dll can be obtained from:
 #   https://github.com/vim/vim-win32-installer/releases
-#	It is part of gvim_9.0.*_x64.zip as vim/vim90/GvimExt/gvimext64.dll.
+#	It is part of gvim_9.1.*_x64.zip as vim/vim91/GvimExt/gvimext64.dll.
 # - Make sure there is a diff.exe two levels up (get it from a previous Vim
 #   version).  Also put winpty32.dll and winpty-agent.exe there.
 # - go to ../nsis and do:
@@ -285,10 +285,10 @@ dist/$(COMMENT_RT): dist/comment
 	echo "Vim - Vi IMproved - v$(VDOT) runtime files for MS-DOS and MS-Windows" > dist/$(COMMENT_RT)
 
 dist/$(COMMENT_W32): dist/comment
-	echo "Vim - Vi IMproved - v$(VDOT) binaries for MS-Windows NT/95" > dist/$(COMMENT_W32)
+	echo "Vim - Vi IMproved - v$(VDOT) binaries for MS-Windows" > dist/$(COMMENT_W32)
 
 dist/$(COMMENT_GVIM): dist/comment
-	echo "Vim - Vi IMproved - v$(VDOT) GUI binaries for MS-Windows NT/95" > dist/$(COMMENT_GVIM)
+	echo "Vim - Vi IMproved - v$(VDOT) GUI binaries for MS-Windows" > dist/$(COMMENT_GVIM)
 
 dist/$(COMMENT_OLE): dist/comment
 	echo "Vim - Vi IMproved - v$(VDOT) MS-Windows GUI binaries with OLE support" > dist/$(COMMENT_OLE)

READMEdir/README_amibin.txt

@@ -2,7 +2,7 @@ README_amibin.txt for version 9.1 of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.
-These files are in the runtime archive (vim90rt.tgz).
+These files are in the runtime archive (vim91rt.tgz).
 
 
 The Amiga "bin" archive contains the Vim executable for the Amiga.  It was

READMEdir/README_amisrc.txt

@@ -2,7 +2,7 @@ README_amisrc.txt for version 9.1 of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_ami.txt" for installation instructions for the Amiga.
-These files are in the runtime archive (vim90rt.tgz).
+These files are in the runtime archive (vim91rt.tgz).
 
 
 The Amiga source archive contains the files needed to compile Vim on the

READMEdir/README_bindos.txt

@@ -2,15 +2,15 @@ README_bindos.txt for version 9.1 of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.
-These files are in the runtime archive (vim90rt.zip).
+These files are in the runtime archive (vim91rt.zip).
 
 
 There are several binary distributions of Vim for the PC.  You would normally
 pick only one of them, but it's also possible to install several.
 These ones are available (the version number may differ):
-	vim91w32.zip	Windows 95/98/NT/etc. console version
-	gvim91.zip	Windows 95/98/NT/etc. GUI version
-	gvim91ole.zip	Windows 95/98/NT/etc. GUI version with OLE
+	vim91w32.zip	Windows console version
+	gvim91.zip	Windows GUI version
+	gvim91ole.zip	Windows GUI version with OLE
 
 You MUST also get the runtime archive (vim91rt.zip).
 The sources are also available (vim91src.zip).

READMEdir/README_dos.txt

@@ -120,30 +120,6 @@ Remarks:
   entry, you can remove it by running the "uninstall.exe".  See
   ":help win32-popup-menu".
 
-- In Windows 95/98/NT you can create a shortcut to Vim.  This works for all
-  DOS and Win32 console versions.  For the console version this gives you the
-  opportunity to set defaults for the Console where Vim runs in.
-
-  1. On the desktop, click right to get a menu.  Select New/Shortcut.
-  2. In the dialog, enter Command line: "C:\command.com".  Click "Next".
-  3. Enter any name.  Click "Finish".
-     The new shortcut will appear on the desktop.
-  4. With the mouse pointer on the new shortcut, click right to get a menu.
-     Select Properties.
-  5. In the Program tab, change the "Cmdline" to add "/c" and the name of the
-     Vim executable.  Examples:
-	C:\command.com /c C:\vim\vim91\vim.exe
-	C:\command.com /c D:\editors\vim\vim91\vim.exe
-  6. Select the font, window size, etc. that you like.  If this isn't
-     possible, select "Advanced" in the Program tab, and deselect "MS-DOS
-     mode".
-  7. Click OK.
-
-  For gvim, you can use a normal shortcut on the desktop, and set the size of
-  the Window in your $VIM/_gvimrc:
-	set lines=30 columns=90
-
-
 For further information, type one of these inside Vim:
 	:help dos
 	:help win32

READMEdir/README_extra.txt

@@ -27,7 +27,7 @@ src/gui_w32.*		Files for the Win32 GUI.
 src/gui_w48.*		Files for the Win32 and Win16 GUI.
 src/Make_mvc.mak	MS Visual C++ makefile for the Win32 GUI.
 
-src/if_ole.*		OLE automation interface, for MS Windows 95 and NT.
+src/if_ole.*		OLE automation interface, for MS Windows.
 
 src/GvimExt/*		DLL for the "Edit with Vim" context menu entry
 

READMEdir/README_ole.txt

@@ -3,7 +3,7 @@ README_ole.txt for version 9.1 of Vim: Vi IMproved.
 This archive contains gvim.exe with OLE interface.
 This version of gvim.exe can also load a number of interface dynamically (you
 can optionally install the .dll files for each interface).
-It is only for MS-Windows 95/98/ME/NT/2000/XP.
+It is only for MS-Windows.
 
 Also see the README_bindos.txt, README_dos.txt and README.txt files.
 

READMEdir/README_srcdos.txt

@@ -2,7 +2,7 @@ README_srcdos.txt for version 9.1 of Vim: Vi IMproved.
 
 See "README.txt" for general information about Vim.
 See "README_dos.txt" for installation instructions for MS-Windows.
-These files are in the runtime archive (vim90rt.zip).
+These files are in the runtime archive (vim91rt.zip).
 
 
 The DOS source archive contains the files needed to compile Vim on MS-Windows.

runtime/autoload/dist/ft.vim

@@ -9,6 +9,8 @@ vim9script
 # These functions are moved here from runtime/filetype.vim to make startup
 # faster.
 
+var prolog_pattern = '^\s*\(:-\|%\+\(\s\|$\)\|\/\*\)\|\.\s*$'
+
 export def Check_inp()
   if getline(1) =~ '%%'
     setf tex
@@ -419,7 +421,6 @@ export def FThtml()
       setf htmlangular
       return
     endif
-
     # Check for XHTML
     if getline(n) =~ '\<DTD\s\+XHTML\s'
       setf xhtml
@@ -430,6 +431,11 @@ export def FThtml()
       setf htmldjango
       return
     endif
+    # Check for SuperHTML
+    if getline(n) =~ '<extend\|<super>'
+        setf superhtml
+        return
+    endif
     n += 1
   endwhile
   setf FALLBACK html
@@ -465,7 +471,7 @@ export def ProtoCheck(default: string)
     # recognize Prolog by specific text in the first non-empty line
     # require a blank after the '%' because Perl uses "%list" and "%translate"
     var lnum = getline(nextnonblank(1))
-    if lnum =~ '\<prolog\>' || lnum =~ '^\(:-\|%\|\/\*\)\|\.$'
+    if lnum =~ '\<prolog\>' || lnum =~ prolog_pattern
       setf prolog
     else
       exe 'setf ' .. default
@@ -530,6 +536,25 @@ export def FTm()
   endif
 enddef
 
+export def FTmake()
+  # Check if it is a Microsoft Makefile
+  unlet! b:make_microsoft
+  var n = 1
+  while n < 1000 && n <= line('$')
+    var line = getline(n)
+    if line =~? '^\s*!\s*\(ifn\=\(def\)\=\|include\|message\|error\)\>'
+      b:make_microsoft = 1
+      break
+    elseif line =~ '^ *ifn\=\(eq\|def\)\>' || line =~ '^ *[-s]\=include\s'
+      break
+    elseif line =~ '^ *\w\+\s*[!?:+]='
+      break
+    endif
+    n += 1
+  endwhile
+  setf make
+enddef
+
 export def FTmms()
   var n = 1
   while n < 20
@@ -644,7 +669,7 @@ export def FTpl()
     # recognize Prolog by specific text in the first non-empty line
     # require a blank after the '%' because Perl uses "%list" and "%translate"
     var line = getline(nextnonblank(1))
-    if line =~ '\<prolog\>' || line =~ '^\s*\(%\+\(\s\|$\)\|/\*\)' || line =~ ':-'
+    if line =~ '\<prolog\>' || line =~ prolog_pattern
       setf prolog
     else
       setf perl

runtime/autoload/dist/vim.vim

@@ -18,6 +18,9 @@ endif
 if !has('vim9script')
   function dist#vim#IsSafeExecutable(filetype, executable)
     let cwd = getcwd()
+    if empty(exepath(a:executable))
+      return v:false
+    endif
     return get(g:, a:filetype .. '_exec', get(g:, 'plugin_exec', 0)) &&
           \ (fnamemodify(exepath(a:executable), ':p:h') !=# cwd
           \ || (split($PATH, has('win32') ? ';' : ':')->index(cwd) != -1 &&

runtime/autoload/dist/vim9.vim

@@ -6,6 +6,9 @@ vim9script
 # Last Change:	2023 Oct 25
 
 export def IsSafeExecutable(filetype: string, executable: string): bool
+    if empty(exepath(executable))
+      return v:false
+    endif
     var cwd = getcwd()
     return get(g:, filetype .. '_exec', get(g:, 'plugin_exec', 0))
       && (fnamemodify(exepath(executable), ':p:h') !=# cwd

runtime/autoload/getscript.vim

@@ -3,9 +3,15 @@
 "  Maintainer: This runtime file is looking for a new maintainer.
 "  Original Author: Charles E. Campbell
 "  Date:	Jan 21, 2014
-"  Version:	36
+"  Version:	37
 "  Installing:	:help glvs-install
 "  Usage:	:help glvs
+"  Last Change:	{{{1
+"   2024 Sep 08 by Vim Project: several small fixes (#15640)
+"   2024 Sep 23 by Vim Project: runtime dir selection fix (#15722)
+"                               autoloading search path fix
+"                               substitution of hardcoded commands with global variables
+"  }}}
 "
 " GetLatestVimScripts: 642 1 :AutoInstall: getscript.vim
 "redraw!|call inputsave()|call input("Press <cr> to continue")|call inputrestore()
@@ -16,7 +22,7 @@
 if exists("g:loaded_getscript")
  finish
 endif
-let g:loaded_getscript= "v36"
+let g:loaded_getscript= "v37"
 if &cp
  echoerr "GetLatestVimScripts is not vi-compatible; not loaded (you need to set nocp)"
  finish
@@ -64,7 +70,7 @@ if !exists("g:GetLatestVimScripts_options")
  if g:GetLatestVimScripts_wget == "wget"
   let g:GetLatestVimScripts_options= "-q -O"
  elseif g:GetLatestVimScripts_wget == "curl"
-  let g:GetLatestVimScripts_options= "-s -O"
+  let g:GetLatestVimScripts_options= "-s -o"
  else
   let g:GetLatestVimScripts_options= ""
  endif
@@ -77,7 +83,29 @@ endif
 
 " set up default scriptaddr address
 if !exists("g:GetLatestVimScripts_scriptaddr")
- let g:GetLatestVimScripts_scriptaddr = 'http://vim.sourceforge.net/script.php?script_id='
+ let g:GetLatestVimScripts_scriptaddr = 'https://www.vim.org/scripts/script.php?script_id='
+endif
+
+if !exists("g:GetLatestVimScripts_downloadaddr")
+  let g:GetLatestVimScripts_downloadaddr = 'https://www.vim.org/scripts/download_script.php?src_id='
+endif
+
+" define decompression tools (on windows this allows redirection to wsl or git tools).
+" Note tar is available as builtin since Windows 11.
+if !exists("g:GetLatestVimScripts_bunzip2")
+ let g:GetLatestVimScripts_bunzip2= "bunzip2"
+endif
+
+if !exists("g:GetLatestVimScripts_gunzip")
+ let g:GetLatestVimScripts_gunzip= "gunzip"
+endif
+
+if !exists("g:GetLatestVimScripts_unxz")
+ let g:GetLatestVimScripts_unxz= "unxz"
+endif
+
+if !exists("g:GetLatestVimScripts_unzip")
+ let g:GetLatestVimScripts_unzip= "unzip"
 endif
 
 "" For debugging:
@@ -89,18 +117,16 @@ endif
 let s:autoinstall= ""
 if g:GetLatestVimScripts_allowautoinstall
 
- if (has("win32") || has("gui_win32") || has("gui_win32s") || has("win16") || has("win64") || has("win32unix") || has("win95")) && &shell != "bash"
-  " windows (but not cygwin/bash)
-  let s:dotvim= "vimfiles"
-  if !exists("g:GetLatestVimScripts_mv")
-   let g:GetLatestVimScripts_mv= "ren"
-  endif
+ let s:is_windows = has("win32") || has("gui_win32") || has("gui_win32s") || has("win16") || has("win64") || has("win32unix") || has("win95")
+ let s:dotvim= s:is_windows ? "vimfiles" : ".vim"
 
- else
-  " unix
-  let s:dotvim= ".vim"
-  if !exists("g:GetLatestVimScripts_mv")
-   let g:GetLatestVimScripts_mv= "mv"
+ if !exists("g:GetLatestVimScripts_mv")
+  if s:is_windows && &shell !~ '\cbash\|pwsh\|powershell'
+   " windows (but not cygwin/bash)
+    let g:GetLatestVimScripts_mv= "move"
+  else
+   " unix
+    let g:GetLatestVimScripts_mv= "mv"
   endif
  endif
 
@@ -210,7 +236,13 @@ fun! getscript#GetLatestVimScripts()
 "  call Decho("lastline#".lastline)
   let firstdir    = substitute(&rtp,',.*$','','')
   let plugins     = split(globpath(firstdir,"plugin/**/*.vim"),'\n')
-  let plugins     = plugins + split(globpath(firstdir,"AsNeeded/**/*.vim"),'\n')
+  let plugins     += split(globpath(firstdir,"ftplugin/**/*.vim"),'\n')
+  let plugins     += split(globpath(firstdir,"AsNeeded/**/*.vim"),'\n')
+" extend the search to the packages too (this script predates the feature)
+  let plugins     += split(globpath(firstdir,"pack/*/start/*/plugin/**/*.vim"),'\n')
+  let plugins     += split(globpath(firstdir,"pack/*/opt/*/plugin/**/*.vim"),'\n')
+  let plugins     += split(globpath(firstdir,"pack/*/start/*/ftplugin/**/*.vim"),'\n')
+  let plugins     += split(globpath(firstdir,"pack/*/opt/*/ftplugin/**/*.vim"),'\n')
   let foundscript = 0
 
   " this loop updates the GetLatestVimScripts.dat file
@@ -515,11 +547,11 @@ fun! s:GetOneScript(...)
 "   call Decho(".downloading new <".sname.">")
    echomsg ".downloading new <".sname.">"
    if has("win32") || has("win16") || has("win95")
-"    call Decho(".new|exe silent r!".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(sname)." ".shellescape('http://vim.sourceforge.net/scripts/download_script.php?src_id='.latestsrcid)."|q")
-    new|exe "silent r!".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(sname)." ".shellescape('http://vim.sourceforge.net/scripts/download_script.php?src_id='.latestsrcid)|q
+"    call Decho(".new|exe silent r!".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(sname)." ".shellescape(g:GetLatestVimScripts_downloadaddr.latestsrcid)."|q")
+    new|exe "silent r!".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(sname)." ".shellescape(g:GetLatestVimScripts_downloadaddr.latestsrcid)|q
    else
-"    call Decho(".exe silent !".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(sname)." ".shellescape('http://vim.sourceforge.net/scripts/download_script.php?src_id='))
-    exe "silent !".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(sname)." ".shellescape('http://vim.sourceforge.net/scripts/download_script.php?src_id=').latestsrcid
+"    call Decho(".exe silent !".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(sname)." ".shellescape(g:GetLatestVimScripts_downloadaddr).latestsrcid
+    exe "silent !".g:GetLatestVimScripts_wget." ".g:GetLatestVimScripts_options." ".shellescape(sname)." ".shellescape(g:GetLatestVimScripts_downloadaddr).latestsrcid
    endif
 
    " --------------------------------------------------------------------------
@@ -556,27 +588,27 @@ fun! s:GetOneScript(...)
      " decompress
      if sname =~ '\.bz2$'
 "      call Decho("decompress: attempt to bunzip2 ".sname)
-      exe "sil !bunzip2 ".shellescape(sname)
+      exe "sil !".g:GetLatestVimScripts_bunzip2." ".shellescape(sname)
       let sname= substitute(sname,'\.bz2$','','')
 "      call Decho("decompress: new sname<".sname."> after bunzip2")
      elseif sname =~ '\.gz$'
 "      call Decho("decompress: attempt to gunzip ".sname)
-      exe "sil !gunzip ".shellescape(sname)
+      exe "sil !".g:GetLatestVimScripts_gunzip." ".shellescape(sname)
       let sname= substitute(sname,'\.gz$','','')
 "      call Decho("decompress: new sname<".sname."> after gunzip")
      elseif sname =~ '\.xz$'
 "      call Decho("decompress: attempt to unxz ".sname)
-      exe "sil !unxz ".shellescape(sname)
+      exe "sil !".g:GetLatestVimScripts_unxz." ".shellescape(sname)
       let sname= substitute(sname,'\.xz$','','')
 "      call Decho("decompress: new sname<".sname."> after unxz")
      else
 "      call Decho("no decompression needed")
      endif
      
-     " distribute archive(.zip, .tar, .vba, ...) contents
+     " distribute archive(.zip, .tar, .vba, .vmb, ...) contents
      if sname =~ '\.zip$'
 "      call Decho("dearchive: attempt to unzip ".sname)
-      exe "silent !unzip -o ".shellescape(sname)
+      exe "silent !".g:GetLatestVimScripts_unzip." -o ".shellescape(sname)
      elseif sname =~ '\.tar$'
 "      call Decho("dearchive: attempt to untar ".sname)
       exe "silent !tar -xvf ".shellescape(sname)
@@ -592,7 +624,7 @@ fun! s:GetOneScript(...)
      elseif sname =~ '\.txz$'
 "      call Decho("dearchive: attempt to untar+xz ".sname)
       exe "silent !tar -Jxvf ".shellescape(sname)
-     elseif sname =~ '\.vba$'
+     elseif sname =~ '\.vba$\|\.vmb$'
 "      call Decho("dearchive: attempt to handle a vimball: ".sname)
       silent 1split
       if exists("g:vimball_home")

runtime/autoload/hcl.vim

@@ -0,0 +1,40 @@
+" Language:    HCL
+" Maintainer:  Gregory Anders
+" Last Change: 2024-09-03
+" Based on:    https://github.com/hashivim/vim-terraform
+
+function! hcl#indentexpr(lnum)
+  " Beginning of the file should have no indent
+  if a:lnum == 0
+    return 0
+  endif
+
+  " Usual case is to continue at the same indent as the previous non-blank line.
+  let prevlnum = prevnonblank(a:lnum-1)
+  let thisindent = indent(prevlnum)
+
+  " If that previous line is a non-comment ending in [ { (, increase the
+  " indent level.
+  let prevline = getline(prevlnum)
+  if prevline !~# '^\s*\(#\|//\)' && prevline =~# '[\[{\(]\s*$'
+    let thisindent += &shiftwidth
+  endif
+
+  " If the current line ends a block, decrease the indent level.
+  let thisline = getline(a:lnum)
+  if thisline =~# '^\s*[\)}\]]'
+    let thisindent -= &shiftwidth
+  endif
+
+  " If the previous line starts a block comment /*, increase by one
+  if prevline =~# '/\*'
+    let thisindent += 1
+  endif
+
+  " If the previous line ends a block comment */, decrease by one
+  if prevline =~# '\*/'
+    let thisindent -= 1
+  endif
+
+  return thisindent
+endfunction

runtime/autoload/javaformat.vim

@@ -0,0 +1,92 @@
+" Vim formatting plugin file
+" Language:		Java
+" Maintainer:		Aliaksei Budavei <0x000c70 AT gmail DOT com>
+" Repository:		https://github.com/zzzyxwvut/java-vim.git
+" Last Change:		2024 Sep 26
+
+" Documented in ":help ft-java-plugin".
+if &cp || exists("g:loaded_javaformat") || exists("g:java_ignore_javadoc") || exists("g:java_ignore_markdown")
+    finish
+endif
+
+let g:loaded_javaformat = 1
+
+"""" STRIVE TO REMAIN COMPATIBLE FOR AT LEAST VIM 7.0.
+
+function! javaformat#RemoveCommonMarkdownWhitespace() abort
+    if mode() != 'n'
+	return 0
+    endif
+
+    let pattern = '\(^\s*///\)\(\s*\)\(.*\)'
+
+    " E121 for v:numbermax before v8.2.2388.
+    " E15 for expr-<< before v8.2.5003.
+    let common = 0x7fffffff
+    let comments = []
+
+    for n in range(v:lnum, (v:lnum + v:count - 1))
+	let parts = matchlist(getline(n), pattern)
+	let whitespace = get(parts, 2, '')
+	let nonwhitespace = get(parts, 3, '')
+
+	if !empty(whitespace)
+	    let common = min([common, strlen(whitespace)])
+	elseif !empty(nonwhitespace) || empty(parts)
+	    " No whitespace prefix or not a Markdown comment.
+	    return 0
+	endif
+
+	call add(comments, [whitespace, parts[1], nonwhitespace])
+    endfor
+
+    let cursor = v:lnum
+
+    for line in comments
+	call setline(cursor, join(line[1 :], strpart(line[0], common)))
+	let cursor += 1
+    endfor
+
+    return 0
+endfunction
+
+" See ":help vim9-mix".
+if !has("vim9script")
+    finish
+endif
+
+def! g:javaformat#RemoveCommonMarkdownWhitespace(): number
+    if mode() != 'n'
+	return 0
+    endif
+
+    const pattern: string = '\(^\s*///\)\(\s*\)\(.*\)'
+    var common: number = v:numbermax
+    var comments: list<list<string>> = []
+
+    for n in range(v:lnum, (v:lnum + v:count - 1))
+	const parts: list<string> = matchlist(getline(n), pattern)
+	const whitespace: string = get(parts, 2, '')
+	const nonwhitespace: string = get(parts, 3, '')
+
+	if !empty(whitespace)
+	    common = min([common, strlen(whitespace)])
+	elseif !empty(nonwhitespace) || empty(parts)
+	    # No whitespace prefix or not a Markdown comment.
+	    return 0
+	endif
+
+	add(comments, [whitespace, parts[1], nonwhitespace])
+    endfor
+
+    var cursor: number = v:lnum
+
+    for line in comments
+	setline(cursor, join(line[1 :], strpart(line[0], common)))
+	cursor += 1
+    endfor
+
+    return 0
+enddef
+
+" vim: fdm=syntax sw=4 ts=8 noet sta

runtime/autoload/netrw.vim

@@ -3,7 +3,7 @@
 " Maintainer: This runtime file is looking for a new maintainer.
 " Date:		  May 03, 2023
 " Version:	173a
-" Last Change:
+" Last Change: {{{1
 " 	2023 Nov 21 by Vim Project: ignore wildignore when expanding $COMSPEC	(v173a)
 " 	2023 Nov 22 by Vim Project: fix handling of very long filename on longlist style	(v173a)
 "   2024 Feb 19 by Vim Project: (announce adoption)
@@ -16,6 +16,17 @@
 "   2024 Jun 04 by Vim Project: set bufhidden if buffer changed, nohidden is set and buffer shall be switched (#14915)
 "   2024 Jun 13 by Vim Project: glob() on Windows fails when a directory name contains [] (#14952)
 "   2024 Jun 23 by Vim Project: save ad restore registers when liststyle = WIDELIST (#15077, #15114)
+"   2024 Jul 22 by Vim Project: avoid endless recursion (#15318)
+"   2024 Jul 23 by Vim Project: escape filename before trying to delete it (#15330)
+"   2024 Jul 30 by Vim Project: handle mark-copy to same target directory (#12112)
+"   2024 Aug 02 by Vim Project: honor g:netrw_alt{o,v} for :{S,H,V}explore (#15417)
+"   2024 Aug 15 by Vim Project: style changes, prevent E121 (#15501)
+"   2024 Aug 22 by Vim Project: fix mf-selection highlight (#15551)
+"   2024 Aug 22 by Vim Project: adjust echo output of mx command (#15550)
+"   2024 Sep 15 by Vim Project: more strict confirmation dialog (#15680)
+"   2024 Sep 19 by Vim Project: mf-selection highlight uses wrong pattern (#15700)
+"   2024 Sep 21 by Vim Project: remove extraneous closing bracket (#15718)
+"   }}}
 " Former Maintainer:	Charles E Campbell
 " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
 " Copyright:    Copyright (C) 2016 Charles E. Campbell {{{1
@@ -58,11 +69,6 @@ if exists("s:needspatches")
 endif
 
 let g:loaded_netrw = "v173"
-if !exists("s:NOTE")
- let s:NOTE    = 0
- let s:WARNING = 1
- let s:ERROR   = 2
-endif
 
 let s:keepcpo= &cpo
 setl cpo&vim
@@ -100,7 +106,7 @@ fun! netrw#ErrorMsg(level,msg,errnum)
   endif
 "  call Decho("level=".level,'~'.expand("<slnum>"))
 
-  if g:netrw_use_errorwindow == 2 && (v:version > 802 || (v:version == 802 && has("patch486")))
+  if g:netrw_use_errorwindow == 2 && exists("*popup_atcursor")
    " use popup window
    if type(a:msg) == 3
     let msg = [level]+a:msg
@@ -216,6 +222,11 @@ if !exists("s:LONGLIST")
  call s:NetrwInit("s:MAXLIST" ,4)
 endif
 
+let s:NOTE    = 0
+let s:WARNING = 1
+let s:ERROR   = 2
+call s:NetrwInit("g:netrw_errorlvl", s:NOTE)
+
 " ---------------------------------------------------------------------
 " Default option values: {{{2
 let g:netrw_localcopycmdopt    = ""
@@ -225,7 +236,10 @@ let g:netrw_localmovecmdopt    = ""
 
 " ---------------------------------------------------------------------
 " Default values for netrw's global protocol variables {{{2
-if (v:version > 802 || (v:version == 802 && has("patch486"))) && has("balloon_eval") && !exists("s:initbeval") && !exists("g:netrw_nobeval") && has("syntax") && exists("g:syntax_on") && has("mouse")
+if exists("*popup_atcursor")
+\   && has("syntax")
+\   && exists("g:syntax_on")
+\   && has("mouse")
   call s:NetrwInit("g:netrw_use_errorwindow",2)
 else
   call s:NetrwInit("g:netrw_use_errorwindow",1)
@@ -343,7 +357,6 @@ call s:NetrwInit("s:didstarstar",0)
 call s:NetrwInit("g:netrw_dirhistcnt"      , 0)
 call s:NetrwInit("g:netrw_decompress"       , '{ ".gz" : "gunzip", ".bz2" : "bunzip2", ".zip" : "unzip", ".tar" : "tar -xf", ".xz" : "unxz" }')
 call s:NetrwInit("g:netrw_dirhistmax"       , 10)
-call s:NetrwInit("g:netrw_errorlvl"  , s:NOTE)
 call s:NetrwInit("g:netrw_fastbrowse"       , 1)
 call s:NetrwInit("g:netrw_ftp_browse_reject", '^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$')
 if !exists("g:netrw_ftp_list_cmd")
@@ -694,12 +707,11 @@ fun! netrw#Explore(indx,dosplit,style,...)
      \ ((isdirectory(s:NetrwFile(a:1))))?  'is a directory'           : 'is not a directory',
      \ '~'.expand("<slnum>"))
    if a:1 =~ "\\\s" && !filereadable(s:NetrwFile(a:1)) && !isdirectory(s:NetrwFile(a:1))
-"    call Decho("re-trying Explore with <".substitute(a:1,'\\\(\s\)','\1','g').">",'~'.expand("<slnum>"))
-    call netrw#Explore(a:indx,a:dosplit,a:style,substitute(a:1,'\\\(\s\)','\1','g'))
-"    call Dret("netrw#Explore : returning from retry")
-    return
-"   else " Decho
-"    call Decho("retry not needed",'~'.expand("<slnum>"))
+    let a1 = substitute(a:1, '\\\(\s\)', '\1', 'g')
+    if a1 != a:1
+      call netrw#Explore(a:indx, a:dosplit, a:style, a1)
+      return
+    endif
    endif
   endif
 
@@ -715,7 +727,6 @@ fun! netrw#Explore(indx,dosplit,style,...)
   " -or- file has been modified AND file not hidden when abandoned
   " -or- Texplore used
   if a:dosplit || (&modified && &hidden == 0 && &bufhidden != "hide") || a:style == 6
-"   call Decho("case dosplit=".a:dosplit." modified=".&modified." a:style=".a:style.": dosplit or file has been modified",'~'.expand("<slnum>"))
    call s:SaveWinVars()
    let winsz= g:netrw_winsize
    if a:indx > 0
@@ -723,57 +734,41 @@ fun! netrw#Explore(indx,dosplit,style,...)
    endif
 
    if a:style == 0      " Explore, Sexplore
-"    call Decho("style=0: Explore or Sexplore",'~'.expand("<slnum>"))
     let winsz= (winsz > 0)? (winsz*winheight(0))/100 : -winsz
     if winsz == 0|let winsz= ""|endif
-    exe "noswapfile ".winsz."wincmd s"
-"    call Decho("exe noswapfile ".winsz."wincmd s",'~'.expand("<slnum>"))
+    exe "noswapfile ".(g:netrw_alto ? "below " : "above ").winsz."wincmd s"
 
-   elseif a:style == 1  "Explore!, Sexplore!
-"    call Decho("style=1: Explore! or Sexplore!",'~'.expand("<slnum>"))
+   elseif a:style == 1  " Explore!, Sexplore!
     let winsz= (winsz > 0)? (winsz*winwidth(0))/100 : -winsz
     if winsz == 0|let winsz= ""|endif
-    exe "keepalt noswapfile ".winsz."wincmd v"
-"    call Decho("exe keepalt noswapfile ".winsz."wincmd v",'~'.expand("<slnum>"))
+    exe "keepalt noswapfile ".(g:netrw_altv ? "rightbelow " : "leftabove ").winsz."wincmd v"
 
    elseif a:style == 2  " Hexplore
-"    call Decho("style=2: Hexplore",'~'.expand("<slnum>"))
     let winsz= (winsz > 0)? (winsz*winheight(0))/100 : -winsz
     if winsz == 0|let winsz= ""|endif
-    exe "keepalt noswapfile bel ".winsz."wincmd s"
-"    call Decho("exe keepalt noswapfile bel ".winsz."wincmd s",'~'.expand("<slnum>"))
+    exe "keepalt noswapfile ".(g:netrw_alto ? "below " : "above ").winsz."wincmd s"
 
    elseif a:style == 3  " Hexplore!
-"    call Decho("style=3: Hexplore!",'~'.expand("<slnum>"))
     let winsz= (winsz > 0)? (winsz*winheight(0))/100 : -winsz
     if winsz == 0|let winsz= ""|endif
-    exe "keepalt noswapfile abo ".winsz."wincmd s"
-"    call Decho("exe keepalt noswapfile abo ".winsz."wincmd s",'~'.expand("<slnum>"))
+    exe "keepalt noswapfile ".(!g:netrw_alto ? "below " : "above ").winsz."wincmd s"
 
    elseif a:style == 4  " Vexplore
-"    call Decho("style=4: Vexplore",'~'.expand("<slnum>"))
     let winsz= (winsz > 0)? (winsz*winwidth(0))/100 : -winsz
     if winsz == 0|let winsz= ""|endif
-    exe "keepalt noswapfile lefta ".winsz."wincmd v"
-"    call Decho("exe keepalt noswapfile lefta ".winsz."wincmd v",'~'.expand("<slnum>"))
+    exe "keepalt noswapfile ".(g:netrw_altv ? "rightbelow " : "leftabove ").winsz."wincmd v"
 
    elseif a:style == 5  " Vexplore!
-"    call Decho("style=5: Vexplore!",'~'.expand("<slnum>"))
     let winsz= (winsz > 0)? (winsz*winwidth(0))/100 : -winsz
     if winsz == 0|let winsz= ""|endif
-    exe "keepalt noswapfile rightb ".winsz."wincmd v"
-"    call Decho("exe keepalt noswapfile rightb ".winsz."wincmd v",'~'.expand("<slnum>"))
+    exe "keepalt noswapfile ".(!g:netrw_altv ? "rightbelow " : "leftabove ").winsz."wincmd v"
 
    elseif a:style == 6  " Texplore
     call s:SaveBufVars()
-"    call Decho("style  = 6: Texplore",'~'.expand("<slnum>"))
     exe "keepalt tabnew ".fnameescape(curdir)
-"    call Decho("exe keepalt tabnew ".fnameescape(curdir),'~'.expand("<slnum>"))
     call s:RestoreBufVars()
    endif
    call s:RestoreWinVars()
-"  else " Decho
-"   call Decho("case a:dosplit=".a:dosplit." AND modified=".&modified." AND a:style=".a:style." is not 6",'~'.expand("<slnum>"))
   endif
   NetrwKeepj norm! 0
 
@@ -4239,7 +4234,7 @@ fun! s:NetrwGetBuffer(islocal,dirname)
     endif
 "    call Decho("  NetrwTreeListing: bufnum#".bufnum,'~'.expand("<slnum>"))
     if !bufexists(bufnum)
-     call remove(s:netrwbuf,"NetrwTreeListing"])
+     call remove(s:netrwbuf,"NetrwTreeListing")
      let bufnum= -1
     endif
    elseif bufnr("NetrwTreeListing") != -1
@@ -6897,11 +6892,7 @@ fun! s:NetrwMarkFile(islocal,fname)
 
   let ykeep   = @@
   let curbufnr= bufnr("%")
-  if a:fname =~ '^\a'
-   let leader= '\<'
-  else
-   let leader= ''
-  endif
+  let leader= '\%(^\|\s\)\zs'
   if a:fname =~ '\a$'
    let trailer = '\>[@=|\/\*]\=\ze\%(  \|\t\|$\)'
   else
@@ -7164,7 +7155,7 @@ fun! s:NetrwMarkFileCopy(islocal,...)
    endif
 
    " copy marked files while within the same directory (ie. allow renaming)
-   if simplify(s:netrwmftgt) == simplify(b:netrw_curdir)
+   if s:StripTrailingSlash(simplify(s:netrwmftgt)) == s:StripTrailingSlash(simplify(b:netrw_curdir))
     if len(s:netrwmarkfilelist_{bufnr('%')}) == 1
      " only one marked file
 "     call Decho("case: only one marked file",'~'.expand("<slnum>"))
@@ -7241,7 +7232,7 @@ fun! s:NetrwMarkFileCopy(islocal,...)
 "   call Decho("system(".copycmd." '".args."' '".tgt."')",'~'.expand("<slnum>"))
    call system(copycmd.g:netrw_localcopycmdopt." '".args."' '".tgt."'")
    if v:shell_error != 0
-    if exists("b:netrw_curdir") && b:netrw_curdir != getcwd() && !g:netrw_keepdir
+    if exists("b:netrw_curdir") && b:netrw_curdir != getcwd() && g:netrw_keepdir
      call netrw#ErrorMsg(s:ERROR,"copy failed; perhaps due to vim's current directory<".getcwd()."> not matching netrw's (".b:netrw_curdir.") (see :help netrw-cd)",101)
     else
      call netrw#ErrorMsg(s:ERROR,"tried using g:netrw_localcopycmd<".g:netrw_localcopycmd.">; it doesn't work!",80)
@@ -7510,7 +7501,13 @@ fun! s:NetrwMarkFileExe(islocal,enbloc)
        NetrwKeepj call netrw#ErrorMsg(s:ERROR,"command<".xcmd."> failed, aborting",54)
        break
       else
-       echo ret
+       if ret !=# ''
+        echo "\n"
+        " skip trailing new line
+        echo ret[0:-2]
+       else
+        echo ret
+       endif
       endif
      endfor
 
@@ -11394,7 +11391,7 @@ fun! s:NetrwLocalRm(path) range
     let ok= s:NetrwLocalRmFile(a:path,fname,all)
     if ok =~# 'q\%[uit]' || ok == "no"
      break
-    elseif ok =~# 'a\%[ll]'
+    elseif ok =~# '^a\%[ll]$'
      let all= 1
     endif
    endfor
@@ -11423,7 +11420,7 @@ fun! s:NetrwLocalRm(path) range
     let ok= s:NetrwLocalRmFile(a:path,curword,all)
     if ok =~# 'q\%[uit]' || ok == "no"
      break
-    elseif ok =~# 'a\%[ll]'
+    elseif ok =~# '^a\%[ll]$'
      let all= 1
     endif
     let ctr= ctr + 1
@@ -11452,7 +11449,7 @@ fun! s:NetrwLocalRmFile(path,fname,all)
   let all= a:all
   let ok = ""
   NetrwKeepj norm! 0
-  let rmfile= s:NetrwFile(s:ComposePath(a:path,a:fname))
+  let rmfile= s:NetrwFile(s:ComposePath(a:path,escape(a:fname, '\\')))
 "  call Decho("rmfile<".rmfile.">",'~'.expand("<slnum>"))
 
   if rmfile !~ '^"' && (rmfile =~ '@$' || rmfile !~ '[\/]$')
@@ -11461,7 +11458,7 @@ fun! s:NetrwLocalRmFile(path,fname,all)
    if !all
     echohl Statement
     call inputsave()
-    let ok= input("Confirm deletion of file<".rmfile."> ","[{y(es)},n(o),a(ll),q(uit)] ")
+    let ok= input("Confirm deletion of file <".rmfile."> ","[{y(es)},n(o),a(ll),q(uit)] ")
     call inputrestore()
     echohl NONE
     if ok == ""
@@ -11470,12 +11467,12 @@ fun! s:NetrwLocalRmFile(path,fname,all)
 "    call Decho("response: ok<".ok.">",'~'.expand("<slnum>"))
     let ok= substitute(ok,'\[{y(es)},n(o),a(ll),q(uit)]\s*','','e')
 "    call Decho("response: ok<".ok."> (after sub)",'~'.expand("<slnum>"))
-    if ok =~# 'a\%[ll]'
+    if ok =~# '^a\%[ll]$'
      let all= 1
     endif
    endif
 
-   if all || ok =~# 'y\%[es]' || ok == ""
+   if all || ok =~# '^y\%[es]$' || ok == ""
     let ret= s:NetrwDelete(rmfile)
 "    call Decho("errcode=".v:shell_error." ret=".ret,'~'.expand("<slnum>"))
    endif
@@ -11485,19 +11482,19 @@ fun! s:NetrwLocalRmFile(path,fname,all)
    if !all
     echohl Statement
     call inputsave()
-    let ok= input("Confirm *recursive* deletion of directory<".rmfile."> ","[{y(es)},n(o),a(ll),q(uit)] ")
+    let ok= input("Confirm *recursive* deletion of directory <".rmfile."> ","[{y(es)},n(o),a(ll),q(uit)] ")
     call inputrestore()
     let ok= substitute(ok,'\[{y(es)},n(o),a(ll),q(uit)]\s*','','e')
     if ok == ""
      let ok="no"
     endif
-    if ok =~# 'a\%[ll]'
+    if ok =~# '^a\%[ll]$'
      let all= 1
     endif
    endif
    let rmfile= substitute(rmfile,'[\/]$','','e')
 
-   if all || ok =~# 'y\%[es]' || ok == ""
+   if all || ok =~# '^y\%[es]$' || ok == ""
     if delete(rmfile,"rf")
      call netrw#ErrorMsg(s:ERROR,"unable to delete directory <".rmfile.">!",103)
     endif
@@ -11644,6 +11641,13 @@ fun! netrw#WinPath(path)
   return path
 endfun
 
+" ---------------------------------------------------------------------
+" s:StripTrailingSlash: removes trailing slashes from a path {{{2
+fun! s:StripTrailingSlash(path)
+   " remove trailing slash
+   return substitute(a:path, '[/\\]$', '', 'g')
+endfun
+
 " ---------------------------------------------------------------------
 " s:NetrwBadd: adds marked files to buffer list or vice versa {{{2
 "              cb : bl2mf=0  add marked files to buffer list
@@ -12828,54 +12832,3 @@ unlet s:keepcpo
 " Modelines: {{{1
 " ===============
 " vim:ts=8 fdm=marker
-" doing autoload/netrw.vim version v172g ~57
-" varname<g:netrw_dirhistcnt> value=0 ~1
-" varname<s:THINLIST> value=0 ~1
-" varname<s:LONGLIST> value=1 ~1
-" varname<s:WIDELIST> value=2 ~1
-" varname<s:TREELIST> value=3 ~1
-" varname<s:MAXLIST> value=4 ~1
-" varname<g:netrw_use_errorwindow> value=2 ~1
-" varname<g:netrw_http_xcmd> value=-q -O ~1
-" varname<g:netrw_http_put_cmd> value=curl -T ~1
-" varname<g:netrw_keepj> value=keepj ~1
-" varname<g:netrw_rcp_cmd> value=rcp ~1
-" varname<g:netrw_rsync_cmd> value=rsync ~1
-" varname<g:netrw_rsync_sep> value=/ ~1
-" varname<g:netrw_scp_cmd> value=scp -q ~1
-" varname<g:netrw_sftp_cmd> value=sftp ~1
-" varname<g:netrw_ssh_cmd> value=ssh ~1
-" varname<g:netrw_alto> value=0 ~1
-" varname<g:netrw_altv> value=1 ~1
-" varname<g:netrw_banner> value=1 ~1
-" varname<g:netrw_browse_split> value=0 ~1
-" varname<g:netrw_bufsettings> value=noma nomod nonu nobl nowrap ro nornu ~1
-" varname<g:netrw_chgwin> value=-1 ~1
-" varname<g:netrw_clipboard> value=1 ~1
-" varname<g:netrw_compress> value=gzip ~1
-" varname<g:netrw_ctags> value=ctags ~1
-" varname<g:netrw_cursor> value=2 ~1
-" (netrw) COMBAK: cuc=0 cul=0 initialization of s:netrw_cu[cl]
-" varname<g:netrw_cygdrive> value=/cygdrive ~1
-" varname<s:didstarstar> value=0 ~1
-" varname<g:netrw_dirhistcnt> value=0 ~1
-" varname<g:netrw_decompress> value={ ".gz" : "gunzip", ".bz2" : "bunzip2", ".zip" : "unzip", ".tar" : "tar -xf", ".xz" : "unxz" } ~1
-" varname<g:netrw_dirhistmax> value=10 ~1
-" varname<g:netrw_errorlvl> value=0 ~1
-" varname<g:netrw_fastbrowse> value=1 ~1
-" varname<g:netrw_ftp_browse_reject> value=^total\s\+\d\+$\|^Trying\s\+\d\+.*$\|^KERBEROS_V\d rejected\|^Security extensions not\|No such file\|: connect to address [0-9a-fA-F:]*: No route to host$ ~1
-" varname<g:netrw_ftpmode> value=binary ~1
-" varname<g:netrw_hide> value=1 ~1
-" varname<g:netrw_keepdir> value=1 ~1
-" varname<g:netrw_list_hide> value= ~1
-" varname<g:netrw_localmkdir> value=mkdir ~1
-" varname<g:netrw_remote_mkdir> value=mkdir ~1
-" varname<g:netrw_liststyle> value=0 ~1
-" varname<g:netrw_markfileesc> value=*./[\~ ~1
-" varname<g:netrw_maxfilenamelen> value=32 ~1
-" varname<g:netrw_menu> value=1 ~1
-" varname<g:netrw_mkdir_cmd> value=ssh USEPORT HOSTNAME mkdir ~1
-" varname<g:netrw_mousemaps> value=1 ~1
-" varname<g:netrw_retmap> value=0 ~1
-" varname<g:netrw_chgperm> value=chmod PERM FILENAME ~1
-" varname<g:netrw_preview> value=0 ~1

runtime/autoload/typst.vim

@@ -0,0 +1,50 @@
+" Language:    Typst
+" Maintainer:  Gregory Anders
+" Last Change: 2024-07-14
+" Based on:    https://github.com/kaarmu/typst.vim
+
+function! typst#indentexpr() abort
+    let l:lnum = v:lnum
+    let s:sw = shiftwidth()
+
+    let [l:plnum, l:pline] = s:get_prev_nonblank(l:lnum - 1)
+    if l:plnum == 0 | return 0 | endif
+
+    let l:line = getline(l:lnum)
+    let l:ind = indent(l:plnum)
+
+    let l:synname = synIDattr(synID(l:lnum, 1, 1), 'name')
+
+    " Use last indent for block comments
+    if l:synname == 'typstCommentBlock'
+        return l:ind
+    endif
+
+    if l:pline =~ '\v[{[(]\s*$'
+        let l:ind += s:sw
+    endif
+
+    if l:line =~ '\v^\s*[}\])]'
+        let l:ind -= s:sw
+    endif
+
+    return l:ind
+endfunction
+
+" Gets the previous non-blank line that is not a comment.
+function! s:get_prev_nonblank(lnum) abort
+    let l:lnum = prevnonblank(a:lnum)
+    let l:line = getline(l:lnum)
+
+    while l:lnum > 0 && l:line =~ '^\s*//'
+        let l:lnum = prevnonblank(l:lnum - 1)
+        let l:line = getline(l:lnum)
+    endwhile
+
+    return [l:lnum, s:remove_comments(l:line)]
+endfunction
+
+" Removes comments from the given line.
+function! s:remove_comments(line) abort
+    return substitute(a:line, '\s*//.*', '', '')
+endfunction

runtime/autoload/zip.vim

@@ -1,11 +1,19 @@
 " zip.vim: Handles browsing zipfiles
-"            AUTOLOAD PORTION
-" Date:		Mar 12, 2023
-" Version:	33
+" AUTOLOAD PORTION
+" Date:		2024 Aug 21
+" Version:	34
 " Maintainer:	This runtime file is looking for a new maintainer.
 " Former Maintainer:	Charles E Campbell
 " Last Change:
-"		2024 Jun 16 by Vim Project: handle whitespace on Windows properly (#14998)
+" 2024 Jun 16 by Vim Project: handle whitespace on Windows properly (#14998)
+" 2024 Jul 23 by Vim Project: fix 'x' command
+" 2024 Jul 24 by Vim Project: use delete() function
+" 2024 Jul 30 by Vim Project: fix opening remote zipfile
+" 2024 Aug 04 by Vim Project: escape '[' in name of file to be extracted
+" 2024 Aug 05 by Vim Project: workaround for the FreeBSD's unzip
+" 2024 Aug 05 by Vim Project: clean-up and make it work with shellslash on Windows
+" 2024 Aug 18 by Vim Project: correctly handle special globbing chars
+" 2024 Aug 21 by Vim Project: simplify condition to detect MS-Windows
 " License:	Vim License  (see vim's :help license)
 " Copyright:	Copyright (C) 2005-2019 Charles E. Campbell {{{1
 "		Permission is hereby granted to use and distribute this code,
@@ -22,16 +30,9 @@
 if &cp || exists("g:loaded_zip")
  finish
 endif
-let g:loaded_zip= "v33"
-if v:version < 702
- echohl WarningMsg
- echo "***warning*** this version of zip needs vim 7.2 or later"
- echohl Normal
- finish
-endif
+let g:loaded_zip= "v34"
 let s:keepcpo= &cpo
 set cpo&vim
-"DechoTabOn
 
 let s:zipfile_escape = ' ?&;\'
 let s:ERROR          = 2
@@ -59,8 +60,28 @@ if !exists("g:zip_extractcmd")
  let g:zip_extractcmd= g:zip_unzipcmd
 endif
 
+" ---------------------------------------------------------------------
+"  required early
+" s:Mess: {{{2
+fun! s:Mess(group, msg)
+  redraw!
+  exe "echohl " . a:group
+  echomsg a:msg
+  echohl Normal
+endfun
+
+if v:version < 901
+ " required for defer
+ call s:Mess('WarningMsg', "***warning*** this version of zip needs vim 9.1 or later")
+ finish
+endif
+" sanity checks
+if !executable(g:zip_unzipcmd)
+ call s:Mess('Error', "***error*** (zip#Browse) unzip not available on your system")
+ finish
+endif
 if !dist#vim#IsSafeExecutable('zip', g:zip_unzipcmd)
- echoerr "Warning: NOT executing " .. g:zip_unzipcmd .. " from current directory!"
+ call s:Mess('Error', "Warning: NOT executing " .. g:zip_unzipcmd .. " from current directory!")
  finish
 endif
 
@@ -71,47 +92,28 @@ endif
 " ---------------------------------------------------------------------
 " zip#Browse: {{{2
 fun! zip#Browse(zipfile)
-"  call Dfunc("zip#Browse(zipfile<".a:zipfile.">)")
-  " sanity check: insure that the zipfile has "PK" as its first two letters
-  "               (zipped files have a leading PK as a "magic cookie")
-  if !filereadable(a:zipfile) || readfile(a:zipfile, "", 1)[0] !~ '^PK'
-   exe "noswapfile noautocmd noswapfile e ".fnameescape(a:zipfile)
-"   call Dret("zip#Browse : not a zipfile<".a:zipfile.">")
+  " sanity check: ensure that the zipfile has "PK" as its first two letters
+  "               (zip files have a leading PK as a "magic cookie")
+  if filereadable(a:zipfile) && readblob(a:zipfile, 0, 2) != 0z50.4B
+   exe "noswapfile noautocmd e " .. fnameescape(a:zipfile)
    return
-"  else        " Decho
-"   call Decho("zip#Browse: a:zipfile<".a:zipfile."> passed PK test - it's a zip file")
   endif
 
-  let repkeep= &report
-  set report=10
+  let dict = s:SetSaneOpts()
+  defer s:RestoreOpts(dict)
 
   " sanity checks
-  if !exists("*fnameescape")
-   if &verbose > 1
-    echoerr "the zip plugin is not available (your vim doesn't support fnameescape())"
-   endif
-   return
-  endif
   if !executable(g:zip_unzipcmd)
-   redraw!
-   echohl Error | echo "***error*** (zip#Browse) unzip not available on your system"
-"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
-   let &report= repkeep
-"   call Dret("zip#Browse")
+   call s:Mess('Error', "***error*** (zip#Browse) unzip not available on your system")
    return
   endif
   if !filereadable(a:zipfile)
    if a:zipfile !~# '^\a\+://'
     " if it's an url, don't complain, let url-handlers such as vim do its thing
-    redraw!
-    echohl Error | echo "***error*** (zip#Browse) File not readable<".a:zipfile.">" | echohl None
-"    call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+    call s:Mess('Error', "***error*** (zip#Browse) File not readable <".a:zipfile.">")
    endif
-   let &report= repkeep
-"   call Dret("zip#Browse : file<".a:zipfile."> not readable")
    return
   endif
-"  call Decho("passed sanity checks")
   if &ma != 1
    set ma
   endif
@@ -136,19 +138,15 @@ fun! zip#Browse(zipfile)
  \                '" Select a file with cursor and press ENTER'])
   keepj $
 
-"  call Decho("exe silent r! ".g:zip_unzipcmd." -l -- ".s:Escape(a:zipfile,1))
-  exe "keepj sil! r! ".g:zip_unzipcmd." -Z -1 -- ".s:Escape(a:zipfile,1)
+  exe $"keepj sil r! {g:zip_unzipcmd} -Z1 -- {s:Escape(a:zipfile, 1)}"
   if v:shell_error != 0
-   redraw!
-   echohl WarningMsg | echo "***warning*** (zip#Browse) ".fnameescape(a:zipfile)." is not a zip file" | echohl None
-"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+   call s:Mess('WarningMsg', "***warning*** (zip#Browse) ".fnameescape(a:zipfile)." is not a zip file")
    keepj sil! %d
    let eikeep= &ei
    set ei=BufReadCmd,FileReadCmd
    exe "keepj r ".fnameescape(a:zipfile)
    let &ei= eikeep
    keepj 1d
-"   call Dret("zip#Browse")
    return
   endif
 
@@ -160,63 +158,46 @@ fun! zip#Browse(zipfile)
    noremap <silent> <buffer>	<leftmouse>	<leftmouse>:call <SID>ZipBrowseSelect()<cr>
   endif
 
-  let &report= repkeep
-"  call Dret("zip#Browse")
 endfun
 
 " ---------------------------------------------------------------------
 " ZipBrowseSelect: {{{2
 fun! s:ZipBrowseSelect()
-  "  call Dfunc("ZipBrowseSelect() zipfile<".((exists("b:zipfile"))? b:zipfile : "n/a")."> curfile<".expand("%").">")
-  let repkeep= &report
-  set report=10
+  let dict = s:SetSaneOpts()
+  defer s:RestoreOpts(dict)
   let fname= getline(".")
   if !exists("b:zipfile")
-"   call Dret("ZipBrowseSelect : b:zipfile doesn't exist!")
    return
   endif
 
   " sanity check
   if fname =~ '^"'
-   let &report= repkeep
-"   call Dret("ZipBrowseSelect")
    return
   endif
   if fname =~ '/$'
-   redraw!
-   echohl Error | echo "***error*** (zip#Browse) Please specify a file, not a directory" | echohl None
-"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
-   let &report= repkeep
-"   call Dret("ZipBrowseSelect")
+   call s:Mess('Error', "***error*** (zip#Browse) Please specify a file, not a directory")
    return
   endif
 
-"  call Decho("fname<".fname.">")
-
   " get zipfile to the new-window
   let zipfile = b:zipfile
   let curfile = expand("%")
-"  call Decho("zipfile<".zipfile.">")
-"  call Decho("curfile<".curfile.">")
 
   noswapfile new
   if !exists("g:zip_nomax") || g:zip_nomax == 0
    wincmd _
   endif
   let s:zipfile_{winnr()}= curfile
-"  call Decho("exe e ".fnameescape("zipfile://".zipfile.'::'.fname))
   exe "noswapfile e ".fnameescape("zipfile://".zipfile.'::'.fname)
   filetype detect
 
-  let &report= repkeep
-"  call Dret("ZipBrowseSelect : s:zipfile_".winnr()."<".s:zipfile_{winnr()}.">")
 endfun
 
 " ---------------------------------------------------------------------
 " zip#Read: {{{2
 fun! zip#Read(fname,mode)
-  let repkeep= &report
-  set report=10
+  let dict = s:SetSaneOpts()
+  defer s:RestoreOpts(dict)
 
   if has("unix")
    let zipfile = substitute(a:fname,'zipfile://\(.\{-}\)::[^\\].*$','\1','')
@@ -224,23 +205,20 @@ fun! zip#Read(fname,mode)
   else
    let zipfile = substitute(a:fname,'^.\{-}zipfile://\(.\{-}\)::[^\\].*$','\1','')
    let fname   = substitute(a:fname,'^.\{-}zipfile://.\{-}::\([^\\].*\)$','\1','')
-   let fname   = substitute(fname, '[', '[[]', 'g')
   endif
+  let fname    = fname->substitute('[', '[[]', 'g')->escape('?*\\')
   " sanity check
   if !executable(substitute(g:zip_unzipcmd,'\s\+.*$','',''))
-   redraw!
-   echohl Error | echo "***error*** (zip#Read) sorry, your system doesn't appear to have the ".g:zip_unzipcmd." program" | echohl None
-"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
-   let &report= repkeep
+   call s:Mess('Error', "***error*** (zip#Read) sorry, your system doesn't appear to have the ".g:zip_unzipcmd." program")
    return
   endif
 
   " the following code does much the same thing as
-  "   exe "keepj sil! r! ".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fnameescape(fname),1)
+  "   exe "keepj sil! r! ".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fname,1)
   " but allows zipfile://... entries in quickfix lists
   let temp = tempname()
   let fn   = expand('%:p')
-  exe "sil! !".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fname,1).' > '.temp
+  exe "sil !".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fname,1).' > '.temp
   sil exe 'keepalt file '.temp
   sil keepj e!
   sil exe 'keepalt file '.fnameescape(fn)
@@ -251,58 +229,42 @@ fun! zip#Read(fname,mode)
   " cleanup
   set nomod
 
-  let &report= repkeep
 endfun
 
 " ---------------------------------------------------------------------
 " zip#Write: {{{2
 fun! zip#Write(fname)
-"  call Dfunc("zip#Write(fname<".a:fname.">) zipfile_".winnr()."<".s:zipfile_{winnr()}.">")
-  let repkeep= &report
-  set report=10
+  let dict = s:SetSaneOpts()
+  defer s:RestoreOpts(dict)
 
   " sanity checks
   if !executable(substitute(g:zip_zipcmd,'\s\+.*$','',''))
-   redraw!
-   echohl Error | echo "***error*** (zip#Write) sorry, your system doesn't appear to have the ".g:zip_zipcmd." program" | echohl None
-"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
-   let &report= repkeep
-"   call Dret("zip#Write")
+   call s:Mess('Error', "***error*** (zip#Write) sorry, your system doesn't appear to have the ".g:zip_zipcmd." program")
    return
   endif
   if !exists("*mkdir")
-   redraw!
-   echohl Error | echo "***error*** (zip#Write) sorry, mkdir() doesn't work on your system" | echohl None
-"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
-   let &report= repkeep
-"   call Dret("zip#Write")
+   call s:Mess('Error', "***error*** (zip#Write) sorry, mkdir() doesn't work on your system")
    return
   endif
 
   let curdir= getcwd()
   let tmpdir= tempname()
-"  call Decho("orig tempname<".tmpdir.">")
   if tmpdir =~ '\.'
    let tmpdir= substitute(tmpdir,'\.[^.]*$','','e')
   endif
-"  call Decho("tmpdir<".tmpdir.">")
   call mkdir(tmpdir,"p")
 
   " attempt to change to the indicated directory
   if s:ChgDir(tmpdir,s:ERROR,"(zip#Write) cannot cd to temporary directory")
-   let &report= repkeep
-"   call Dret("zip#Write")
    return
   endif
-"  call Decho("current directory now: ".getcwd())
 
   " place temporary files under .../_ZIPVIM_/
   if isdirectory("_ZIPVIM_")
-   call s:Rmdir("_ZIPVIM_")
+   call delete("_ZIPVIM_", "rf")
   endif
   call mkdir("_ZIPVIM_")
   cd _ZIPVIM_
-"  call Decho("current directory now: ".getcwd())
 
   if has("unix")
    let zipfile = substitute(a:fname,'zipfile://\(.\{-}\)::[^\\].*$','\1','')
@@ -311,21 +273,17 @@ fun! zip#Write(fname)
    let zipfile = substitute(a:fname,'^.\{-}zipfile://\(.\{-}\)::[^\\].*$','\1','')
    let fname   = substitute(a:fname,'^.\{-}zipfile://.\{-}::\([^\\].*\)$','\1','')
   endif
-"  call Decho("zipfile<".zipfile.">")
-"  call Decho("fname  <".fname.">")
 
   if fname =~ '/'
    let dirpath = substitute(fname,'/[^/]\+$','','e')
    if has("win32unix") && executable("cygpath")
     let dirpath = substitute(system("cygpath ".s:Escape(dirpath,0)),'\n','','e')
    endif
-"   call Decho("mkdir(dirpath<".dirpath.">,p)")
    call mkdir(dirpath,"p")
   endif
   if zipfile !~ '/'
    let zipfile= curdir.'/'.zipfile
   endif
-"  call Decho("zipfile<".zipfile."> fname<".fname.">")
 
   exe "w! ".fnameescape(fname)
   if has("win32unix") && executable("cygpath")
@@ -336,17 +294,13 @@ fun! zip#Write(fname)
     let fname = substitute(fname, '[', '[[]', 'g')
   endif
 
-"  call Decho(g:zip_zipcmd." -u ".s:Escape(fnamemodify(zipfile,":p"),0)." ".s:Escape(fname,0))
   call system(g:zip_zipcmd." -u ".s:Escape(fnamemodify(zipfile,":p"),0)." ".s:Escape(fname,0))
   if v:shell_error != 0
-   redraw!
-   echohl Error | echo "***error*** (zip#Write) sorry, unable to update ".zipfile." with ".fname | echohl None
-"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+   call s:Mess('Error', "***error*** (zip#Write) sorry, unable to update ".zipfile." with ".fname)
 
   elseif s:zipfile_{winnr()} =~ '^\a\+://'
    " support writing zipfiles across a network
    let netzipfile= s:zipfile_{winnr()}
-"   call Decho("handle writing <".zipfile."> across network as <".netzipfile.">")
    1split|enew
    let binkeep= &binary
    let eikeep = &ei
@@ -358,58 +312,58 @@ fun! zip#Write(fname)
    q!
    unlet s:zipfile_{winnr()}
   endif
-  
+
   " cleanup and restore current directory
   cd ..
-  call s:Rmdir("_ZIPVIM_")
+  call delete("_ZIPVIM_", "rf")
   call s:ChgDir(curdir,s:WARNING,"(zip#Write) unable to return to ".curdir."!")
-  call s:Rmdir(tmpdir)
+  call delete(tmpdir, "rf")
   setlocal nomod
 
-  let &report= repkeep
-"  call Dret("zip#Write")
 endfun
 
 " ---------------------------------------------------------------------
 " zip#Extract: extract a file from a zip archive {{{2
 fun! zip#Extract()
-"  call Dfunc("zip#Extract()")
 
-  let repkeep= &report
-  set report=10
+  let dict = s:SetSaneOpts()
+  defer s:RestoreOpts(dict)
   let fname= getline(".")
-"  call Decho("fname<".fname.">")
 
   " sanity check
   if fname =~ '^"'
-   let &report= repkeep
-"   call Dret("zip#Extract")
    return
   endif
   if fname =~ '/$'
-   redraw!
-   echohl Error | echo "***error*** (zip#Extract) Please specify a file, not a directory" | echohl None
-   let &report= repkeep
-"   call Dret("zip#Extract")
+   call s:Mess('Error', "***error*** (zip#Extract) Please specify a file, not a directory")
    return
   endif
+  if filereadable(fname)
+   call s:Mess('Error', "***error*** (zip#Extract) <" .. fname .."> already exists in directory, not overwriting!")
+   return
+  endif
+  let target = fname->substitute('\[', '[[]', 'g')
+  if &shell =~ 'cmd' && has("win32")
+    let target = target
+		\ ->substitute('[?*]', '[&]', 'g')
+		\ ->substitute('[\\]', '?', 'g')
+		\ ->shellescape()
+    " there cannot be a file name with '\' in its name, unzip replaces it by _
+    let fname = fname->substitute('[\\?*]', '_', 'g')
+  else
+    let target = target->escape('*?\\')->shellescape()
+  endif
 
   " extract the file mentioned under the cursor
-"  call Decho("system(".g:zip_extractcmd." ".shellescape(b:zipfile)." ".shellescape(shell).")")
-  call system(g:zip_extractcmd." ".shellescape(b:zipfile)." ".shellescape(shell))
-"  call Decho("zipfile<".b:zipfile.">")
+  call system($"{g:zip_extractcmd} -o {shellescape(b:zipfile)} {target}")
   if v:shell_error != 0
-   echohl Error | echo "***error*** ".g:zip_extractcmd." ".b:zipfile." ".fname.": failed!" | echohl NONE
+   call s:Mess('Error', "***error*** ".g:zip_extractcmd." ".b:zipfile." ".fname.": failed!")
   elseif !filereadable(fname)
-   echohl Error | echo "***error*** attempted to extract ".fname." but it doesn't appear to be present!"
+   call s:Mess('Error', "***error*** attempted to extract ".fname." but it doesn't appear to be present!")
   else
-   echo "***note*** successfully extracted ".fname
+   echomsg "***note*** successfully extracted ".fname
   endif
 
-  " restore option
-  let &report= repkeep
-
-"  call Dret("zip#Extract")
 endfun
 
 " ---------------------------------------------------------------------
@@ -424,48 +378,48 @@ fun! s:Escape(fname,isfilt)
   else
    let qnameq= g:zip_shq.escape(a:fname,g:zip_shq).g:zip_shq
   endif
-  if exists("+shellslash") && &shellslash && &shell =~ "cmd.exe"
-   " renormalize directory separator on Windows
-   let qnameq=substitute(qnameq, '/', '\\', 'g')
-  endif
   return qnameq
 endfun
 
 " ---------------------------------------------------------------------
-" ChgDir: {{{2
+" s:ChgDir: {{{2
 fun! s:ChgDir(newdir,errlvl,errmsg)
-"  call Dfunc("ChgDir(newdir<".a:newdir."> errlvl=".a:errlvl."  errmsg<".a:errmsg.">)")
-
   try
    exe "cd ".fnameescape(a:newdir)
   catch /^Vim\%((\a\+)\)\=:E344/
    redraw!
    if a:errlvl == s:NOTE
-    echo "***note*** ".a:errmsg
+    echomsg "***note*** ".a:errmsg
    elseif a:errlvl == s:WARNING
-    echohl WarningMsg | echo "***warning*** ".a:errmsg | echohl NONE
+    call s:Mess("WarningMsg", "***warning*** ".a:errmsg)
    elseif a:errlvl == s:ERROR
-    echohl Error | echo "***error*** ".a:errmsg | echohl NONE
+    call s:Mess("Error", "***error*** ".a:errmsg)
    endif
-"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
-"   call Dret("ChgDir 1")
    return 1
   endtry
 
-"  call Dret("ChgDir 0")
   return 0
 endfun
 
 " ---------------------------------------------------------------------
-" s:Rmdir: {{{2
-fun! s:Rmdir(fname)
-"  call Dfunc("Rmdir(fname<".a:fname.">)")
-  if (has("win32") || has("win95") || has("win64") || has("win16")) && &shell !~? 'sh$'
-   call system("rmdir /S/Q ".s:Escape(a:fname,0))
-  else
-   call system("/bin/rm -rf ".s:Escape(a:fname,0))
-  endif
-"  call Dret("Rmdir")
+" s:SetSaneOpts: {{{2
+fun! s:SetSaneOpts()
+  let dict = {}
+  let dict.report = &report
+  let dict.shellslash = &shellslash
+
+  let &report = 10
+  let &shellslash = 0
+
+  return dict
+endfun
+
+" ---------------------------------------------------------------------
+" s:RestoreOpts: {{{2
+fun! s:RestoreOpts(dict)
+  for [key, val] in items(a:dict)
+    exe $"let &{key} = {val}"
+  endfor
 endfun
 
 " ------------------------------------------------------------------------

runtime/colors/blue.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Steven Vertigan <steven@vertigan.wattle.id.au>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Mon 08 Jan 2024 09:42:49 AM AEDT
+" Last Change:  2024 Aug 15
 
 " Generated by Colortemplate v2.2.3
 
@@ -22,9 +22,11 @@ hi Normal guifg=#ffd700 guibg=#000087 gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#005faf gui=NONE cterm=NONE
 hi Pmenu guifg=#ffffff guibg=#008787 gui=NONE cterm=NONE
 hi PmenuSel guifg=#008787 guibg=#ffffff gui=NONE cterm=NONE
+hi PmenuMatch guifg=#ffd700 guibg=#008787 gui=NONE cterm=NONE
+hi PmenuMatchSel guifg=#ff7f50 guibg=#ffffff gui=NONE cterm=NONE
 hi QuickFixLine guifg=#000000 guibg=#d787d7 gui=NONE cterm=NONE
 hi ColorColumn guifg=NONE guibg=#870087 gui=NONE cterm=NONE
-hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi Conceal guifg=#008787 guibg=NONE gui=NONE cterm=NONE
 hi Cursor guifg=#000000 guibg=#00ff00 gui=NONE cterm=NONE
 hi CursorColumn guifg=NONE guibg=#005faf gui=NONE cterm=NONE
 hi CursorIM guifg=#000000 guibg=#ffd700 gui=NONE cterm=NONE
@@ -132,9 +134,11 @@ if s:t_Co >= 256
   hi CursorLine ctermfg=NONE ctermbg=25 cterm=NONE
   hi Pmenu ctermfg=231 ctermbg=30 cterm=NONE
   hi PmenuSel ctermfg=30 ctermbg=231 cterm=NONE
+  hi PmenuMatch ctermfg=220 ctermbg=30 cterm=NONE
+  hi PmenuMatchSel ctermfg=209 ctermbg=231 cterm=NONE
   hi QuickFixLine ctermfg=16 ctermbg=176 cterm=NONE
   hi ColorColumn ctermfg=NONE ctermbg=90 cterm=NONE
-  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=30 ctermbg=NONE cterm=NONE
   hi Cursor ctermfg=16 ctermbg=46 cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=25 cterm=NONE
   hi CursorIM ctermfg=16 ctermbg=220 cterm=NONE
@@ -245,9 +249,11 @@ if s:t_Co >= 16
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=white cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=white cterm=bold
   hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE
   hi ColorColumn ctermfg=NONE ctermbg=darkmagenta cterm=NONE
-  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Cursor ctermfg=black ctermbg=green cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=blue cterm=NONE
   hi CursorIM ctermfg=black ctermbg=yellow cterm=NONE
@@ -358,6 +364,8 @@ if s:t_Co >= 8
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi Pmenu ctermfg=black ctermbg=cyan cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=gray cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=cyan cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=gray cterm=bold
   hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE
   hi ColorColumn ctermfg=NONE ctermbg=magenta cterm=NONE
   hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE

runtime/colors/darkblue.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Original author Bohdan Vlasyuk <bohdan@vstu.edu.ua>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Mon 08 Jan 2024 09:43:03 AM AEDT
+" Last Change:  2024 Aug 15
 
 " Generated by Colortemplate v2.2.3
 
@@ -68,7 +68,7 @@ hi! link CurSearch Search
 hi! link MessageWindow Pmenu
 hi! link PopupNotification Todo
 hi Normal guifg=#c0c0c0 guibg=#000040 gui=NONE cterm=NONE
-hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi Conceal guifg=#008b8b guibg=NONE gui=NONE cterm=NONE
 hi ColorColumn guifg=#c0c0c0 guibg=#8b0000 gui=NONE cterm=NONE
 hi Cursor guifg=#000000 guibg=#ffff60 gui=NONE cterm=NONE
 hi QuickFixLine guifg=#000000 guibg=#ff80ff gui=NONE cterm=NONE
@@ -85,6 +85,8 @@ hi Pmenu guifg=#ffffff guibg=#0030ff gui=NONE cterm=NONE
 hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi PmenuSel guifg=#0030ff guibg=#ffffff gui=NONE cterm=NONE
 hi PmenuThumb guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
+hi PmenuMatch guifg=#ff80ff guibg=#0030ff gui=NONE cterm=NONE
+hi PmenuMatchSel guifg=#ff00ff guibg=#ffffff gui=NONE cterm=NONE
 hi Question guifg=#90f020 guibg=NONE gui=NONE cterm=NONE
 hi SignColumn guifg=#808080 guibg=NONE gui=NONE cterm=NONE
 hi SpecialKey guifg=#008b8b guibg=NONE gui=NONE cterm=NONE
@@ -176,7 +178,7 @@ if s:t_Co >= 256
   hi! link MessageWindow Pmenu
   hi! link PopupNotification Todo
   hi Normal ctermfg=252 ctermbg=17 cterm=NONE
-  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=30 ctermbg=NONE cterm=NONE
   hi ColorColumn ctermfg=252 ctermbg=88 cterm=NONE
   hi Cursor ctermfg=16 ctermbg=227 cterm=NONE
   hi QuickFixLine ctermfg=16 ctermbg=213 cterm=NONE
@@ -193,6 +195,8 @@ if s:t_Co >= 256
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuSel ctermfg=27 ctermbg=231 cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=231 cterm=NONE
+  hi PmenuMatch ctermfg=213 ctermbg=27 cterm=NONE
+  hi PmenuMatchSel ctermfg=201 ctermbg=231 cterm=NONE
   hi Question ctermfg=118 ctermbg=NONE cterm=NONE
   hi SignColumn ctermfg=102 ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=30 ctermbg=NONE cterm=NONE
@@ -238,7 +242,7 @@ endif
 
 if s:t_Co >= 16
   hi Normal ctermfg=grey ctermbg=black cterm=NONE
-  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi ColorColumn ctermfg=grey ctermbg=darkred cterm=NONE
   hi Cursor ctermfg=black ctermbg=yellow cterm=NONE
   hi QuickFixLine ctermfg=black ctermbg=magenta cterm=NONE
@@ -255,6 +259,8 @@ if s:t_Co >= 16
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuSel ctermfg=blue ctermbg=white cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
+  hi PmenuMatch ctermfg=magenta ctermbg=blue cterm=NONE
+  hi PmenuMatchSel ctermfg=darkmagenta ctermbg=white cterm=NONE
   hi Question ctermfg=green ctermbg=NONE cterm=NONE
   hi SignColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=darkcyan ctermbg=NONE cterm=NONE
@@ -318,6 +324,8 @@ if s:t_Co >= 8
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuSel ctermfg=blue ctermbg=grey cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
+  hi PmenuMatch ctermfg=grey ctermbg=blue cterm=bold
+  hi PmenuMatchSel ctermfg=blue ctermbg=grey cterm=bold
   hi Question ctermfg=darkgreen ctermbg=NONE cterm=bold
   hi Search ctermfg=darkcyan ctermbg=blue cterm=NONE
   hi SignColumn ctermfg=grey ctermbg=NONE cterm=NONE

runtime/colors/delek.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer David Schweikert <david@schweikert.ch>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Fri 15 Dec 2023 20:05:34
+" Last Change:  2024 Aug 15
 
 " Generated by Colortemplate v2.2.3
 
@@ -38,6 +38,8 @@ hi Pmenu guifg=#000000 guibg=#add8e6 gui=NONE cterm=NONE
 hi PmenuSel guifg=#ffffff guibg=#00008b gui=NONE cterm=NONE
 hi PmenuSbar guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
 hi PmenuThumb guifg=NONE guibg=#008b8b gui=NONE cterm=NONE
+hi PmenuMatch guifg=#cd00cd guibg=#add8e6 gui=NONE cterm=NONE
+hi PmenuMatchSel guifg=#ff87ff guibg=#00008b gui=NONE cterm=NONE
 hi TabLine guifg=#000000 guibg=#e4e4e4 gui=NONE cterm=NONE
 hi TabLineFill guifg=NONE guibg=#bcbcbc gui=NONE cterm=NONE
 hi TabLineSel guifg=#000000 guibg=#ffffff gui=bold cterm=bold
@@ -45,6 +47,7 @@ hi ToolbarLine guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
 hi ToolbarButton guifg=#ffffff guibg=#bcbcbc gui=bold cterm=bold
 hi NonText guifg=#bcbcbc guibg=NONE gui=NONE cterm=NONE
 hi SpecialKey guifg=#bcbcbc guibg=NONE gui=NONE cterm=NONE
+hi Conceal guifg=#bcbcbc guibg=NONE gui=NONE cterm=NONE
 hi Folded guifg=#00008b guibg=#e4e4e4 gui=NONE cterm=NONE
 hi Visual guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE
 hi VisualNOS guifg=NONE guibg=#ee0000 gui=NONE cterm=NONE
@@ -82,7 +85,6 @@ hi PreProc guifg=#cd00cd guibg=NONE gui=NONE cterm=NONE
 hi Type guifg=#0000ff guibg=NONE gui=bold cterm=bold
 hi Special guifg=#ff1493 guibg=NONE gui=NONE cterm=NONE
 hi Directory guifg=#008b8b guibg=NONE gui=bold cterm=bold
-hi Conceal guifg=#ee0000 guibg=NONE gui=NONE cterm=NONE
 hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi Title guifg=#cd00cd guibg=NONE gui=bold cterm=bold
 hi CursorLine guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
@@ -112,6 +114,8 @@ if s:t_Co >= 256
   hi PmenuSel ctermfg=231 ctermbg=18 cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=231 cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=30 cterm=NONE
+  hi PmenuMatch ctermfg=164 ctermbg=152 cterm=NONE
+  hi PmenuMatchSel ctermfg=213 ctermbg=18 cterm=NONE
   hi TabLine ctermfg=16 ctermbg=254 cterm=NONE
   hi TabLineFill ctermfg=NONE ctermbg=250 cterm=NONE
   hi TabLineSel ctermfg=16 ctermbg=231 cterm=bold
@@ -119,6 +123,7 @@ if s:t_Co >= 256
   hi ToolbarButton ctermfg=231 ctermbg=250 cterm=bold
   hi NonText ctermfg=250 ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=250 ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=250 ctermbg=NONE cterm=NONE
   hi Folded ctermfg=18 ctermbg=254 cterm=NONE
   hi Visual ctermfg=16 ctermbg=252 cterm=NONE
   hi VisualNOS ctermfg=NONE ctermbg=196 cterm=NONE
@@ -156,7 +161,6 @@ if s:t_Co >= 256
   hi Type ctermfg=21 ctermbg=NONE cterm=bold
   hi Special ctermfg=198 ctermbg=NONE cterm=NONE
   hi Directory ctermfg=30 ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=196 ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Title ctermfg=164 ctermbg=NONE cterm=bold
   hi CursorLine ctermfg=NONE ctermbg=254 cterm=NONE
@@ -180,6 +184,8 @@ if s:t_Co >= 16
   hi PmenuSel ctermfg=white ctermbg=darkblue cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=white cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=darkcyan cterm=NONE
+  hi PmenuMatch ctermfg=darkmagenta ctermbg=grey cterm=NONE
+  hi PmenuMatchSel ctermfg=magenta ctermbg=darkblue cterm=NONE
   hi TabLine ctermfg=black ctermbg=grey cterm=NONE
   hi TabLineFill ctermfg=NONE ctermbg=darkgrey cterm=NONE
   hi TabLineSel ctermfg=black ctermbg=white cterm=bold
@@ -187,6 +193,7 @@ if s:t_Co >= 16
   hi ToolbarButton ctermfg=white ctermbg=darkgrey cterm=bold
   hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi Folded ctermfg=darkblue ctermbg=grey cterm=NONE
   hi Visual ctermfg=black ctermbg=darkgrey cterm=NONE
   hi VisualNOS ctermfg=NONE ctermbg=darkred cterm=NONE
@@ -224,7 +231,6 @@ if s:t_Co >= 16
   hi Type ctermfg=blue ctermbg=NONE cterm=bold
   hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
   hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=darkred ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
@@ -249,6 +255,8 @@ if s:t_Co >= 8
   hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
   hi TabLine ctermfg=gray ctermbg=black cterm=NONE
   hi TabLineFill ctermfg=NONE ctermbg=black cterm=NONE
   hi TabLineSel ctermfg=black ctermbg=gray cterm=NONE
@@ -256,6 +264,7 @@ if s:t_Co >= 8
   hi ToolbarButton ctermfg=black ctermbg=gray cterm=bold,reverse
   hi NonText ctermfg=darkblue ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Folded ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
   hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=underline
@@ -291,7 +300,6 @@ if s:t_Co >= 8
   hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE
   hi Special ctermfg=darkmagenta ctermbg=NONE cterm=bold
   hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
   hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
@@ -398,6 +406,7 @@ endif
 " Color: darkmagenta #870087        18             darkmagenta
 " Color: darkcyan    #008787        30             darkcyan
 " Color: gray        #878787        102            gray
+" Color: magenta     #ff87ff        213            magenta
 " Term colors: bg0     statement constant preproc identifier type special bg1
 " Term colors: comment statement constant preproc identifier type special fg0
 " Color: bgDiffA     #5F875F        65             darkgreen

runtime/colors/desert.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Hans Fugal <hans@fugal.net>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Fri 15 Dec 2023 20:05:34
+" Last Change:  2024 Aug 15
 
 " Generated by Colortemplate v2.2.3
 
@@ -37,6 +37,8 @@ hi Pmenu guifg=#ffffff guibg=#666666 gui=NONE cterm=NONE
 hi PmenuSel guifg=#333333 guibg=#f0e68c gui=NONE cterm=NONE
 hi PmenuSbar guifg=NONE guibg=#333333 gui=NONE cterm=NONE
 hi PmenuThumb guifg=NONE guibg=#c2bfa5 gui=NONE cterm=NONE
+hi PmenuMatch guifg=#ffa0a0 guibg=#666666 gui=NONE cterm=NONE
+hi PmenuMatchSel guifg=#cd5c5c guibg=#f0e68c gui=NONE cterm=NONE
 hi TabLine guifg=#333333 guibg=#c2bfa5 gui=NONE cterm=NONE
 hi TabLineFill guifg=NONE guibg=#c2bfa5 gui=NONE cterm=NONE
 hi TabLineSel guifg=#333333 guibg=#f0e68c gui=NONE cterm=NONE
@@ -111,6 +113,8 @@ if s:t_Co >= 256
   hi PmenuSel ctermfg=236 ctermbg=186 cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=236 cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=144 cterm=NONE
+  hi PmenuMatch ctermfg=217 ctermbg=241 cterm=NONE
+  hi PmenuMatchSel ctermfg=167 ctermbg=186 cterm=NONE
   hi TabLine ctermfg=236 ctermbg=144 cterm=NONE
   hi TabLineFill ctermfg=NONE ctermbg=144 cterm=NONE
   hi TabLineSel ctermfg=236 ctermbg=186 cterm=NONE
@@ -177,6 +181,8 @@ if s:t_Co >= 16
   hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
+  hi PmenuMatch ctermfg=NONE ctermbg=darkgrey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
   hi TabLine ctermfg=black ctermbg=grey cterm=NONE
   hi TabLineFill ctermfg=NONE ctermbg=white cterm=NONE
   hi TabLineSel ctermfg=white ctermbg=black cterm=NONE
@@ -243,6 +249,8 @@ if s:t_Co >= 8
   hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
   hi TabLine ctermfg=black ctermbg=grey cterm=NONE
   hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
   hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE

runtime/colors/elflord.vim

@@ -3,7 +3,7 @@
 " Maintainer:   original maintainer Ron Aaron <ron@ronware.org>
 " Website:      https://www.github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Fri 15 Dec 2023 20:05:35
+" Last Change:  2024 Aug 15
 
 " Generated by Colortemplate v2.2.3
 
@@ -72,6 +72,8 @@ hi Pmenu guifg=#ffffff guibg=#444444 gui=NONE cterm=NONE
 hi PmenuSbar guifg=NONE guibg=#bebebe gui=NONE cterm=NONE
 hi PmenuSel guifg=#000000 guibg=#00cdcd gui=NONE cterm=NONE
 hi PmenuThumb guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
+hi PmenuMatch guifg=#ff00ff guibg=#444444 gui=bold cterm=bold
+hi PmenuMatchSel guifg=#ff00ff guibg=#00cdcd gui=bold cterm=bold
 hi Question guifg=#00ff00 guibg=NONE gui=bold cterm=bold
 hi Search guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
 hi SignColumn guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
@@ -140,6 +142,8 @@ if s:t_Co >= 256
   hi PmenuSbar ctermfg=NONE ctermbg=250 cterm=NONE
   hi PmenuSel ctermfg=16 ctermbg=44 cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=231 cterm=NONE
+  hi PmenuMatch ctermfg=201 ctermbg=238 cterm=bold
+  hi PmenuMatchSel ctermfg=201 ctermbg=44 cterm=bold
   hi Question ctermfg=46 ctermbg=NONE cterm=bold
   hi Search ctermfg=16 ctermbg=226 cterm=NONE
   hi SignColumn ctermfg=51 ctermbg=NONE cterm=NONE
@@ -211,6 +215,8 @@ if s:t_Co >= 16
   hi PmenuSbar ctermfg=NONE ctermbg=grey cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
+  hi PmenuMatch ctermfg=magenta ctermbg=darkgrey cterm=bold
+  hi PmenuMatchSel ctermfg=magenta ctermbg=darkcyan cterm=bold
   hi Question ctermfg=green ctermbg=NONE cterm=bold
   hi Search ctermfg=black ctermbg=yellow cterm=NONE
   hi SignColumn ctermfg=cyan ctermbg=NONE cterm=NONE
@@ -281,6 +287,8 @@ if s:t_Co >= 8
   hi PmenuSbar ctermfg=grey ctermbg=grey cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=darkcyan cterm=NONE
+  hi PmenuMatch ctermfg=grey ctermbg=NONE cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold
   hi Question ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi Search ctermfg=black ctermbg=darkyellow cterm=NONE
   hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE

runtime/colors/evening.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Steven Vertigan <steven@vertigan.wattle.id.au>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Mon 08 Jan 2024 09:43:27 AM AEDT
+" Last Change:  2024 Aug 15
 
 " Generated by Colortemplate v2.2.3
 
@@ -75,6 +75,8 @@ hi StatusLine guifg=#333333 guibg=#ffffff gui=bold cterm=bold
 hi StatusLineNC guifg=#333333 guibg=#d3d3d3 gui=NONE cterm=NONE
 hi TabLineSel guifg=#333333 guibg=#ffffff gui=bold cterm=bold
 hi TabLine guifg=#333333 guibg=#d3d3d3 gui=NONE cterm=NONE
+hi PmenuMatch guifg=#ff80ff guibg=#4d4d4d gui=NONE cterm=NONE
+hi PmenuMatchSel guifg=#8b008b guibg=#bebebe gui=NONE cterm=NONE
 hi Pmenu guifg=#ffffff guibg=#4d4d4d gui=NONE cterm=NONE
 hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi PmenuSel guifg=#000000 guibg=#bebebe gui=NONE cterm=NONE
@@ -84,7 +86,7 @@ hi Cursor guifg=#000000 guibg=#00ff00 gui=NONE cterm=NONE
 hi Error guifg=#ff0000 guibg=#ffffff gui=reverse cterm=reverse
 hi ErrorMsg guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
 hi LineNr guifg=#ffff00 guibg=NONE gui=NONE cterm=NONE
-hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+hi Conceal guifg=#666666 guibg=NONE gui=NONE cterm=NONE
 hi FoldColumn guifg=#add8e6 guibg=NONE gui=NONE cterm=NONE
 hi Folded guifg=#00008b guibg=#d3d3d3 gui=bold cterm=bold
 hi IncSearch guifg=#00ff00 guibg=NONE gui=reverse cterm=reverse
@@ -183,6 +185,8 @@ if s:t_Co >= 256
   hi StatusLineNC ctermfg=236 ctermbg=252 cterm=NONE
   hi TabLineSel ctermfg=236 ctermbg=231 cterm=bold
   hi TabLine ctermfg=236 ctermbg=252 cterm=NONE
+  hi PmenuMatch ctermfg=201 ctermbg=239 cterm=NONE
+  hi PmenuMatchSel ctermfg=90 ctermbg=250 cterm=NONE
   hi Pmenu ctermfg=231 ctermbg=239 cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuSel ctermfg=16 ctermbg=250 cterm=NONE
@@ -192,7 +196,7 @@ if s:t_Co >= 256
   hi Error ctermfg=196 ctermbg=231 cterm=reverse
   hi ErrorMsg ctermfg=231 ctermbg=196 cterm=NONE
   hi LineNr ctermfg=226 ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=241 ctermbg=NONE cterm=NONE
   hi FoldColumn ctermfg=153 ctermbg=NONE cterm=NONE
   hi Folded ctermfg=18 ctermbg=252 cterm=bold
   hi IncSearch ctermfg=46 ctermbg=NONE cterm=reverse
@@ -294,6 +298,8 @@ if s:t_Co >= 16
   hi StatusLineNC ctermfg=black ctermbg=gray cterm=NONE
   hi TabLineSel ctermfg=black ctermbg=white cterm=NONE
   hi TabLine ctermfg=black ctermbg=gray cterm=NONE
+  hi PmenuMatch ctermfg=white ctermbg=darkgray cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=gray cterm=bold
   hi Pmenu ctermfg=white ctermbg=darkgray cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=gray cterm=NONE
@@ -303,7 +309,7 @@ if s:t_Co >= 16
   hi Error ctermfg=red ctermbg=white cterm=reverse
   hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
   hi LineNr ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=darkgray ctermbg=NONE cterm=NONE
   hi FoldColumn ctermfg=lightblue ctermbg=NONE cterm=NONE
   hi Folded ctermfg=darkblue ctermbg=gray cterm=bold
   hi IncSearch ctermfg=green ctermbg=NONE cterm=reverse
@@ -361,6 +367,8 @@ if s:t_Co >= 8
   hi PmenuSbar ctermfg=NONE ctermbg=gray cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=gray cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=black cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=gray cterm=bold
   hi QuickFixLine ctermfg=gray ctermbg=darkmagenta cterm=NONE
   hi Error ctermfg=red ctermbg=gray cterm=reverse
   hi ErrorMsg ctermfg=gray ctermbg=red cterm=NONE

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: Mon 08 Jan 2024 09:39:53 AM AEDT
+" Last Change:  2024 Aug 15
 
 " Generated by Colortemplate v2.2.3
 
@@ -16,13 +16,12 @@ let g:colors_name = 'habamax'
 let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
 
 if (has('termguicolors') && &termguicolors) || has('gui_running')
-  let g:terminal_ansi_colors = ['#1c1c1c', '#d75f5f', '#87af87', '#afaf87', '#5f87af', '#af87af', '#5f8787', '#9e9e9e', '#767676', '#d7875f', '#afd7af', '#d7d787', '#87afd7', '#d7afd7', '#87afaf', '#bcbcbc']
+  let g:terminal_ansi_colors = ['#1c1c1c', '#af5f5f', '#5faf5f', '#af875f', '#5f87af', '#af87af', '#5f8787', '#9e9e9e', '#767676', '#d75f87', '#87d787', '#d7af87', '#5fafd7', '#d787d7', '#87afaf', '#bcbcbc']
 endif
 hi! link Terminal Normal
 hi! link StatuslineTerm Statusline
 hi! link StatuslineTermNC StatuslineNC
 hi! link MessageWindow Pmenu
-hi! link PopupNotification Todo
 hi! link javaScriptFunction Statement
 hi! link javaScriptIdentifier Statement
 hi! link sqlKeyword Statement
@@ -34,7 +33,6 @@ hi! link vimOper Normal
 hi! link vimSep Normal
 hi! link vimParenSep Normal
 hi! link vimCommentString Comment
-hi! link gitCommitSummary Title
 hi! link markdownUrl String
 hi Normal guifg=#bcbcbc guibg=#1c1c1c gui=NONE cterm=NONE
 hi Statusline guifg=#1c1c1c guibg=#9e9e9e gui=NONE cterm=NONE
@@ -42,11 +40,11 @@ hi StatuslineNC guifg=#1c1c1c guibg=#767676 gui=NONE cterm=NONE
 hi VertSplit guifg=#767676 guibg=#767676 gui=NONE cterm=NONE
 hi TabLine guifg=#1c1c1c guibg=#767676 gui=NONE cterm=NONE
 hi TabLineFill guifg=#1c1c1c guibg=#767676 gui=NONE cterm=NONE
-hi TabLineSel guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
+hi TabLineSel guifg=#1c1c1c guibg=#9e9e9e gui=bold cterm=bold
 hi ToolbarLine guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi ToolbarButton guifg=#9e9e9e guibg=#1c1c1c gui=bold,reverse cterm=bold,reverse
+hi ToolbarButton guifg=#767676 guibg=#1c1c1c gui=bold,reverse cterm=bold,reverse
 hi QuickFixLine guifg=#1c1c1c guibg=#5f87af gui=NONE cterm=NONE
-hi CursorLineNr guifg=#ffaf5f guibg=NONE gui=bold cterm=bold
+hi CursorLineNr guifg=#dadada guibg=NONE gui=bold cterm=bold
 hi LineNr guifg=#585858 guibg=NONE gui=NONE cterm=NONE
 hi LineNrAbove guifg=#585858 guibg=NONE gui=NONE cterm=NONE
 hi LineNrBelow guifg=#585858 guibg=NONE gui=NONE cterm=NONE
@@ -54,71 +52,71 @@ hi NonText guifg=#585858 guibg=NONE gui=NONE cterm=NONE
 hi EndOfBuffer guifg=#585858 guibg=NONE gui=NONE cterm=NONE
 hi SpecialKey guifg=#585858 guibg=NONE gui=NONE cterm=NONE
 hi FoldColumn guifg=#585858 guibg=NONE gui=NONE cterm=NONE
-hi Visual guifg=#1c1c1c guibg=#87afaf gui=NONE cterm=NONE
+hi Visual guifg=#87afaf guibg=#1c1c1c gui=reverse cterm=reverse
 hi VisualNOS guifg=#1c1c1c guibg=#5f8787 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 PmenuSel guifg=NONE guibg=#585858 gui=NONE cterm=NONE
+hi PmenuKind guifg=#5f8787 guibg=#3a3a3a gui=NONE cterm=NONE
+hi PmenuKindSel guifg=#5f8787 guibg=#585858 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 PmenuExtraSel guifg=#9e9e9e guibg=#585858 gui=NONE cterm=NONE
+hi PmenuMatch guifg=#ffaf5f guibg=#3a3a3a gui=NONE cterm=NONE
+hi PmenuMatchSel guifg=#ffaf5f guibg=#585858 gui=NONE cterm=NONE
 hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-hi Error guifg=#d75f5f guibg=#1c1c1c gui=reverse cterm=reverse
-hi ErrorMsg guifg=#d75f5f guibg=#1c1c1c gui=reverse cterm=reverse
-hi ModeMsg guifg=#1c1c1c guibg=#d7d787 gui=NONE cterm=NONE
-hi MoreMsg guifg=#87af87 guibg=NONE gui=NONE cterm=NONE
-hi Question guifg=#afaf87 guibg=NONE gui=NONE cterm=NONE
-hi WarningMsg guifg=#d7875f guibg=NONE gui=NONE cterm=NONE
-hi Todo guifg=#d7d787 guibg=#1c1c1c gui=reverse cterm=reverse
+hi Error guifg=#af5f5f guibg=#1c1c1c gui=reverse cterm=reverse
+hi ErrorMsg guifg=#af5f5f guibg=#1c1c1c gui=reverse cterm=reverse
+hi ModeMsg guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
+hi MoreMsg guifg=#5faf5f guibg=NONE gui=NONE cterm=NONE
+hi Question guifg=#d7af87 guibg=NONE gui=NONE cterm=NONE
+hi WarningMsg guifg=#d75f87 guibg=NONE gui=NONE cterm=NONE
+hi Todo guifg=#dadada guibg=NONE gui=bold cterm=bold
 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
-hi WildMenu guifg=#1c1c1c guibg=#d7d787 gui=NONE cterm=NONE
+hi Search guifg=#5fafd7 guibg=#1c1c1c gui=reverse cterm=reverse
+hi IncSearch guifg=#ffaf5f guibg=#1c1c1c gui=reverse cterm=reverse
+hi CurSearch guifg=#ffaf5f guibg=#1c1c1c gui=reverse cterm=reverse
+hi WildMenu guifg=#1c1c1c guibg=#d7af87 gui=bold cterm=bold
 hi debugPC guifg=#1c1c1c guibg=#5f87af gui=NONE cterm=NONE
-hi debugBreakpoint guifg=#1c1c1c guibg=#d7875f gui=NONE cterm=NONE
-hi Cursor guifg=#1c1c1c guibg=#ffaf5f gui=NONE cterm=NONE
+hi debugBreakpoint guifg=#1c1c1c guibg=#d75f87 gui=NONE cterm=NONE
+hi Cursor guifg=#000000 guibg=#dadada gui=NONE cterm=NONE
 hi lCursor guifg=#1c1c1c guibg=#5fff00 gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#303030 gui=NONE cterm=NONE
 hi CursorColumn guifg=NONE guibg=#303030 gui=NONE cterm=NONE
 hi Folded guifg=#9e9e9e guibg=#262626 gui=NONE cterm=NONE
 hi ColorColumn guifg=NONE guibg=#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
-hi SpellRare guifg=NONE guibg=NONE guisp=#d7afd7 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
+hi SpellCap guifg=NONE guibg=NONE guisp=#ffaf5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
+hi SpellLocal guifg=NONE guibg=NONE guisp=#5fd75f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
+hi SpellRare guifg=NONE guibg=NONE guisp=#d787d7 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=underline
 hi Comment guifg=#767676 guibg=NONE gui=NONE cterm=NONE
-hi Constant guifg=#d7875f guibg=NONE gui=NONE cterm=NONE
-hi String guifg=#87af87 guibg=NONE gui=NONE cterm=NONE
-hi Character guifg=#afd7af guibg=NONE gui=NONE cterm=NONE
+hi Constant guifg=#d75f87 guibg=NONE gui=NONE cterm=NONE
+hi String guifg=#5faf5f guibg=NONE gui=NONE cterm=NONE
+hi Character guifg=#87d787 guibg=NONE gui=NONE cterm=NONE
 hi Identifier guifg=#87afaf guibg=NONE gui=NONE cterm=NONE
 hi Statement guifg=#af87af guibg=NONE gui=NONE cterm=NONE
-hi PreProc guifg=#afaf87 guibg=NONE gui=NONE cterm=NONE
-hi Type guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE
+hi PreProc guifg=#af875f guibg=NONE gui=NONE cterm=NONE
+hi Type guifg=#5f87af guibg=NONE gui=NONE cterm=NONE
 hi Special guifg=#5f8787 guibg=NONE gui=NONE cterm=NONE
 hi Underlined guifg=NONE guibg=NONE gui=underline ctermfg=NONE ctermbg=NONE cterm=underline
-hi Title guifg=#d7d787 guibg=NONE gui=bold cterm=bold
+hi Title guifg=NONE guibg=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
 hi Directory guifg=#87afaf guibg=NONE gui=bold cterm=bold
-hi Conceal guifg=#767676 guibg=NONE gui=NONE cterm=NONE
+hi Conceal guifg=#585858 guibg=NONE gui=NONE cterm=NONE
 hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi Debug guifg=#5f8787 guibg=NONE gui=NONE cterm=NONE
-hi DiffAdd guifg=#dadada guibg=#5f875f gui=NONE cterm=NONE
-hi DiffDelete guifg=#af875f guibg=NONE gui=NONE cterm=NONE
-hi Added guifg=#87af87 guibg=NONE gui=NONE cterm=NONE
-hi Changed guifg=#5f8787 guibg=NONE gui=NONE cterm=NONE
+hi DiffAdd guifg=#5faf5f guibg=NONE gui=reverse cterm=reverse
+hi DiffChange guifg=#5f87af guibg=NONE gui=reverse cterm=reverse
+hi DiffText guifg=#af87af guibg=NONE gui=reverse cterm=reverse
+hi DiffDelete guifg=#af5f5f guibg=NONE gui=reverse cterm=reverse
+hi Added guifg=#5fd75f guibg=NONE gui=NONE cterm=NONE
+hi Changed guifg=#ffaf5f guibg=NONE gui=NONE cterm=NONE
 hi Removed guifg=#d75f5f guibg=NONE gui=NONE cterm=NONE
-hi diffSubname guifg=#af87af guibg=NONE gui=NONE cterm=NONE
-hi DiffText guifg=#dadada guibg=#878787 gui=NONE cterm=NONE
-hi DiffChange guifg=#bcbcbc guibg=#5f5f5f gui=NONE cterm=NONE
 
 if s:t_Co >= 256
   hi! link Terminal Normal
   hi! link StatuslineTerm Statusline
   hi! link StatuslineTermNC StatuslineNC
   hi! link MessageWindow Pmenu
-  hi! link PopupNotification Todo
   hi! link javaScriptFunction Statement
   hi! link javaScriptIdentifier Statement
   hi! link sqlKeyword Statement
@@ -130,7 +128,6 @@ if s:t_Co >= 256
   hi! link vimSep Normal
   hi! link vimParenSep Normal
   hi! link vimCommentString Comment
-  hi! link gitCommitSummary Title
   hi! link markdownUrl String
   hi Normal ctermfg=250 ctermbg=234 cterm=NONE
   hi Statusline ctermfg=234 ctermbg=247 cterm=NONE
@@ -138,11 +135,11 @@ if s:t_Co >= 256
   hi VertSplit ctermfg=243 ctermbg=243 cterm=NONE
   hi TabLine ctermfg=234 ctermbg=243 cterm=NONE
   hi TabLineFill ctermfg=234 ctermbg=243 cterm=NONE
-  hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi TabLineSel ctermfg=234 ctermbg=247 cterm=bold
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=247 ctermbg=234 cterm=bold,reverse
+  hi ToolbarButton ctermfg=243 ctermbg=234 cterm=bold,reverse
   hi QuickFixLine ctermfg=234 ctermbg=67 cterm=NONE
-  hi CursorLineNr ctermfg=215 ctermbg=NONE cterm=bold
+  hi CursorLineNr ctermfg=253 ctermbg=NONE cterm=bold
   hi LineNr ctermfg=240 ctermbg=NONE cterm=NONE
   hi LineNrAbove ctermfg=240 ctermbg=NONE cterm=NONE
   hi LineNrBelow ctermfg=240 ctermbg=NONE cterm=NONE
@@ -150,62 +147,63 @@ if s:t_Co >= 256
   hi EndOfBuffer ctermfg=240 ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=240 ctermbg=NONE cterm=NONE
   hi FoldColumn ctermfg=240 ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=234 ctermbg=109 cterm=NONE
+  hi Visual ctermfg=109 ctermbg=234 cterm=reverse
   hi VisualNOS ctermfg=234 ctermbg=66 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 PmenuSel ctermfg=NONE ctermbg=240 cterm=NONE
+  hi PmenuKind ctermfg=66 ctermbg=237 cterm=NONE
+  hi PmenuKindSel ctermfg=66 ctermbg=240 cterm=NONE
   hi PmenuExtra ctermfg=243 ctermbg=237 cterm=NONE
-  hi PmenuExtraSel ctermfg=234 ctermbg=144 cterm=NONE
+  hi PmenuExtraSel ctermfg=247 ctermbg=240 cterm=NONE
+  hi PmenuMatch ctermfg=215 ctermbg=237 cterm=NONE
+  hi PmenuMatchSel ctermfg=215 ctermbg=240 cterm=NONE
   hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Error ctermfg=167 ctermbg=234 cterm=reverse
-  hi ErrorMsg ctermfg=167 ctermbg=234 cterm=reverse
-  hi ModeMsg ctermfg=234 ctermbg=186 cterm=NONE
-  hi MoreMsg ctermfg=108 ctermbg=NONE cterm=NONE
-  hi Question ctermfg=144 ctermbg=NONE cterm=NONE
-  hi WarningMsg ctermfg=173 ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=186 ctermbg=234 cterm=reverse
+  hi Error ctermfg=131 ctermbg=234 cterm=reverse
+  hi ErrorMsg ctermfg=131 ctermbg=234 cterm=reverse
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
+  hi MoreMsg ctermfg=71 ctermbg=NONE cterm=NONE
+  hi Question ctermfg=180 ctermbg=NONE cterm=NONE
+  hi WarningMsg ctermfg=168 ctermbg=NONE cterm=NONE
+  hi Todo ctermfg=253 ctermbg=NONE cterm=bold
   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
-  hi WildMenu ctermfg=234 ctermbg=186 cterm=NONE
+  hi Search ctermfg=74 ctermbg=234 cterm=reverse
+  hi IncSearch ctermfg=215 ctermbg=234 cterm=reverse
+  hi CurSearch ctermfg=215 ctermbg=234 cterm=reverse
+  hi WildMenu ctermfg=234 ctermbg=180 cterm=bold
   hi debugPC ctermfg=234 ctermbg=67 cterm=NONE
-  hi debugBreakpoint ctermfg=234 ctermbg=173 cterm=NONE
+  hi debugBreakpoint ctermfg=234 ctermbg=168 cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=236 cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=236 cterm=NONE
   hi Folded ctermfg=247 ctermbg=235 cterm=NONE
   hi ColorColumn ctermfg=NONE ctermbg=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
-  hi SpellRare ctermfg=182 ctermbg=NONE cterm=underline
+  hi SpellCap ctermfg=215 ctermbg=NONE cterm=underline
+  hi SpellLocal ctermfg=77 ctermbg=NONE cterm=underline
+  hi SpellRare ctermfg=176 ctermbg=NONE cterm=underline
   hi Comment ctermfg=243 ctermbg=NONE cterm=NONE
-  hi Constant ctermfg=173 ctermbg=NONE cterm=NONE
-  hi String ctermfg=108 ctermbg=NONE cterm=NONE
-  hi Character ctermfg=151 ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=168 ctermbg=NONE cterm=NONE
+  hi String ctermfg=71 ctermbg=NONE cterm=NONE
+  hi Character ctermfg=114 ctermbg=NONE cterm=NONE
   hi Identifier ctermfg=109 ctermbg=NONE cterm=NONE
   hi Statement ctermfg=139 ctermbg=NONE cterm=NONE
-  hi PreProc ctermfg=144 ctermbg=NONE cterm=NONE
-  hi Type ctermfg=110 ctermbg=NONE cterm=NONE
+  hi PreProc ctermfg=137 ctermbg=NONE cterm=NONE
+  hi Type ctermfg=67 ctermbg=NONE cterm=NONE
   hi Special ctermfg=66 ctermbg=NONE cterm=NONE
   hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Title ctermfg=186 ctermbg=NONE cterm=bold
+  hi Title ctermfg=NONE ctermbg=NONE cterm=bold
   hi Directory ctermfg=109 ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=243 ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=240 ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Debug ctermfg=66 ctermbg=NONE cterm=NONE
-  hi DiffAdd ctermfg=253 ctermbg=65 cterm=NONE
-  hi DiffDelete ctermfg=137 ctermbg=NONE cterm=NONE
-  hi Added ctermfg=108 ctermbg=NONE cterm=NONE
-  hi Changed ctermfg=66 ctermbg=NONE cterm=NONE
+  hi DiffAdd ctermfg=71 ctermbg=NONE cterm=reverse
+  hi DiffChange ctermfg=67 ctermbg=NONE cterm=reverse
+  hi DiffText ctermfg=139 ctermbg=NONE cterm=reverse
+  hi DiffDelete ctermfg=131 ctermbg=NONE cterm=reverse
+  hi Added ctermfg=77 ctermbg=NONE cterm=NONE
+  hi Changed ctermfg=215 ctermbg=NONE cterm=NONE
   hi Removed ctermfg=167 ctermbg=NONE cterm=NONE
-  hi diffSubname ctermfg=139 ctermbg=NONE cterm=NONE
-  hi DiffText ctermfg=253 ctermbg=102 cterm=NONE
-  hi DiffChange ctermfg=250 ctermbg=59 cterm=NONE
   unlet s:t_Co
   finish
 endif
@@ -217,11 +215,11 @@ if s:t_Co >= 16
   hi VertSplit ctermfg=darkgray ctermbg=darkgray cterm=NONE
   hi TabLine ctermfg=black ctermbg=darkgray cterm=NONE
   hi TabLineFill ctermfg=black ctermbg=darkgray cterm=NONE
-  hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold
+  hi TabLineSel ctermfg=black ctermbg=gray cterm=bold
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=gray ctermbg=black cterm=bold,reverse
-  hi QuickFixLine ctermfg=black ctermbg=blue cterm=NONE
-  hi CursorLineNr ctermfg=red ctermbg=NONE cterm=bold
+  hi ToolbarButton ctermfg=darkgray ctermbg=black cterm=bold,reverse
+  hi QuickFixLine ctermfg=black ctermbg=darkblue cterm=NONE
+  hi CursorLineNr ctermfg=white ctermbg=NONE cterm=bold
   hi LineNr ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi LineNrAbove ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi LineNrBelow ctermfg=darkgrey ctermbg=NONE cterm=NONE
@@ -229,7 +227,7 @@ if s:t_Co >= 16
   hi EndOfBuffer ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi SpecialKey ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi FoldColumn ctermfg=darkgrey ctermbg=NONE cterm=NONE
-  hi Visual ctermfg=black ctermbg=cyan cterm=NONE
+  hi Visual ctermfg=cyan ctermbg=black cterm=reverse
   hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE
   hi Pmenu ctermfg=black ctermbg=gray cterm=NONE
   hi PmenuThumb ctermfg=gray ctermbg=black cterm=NONE
@@ -239,27 +237,29 @@ if s:t_Co >= 16
   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 PmenuMatch ctermfg=black ctermbg=gray cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
   hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Error ctermfg=darkred ctermbg=black cterm=reverse
   hi ErrorMsg ctermfg=darkred ctermbg=black cterm=reverse
-  hi ModeMsg ctermfg=black ctermbg=yellow cterm=NONE
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Question ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi Question ctermfg=yellow ctermbg=NONE cterm=NONE
   hi WarningMsg ctermfg=red ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=yellow ctermbg=black cterm=reverse
+  hi Todo ctermfg=white ctermbg=NONE cterm=bold
   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
-  hi WildMenu ctermfg=black ctermbg=yellow cterm=NONE
-  hi debugPC ctermfg=black ctermbg=blue cterm=NONE
+  hi Search ctermfg=blue ctermbg=black cterm=reverse
+  hi IncSearch ctermfg=red ctermbg=black cterm=reverse
+  hi CurSearch ctermfg=red ctermbg=black cterm=reverse
+  hi WildMenu ctermfg=black ctermbg=yellow cterm=bold
+  hi debugPC ctermfg=black ctermbg=darkblue cterm=NONE
   hi debugBreakpoint ctermfg=black ctermbg=red cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
   hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE
   hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
   hi SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
-  hi SpellCap ctermfg=blue ctermbg=NONE cterm=underline
+  hi SpellCap ctermfg=darkyellow ctermbg=NONE cterm=underline
   hi SpellLocal ctermfg=darkgreen ctermbg=NONE cterm=underline
   hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
   hi Comment ctermfg=darkgray ctermbg=NONE cterm=NONE
@@ -269,22 +269,21 @@ if s:t_Co >= 16
   hi Identifier ctermfg=cyan ctermbg=NONE cterm=NONE
   hi Statement ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Type ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE
   hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Title ctermfg=yellow ctermbg=NONE cterm=bold
+  hi Title ctermfg=NONE ctermbg=NONE cterm=bold
   hi Directory ctermfg=cyan ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=darkgray ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Debug ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffDelete ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi DiffAdd ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi DiffChange ctermfg=darkblue ctermbg=NONE cterm=reverse
+  hi DiffText ctermfg=darkmagenta ctermbg=NONE cterm=reverse
+  hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=reverse
   hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Changed ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Changed ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi diffSubname ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi DiffText ctermfg=white ctermbg=lightgrey cterm=NONE
-  hi DiffChange ctermfg=white ctermbg=darkgray cterm=NONE
   unlet s:t_Co
   finish
 endif
@@ -293,13 +292,13 @@ if s:t_Co >= 8
   hi Normal ctermfg=gray ctermbg=black cterm=NONE
   hi Statusline ctermfg=gray ctermbg=black cterm=bold,reverse
   hi StatuslineNC ctermfg=gray ctermbg=black cterm=reverse
-  hi VertSplit ctermfg=gray ctermbg=black cterm=reverse
+  hi VertSplit ctermfg=gray ctermbg=gray cterm=NONE
   hi TabLine ctermfg=black ctermbg=gray cterm=NONE
-  hi TabLineFill ctermfg=black ctermbg=gray cterm=NONE
-  hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi TabLineFill ctermfg=gray ctermbg=gray cterm=NONE
+  hi TabLineSel ctermfg=black ctermbg=gray cterm=bold
   hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi ToolbarButton ctermfg=gray ctermbg=black cterm=bold,reverse
-  hi QuickFixLine ctermfg=black ctermbg=blue cterm=NONE
+  hi ToolbarButton ctermfg=gray ctermbg=black cterm=reverse
+  hi QuickFixLine ctermfg=black ctermbg=darkblue cterm=NONE
   hi CursorLineNr ctermfg=darkyellow ctermbg=NONE cterm=bold
   hi LineNr ctermfg=gray ctermbg=NONE cterm=bold
   hi LineNrAbove ctermfg=gray ctermbg=NONE cterm=bold
@@ -318,52 +317,53 @@ if s:t_Co >= 8
   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 PmenuMatch ctermfg=black ctermbg=gray cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
   hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Error ctermfg=darkred ctermbg=gray cterm=bold,reverse
   hi ErrorMsg ctermfg=darkred ctermbg=gray cterm=bold,reverse
-  hi ModeMsg ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi Question ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi WarningMsg ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi Todo ctermfg=darkyellow ctermbg=black cterm=reverse
+  hi Todo ctermfg=gray ctermbg=NONE cterm=bold
   hi MatchParen ctermfg=magenta ctermbg=NONE cterm=bold
-  hi Search ctermfg=black ctermbg=darkgreen cterm=NONE
+  hi Search ctermfg=black ctermbg=darkblue cterm=NONE
   hi IncSearch ctermfg=black ctermbg=darkyellow cterm=NONE
   hi CurSearch ctermfg=black ctermbg=darkyellow cterm=NONE
   hi WildMenu ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi debugPC ctermfg=black ctermbg=blue cterm=NONE
+  hi debugPC ctermfg=black ctermbg=darkblue cterm=NONE
   hi debugBreakpoint ctermfg=black ctermbg=darkcyan cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
   hi Folded ctermfg=black ctermbg=darkyellow cterm=NONE
   hi ColorColumn ctermfg=black ctermbg=darkyellow cterm=NONE
   hi SpellBad ctermfg=darkred ctermbg=gray cterm=reverse
-  hi SpellCap ctermfg=blue ctermbg=gray cterm=reverse
+  hi SpellCap ctermfg=darkblue ctermbg=gray cterm=reverse
   hi SpellLocal ctermfg=darkgreen ctermbg=black cterm=reverse
   hi SpellRare ctermfg=darkmagenta ctermbg=gray cterm=reverse
   hi Comment ctermfg=gray ctermbg=NONE cterm=bold
-  hi Constant ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
   hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi Character ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi Identifier ctermfg=gray ctermbg=NONE cterm=NONE
   hi Statement ctermfg=darkmagenta ctermbg=NONE cterm=NONE
   hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
-  hi Type ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Type ctermfg=darkblue ctermbg=NONE cterm=NONE
   hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
-  hi Title ctermfg=darkyellow ctermbg=NONE cterm=bold
+  hi Title ctermfg=NONE ctermbg=NONE cterm=bold
   hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
   hi Conceal ctermfg=gray ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Debug ctermfg=darkcyan ctermbg=NONE cterm=NONE
-  hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
-  hi DiffDelete ctermfg=darkyellow ctermbg=NONE cterm=NONE
+  hi DiffAdd ctermfg=darkgreen ctermbg=NONE cterm=reverse
+  hi DiffChange ctermfg=darkblue ctermbg=NONE cterm=reverse
+  hi DiffText ctermfg=darkmagenta ctermbg=NONE cterm=reverse
+  hi DiffDelete ctermfg=darkred ctermbg=NONE cterm=reverse
   hi Added ctermfg=darkgreen ctermbg=NONE cterm=NONE
-  hi Changed ctermfg=darkcyan ctermbg=NONE cterm=NONE
+  hi Changed ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi Removed ctermfg=darkred ctermbg=NONE cterm=NONE
-  hi diffSubname ctermfg=darkmagenta ctermbg=NONE cterm=NONE
-  hi DiffText ctermfg=white ctermbg=black cterm=bold,reverse
-  hi DiffChange ctermfg=black ctermbg=white cterm=NONE
   unlet s:t_Co
   finish
 endif
@@ -437,36 +437,39 @@ if s:t_Co >= 0
 endif
 
 " Background: dark
-" Color: color00          #1C1C1C        234            black
+" Color: color00          #1c1c1c        234            black
 " Color: color08          #767676        243            darkgray
-" Color: color01          #D75F5F        167            darkred
-" Color: color09          #D7875F        173            red
-" Color: color02          #87AF87        108            darkgreen
-" Color: color10          #AFD7AF        151            green
-" Color: color03          #AFAF87        144            darkyellow
-" Color: color11          #D7D787        186            yellow
-" Color: color04          #5F87AF        67             blue
-" Color: color12          #87AFD7        110            blue
-" Color: color05          #AF87AF        139            darkmagenta
-" Color: color13          #D7AFD7        182            magenta
-" Color: color06          #5F8787        66             darkcyan
-" Color: color14          #87AFAF        109            cyan
-" Color: color07          #9E9E9E        247            gray
-" Color: color15          #BCBCBC        250            white
+" Color: color01          #af5f5f        131            darkred
+" Color: color09          #d75f87        168            red
+" Color: color02          #5faf5f        71             darkgreen
+" Color: color10          #87d787        114            green
+" Color: color03          #af875f        137            darkyellow
+" Color: color11          #d7af87        180            yellow
+" Color: color04          #5f87af        67             darkblue
+" Color: color12          #5fafd7        74             blue
+" Color: color05          #af87af        139            darkmagenta
+" Color: color13          #d787d7        176            magenta
+" Color: color06          #5f8787        66             darkcyan
+" Color: color14          #87afaf        109            cyan
+" Color: color07          #9e9e9e        247            gray
+" Color: color15          #bcbcbc        250            white
 " Color: colorLine        #303030        236            darkgrey
 " Color: colorB           #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: colorC           #ffaf5f        215            red
+" Color: colorlC          #5fff00        82             green
+" Color: colorV           #1f3f5f        109            cyan
 " Color: colorMP          #ff00af        199            magenta
-" Color: diffAdd          #5f875f        65             darkgreen
-" Color: diffDelete       #af875f        137            darkyellow
-" Color: diffChange       #5f5f5f        59             darkgray
-" Color: diffText         #878787        102            lightgrey
+" Color: diffAdd          #5faf5f        71             darkgreen
+" Color: diffDelete       #af5f5f        131            darkred
+" Color: diffChange       #5f87af        67             darkblue
+" Color: diffText         #af87af        139            darkmagenta
 " Color: black            #000000        16             black
 " Color: white            #dadada        253            white
+" Color: Added            #5fd75f        77             darkgreen
+" Color: Changed          #ffaf5f        215            darkyellow
+" Color: Removed          #d75f5f        167            darkred
 " Term colors: color00 color01 color02 color03 color04 color05 color06 color07
 " Term colors: color08 color09 color10 color11 color12 color13 color14 color15
 " vim: et ts=8 sw=2 sts=2

runtime/colors/industry.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Shian Lee.
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Fri 15 Dec 2023 20:05:36
+" Last Change:  2024 Aug 15
 
 " Generated by Colortemplate v2.2.3
 
@@ -29,6 +29,8 @@ hi Pmenu guifg=#dadada guibg=#444444 gui=NONE cterm=NONE
 hi PmenuSel guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
 hi PmenuSbar guifg=NONE guibg=#000000 gui=NONE cterm=NONE
 hi PmenuThumb guifg=NONE guibg=#6c6c6c gui=NONE cterm=NONE
+hi PmenuMatch guifg=#ff00ff guibg=#444444 gui=NONE cterm=NONE
+hi PmenuMatchSel guifg=#ff00ff guibg=#ffff00 gui=NONE cterm=NONE
 hi TabLine guifg=#dadada guibg=#444444 gui=NONE cterm=NONE
 hi TabLineFill guifg=NONE guibg=#6c6c6c gui=NONE cterm=NONE
 hi TabLineSel guifg=#ffffff guibg=#000000 gui=bold cterm=bold
@@ -103,6 +105,8 @@ if s:t_Co >= 256
   hi PmenuSel ctermfg=16 ctermbg=226 cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=16 cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=242 cterm=NONE
+  hi PmenuMatch ctermfg=201 ctermbg=238 cterm=NONE
+  hi PmenuMatchSel ctermfg=201 ctermbg=226 cterm=NONE
   hi TabLine ctermfg=253 ctermbg=238 cterm=NONE
   hi TabLineFill ctermfg=NONE ctermbg=242 cterm=NONE
   hi TabLineSel ctermfg=231 ctermbg=16 cterm=bold
@@ -180,6 +184,8 @@ if s:t_Co >= 16
   hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
+  hi PmenuMatch ctermfg=white ctermbg=darkgrey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
   hi TabLine ctermfg=white ctermbg=darkgrey cterm=NONE
   hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
   hi TabLineSel ctermfg=white ctermbg=black cterm=bold
@@ -257,6 +263,8 @@ if s:t_Co >= 8
   hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
   hi PmenuThumb ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=grey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
   hi TabLine ctermfg=black ctermbg=grey cterm=NONE
   hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
   hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE

runtime/colors/koehler.vim

@@ -3,7 +3,7 @@
 " Maintainer:   original maintainer Ron Aaron <ron@ronware.org>
 " Website:      https://www.github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Fri 15 Dec 2023 20:05:36
+" Last Change:  2024 Aug 15
 
 " Generated by Colortemplate v2.2.3
 
@@ -62,7 +62,7 @@ hi CursorLine guifg=NONE guibg=#555555 gui=NONE cterm=NONE
 hi CursorLineNr guifg=#ffff00 guibg=NONE gui=bold cterm=bold
 hi Folded guifg=#00cdcd guibg=#666666 gui=NONE cterm=NONE
 hi QuickFixLine guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
-hi Conceal guifg=#e5e5e5 guibg=#a9a9a9 gui=NONE cterm=NONE
+hi Conceal guifg=#666666 guibg=NONE gui=NONE cterm=NONE
 hi Cursor guifg=#000000 guibg=#00ff00 gui=NONE cterm=NONE
 hi Directory guifg=#cc8000 guibg=NONE gui=NONE cterm=NONE
 hi EndOfBuffer guifg=#cd0000 guibg=NONE gui=bold cterm=bold
@@ -77,6 +77,8 @@ hi Pmenu guifg=#ffffff guibg=#444444 gui=NONE cterm=NONE
 hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi PmenuSel guifg=#000000 guibg=#00cdcd gui=NONE cterm=NONE
 hi PmenuThumb guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
+hi PmenuMatch guifg=#ff00ff guibg=#444444 gui=NONE cterm=NONE
+hi PmenuMatchSel guifg=#ff0000 guibg=#00cdcd gui=NONE cterm=NONE
 hi Question guifg=#5c5cff guibg=NONE gui=bold cterm=bold
 hi Search guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
 hi SignColumn guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
@@ -123,7 +125,7 @@ if s:t_Co >= 256
   hi CursorLineNr ctermfg=226 ctermbg=NONE cterm=bold
   hi Folded ctermfg=44 ctermbg=59 cterm=NONE
   hi QuickFixLine ctermfg=16 ctermbg=226 cterm=NONE
-  hi Conceal ctermfg=254 ctermbg=145 cterm=NONE
+  hi Conceal ctermfg=59 ctermbg=NONE cterm=NONE
   hi Cursor ctermfg=16 ctermbg=46 cterm=NONE
   hi Directory ctermfg=172 ctermbg=NONE cterm=NONE
   hi EndOfBuffer ctermfg=160 ctermbg=NONE cterm=bold
@@ -138,6 +140,8 @@ if s:t_Co >= 256
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuSel ctermfg=16 ctermbg=44 cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=231 cterm=NONE
+  hi PmenuMatch ctermfg=201 ctermbg=238 cterm=NONE
+  hi PmenuMatchSel ctermfg=196 ctermbg=44 cterm=NONE
   hi Question ctermfg=63 ctermbg=NONE cterm=bold
   hi Search ctermfg=231 ctermbg=196 cterm=NONE
   hi SignColumn ctermfg=51 ctermbg=NONE cterm=NONE
@@ -187,7 +191,7 @@ if s:t_Co >= 16
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi Folded ctermfg=darkblue ctermbg=NONE cterm=NONE
   hi QuickFixLine ctermfg=black ctermbg=yellow cterm=NONE
-  hi Conceal ctermfg=grey ctermbg=grey cterm=NONE
+  hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi Cursor ctermfg=black ctermbg=green cterm=NONE
   hi Directory ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi EndOfBuffer ctermfg=darkred ctermbg=NONE cterm=bold
@@ -202,6 +206,8 @@ if s:t_Co >= 16
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
+  hi PmenuMatch ctermfg=white ctermbg=darkgrey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold
   hi Question ctermfg=blue ctermbg=NONE cterm=bold
   hi Search ctermfg=white ctermbg=red cterm=NONE
   hi SignColumn ctermfg=cyan ctermbg=NONE cterm=NONE
@@ -265,6 +271,8 @@ if s:t_Co >= 8
   hi PmenuSbar ctermfg=NONE ctermbg=grey cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=darkcyan cterm=NONE
+  hi PmenuMatch ctermfg=grey ctermbg=darkgrey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold
   hi Question ctermfg=darkblue ctermbg=NONE cterm=bold
   hi Search ctermfg=grey ctermbg=darkred cterm=NONE
   hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE

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: Mon 08 Jan 2024 09:41:03 AM AEDT
+" Last Change:  2024 Aug 15
 
 " Generated by Colortemplate v2.2.3
 
@@ -120,6 +120,8 @@ if &background ==# 'dark'
   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 PmenuMatch guifg=#d787d7 guibg=#303030 gui=NONE cterm=NONE
+  hi PmenuMatchSel guifg=#d787d7 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
@@ -158,7 +160,7 @@ if &background ==# 'dark'
   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=#5fafff guibg=NONE gui=bold cterm=bold
-  hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Conceal guifg=#585858 guibg=NONE gui=NONE cterm=NONE
   hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi DiffAdd guifg=#c6c6c6 guibg=#875f87 gui=NONE cterm=NONE
   hi DiffChange guifg=#c6c6c6 guibg=#5f5f5f gui=NONE cterm=NONE
@@ -211,6 +213,8 @@ else
   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 PmenuMatch guifg=#af00af guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi PmenuMatchSel guifg=#af00af 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
@@ -249,7 +253,7 @@ else
   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=#005fd7 guibg=NONE gui=bold cterm=bold
-  hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Conceal guifg=#9e9e9e guibg=NONE gui=NONE cterm=NONE
   hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi DiffAdd guifg=#000000 guibg=#d7afd7 gui=NONE cterm=NONE
   hi DiffChange guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE
@@ -381,6 +385,8 @@ if s:t_Co >= 256
     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 PmenuMatch ctermfg=176 ctermbg=236 cterm=NONE
+    hi PmenuMatchSel ctermfg=176 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
@@ -417,7 +423,7 @@ if s:t_Co >= 256
     hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
     hi Title ctermfg=NONE ctermbg=NONE cterm=bold
     hi Directory ctermfg=75 ctermbg=NONE cterm=bold
-    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Conceal ctermfg=240 ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
     hi DiffAdd ctermfg=251 ctermbg=96 cterm=NONE
     hi DiffChange ctermfg=251 ctermbg=59 cterm=NONE
@@ -467,6 +473,8 @@ if s:t_Co >= 256
     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 PmenuMatch ctermfg=127 ctermbg=254 cterm=NONE
+    hi PmenuMatchSel ctermfg=127 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
@@ -503,7 +511,7 @@ if s:t_Co >= 256
     hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
     hi Title ctermfg=NONE ctermbg=NONE cterm=bold
     hi Directory ctermfg=26 ctermbg=NONE cterm=bold
-    hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi Conceal ctermfg=247 ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
     hi DiffAdd ctermfg=16 ctermbg=182 cterm=NONE
     hi DiffChange ctermfg=16 ctermbg=252 cterm=NONE
@@ -559,6 +567,8 @@ if s:t_Co >= 16
     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 PmenuMatch ctermfg=black ctermbg=grey cterm=bold
+    hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Error ctermfg=white ctermbg=red cterm=NONE
     hi ErrorMsg ctermfg=white ctermbg=red cterm=NONE
@@ -594,7 +604,7 @@ if s:t_Co >= 16
     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 Conceal ctermfg=grey ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
     hi DiffAdd ctermfg=white ctermbg=darkmagenta cterm=NONE
     hi DiffChange ctermfg=white ctermbg=darkgreen cterm=NONE
@@ -680,7 +690,7 @@ if s:t_Co >= 16
     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 Conceal ctermfg=darkgrey 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
@@ -736,6 +746,8 @@ if s:t_Co >= 8
     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 PmenuMatch ctermfg=black ctermbg=grey cterm=bold
+    hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Error ctermfg=grey ctermbg=darkred cterm=NONE
     hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE

runtime/colors/morning.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Bram Moolenaar <Bram@vim.org>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Fri 15 Dec 2023 20:05:37
+" Last Change:  2024 Aug 15
 
 " Generated by Colortemplate v2.2.3
 
@@ -42,6 +42,8 @@ hi Pmenu guifg=#000000 guibg=#b2b2b2 gui=NONE cterm=NONE
 hi PmenuSel guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
 hi PmenuSbar guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
 hi PmenuThumb guifg=NONE guibg=#000000 gui=NONE cterm=NONE
+hi PmenuMatch guifg=#a52a2a guibg=#b2b2b2 gui=NONE cterm=NONE
+hi PmenuMatchSel guifg=#a52a2a guibg=#ffff00 gui=NONE cterm=NONE
 hi TabLine guifg=#000000 guibg=#bcbcbc gui=underline cterm=underline
 hi TabLineFill guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
 hi TabLineSel guifg=#000000 guibg=#e4e4e4 gui=bold cterm=bold
@@ -82,7 +84,7 @@ hi Type guifg=#2e8b57 guibg=NONE gui=bold cterm=bold
 hi Special guifg=#6a5acd guibg=NONE gui=NONE cterm=NONE
 hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi Directory guifg=#008787 guibg=NONE gui=bold cterm=bold
-hi Conceal guifg=#0000ff guibg=NONE gui=NONE cterm=NONE
+hi Conceal guifg=#878787 guibg=NONE gui=NONE cterm=NONE
 hi Title guifg=#a52a2a guibg=NONE gui=bold cterm=bold
 hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
 hi DiffChange guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
@@ -114,6 +116,8 @@ if s:t_Co >= 256
   hi PmenuSel ctermfg=16 ctermbg=226 cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=254 cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=16 cterm=NONE
+  hi PmenuMatch ctermfg=124 ctermbg=249 cterm=NONE
+  hi PmenuMatchSel ctermfg=124 ctermbg=226 cterm=NONE
   hi TabLine ctermfg=16 ctermbg=250 cterm=underline
   hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
   hi TabLineSel ctermfg=16 ctermbg=254 cterm=bold
@@ -154,7 +158,7 @@ if s:t_Co >= 256
   hi Special ctermfg=62 ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Directory ctermfg=30 ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=21 ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=102 ctermbg=NONE cterm=NONE
   hi Title ctermfg=124 ctermbg=NONE cterm=bold
   hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
   hi DiffChange ctermfg=231 ctermbg=67 cterm=NONE
@@ -179,6 +183,8 @@ if s:t_Co >= 16
   hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=grey cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=black cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=white cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
   hi TabLine ctermfg=black ctermbg=white cterm=underline
   hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
   hi TabLineSel ctermfg=black ctermbg=grey cterm=bold
@@ -219,7 +225,7 @@ if s:t_Co >= 16
   hi Special ctermfg=darkblue ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=blue ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=gray ctermbg=NONE cterm=NONE
   hi Title ctermfg=darkred ctermbg=NONE cterm=bold
   hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
   hi DiffChange ctermfg=white ctermbg=blue cterm=NONE
@@ -244,6 +250,8 @@ if s:t_Co >= 8
   hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
   hi TabLine ctermfg=gray ctermbg=black cterm=NONE
   hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
   hi TabLineSel ctermfg=black ctermbg=gray cterm=NONE

runtime/colors/murphy.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Ron Aaron <ron@ronware.org>.
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Mon 08 Jan 2024 09:50:15 AM AEDT
+" Last Change:  2024 Aug 15
 
 " Generated by Colortemplate v2.2.3
 
@@ -38,6 +38,8 @@ hi Pmenu guifg=#ffffff guibg=#444444 gui=NONE cterm=NONE
 hi PmenuSel guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
 hi PmenuSbar guifg=NONE guibg=#303030 gui=NONE cterm=NONE
 hi PmenuThumb guifg=NONE guibg=#bcbcbc gui=NONE cterm=NONE
+hi PmenuMatch guifg=#ff00ff guibg=#444444 gui=NONE cterm=NONE
+hi PmenuMatchSel guifg=#ff00ff guibg=#ffff00 gui=NONE cterm=NONE
 hi TabLineFill guifg=NONE guibg=#303030 gui=NONE cterm=NONE
 hi TabLine guifg=#87ff87 guibg=#444444 gui=NONE cterm=NONE
 hi TabLineSel guifg=#ffffff guibg=#000000 gui=NONE cterm=NONE
@@ -111,6 +113,8 @@ if s:t_Co >= 256
   hi PmenuSel ctermfg=16 ctermbg=226 cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=236 cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=250 cterm=NONE
+  hi PmenuMatch ctermfg=201 ctermbg=238 cterm=NONE
+  hi PmenuMatchSel ctermfg=201 ctermbg=226 cterm=NONE
   hi TabLineFill ctermfg=NONE ctermbg=236 cterm=NONE
   hi TabLine ctermfg=120 ctermbg=238 cterm=NONE
   hi TabLineSel ctermfg=231 ctermbg=16 cterm=NONE
@@ -176,6 +180,8 @@ if s:t_Co >= 16
   hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
+  hi PmenuMatch ctermfg=white ctermbg=darkgrey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
   hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
   hi TabLine ctermfg=green ctermbg=darkgrey cterm=NONE
   hi TabLineSel ctermfg=white ctermbg=black cterm=NONE
@@ -241,6 +247,8 @@ if s:t_Co >= 8
   hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
   hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
   hi TabLine ctermfg=grey ctermbg=black cterm=reverse
   hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE

runtime/colors/pablo.vim

@@ -3,7 +3,7 @@
 " Maintainer:   Original maintainerRon Aaron <ron@ronware.org>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Fri 15 Dec 2023 20:05:38
+" Last Change:  2024 Aug 15
 
 " Generated by Colortemplate v2.2.3
 
@@ -37,7 +37,7 @@ hi Underlined guifg=#80a0ff guibg=NONE gui=underline cterm=underline
 hi Ignore guifg=#000000 guibg=#000000 gui=NONE cterm=NONE
 hi Error guifg=#ffffff guibg=#ff0000 gui=NONE cterm=NONE
 hi Todo guifg=#000000 guibg=#c0c000 gui=NONE cterm=NONE
-hi Conceal guifg=#e5e5e5 guibg=#a9a9a9 gui=NONE cterm=NONE
+hi Conceal guifg=#666666 guibg=NONE gui=NONE cterm=NONE
 hi Cursor guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
 hi lCursor guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
 hi CursorIM guifg=NONE guibg=fg gui=NONE cterm=NONE
@@ -80,6 +80,8 @@ hi TabLineFill guifg=NONE guibg=#000000 gui=reverse cterm=reverse
 hi TabLineSel guifg=#ffffff guibg=#000000 gui=bold cterm=bold
 hi ToolbarLine guifg=NONE guibg=#000000 gui=NONE cterm=NONE
 hi ToolbarButton guifg=#000000 guibg=#e5e5e5 gui=bold cterm=bold
+hi PmenuMatch guifg=#ff00ff guibg=#303030 gui=NONE cterm=NONE
+hi PmenuMatchSel guifg=#ff00ff guibg=#e5e5e5 gui=NONE cterm=NONE
 hi Pmenu guifg=fg guibg=#303030 gui=NONE cterm=NONE
 hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi PmenuSel guifg=#000000 guibg=#e5e5e5 gui=NONE cterm=NONE
@@ -110,7 +112,7 @@ if s:t_Co >= 256
   hi Ignore ctermfg=16 ctermbg=16 cterm=NONE
   hi Error ctermfg=231 ctermbg=196 cterm=NONE
   hi Todo ctermfg=16 ctermbg=142 cterm=NONE
-  hi Conceal ctermfg=254 ctermbg=248 cterm=NONE
+  hi Conceal ctermfg=241 ctermbg=NONE cterm=NONE
   hi Cursor ctermfg=16 ctermbg=231 cterm=NONE
   hi lCursor ctermfg=16 ctermbg=231 cterm=NONE
   hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
@@ -153,6 +155,8 @@ if s:t_Co >= 256
   hi TabLineSel ctermfg=231 ctermbg=16 cterm=bold
   hi ToolbarLine ctermfg=NONE ctermbg=16 cterm=NONE
   hi ToolbarButton ctermfg=16 ctermbg=254 cterm=bold
+  hi PmenuMatch ctermfg=201 ctermbg=236 cterm=NONE
+  hi PmenuMatchSel ctermfg=201 ctermbg=254 cterm=NONE
   hi Pmenu ctermfg=fg ctermbg=236 cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuSel ctermfg=16 ctermbg=254 cterm=NONE
@@ -178,7 +182,7 @@ if s:t_Co >= 16
   hi Ignore ctermfg=black ctermbg=black cterm=NONE
   hi Error ctermfg=white ctermbg=red cterm=NONE
   hi Todo ctermfg=black ctermbg=darkyellow cterm=NONE
-  hi Conceal ctermfg=grey ctermbg=grey cterm=NONE
+  hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi Cursor ctermfg=black ctermbg=white cterm=NONE
   hi lCursor ctermfg=black ctermbg=white cterm=NONE
   hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
@@ -221,6 +225,8 @@ if s:t_Co >= 16
   hi TabLineSel ctermfg=white ctermbg=black cterm=bold
   hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
   hi ToolbarButton ctermfg=black ctermbg=grey cterm=bold
+  hi PmenuMatch ctermfg=fg ctermbg=darkgrey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=grey cterm=bold
   hi Pmenu ctermfg=fg ctermbg=darkgrey cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=grey cterm=NONE
@@ -245,6 +251,8 @@ if s:t_Co >= 8
   hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
   hi PmenuThumb ctermfg=black ctermbg=darkyellow cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=grey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
   hi TabLine ctermfg=black ctermbg=grey cterm=NONE
   hi TabLineFill ctermfg=NONE ctermbg=grey cterm=NONE
   hi TabLineSel ctermfg=grey ctermbg=black cterm=NONE

runtime/colors/peachpuff.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Fri 15 Dec 2023 20:05:39
+" Last Change:  2024 Aug 15
 
 " Generated by Colortemplate v2.2.3
 
@@ -39,9 +39,11 @@ hi StatusLineTerm guifg=#ffffff guibg=#2e8b57 gui=bold cterm=bold
 hi StatusLineTermNC guifg=#ffdab9 guibg=#008b8b gui=bold cterm=bold
 hi VertSplit guifg=#ffdab9 guibg=#737373 gui=NONE cterm=NONE
 hi Pmenu guifg=#000000 guibg=#ffaf87 gui=NONE cterm=NONE
-hi PmenuSel guifg=#000000 guibg=#f5c195 gui=bold cterm=bold
 hi PmenuSbar guifg=NONE guibg=#ffdab9 gui=NONE cterm=NONE
 hi PmenuThumb guifg=NONE guibg=#737373 gui=NONE cterm=NONE
+hi PmenuSel guifg=#000000 guibg=#f5c195 gui=bold cterm=bold
+hi PmenuMatch guifg=#a52a2a guibg=#ffaf87 gui=NONE cterm=NONE
+hi PmenuMatchSel guifg=#a52a2a guibg=#f5c195 gui=bold cterm=bold
 hi TabLine guifg=#ffdab9 guibg=#737373 gui=underline cterm=underline
 hi TabLineFill guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
 hi TabLineSel guifg=#000000 guibg=#ffdab9 gui=bold cterm=bold
@@ -81,7 +83,7 @@ hi PreProc guifg=#cd00cd guibg=NONE gui=NONE cterm=NONE
 hi Type guifg=#2e8b57 guibg=NONE gui=bold cterm=bold
 hi Special guifg=#6a5acd guibg=NONE gui=NONE cterm=NONE
 hi Directory guifg=#008b8b guibg=NONE gui=bold cterm=bold
-hi Conceal guifg=#406090 guibg=NONE gui=NONE cterm=NONE
+hi Conceal guifg=#737373 guibg=NONE gui=NONE cterm=NONE
 hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi Title guifg=#cd00cd guibg=NONE gui=bold cterm=bold
 hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
@@ -111,9 +113,11 @@ if s:t_Co >= 256
   hi StatusLineTermNC ctermfg=223 ctermbg=30 cterm=bold
   hi VertSplit ctermfg=223 ctermbg=243 cterm=NONE
   hi Pmenu ctermfg=16 ctermbg=216 cterm=NONE
-  hi PmenuSel ctermfg=16 ctermbg=180 cterm=bold
   hi PmenuSbar ctermfg=NONE ctermbg=223 cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=243 cterm=NONE
+  hi PmenuSel ctermfg=16 ctermbg=180 cterm=bold
+  hi PmenuMatch ctermfg=124 ctermbg=216 cterm=NONE
+  hi PmenuMatchSel ctermfg=124 ctermbg=180 cterm=bold
   hi TabLine ctermfg=223 ctermbg=243 cterm=underline
   hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
   hi TabLineSel ctermfg=16 ctermbg=223 cterm=bold
@@ -153,7 +157,7 @@ if s:t_Co >= 256
   hi Type ctermfg=29 ctermbg=NONE cterm=bold
   hi Special ctermfg=62 ctermbg=NONE cterm=NONE
   hi Directory ctermfg=30 ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=25 ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=243 ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Title ctermfg=164 ctermbg=NONE cterm=bold
   hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
@@ -178,9 +182,11 @@ if s:t_Co >= 16
   hi StatusLineTermNC ctermfg=white ctermbg=darkcyan cterm=bold
   hi VertSplit ctermfg=white ctermbg=darkgrey cterm=NONE
   hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=yellow cterm=bold
   hi PmenuSbar ctermfg=NONE ctermbg=white cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=darkgrey cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=grey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
   hi TabLine ctermfg=white ctermbg=darkgrey cterm=underline
   hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
   hi TabLineSel ctermfg=black ctermbg=white cterm=bold
@@ -248,6 +254,8 @@ if s:t_Co >= 8
   hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
   hi TabLine ctermfg=gray ctermbg=black cterm=NONE
   hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
   hi TabLineSel ctermfg=black ctermbg=white cterm=NONE

runtime/colors/quiet.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Maxence Weynans <neutaaaaan@gmail.com>
 " Website:      https://github.com/vim/colorschemes
 " License:      Vim License (see `:help license`)`
-" Last Updated: Fri 15 Dec 2023 20:05:39
+" Last Change:  2024 Aug 05
 
 " Generated by Colortemplate v2.2.3
 
@@ -13,6 +13,9 @@ let g:colors_name = 'quiet'
 
 let s:t_Co = has('gui_running') ? -1 : (&t_Co ?? 0)
 
+hi! link Added Normal
+hi! link Changed Normal
+hi! link Removed Normal
 hi! link Terminal Normal
 hi! link StatusLineTerm StatusLine
 hi! link StatusLineTermNC StatusLineNC
@@ -74,10 +77,12 @@ if &background ==# 'dark'
   hi MoreMsg guifg=#dadada guibg=NONE gui=NONE cterm=NONE
   hi NonText guifg=#707070 guibg=NONE gui=NONE cterm=NONE
   hi Pmenu guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
+  hi PmenuMatch guifg=#d7005f 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 PmenuMatchSel guifg=#d7005f guibg=#dadada gui=bold cterm=bold
   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
@@ -144,10 +149,12 @@ else
   hi MoreMsg guifg=#000000 guibg=NONE gui=NONE cterm=NONE
   hi NonText guifg=#626262 guibg=NONE gui=NONE cterm=NONE
   hi Pmenu guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
+  hi PmenuMatch guifg=#d70000 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 PmenuMatchSel guifg=#d70000 guibg=#000000 gui=bold cterm=bold
   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
@@ -213,10 +220,12 @@ if s:t_Co >= 256
     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 PmenuMatch ctermfg=161 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 PmenuMatchSel ctermfg=161 ctermbg=253 cterm=bold
     hi PmenuExtraSel ctermfg=16 ctermbg=253 cterm=NONE
     hi PmenuKindSel ctermfg=16 ctermbg=253 cterm=bold
     hi PmenuThumb ctermfg=253 ctermbg=253 cterm=NONE
@@ -280,10 +289,12 @@ if s:t_Co >= 256
     hi MoreMsg ctermfg=16 ctermbg=NONE cterm=NONE
     hi NonText ctermfg=241 ctermbg=NONE cterm=NONE
     hi Pmenu ctermfg=16 ctermbg=248 cterm=NONE
+    hi PmenuMatch ctermfg=160 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 PmenuMatchSel ctermfg=160 ctermbg=16 cterm=bold
     hi PmenuExtraSel ctermfg=188 ctermbg=16 cterm=NONE
     hi PmenuKindSel ctermfg=188 ctermbg=16 cterm=bold
     hi PmenuThumb ctermfg=16 ctermbg=16 cterm=NONE
@@ -359,9 +370,11 @@ if s:t_Co >= 16
     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 PmenuMatch ctermfg=NONE ctermbg=darkred 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 PmenuMatchSel ctermfg=darkred 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
@@ -425,9 +438,11 @@ if s:t_Co >= 16
     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 PmenuMatch ctermfg=NONE ctermbg=darkred 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 PmenuMatchSel ctermfg=darkred 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
@@ -498,9 +513,11 @@ if s:t_Co >= 8
     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 PmenuMatch ctermfg=NONE ctermbg=darkred 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 PmenuMatchSel ctermfg=darkred 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
@@ -564,9 +581,11 @@ if s:t_Co >= 8
     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 PmenuMatch ctermfg=NONE ctermbg=darkred 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 PmenuMatchSel ctermfg=darkred 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

runtime/colors/retrobox.vim

@@ -4,7 +4,7 @@
 " 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: Fri 15 Dec 2023 20:05:40
+" Last Change:  2024 Aug 15
 
 " Generated by Colortemplate v2.2.3
 
@@ -21,14 +21,15 @@ hi! link Tag Special
 hi! link lCursor Cursor
 hi! link MessageWindow PMenu
 hi! link PopupNotification Todo
-hi! link CurSearch Search
+hi! link CurSearch IncSearch
+hi! link Terminal Normal
 
 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 CursorLineNr guifg=#fabd2f guibg=#1c1c1c gui=bold cterm=bold
   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
@@ -49,6 +50,8 @@ if &background ==# 'dark'
   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 PmenuMatch guifg=#b16286 guibg=#3c3836 gui=NONE cterm=NONE
+  hi PmenuMatchSel guifg=#b16286 guibg=#83a598 gui=bold cterm=bold
   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
@@ -60,7 +63,7 @@ if &background ==# 'dark'
   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 Conceal guifg=#504945 guibg=NONE gui=NONE cterm=NONE
   hi Cursor guifg=#1c1c1c guibg=#fbf1c7 gui=NONE cterm=NONE
   hi DiffAdd guifg=#b8bb26 guibg=#1c1c1c gui=reverse cterm=reverse
   hi DiffChange guifg=#8ec07c guibg=#1c1c1c gui=reverse cterm=reverse
@@ -119,7 +122,7 @@ else
     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 CursorLineNr guifg=#b57614 guibg=#fbf1c7 gui=bold cterm=bold
   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
@@ -140,6 +143,8 @@ else
   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 PmenuMatch guifg=#8f3f71 guibg=#e5d4b1 gui=NONE cterm=NONE
+  hi PmenuMatchSel guifg=#d3869b guibg=#076678 gui=bold cterm=bold
   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
@@ -151,7 +156,7 @@ else
   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 Conceal guifg=#a89984 guibg=NONE gui=NONE cterm=NONE
   hi Cursor guifg=#fbf1c7 guibg=#282828 gui=NONE cterm=NONE
   hi DiffAdd guifg=#79740e guibg=#fbf1c7 gui=reverse cterm=reverse
   hi DiffChange guifg=#427b58 guibg=#fbf1c7 gui=reverse cterm=reverse
@@ -209,7 +214,7 @@ 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 CursorLineNr ctermfg=214 ctermbg=234 cterm=bold
     hi FoldColumn ctermfg=102 ctermbg=234 cterm=NONE
     hi SignColumn ctermfg=102 ctermbg=234 cterm=NONE
     hi VertSplit ctermfg=236 ctermbg=234 cterm=NONE
@@ -230,6 +235,8 @@ if s:t_Co >= 256
     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 PmenuMatch ctermfg=132 ctermbg=237 cterm=NONE
+    hi PmenuMatchSel ctermfg=132 ctermbg=109 cterm=bold
     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
@@ -241,7 +248,7 @@ if s:t_Co >= 256
     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 Conceal ctermfg=239 ctermbg=NONE cterm=NONE
     hi Cursor ctermfg=234 ctermbg=230 cterm=NONE
     hi DiffAdd ctermfg=142 ctermbg=234 cterm=reverse
     hi DiffChange ctermfg=107 ctermbg=234 cterm=reverse
@@ -297,7 +304,7 @@ if s:t_Co >= 256
   else
     " Light background
     hi Normal ctermfg=237 ctermbg=230 cterm=NONE
-    hi CursorLineNr ctermfg=172 ctermbg=188 cterm=NONE
+    hi CursorLineNr ctermfg=172 ctermbg=230 cterm=bold
     hi FoldColumn ctermfg=102 ctermbg=230 cterm=NONE
     hi SignColumn ctermfg=237 ctermbg=230 cterm=NONE
     hi VertSplit ctermfg=144 ctermbg=230 cterm=NONE
@@ -318,6 +325,8 @@ if s:t_Co >= 256
     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 PmenuMatch ctermfg=126 ctermbg=188 cterm=NONE
+    hi PmenuMatchSel ctermfg=175 ctermbg=23 cterm=bold
     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
@@ -329,7 +338,7 @@ if s:t_Co >= 256
     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 Conceal ctermfg=137 ctermbg=NONE cterm=NONE
     hi Cursor ctermfg=230 ctermbg=235 cterm=NONE
     hi DiffAdd ctermfg=64 ctermbg=230 cterm=reverse
     hi DiffChange ctermfg=29 ctermbg=230 cterm=reverse
@@ -409,6 +418,8 @@ if s:t_Co >= 16
     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 PmenuMatch ctermfg=White ctermbg=DarkGray cterm=bold
+    hi PmenuMatchSel ctermfg=Black ctermbg=Blue cterm=bold
     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
@@ -422,7 +433,7 @@ if s:t_Co >= 16
     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 Conceal ctermfg=DarkGray ctermbg=NONE cterm=NONE
     hi Cursor ctermfg=Black ctermbg=White cterm=NONE
     hi DiffAdd ctermfg=Green ctermbg=Black cterm=reverse
     hi DiffChange ctermfg=Cyan ctermbg=Black cterm=reverse
@@ -497,6 +508,8 @@ if s:t_Co >= 16
     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 PmenuMatch ctermfg=Black ctermbg=Grey cterm=bold
+    hi PmenuMatchSel ctermfg=White ctermbg=Blue cterm=bold
     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
@@ -510,7 +523,7 @@ if s:t_Co >= 16
     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 Conceal ctermfg=Grey ctermbg=NONE cterm=NONE
     hi Cursor ctermfg=White ctermbg=DarkGray cterm=NONE
     hi DiffAdd ctermfg=Green ctermbg=White cterm=reverse
     hi DiffChange ctermfg=Cyan ctermbg=White cterm=reverse
@@ -590,6 +603,8 @@ if s:t_Co >= 8
     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 PmenuMatch ctermfg=DarkGray ctermbg=White cterm=bold
+    hi PmenuMatchSel ctermfg=Black ctermbg=Blue cterm=bold
     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
@@ -603,7 +618,7 @@ if s:t_Co >= 8
     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 Conceal ctermfg=DarkGray ctermbg=NONE cterm=NONE
     hi Cursor ctermfg=Black ctermbg=White cterm=NONE
     hi DiffAdd ctermfg=Green ctermbg=Black cterm=reverse
     hi DiffChange ctermfg=Cyan ctermbg=Black cterm=reverse
@@ -678,6 +693,8 @@ if s:t_Co >= 8
     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 PmenuMatch ctermfg=Grey ctermbg=Black cterm=bold
+    hi PmenuMatchSel ctermfg=White ctermbg=Blue cterm=bold
     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
@@ -691,7 +708,7 @@ if s:t_Co >= 8
     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 Conceal ctermfg=Grey ctermbg=NONE cterm=NONE
     hi Cursor ctermfg=White ctermbg=DarkGray cterm=NONE
     hi DiffAdd ctermfg=Green ctermbg=White cterm=reverse
     hi DiffChange ctermfg=Cyan ctermbg=White cterm=reverse
@@ -852,7 +869,7 @@ endif
 " Color: bg1                     #ebdbb2        187            Grey
 " Color: bg2                     #e5d4b1        188            Grey
 " Color: bg3                     #bdae93        144
-" Color: bg4                     #a89984        137
+" Color: bg4                     #a89984        137            Grey
 " Color: bg5                     #ebe1b7        229            Grey
 " Color: bg6                     #ffffd7        231            Grey
 " Color: fg0                     #282828        235            DarkGray
@@ -866,6 +883,7 @@ endif
 " Color: yellow                  #b57614        172            Yellow
 " Color: blue                    #076678        23             Blue
 " Color: purple                  #8f3f71        126            Magenta
+" Color: lightpurple             #d3869b        175            Magenta
 " Color: aqua                    #427b58        29             Cyan
 " Color: orange                  #ff5f00        202            Magenta
 " Term colors: fg1  neutralred neutralgreen neutralyellow neutralblue neutralpurple neutralaqua fg4

runtime/colors/ron.vim

@@ -3,7 +3,7 @@
 " Maintainer:   original maintainer Ron Aaron <ron@ronware.org>
 " Website:      https://www.github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Fri 15 Dec 2023 20:05:41
+" Last Change:  2024 Aug 15
 
 " Generated by Colortemplate v2.2.3
 
@@ -58,7 +58,7 @@ hi CursorColumn guifg=NONE guibg=#666666 gui=NONE cterm=NONE
 hi CursorLine guifg=NONE guibg=#666666 gui=NONE cterm=NONE
 hi CursorLineNr guifg=#ffff00 guibg=NONE gui=bold cterm=NONE
 hi QuickFixLine guifg=#000000 guibg=#00cdcd gui=NONE cterm=NONE
-hi Conceal guifg=#e5e5e5 guibg=#a9a9a9 gui=NONE cterm=NONE
+hi Conceal guifg=#666666 guibg=NONE gui=NONE cterm=NONE
 hi Cursor guifg=#ffffff guibg=#60a060 gui=NONE cterm=NONE
 hi Directory guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
 hi EndOfBuffer guifg=#ffff00 guibg=#303030 gui=NONE cterm=NONE
@@ -75,6 +75,8 @@ hi Pmenu guifg=#ffffff guibg=#444444 gui=NONE cterm=NONE
 hi PmenuSbar guifg=NONE guibg=#000000 gui=NONE cterm=NONE
 hi PmenuSel guifg=#000000 guibg=#00cdcd gui=NONE cterm=NONE
 hi PmenuThumb guifg=NONE guibg=#e5e5e5 gui=NONE cterm=NONE
+hi PmenuMatch guifg=#ff00ff guibg=#444444 gui=NONE cterm=NONE
+hi PmenuMatchSel guifg=#ff00ff guibg=#00cdcd gui=NONE cterm=NONE
 hi Question guifg=#00ff00 guibg=#000000 gui=bold cterm=NONE
 hi Search guifg=#000000 guibg=#a9a9a9 gui=bold cterm=NONE
 hi SignColumn guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
@@ -123,7 +125,7 @@ if s:t_Co >= 256
   hi CursorLine ctermfg=NONE ctermbg=59 cterm=NONE
   hi CursorLineNr ctermfg=226 ctermbg=NONE cterm=NONE
   hi QuickFixLine ctermfg=16 ctermbg=44 cterm=NONE
-  hi Conceal ctermfg=254 ctermbg=145 cterm=NONE
+  hi Conceal ctermfg=59 ctermbg=NONE cterm=NONE
   hi Cursor ctermfg=231 ctermbg=71 cterm=NONE
   hi Directory ctermfg=51 ctermbg=NONE cterm=NONE
   hi EndOfBuffer ctermfg=226 ctermbg=236 cterm=NONE
@@ -140,6 +142,8 @@ if s:t_Co >= 256
   hi PmenuSbar ctermfg=NONE ctermbg=16 cterm=NONE
   hi PmenuSel ctermfg=16 ctermbg=44 cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=254 cterm=NONE
+  hi PmenuMatch ctermfg=201 ctermbg=238 cterm=NONE
+  hi PmenuMatchSel ctermfg=201 ctermbg=44 cterm=NONE
   hi Question ctermfg=46 ctermbg=16 cterm=NONE
   hi Search ctermfg=16 ctermbg=145 cterm=NONE
   hi SignColumn ctermfg=51 ctermbg=NONE cterm=NONE
@@ -191,7 +195,7 @@ if s:t_Co >= 16
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorLineNr ctermfg=yellow ctermbg=NONE cterm=underline
   hi QuickFixLine ctermfg=black ctermbg=darkcyan cterm=NONE
-  hi Conceal ctermfg=grey ctermbg=grey cterm=NONE
+  hi Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi Cursor ctermfg=white ctermbg=green cterm=NONE
   hi Directory ctermfg=cyan ctermbg=NONE cterm=NONE
   hi EndOfBuffer ctermfg=yellow ctermbg=darkgrey cterm=NONE
@@ -208,6 +212,8 @@ if s:t_Co >= 16
   hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
+  hi PmenuMatch ctermfg=white ctermbg=darkgrey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold
   hi Question ctermfg=green ctermbg=black cterm=NONE
   hi Search ctermfg=black ctermbg=grey cterm=NONE
   hi SignColumn ctermfg=cyan ctermbg=NONE cterm=NONE
@@ -275,6 +281,8 @@ if s:t_Co >= 8
   hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
+  hi PmenuMatch ctermfg=grey ctermbg=darkgrey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkcyan cterm=bold
   hi Question ctermfg=darkgreen ctermbg=black cterm=bold
   hi Search ctermfg=black ctermbg=grey cterm=NONE
   hi SignColumn ctermfg=darkcyan ctermbg=NONE cterm=NONE

runtime/colors/shine.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer is Yasuhiro Matsumoto <mattn@mail.goo.ne.jp>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Fri 15 Dec 2023 20:05:41
+" Last Change:  2024 Aug 15
 
 " Generated by Colortemplate v2.2.3
 
@@ -45,6 +45,8 @@ hi Pmenu guifg=#000000 guibg=#a8a8a8 gui=NONE cterm=NONE
 hi PmenuSel guifg=#000000 guibg=#ffff60 gui=NONE cterm=NONE
 hi PmenuSbar guifg=#ffffff guibg=#ffffff gui=NONE cterm=NONE
 hi PmenuThumb guifg=#767676 guibg=#767676 gui=NONE cterm=NONE
+hi PmenuMatch guifg=#ff0000 guibg=#a8a8a8 gui=NONE cterm=NONE
+hi PmenuMatchSel guifg=#ff0000 guibg=#ffff60 gui=NONE cterm=NONE
 hi TabLine guifg=#000000 guibg=#dadada gui=underline cterm=underline
 hi TabLineFill guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
 hi TabLineSel guifg=#000000 guibg=#ffffff gui=bold cterm=bold
@@ -79,7 +81,7 @@ hi Statement guifg=#2e8b57 guibg=NONE gui=bold cterm=bold
 hi Type guifg=#2e8b57 guibg=NONE gui=bold cterm=bold
 hi Comment guifg=#a8a8a8 guibg=NONE gui=bold cterm=NONE
 hi StorageClass guifg=#ff0000 guibg=NONE gui=bold cterm=bold
-hi Conceal guifg=#dadada guibg=#767676 gui=NONE cterm=NONE
+hi Conceal guifg=#add8e6 guibg=NONE gui=NONE cterm=NONE
 hi Identifier guifg=#008b8b guibg=NONE gui=NONE cterm=NONE
 hi Constant guifg=#a07070 guibg=NONE gui=NONE cterm=NONE
 hi Number guifg=#a07070 guibg=NONE gui=bold cterm=bold
@@ -123,6 +125,8 @@ if s:t_Co >= 256
   hi PmenuSel ctermfg=16 ctermbg=228 cterm=NONE
   hi PmenuSbar ctermfg=231 ctermbg=231 cterm=NONE
   hi PmenuThumb ctermfg=243 ctermbg=243 cterm=NONE
+  hi PmenuMatch ctermfg=196 ctermbg=248 cterm=NONE
+  hi PmenuMatchSel ctermfg=196 ctermbg=228 cterm=NONE
   hi TabLine ctermfg=16 ctermbg=253 cterm=underline
   hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
   hi TabLineSel ctermfg=16 ctermbg=231 cterm=bold
@@ -157,7 +161,7 @@ if s:t_Co >= 256
   hi Type ctermfg=29 ctermbg=NONE cterm=bold
   hi Comment ctermfg=248 ctermbg=NONE cterm=NONE
   hi StorageClass ctermfg=196 ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=253 ctermbg=243 cterm=NONE
+  hi Conceal ctermfg=153 ctermbg=NONE cterm=NONE
   hi Identifier ctermfg=30 ctermbg=NONE cterm=NONE
   hi Constant ctermfg=95 ctermbg=NONE cterm=NONE
   hi Number ctermfg=95 ctermbg=NONE cterm=bold
@@ -192,6 +196,8 @@ if s:t_Co >= 16
   hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
   hi PmenuSbar ctermfg=white ctermbg=white cterm=NONE
   hi PmenuThumb ctermfg=darkgrey ctermbg=darkgrey cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=darkgrey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
   hi TabLine ctermfg=black ctermbg=grey cterm=underline
   hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
   hi TabLineSel ctermfg=black ctermbg=white cterm=bold
@@ -226,7 +232,7 @@ if s:t_Co >= 16
   hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
   hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi StorageClass ctermfg=red ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=grey ctermbg=darkgrey cterm=NONE
+  hi Conceal ctermfg=blue ctermbg=NONE cterm=NONE
   hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
   hi Number ctermfg=darkred ctermbg=NONE cterm=bold
@@ -261,6 +267,8 @@ if s:t_Co >= 8
   hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
   hi PmenuSbar ctermfg=grey ctermbg=grey cterm=NONE
   hi PmenuThumb ctermfg=black ctermbg=black cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
   hi TabLine ctermfg=black ctermbg=grey cterm=reverse
   hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
   hi TabLineSel ctermfg=grey ctermbg=black cterm=reverse

runtime/colors/slate.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Ralph Amissah <ralph@amissah.com>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Fri 15 Dec 2023 20:05:41
+" Last Change:  2024 Aug 15
 
 " Generated by Colortemplate v2.2.3
 
@@ -33,10 +33,12 @@ hi StatusLineNC guifg=#666666 guibg=#afaf87 gui=NONE cterm=NONE
 hi StatusLineTerm guifg=#000000 guibg=#afaf87 gui=NONE cterm=NONE
 hi StatusLineTermNC guifg=#666666 guibg=#afaf87 gui=NONE cterm=NONE
 hi VertSplit guifg=#666666 guibg=#afaf87 gui=NONE cterm=NONE
-hi PmenuSel guifg=#262626 guibg=#d7d787 gui=NONE cterm=NONE
 hi Pmenu guifg=NONE guibg=#4a4a4a gui=NONE cterm=NONE
+hi PmenuSel guifg=#262626 guibg=#d7d787 gui=NONE cterm=NONE
 hi PmenuSbar guifg=NONE guibg=#262626 gui=NONE cterm=NONE
 hi PmenuThumb guifg=NONE guibg=#ffd700 gui=NONE cterm=NONE
+hi PmenuMatch guifg=#d7875f guibg=#4a4a4a gui=NONE cterm=NONE
+hi PmenuMatchSel guifg=#d7875f guibg=#d7d787 gui=NONE cterm=NONE
 hi TabLineSel guifg=#000000 guibg=#afaf87 gui=NONE cterm=NONE
 hi TabLine guifg=#666666 guibg=#333333 gui=NONE cterm=NONE
 hi TabLineFill guifg=#ff8787 guibg=#333333 gui=NONE cterm=NONE
@@ -110,10 +112,12 @@ if s:t_Co >= 256
   hi StatusLineTerm ctermfg=16 ctermbg=144 cterm=NONE
   hi StatusLineTermNC ctermfg=241 ctermbg=144 cterm=NONE
   hi VertSplit ctermfg=241 ctermbg=144 cterm=NONE
-  hi PmenuSel ctermfg=235 ctermbg=186 cterm=NONE
   hi Pmenu ctermfg=NONE ctermbg=239 cterm=NONE
+  hi PmenuSel ctermfg=235 ctermbg=186 cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=235 cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=220 cterm=NONE
+  hi PmenuMatch ctermfg=173 ctermbg=239 cterm=NONE
+  hi PmenuMatchSel ctermfg=173 ctermbg=186 cterm=NONE
   hi TabLineSel ctermfg=16 ctermbg=144 cterm=NONE
   hi TabLine ctermfg=241 ctermbg=236 cterm=NONE
   hi TabLineFill ctermfg=210 ctermbg=236 cterm=NONE
@@ -180,10 +184,12 @@ if s:t_Co >= 16
   hi StatusLineTerm ctermfg=white ctermbg=black cterm=bold,reverse
   hi StatusLineTermNC ctermfg=black ctermbg=grey cterm=NONE
   hi VertSplit ctermfg=darkgrey ctermbg=grey cterm=NONE
-  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
   hi Pmenu ctermfg=NONE ctermbg=darkgrey cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkmagenta cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=yellow cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=darkgrey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkmagenta cterm=bold
   hi TabLineSel ctermfg=black ctermbg=darkyellow cterm=NONE
   hi TabLine ctermfg=grey ctermbg=darkgrey cterm=NONE
   hi TabLineFill ctermfg=cyan ctermbg=darkgrey cterm=NONE
@@ -250,10 +256,12 @@ if s:t_Co >= 8
   hi StatusLineTerm ctermfg=grey ctermbg=black cterm=bold,reverse
   hi StatusLineTermNC ctermfg=grey ctermbg=black cterm=reverse
   hi VertSplit ctermfg=grey ctermbg=black cterm=reverse
-  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
   hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=darkyellow cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
   hi TabLineSel ctermfg=black ctermbg=darkyellow cterm=NONE
   hi TabLine ctermfg=grey ctermbg=black cterm=reverse
   hi TabLineFill ctermfg=grey ctermbg=black cterm=reverse

runtime/colors/sorbet.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Maxence Weynans <neutaaaaan@gmail.com>
 " Website:      https://github.com/vim/colorschemes
 " License:      Vim License (see `:help license`)`
-" Last Updated: Fri 15 Dec 2023 20:05:42
+" Last Change:  2024 Aug 05
 
 " Generated by Colortemplate v2.2.3
 
@@ -51,6 +51,9 @@ 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 Added guifg=#87d75f guibg=NONE gui=NONE cterm=NONE
+hi Changed guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE
+hi Removed guifg=#d75f5f guibg=NONE 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
@@ -73,10 +76,12 @@ 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 PmenuMatch guifg=#d7005f 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 PmenuMatchSel guifg=#d7005f guibg=#d7d7ff gui=bold cterm=bold
 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
@@ -115,11 +120,13 @@ 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 Added ctermfg=113 ctermbg=NONE cterm=NONE
+  hi Changed ctermfg=110 ctermbg=NONE cterm=NONE
+  hi Removed ctermfg=167 ctermbg=NONE 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
@@ -142,10 +149,12 @@ if s:t_Co >= 256
   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 PmenuMatch ctermfg=161 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 PmenuMatchSel ctermfg=161 ctermbg=189 cterm=bold
   hi PmenuExtraSel ctermfg=16 ctermbg=189 cterm=NONE
   hi PmenuKindSel ctermfg=16 ctermbg=189 cterm=bold
   hi PmenuThumb ctermfg=253 ctermbg=189 cterm=NONE
@@ -184,7 +193,6 @@ if s:t_Co >= 256
   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
@@ -204,6 +212,9 @@ if s:t_Co >= 16
   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 Added ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Changed ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Removed ctermfg=darkred 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
@@ -220,9 +231,11 @@ if s:t_Co >= 16
   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 PmenuMatch ctermfg=NONE ctermbg=darkred 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 PmenuMatchSel ctermfg=darkred 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
@@ -256,7 +269,6 @@ if s:t_Co >= 16
   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
@@ -276,6 +288,9 @@ if s:t_Co >= 8
   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 Added ctermfg=darkgreen ctermbg=NONE cterm=NONE
+  hi Changed ctermfg=darkblue ctermbg=NONE cterm=NONE
+  hi Removed ctermfg=darkred 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
@@ -292,9 +307,11 @@ if s:t_Co >= 8
   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 PmenuMatch ctermfg=NONE ctermbg=darkred 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 PmenuMatchSel ctermfg=darkred 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
@@ -328,7 +345,6 @@ if s:t_Co >= 8
   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

runtime/colors/torte.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Thorsten Maerz <info@netztorte.de>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Fri 15 Dec 2023 20:05:42
+" Last Change:  2024 Aug 15
 
 " Generated by Colortemplate v2.2.3
 
@@ -48,7 +48,7 @@ hi CursorLineNr guifg=#ffff00 guibg=#666666 gui=NONE cterm=NONE
 hi SignColumn guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
 hi FoldColumn guifg=#00ffff guibg=NONE gui=NONE cterm=NONE
 hi ColorColumn guifg=#cccccc guibg=#8b0000 gui=NONE cterm=NONE
-hi Conceal guifg=#e5e5e5 guibg=#a9a9a9 gui=NONE cterm=NONE
+hi Conceal guifg=#666666 guibg=NONE gui=NONE cterm=NONE
 hi Cursor guifg=#000000 guibg=#00ff00 gui=bold cterm=NONE
 hi lCursor guifg=#000000 guibg=#e5e5e5 gui=NONE cterm=NONE
 hi CursorIM guifg=NONE guibg=fg gui=NONE cterm=NONE
@@ -81,6 +81,8 @@ hi TabLineFill guifg=NONE guibg=#000000 gui=reverse cterm=reverse
 hi TabLineSel guifg=#cccccc guibg=#000000 gui=bold cterm=bold
 hi ToolbarLine guifg=NONE guibg=#000000 gui=NONE cterm=NONE
 hi ToolbarButton guifg=#000000 guibg=#e5e5e5 gui=bold cterm=bold
+hi PmenuMatch guifg=#ff00ff guibg=#303030 gui=NONE cterm=NONE
+hi PmenuMatchSel guifg=#ff00ff guibg=#ffff00 gui=NONE cterm=NONE
 hi Pmenu guifg=fg guibg=#303030 gui=NONE cterm=NONE
 hi PmenuSbar guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi PmenuSel guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
@@ -121,7 +123,7 @@ if s:t_Co >= 256
   hi SignColumn ctermfg=51 ctermbg=NONE cterm=NONE
   hi FoldColumn ctermfg=51 ctermbg=NONE cterm=NONE
   hi ColorColumn ctermfg=251 ctermbg=88 cterm=NONE
-  hi Conceal ctermfg=254 ctermbg=248 cterm=NONE
+  hi Conceal ctermfg=242 ctermbg=NONE cterm=NONE
   hi Cursor ctermfg=16 ctermbg=46 cterm=NONE
   hi lCursor ctermfg=16 ctermbg=254 cterm=NONE
   hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
@@ -154,6 +156,8 @@ if s:t_Co >= 256
   hi TabLineSel ctermfg=251 ctermbg=16 cterm=bold
   hi ToolbarLine ctermfg=NONE ctermbg=16 cterm=NONE
   hi ToolbarButton ctermfg=16 ctermbg=254 cterm=bold
+  hi PmenuMatch ctermfg=201 ctermbg=236 cterm=NONE
+  hi PmenuMatchSel ctermfg=201 ctermbg=226 cterm=NONE
   hi Pmenu ctermfg=fg ctermbg=236 cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuSel ctermfg=16 ctermbg=226 cterm=NONE
@@ -187,7 +191,7 @@ if s:t_Co >= 16
   hi SignColumn ctermfg=cyan ctermbg=NONE cterm=NONE
   hi FoldColumn ctermfg=cyan ctermbg=NONE cterm=NONE
   hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
-  hi Conceal ctermfg=grey ctermbg=grey cterm=NONE
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
   hi Cursor ctermfg=black ctermbg=green cterm=NONE
   hi lCursor ctermfg=black ctermbg=grey cterm=NONE
   hi CursorIM ctermfg=NONE ctermbg=fg cterm=NONE
@@ -220,6 +224,8 @@ if s:t_Co >= 16
   hi TabLineSel ctermfg=white ctermbg=black cterm=bold
   hi ToolbarLine ctermfg=NONE ctermbg=black cterm=NONE
   hi ToolbarButton ctermfg=black ctermbg=grey cterm=bold
+  hi PmenuMatch ctermfg=fg ctermbg=darkgrey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
   hi Pmenu ctermfg=fg ctermbg=darkgrey cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
@@ -287,6 +293,8 @@ if s:t_Co >= 8
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=darkmagenta cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
   hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
   hi DiffChange ctermfg=white ctermbg=darkblue cterm=NONE
   hi DiffText ctermfg=black ctermbg=grey cterm=NONE

runtime/colors/wildcharm.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Maxim Kim <habamax@gmail.com>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Mon 08 Jan 2024 09:40:36 AM AEDT
+" Last Change:  2024 Aug 15
 
 " Generated by Colortemplate v2.2.3
 
@@ -26,14 +26,14 @@ if &background ==# 'dark'
     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 Statusline guifg=#9e9e9e guibg=#000000 gui=bold,reverse cterm=bold,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 VertSplit guifg=#767676 guibg=NONE gui=NONE cterm=NONE
+  hi TabLine guifg=#000000 guibg=#767676 gui=NONE cterm=NONE
+  hi TabLineFill guifg=NONE guibg=#000000 gui=NONE cterm=NONE
+  hi TabLineSel guifg=#000000 guibg=#9e9e9e gui=bold cterm=bold
   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 ToolbarButton guifg=#000000 guibg=#d0d0d0 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
@@ -43,13 +43,15 @@ if &background ==# 'dark'
   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 PmenuSel guifg=#d0d0d0 guibg=#585858 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 PmenuKindSel guifg=#ff5f87 guibg=#585858 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 PmenuExtraSel guifg=#767676 guibg=#585858 gui=NONE cterm=NONE
+  hi PmenuMatch guifg=#d787d7 guibg=#303030 gui=NONE cterm=NONE
+  hi PmenuMatchSel guifg=#d787d7 guibg=#585858 gui=NONE cterm=NONE
   hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Error guifg=#d7005f guibg=#ffffff gui=reverse cterm=reverse
   hi ErrorMsg guifg=#d7005f guibg=#ffffff gui=reverse cterm=reverse
@@ -65,7 +67,7 @@ if &background ==# 'dark'
   hi debugBreakpoint guifg=#00afaf guibg=NONE gui=reverse cterm=reverse
   hi Cursor guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
   hi lCursor guifg=#000000 guibg=#ff5fff gui=NONE cterm=NONE
-  hi Visual guifg=#0087d7 guibg=#000000 gui=reverse cterm=reverse
+  hi Visual guifg=#5fd7ff guibg=#000000 gui=reverse cterm=reverse
   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
@@ -87,7 +89,7 @@ if &background ==# 'dark'
   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 Conceal guifg=#585858 guibg=NONE gui=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
@@ -102,14 +104,14 @@ else
     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 Statusline guifg=#ffffff guibg=#5f5f5f gui=bold cterm=bold
   hi StatuslineNC guifg=#000000 guibg=#d0d0d0 gui=NONE cterm=NONE
-  hi VertSplit guifg=#d0d0d0 guibg=#d0d0d0 gui=NONE cterm=NONE
+  hi VertSplit guifg=#5f5f5f guibg=NONE 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 TabLineFill guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi TabLineSel guifg=#5f5f5f guibg=#ffffff gui=bold,reverse cterm=bold,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 ToolbarButton guifg=#ffffff guibg=#5f5f5f 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
@@ -118,13 +120,15 @@ else
   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 PmenuSel guifg=#000000 guibg=#b2b2b2 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 PmenuKindSel guifg=#d70000 guibg=#b2b2b2 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 PmenuExtraSel guifg=#808080 guibg=#b2b2b2 gui=NONE cterm=NONE
+  hi PmenuMatch guifg=#870087 guibg=#e4e4e4 gui=NONE cterm=NONE
+  hi PmenuMatchSel guifg=#870087 guibg=#b2b2b2 gui=NONE cterm=NONE
   hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Error guifg=#d70000 guibg=#ffffff gui=reverse cterm=reverse
   hi ErrorMsg guifg=#d70000 guibg=#ffffff gui=reverse cterm=reverse
@@ -132,7 +136,7 @@ else
   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 Todo guifg=#5f00d7 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
@@ -158,11 +162,11 @@ else
   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 Special guifg=#5f00d7 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 Conceal guifg=#b2b2b2 guibg=NONE gui=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
@@ -184,14 +188,14 @@ if s:t_Co >= 256
   hi! link CurSearch IncSearch
   if &background ==# 'dark'
     hi Normal ctermfg=252 ctermbg=16 cterm=NONE
-    hi Statusline ctermfg=252 ctermbg=16 cterm=reverse
+    hi Statusline ctermfg=247 ctermbg=16 cterm=bold,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 VertSplit ctermfg=243 ctermbg=NONE cterm=NONE
+    hi TabLine ctermfg=16 ctermbg=243 cterm=NONE
+    hi TabLineFill ctermfg=NONE ctermbg=16 cterm=NONE
+    hi TabLineSel ctermfg=16 ctermbg=247 cterm=bold
     hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi ToolbarButton ctermfg=16 ctermbg=231 cterm=NONE
+    hi ToolbarButton ctermfg=16 ctermbg=252 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
@@ -201,13 +205,15 @@ if s:t_Co >= 256
     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 PmenuSel ctermfg=252 ctermbg=240 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 PmenuKindSel ctermfg=204 ctermbg=240 cterm=NONE
     hi PmenuExtra ctermfg=243 ctermbg=236 cterm=NONE
-    hi PmenuExtraSel ctermfg=16 ctermbg=214 cterm=NONE
+    hi PmenuExtraSel ctermfg=243 ctermbg=240 cterm=NONE
+    hi PmenuMatch ctermfg=176 ctermbg=236 cterm=NONE
+    hi PmenuMatchSel ctermfg=176 ctermbg=240 cterm=NONE
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Error ctermfg=161 ctermbg=231 cterm=reverse
     hi ErrorMsg ctermfg=161 ctermbg=231 cterm=reverse
@@ -221,17 +227,17 @@ if s:t_Co >= 256
     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=32 ctermbg=16 cterm=reverse
+    hi Visual ctermfg=81 ctermbg=16 cterm=reverse
     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 SpellBad ctermfg=161 ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=37 ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=41 ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=213 ctermbg=NONE cterm=underline
     hi Comment ctermfg=243 ctermbg=NONE cterm=NONE
     hi Constant ctermfg=204 ctermbg=NONE cterm=NONE
     hi String ctermfg=41 ctermbg=NONE cterm=NONE
@@ -243,7 +249,7 @@ if s:t_Co >= 256
     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 Conceal ctermfg=240 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
@@ -255,14 +261,14 @@ if s:t_Co >= 256
   else
     " Light background
     hi Normal ctermfg=16 ctermbg=231 cterm=NONE
-    hi Statusline ctermfg=231 ctermbg=59 cterm=NONE
+    hi Statusline ctermfg=231 ctermbg=59 cterm=bold
     hi StatuslineNC ctermfg=16 ctermbg=252 cterm=NONE
-    hi VertSplit ctermfg=252 ctermbg=252 cterm=NONE
+    hi VertSplit ctermfg=59 ctermbg=NONE 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 TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi TabLineSel ctermfg=59 ctermbg=231 cterm=bold,reverse
     hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi ToolbarButton ctermfg=231 ctermbg=16 cterm=NONE
+    hi ToolbarButton ctermfg=231 ctermbg=59 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
@@ -271,13 +277,15 @@ if s:t_Co >= 256
     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 PmenuSel ctermfg=16 ctermbg=249 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 PmenuKindSel ctermfg=160 ctermbg=249 cterm=NONE
     hi PmenuExtra ctermfg=240 ctermbg=254 cterm=NONE
-    hi PmenuExtraSel ctermfg=231 ctermbg=172 cterm=NONE
+    hi PmenuExtraSel ctermfg=240 ctermbg=249 cterm=NONE
+    hi PmenuMatch ctermfg=90 ctermbg=254 cterm=NONE
+    hi PmenuMatchSel ctermfg=90 ctermbg=249 cterm=NONE
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Error ctermfg=160 ctermbg=231 cterm=reverse
     hi ErrorMsg ctermfg=160 ctermbg=231 cterm=reverse
@@ -285,7 +293,7 @@ if s:t_Co >= 256
     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 Todo ctermfg=56 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
@@ -298,10 +306,10 @@ if s:t_Co >= 256
     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 SpellBad ctermfg=160 ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=30 ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=28 ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=127 ctermbg=NONE cterm=underline
     hi Comment ctermfg=245 ctermbg=NONE cterm=NONE
     hi Constant ctermfg=124 ctermbg=NONE cterm=NONE
     hi String ctermfg=28 ctermbg=NONE cterm=NONE
@@ -309,11 +317,11 @@ if s:t_Co >= 256
     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 Special ctermfg=56 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 Conceal ctermfg=249 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
@@ -330,14 +338,14 @@ 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 Statusline ctermfg=grey ctermbg=black cterm=bold,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 VertSplit ctermfg=darkgrey ctermbg=NONE cterm=NONE
+    hi TabLine ctermfg=black ctermbg=darkgrey cterm=NONE
+    hi TabLineFill ctermfg=NONE ctermbg=black cterm=NONE
+    hi TabLineSel ctermfg=black ctermbg=grey cterm=bold
     hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi ToolbarButton ctermfg=black ctermbg=white cterm=NONE
+    hi ToolbarButton ctermfg=black ctermbg=grey 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
@@ -353,6 +361,8 @@ if s:t_Co >= 16
     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 PmenuMatch ctermfg=black ctermbg=grey cterm=bold
+    hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Error ctermfg=darkred ctermbg=white cterm=reverse
     hi ErrorMsg ctermfg=darkred ctermbg=white cterm=reverse
@@ -366,17 +376,17 @@ if s:t_Co >= 16
     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=darkblue ctermbg=black cterm=reverse
+    hi Visual ctermfg=cyan ctermbg=black cterm=reverse
     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 SpellBad ctermfg=darkred ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=green ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
     hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
     hi Constant ctermfg=red ctermbg=NONE cterm=NONE
     hi String ctermfg=green ctermbg=NONE cterm=NONE
@@ -388,7 +398,7 @@ if s:t_Co >= 16
     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 Conceal ctermfg=grey ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
     hi DiffAdd ctermfg=black ctermbg=darkgreen cterm=NONE
     hi DiffChange ctermfg=black ctermbg=lightgray cterm=NONE
@@ -400,14 +410,14 @@ if s:t_Co >= 16
   else
     " Light background
     hi Normal ctermfg=black ctermbg=white cterm=NONE
-    hi Statusline ctermfg=white ctermbg=darkgrey cterm=NONE
+    hi Statusline ctermfg=white ctermbg=darkgrey cterm=bold
     hi StatuslineNC ctermfg=black ctermbg=lightgrey cterm=NONE
-    hi VertSplit ctermfg=lightgrey ctermbg=lightgrey cterm=NONE
+    hi VertSplit ctermfg=darkgrey ctermbg=NONE 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 TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi TabLineSel ctermfg=darkgrey ctermbg=white cterm=bold,reverse
     hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi ToolbarButton ctermfg=white ctermbg=black cterm=NONE
+    hi ToolbarButton ctermfg=white ctermbg=darkgrey 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
@@ -423,6 +433,8 @@ if s:t_Co >= 16
     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 PmenuMatch ctermfg=black ctermbg=grey cterm=bold
+    hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Error ctermfg=red ctermbg=white cterm=reverse
     hi ErrorMsg ctermfg=red ctermbg=white cterm=reverse
@@ -430,7 +442,7 @@ if s:t_Co >= 16
     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 Todo ctermfg=blue 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
@@ -443,10 +455,10 @@ if s:t_Co >= 16
     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 SpellBad ctermfg=red ctermbg=NONE cterm=underline
+    hi SpellCap ctermfg=darkcyan ctermbg=NONE cterm=underline
+    hi SpellLocal ctermfg=darkgreen ctermbg=NONE cterm=underline
+    hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
     hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
     hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
     hi String ctermfg=darkgreen ctermbg=NONE cterm=NONE
@@ -454,11 +466,11 @@ if s:t_Co >= 16
     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 Special ctermfg=blue 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 Conceal ctermfg=darkgrey ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
     hi DiffAdd ctermfg=black ctermbg=darkgreen cterm=NONE
     hi DiffChange ctermfg=black ctermbg=lightgray cterm=NONE
@@ -477,10 +489,10 @@ if s:t_Co >= 8
     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 VertSplit ctermfg=grey ctermbg=NONE cterm=NONE
+    hi TabLine ctermfg=grey ctermbg=black cterm=NONE
+    hi TabLineFill ctermfg=grey ctermbg=NONE cterm=NONE
+    hi TabLineSel ctermfg=grey ctermbg=black cterm=bold,reverse
     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
@@ -498,6 +510,8 @@ if s:t_Co >= 8
     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 PmenuMatch ctermfg=black ctermbg=grey cterm=bold
+    hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Error ctermfg=grey ctermbg=darkred cterm=NONE
     hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
@@ -544,10 +558,10 @@ if s:t_Co >= 8
     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 VertSplit ctermfg=black ctermbg=NONE cterm=NONE
+    hi TabLine ctermfg=black ctermbg=grey cterm=NONE
+    hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
+    hi TabLineSel ctermfg=grey ctermbg=black cterm=bold
     hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
     hi ToolbarButton ctermfg=grey ctermbg=black cterm=bold
     hi QuickFixLine ctermfg=black ctermbg=darkmagenta cterm=NONE
@@ -565,6 +579,8 @@ if s:t_Co >= 8
     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 PmenuMatch ctermfg=grey ctermbg=black cterm=bold
+    hi PmenuMatchSel ctermfg=NONE ctermbg=darkyellow cterm=bold
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Error ctermfg=white ctermbg=darkred cterm=NONE
     hi ErrorMsg ctermfg=white ctermbg=darkred cterm=NONE
@@ -572,7 +588,7 @@ if s:t_Co >= 8
     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 Todo ctermfg=blue 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
@@ -706,6 +722,8 @@ endif
 " Color: colorlC                 #ff5fff        207            magenta
 " Color: colorDim                #878787        102            grey
 " Color: colorMP                 #ff00af        199            magenta
+" Color: colorV                  #5fd7ff        81             cyan
+" Color: colorSt                 #9e9e9e        247            grey
 " Color: diffAdd                 #5f875f        65             darkgreen
 " Color: diffAddFg               #afffaf        157            black
 " Color: diffDelete              #875f5f        95             darkred
@@ -733,7 +751,7 @@ endif
 " Color: color14                 #00afaf        37             cyan
 " Color: color07                 #8a8a8a        245            grey
 " Color: color15                 #ffffff        231            white
-" Color: color16                 #8700ff        93             darkred
+" Color: color16                 #5f00d7        56             blue
 " Color: colorCm                 #8a8a8a        245            darkgrey
 " Color: colorLine               #EEEEEE        255            grey
 " Color: colorB                  #E4E4E4        254            grey
@@ -741,7 +759,7 @@ endif
 " Color: colorTab                #d0d0d0        252            lightgrey
 " Color: colorC                  #000000        16             black
 " Color: colorlC                 #FF00FF        201            magenta
-" Color: colorV                  #5F87AF        67             darkblue
+" Color: colorV                  #0087af        31             darkcyan
 " Color: colorDim                #626262        241            darkgrey
 " Color: colorSt                 #5f5f5f        59             darkgrey
 " Color: colorMP                 #ff00af        199            magenta

runtime/colors/zaibatsu.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Romain Lafourcade <romainlafourcade@gmail.com>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Fri 15 Dec 2023 20:05:43
+" Last Change:  2024 Aug 15
 
 " Generated by Colortemplate v2.2.3
 
@@ -35,6 +35,8 @@ 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 PmenuMatch guifg=#d700ff guibg=#ffffff gui=NONE cterm=NONE
+hi PmenuMatchSel guifg=#d700ff guibg=#afafff gui=NONE cterm=NONE
 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
@@ -138,6 +140,8 @@ if s:t_Co >= 256
   hi! link PmenuExtraSel PmenuSel
   hi PmenuKind ctermfg=103 ctermbg=231 cterm=NONE
   hi! link PmenuKindSel PmenuSel
+  hi PmenuMatch ctermfg=165 ctermbg=231 cterm=NONE
+  hi PmenuMatchSel ctermfg=165 ctermbg=147 cterm=NONE
   hi ColorColumn ctermfg=NONE ctermbg=52 cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=237 cterm=NONE
   hi CursorColumn ctermfg=NONE ctermbg=237 cterm=NONE
@@ -244,6 +248,8 @@ if s:t_Co >= 16
   hi! link PmenuExtraSel PmenuSel
   hi PmenuKind ctermfg=darkgray ctermbg=white cterm=NONE
   hi! link PmenuKindSel PmenuSel
+  hi PmenuMatch ctermfg=black ctermbg=white cterm=bold
+  hi PmenuMatchSel ctermfg=white ctermbg=blue cterm=bold
   hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorColumn ctermfg=NONE ctermbg=blue cterm=NONE
@@ -350,6 +356,8 @@ if s:t_Co >= 8
   hi! link PmenuExtraSel PmenuSel
   hi! link PmenuKind Pmenu
   hi! link PmenuKindSel PmenuSel
+  hi PmenuMatch ctermfg=black ctermbg=white cterm=bold
+  hi PmenuMatchSel ctermfg=white ctermbg=blue cterm=bold
   hi ColorColumn ctermfg=white ctermbg=darkred cterm=NONE
   hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
   hi CursorColumn ctermfg=NONE ctermbg=blue cterm=NONE

runtime/colors/zellner.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Ron Aaron <ron@ronware.org>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Fri 15 Dec 2023 20:05:44
+" Last Change:  2024 Aug 15
 
 " Generated by Colortemplate v2.2.3
 
@@ -42,6 +42,8 @@ hi Pmenu guifg=#000000 guibg=#dadada gui=NONE cterm=NONE
 hi PmenuSel guifg=#000000 guibg=#ffff00 gui=NONE cterm=NONE
 hi PmenuSbar guifg=NONE guibg=#ffffff gui=NONE cterm=NONE
 hi PmenuThumb guifg=NONE guibg=#a9a9a9 gui=NONE cterm=NONE
+hi PmenuMatch guifg=#a52a2a guibg=#dadada gui=NONE cterm=NONE
+hi PmenuMatchSel guifg=#a52a2a guibg=#ffff00 gui=NONE cterm=NONE
 hi TabLine guifg=#000000 guibg=#a9a9a9 gui=underline cterm=underline
 hi TabLineFill guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
 hi TabLineSel guifg=#000000 guibg=#ffffff gui=bold cterm=bold
@@ -82,7 +84,7 @@ hi Type guifg=#0000ff guibg=NONE gui=NONE cterm=NONE
 hi Special guifg=#ff00ff guibg=NONE gui=NONE cterm=NONE
 hi Tag guifg=#006400 guibg=NONE gui=NONE cterm=NONE
 hi Directory guifg=#0000ff guibg=NONE gui=bold cterm=bold
-hi Conceal guifg=#ff0000 guibg=NONE gui=NONE cterm=NONE
+hi Conceal guifg=#a9a9a9 guibg=NONE gui=NONE cterm=NONE
 hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
 hi Title guifg=#a020f0 guibg=NONE gui=bold cterm=bold
 hi DiffAdd guifg=#ffffff guibg=#5f875f gui=NONE cterm=NONE
@@ -115,6 +117,8 @@ if s:t_Co >= 256
   hi PmenuSel ctermfg=16 ctermbg=226 cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=231 cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=248 cterm=NONE
+  hi PmenuMatch ctermfg=124 ctermbg=253 cterm=NONE
+  hi PmenuMatchSel ctermfg=124 ctermbg=226 cterm=NONE
   hi TabLine ctermfg=16 ctermbg=248 cterm=underline
   hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
   hi TabLineSel ctermfg=16 ctermbg=231 cterm=bold
@@ -155,7 +159,7 @@ if s:t_Co >= 256
   hi Special ctermfg=201 ctermbg=NONE cterm=NONE
   hi Tag ctermfg=22 ctermbg=NONE cterm=NONE
   hi Directory ctermfg=21 ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=196 ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=248 ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Title ctermfg=129 ctermbg=NONE cterm=bold
   hi DiffAdd ctermfg=231 ctermbg=65 cterm=NONE
@@ -183,6 +187,8 @@ if s:t_Co >= 16
   hi PmenuSel ctermfg=black ctermbg=yellow cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=white cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=darkgrey cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=grey cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=yellow cterm=bold
   hi TabLine ctermfg=black ctermbg=grey cterm=underline
   hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
   hi TabLineSel ctermfg=black ctermbg=white cterm=bold
@@ -223,7 +229,7 @@ if s:t_Co >= 16
   hi Special ctermfg=magenta ctermbg=NONE cterm=NONE
   hi Tag ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi Directory ctermfg=blue ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=red ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=grey ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
   hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE
@@ -251,6 +257,8 @@ if s:t_Co >= 8
   hi PmenuSel ctermfg=black ctermbg=darkyellow cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=black cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=darkmagenta cterm=NONE
+  hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
+  hi PmenuMatchSel ctermfg=black ctermbg=darkyellow cterm=bold
   hi TabLine ctermfg=black ctermbg=gray cterm=reverse
   hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=reverse
   hi TabLineSel ctermfg=gray ctermbg=black cterm=bold,reverse
@@ -288,7 +296,7 @@ if s:t_Co >= 8
   hi Type ctermfg=darkblue ctermbg=NONE cterm=bold
   hi Special ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
-  hi Conceal ctermfg=darkred ctermbg=NONE cterm=NONE
+  hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Title ctermfg=darkmagenta ctermbg=NONE cterm=bold
   hi DiffAdd ctermfg=white ctermbg=darkgreen cterm=NONE

runtime/compiler/README.txt

@@ -4,6 +4,8 @@ They are used with the ":compiler" command.
 These scripts usually set options, for example 'errorformat'.
 See ":help write-compiler-plugin".
 
+To undo the effect of a compiler plugin, use the make compiler plugin.
+
 If you want to write your own compiler plugin, have a look at the other files
 for how to do it, the format is simple.
 

runtime/compiler/groff.vim

@@ -0,0 +1,45 @@
+" Vim compiler file
+" Compiler:     Groff
+" Maintainer:   Konfekt
+" Last Change:	2024 Sep 8
+"
+" Expects output file extension, say `:make html` or `:make pdf`.
+" Supported devices as of Sept 2024 are: (x)html, pdf, ps, dvi, lj4, lbp ...
+" Adjust command-line flags, language, encoding by buffer-local/global variables
+" groff_compiler_args, groff_compiler_lang, and groff_compiler_encoding,
+" which default to '', &spelllang and 'utf8'.
+
+if exists("current_compiler")
+  finish
+endif
+
+let s:keepcpo = &cpo
+set cpo&vim
+
+let current_compiler = 'groff'
+
+silent! function s:groff_compiler_lang()
+  let lang = get(b:, 'groff_compiler_lang',
+      \ &spell ? matchstr(&spelllang, '^\a\a') : '')
+  if lang ==# 'en' | let lang = '' | endif
+  return empty(lang) ? '' : '-m'..lang
+endfunction
+
+" Requires output format (= device) to be set by user after :make.
+execute 'CompilerSet makeprg=groff'..escape(
+    \ ' '..s:groff_compiler_lang()..
+    \ ' -K'..get(b:, 'groff_compiler_encoding', get(g:, 'groff_compiler_encoding', 'utf8'))..
+    \ ' '..get(b:, 'groff_compiler_args', get(g:, 'groff_compiler_args', ''))..
+    \ ' -mom -T$* -- %:S > %:r:S.$*', ' ')
+" From Gavin Freeborn's https://github.com/Gavinok/vim-troff under Vim License
+" https://github.com/Gavinok/vim-troff/blob/91017b1423caa80aba541c997909a4f810edd275/compiler/troff.vim#L39
+CompilerSet errorformat=%o:<standard\ input>\ (%f):%l:%m,
+			\%o:\ <standard\ input>\ (%f):%l:%m,
+			\%o:%f:%l:%m,
+			\%o:\ %f:%l:%m,
+			\%f:%l:\ macro\ %trror:%m,
+			\%f:%l:%m,
+			\%W%tarning:\ file\ '%f'\\,\ around\ line\ %l:,%Z%m
+
+let &cpo = s:keepcpo
+unlet s:keepcpo

runtime/compiler/make.vim

@@ -0,0 +1,13 @@
+" Vim compiler plugin
+"
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2024 Sep 10
+" Original Author: Konfekt
+"
+" This compiler plugin is used to reset previously set compiler options.
+
+if exists("g:current_compiler") | unlet g:current_compiler | endif
+if exists("b:current_compiler") | unlet b:current_compiler | endif
+
+CompilerSet makeprg&
+CompilerSet errorformat&

runtime/compiler/pandoc.vim

@@ -1,9 +1,12 @@
 " Vim compiler file
 " Compiler:     Pandoc
 " Maintainer:   Konfekt
+" Last Change:	2024 Sep 8
 "
 " Expects output file extension, say `:make html` or `:make pdf`.
 " Passes additional arguments to pandoc, say `:make html --self-contained`.
+" Adjust command-line flags by buffer-local/global variable
+" b/g:pandoc_compiler_args which defaults to empty.
 
 if exists("current_compiler")
   finish
@@ -25,31 +28,36 @@ let s:supported_filetypes =
 
 silent! function s:PandocFiletype(filetype) abort
   let ft = a:filetype
-  if ft ==# 'pandoc'
-    return 'markdown'
-  elseif ft ==# 'tex'
-    return 'latex'
-  elseif ft ==# 'xml'
-    " Pandoc does not support XML as a generic input format, but it does support
-    " EndNote XML and Jats XML out of which the latter seems more universal.
-    return 'jats'
-  elseif ft ==# 'text' || empty(ft)
-    return 'markdown'
-  elseif index(s:supported_filetypes, &ft) >= 0
-      return ft
+
+  if     ft ==# 'pandoc' | return 'markdown'
+  elseif ft ==# 'tex'    | return 'latex'
+  " Pandoc does not support XML as a generic input format, but it does support
+  " EndNote XML and Jats XML out of which the latter seems more universal.
+  elseif ft ==# 'xml'    | return 'jats'
+  elseif ft ==# 'text' || empty(ft)             | return 'markdown'
+  elseif index(s:supported_filetypes, &ft) >= 0 | return ft
   else
-    echomsg 'Unsupported filetype: ' . ft . ', falling back to Markdown as input format!'
+    echomsg 'Unsupported filetype: '..ft..', falling back to Markdown as input format!'
     return 'markdown'
   endif
 endfunction
-execute 'CompilerSet makeprg=pandoc\ --standalone' .
-      \ '\ --metadata\ title=%:t:r:S' .
-      \ '\ --metadata\ lang=' . matchstr(&spelllang, '^\a\a') .
-      \ '\ --from=' . s:PandocFiletype(&filetype) .
-      \ '\ ' . escape(get(b:, 'pandoc_compiler_args', get(g:, 'pandoc_compiler_args', '')), ' ') .
-      \ '\ --output\ %:r:S.$*\ %:S'
 
-CompilerSet errorformat="%f",\ line\ %l:\ %m
+silent! function s:PandocLang()
+  let lang = get(b:, 'pandoc_compiler_lang',
+      \ &spell ? matchstr(&spelllang, '^\a\a') : '')
+  if lang ==# 'en' | let lang = '' | endif
+  return empty(lang) ? '' : '--metadata lang='..lang
+endfunction
+
+execute 'CompilerSet makeprg=pandoc'..escape(
+    \ ' --standalone'..
+    \ (s:PandocFiletype(&filetype) ==# 'markdown' && (getline(1) =~# '^%\s\+\S\+' || (search('^title:\s+\S+', 'cnw') > 0)) ?
+    \ '' : ' --metadata title=%:t:r:S')..
+    \ ' '..s:PandocLang()..
+    \ ' --from='..s:PandocFiletype(&filetype)..
+    \ ' '..get(b:, 'pandoc_compiler_args', get(g:, 'pandoc_compiler_args', ''))..
+    \ ' --output %:r:S.$* -- %:S', ' ')
+CompilerSet errorformat=\"%f\",\ line\ %l:\ %m
 
 let &cpo = s:keepcpo
 unlet s:keepcpo

runtime/compiler/typst.vim

@@ -0,0 +1,15 @@
+" Vim compiler file
+" Language:    Typst
+" Maintainer:  Gregory Anders
+" Last Change: 2024-07-14
+" Based on:    https://github.com/kaarmu/typst.vim
+
+if exists('current_compiler')
+    finish
+endif
+let current_compiler = get(g:, 'typst_cmd', 'typst')
+
+" With `--diagnostic-format` we can use the default errorformat
+let s:makeprg = [current_compiler, 'compile', '--diagnostic-format', 'short', '%:S']
+
+execute 'CompilerSet makeprg=' . join(s:makeprg, '\ ')

runtime/doc/Make_mvc.mak

@@ -12,7 +12,7 @@
 
 # Correct the following line for the where executeable file vim is installed.
 # Please do not put the path in quotes.
-VIMPROG = D:\Programs\Vim\vim90\vim.exe
+VIMPROG = D:\Programs\Vim\vim91\vim.exe
 
 # Correct the following line for the directory where iconv installed.
 # Please do not put the path in quotes.

runtime/doc/Makefile

@@ -6,7 +6,6 @@
 
 AWK = awk
 
-# Set to $(VIMTARGET) when executed from src/Makefile.
 VIMPROG = ../../src/vim
 
 # include the config.mk from the source directory.  It's only needed to set
@@ -23,7 +22,7 @@ include Make_all.mak
 all: tags vim.man evim.man vimdiff.man vimtutor.man xxd.man $(CONVERTED)
 
 # Use Vim to generate the tags file.  Can only be used when Vim has been
-# compiled and installed.  Supports multiple languages.
+# compiled.  Supports multiple languages.
 vimtags: $(DOCS)
 	@$(VIMPROG) --clean -esX -V1 -u doctags.vim
 
@@ -36,19 +35,19 @@ doctags: doctags.c
 	$(CC) doctags.c -o doctags
 
 vim.man: vim.1
-	nroff -man $< | sed -e s/.//g > $@
+	nroff -man $? | sed -e s/.//g > $@
 
 evim.man: evim.1
-	nroff -man $< | sed -e s/.//g > $@
+	nroff -man $? | sed -e s/.//g > $@
 
 vimdiff.man: vimdiff.1
-	nroff -man $< | sed -e s/.//g > $@
+	nroff -man $? | sed -e s/.//g > $@
 
 vimtutor.man: vimtutor.1
-	nroff -man $< | sed -e s/.//g > $@
+	nroff -man $? | sed -e s/.//g > $@
 
 xxd.man: xxd.1
-	nroff -man $< | sed -e s/.//g > $@
+	nroff -man $? | sed -e s/.//g > $@
 
 uganda.nsis.txt : uganda.???
 	for dpn in $?; do \
@@ -75,10 +74,10 @@ $(HTMLS): tags.ref
 # index.html is the starting point for HTML, but for the help files it is
 # help.txt.  Therefore use vimindex.html for index.txt.
 index.html: help.txt
-	$(AWK) -f makehtml.awk $< >$@
+	$(AWK) -f makehtml.awk $? >$@
 
 vimindex.html: index.txt
-	$(AWK) -f makehtml.awk $< >$@
+	$(AWK) -f makehtml.awk $? >$@
 
 tags.ref tags.html: tags
 	$(AWK) -f maketags.awk tags >tags.html
@@ -152,88 +151,91 @@ os_risc.txt:
 os_win32.txt:
 	touch $@
 
-# Note that $< works with GNU make while $> works for BSD make.
-# Is there a solution that works for both??
+# In *BSD, the variable '$<' is used in suffix-transformation rules (in GNU this
+# is called "implicit rules", and in MS Windows it is called "inference rules").
+# For code portability, it is better to use the '$?' variable for explicit rules.
+# Especially since there is only one dependency and it should presumably always
+# be newer than the target file.
 vim-da.UTF-8.1: vim-da.1
-	iconv -f latin1 -t utf-8 $< >$@
+	iconv -f latin1 -t UTF-8 $? >$@
 
 vimdiff-da.UTF-8.1: vimdiff-da.1
-	iconv -f latin1 -t utf-8 $< >$@
+	iconv -f latin1 -t UTF-8 $? >$@
 
 vimtutor-da.UTF-8.1: vimtutor-da.1
-	iconv -f latin1 -t utf-8 $< >$@
+	iconv -f latin1 -t UTF-8 $? >$@
 
 vim-de.UTF-8.1: vim-de.1
-	iconv -f latin1 -t utf-8 $< >$@
+	iconv -f latin1 -t UTF-8 $? >$@
 
 vim-fr.UTF-8.1: vim-fr.1
-	iconv -f latin1 -t utf-8 $< >$@
+	iconv -f latin1 -t UTF-8 $? >$@
 
 evim-fr.UTF-8.1: evim-fr.1
-	iconv -f latin1 -t utf-8 $< >$@
+	iconv -f latin1 -t UTF-8 $? >$@
 
 vimdiff-fr.UTF-8.1: vimdiff-fr.1
-	iconv -f latin1 -t utf-8 $< >$@
+	iconv -f latin1 -t UTF-8 $? >$@
 
 vimtutor-fr.UTF-8.1: vimtutor-fr.1
-	iconv -f latin1 -t utf-8 $< >$@
+	iconv -f latin1 -t UTF-8 $? >$@
 
 xxd-fr.UTF-8.1: xxd-fr.1
-	iconv -f latin1 -t utf-8 $< >$@
+	iconv -f latin1 -t UTF-8 $? >$@
 
 vim-it.UTF-8.1: vim-it.1
-	iconv -f latin1 -t utf-8 $< >$@
+	iconv -f latin1 -t UTF-8 $? >$@
 
 evim-it.UTF-8.1: evim-it.1
-	iconv -f latin1 -t utf-8 $< >$@
+	iconv -f latin1 -t UTF-8 $? >$@
 
 vimdiff-it.UTF-8.1: vimdiff-it.1
-	iconv -f latin1 -t utf-8 $< >$@
+	iconv -f latin1 -t UTF-8 $? >$@
 
 vimtutor-it.UTF-8.1: vimtutor-it.1
-	iconv -f latin1 -t utf-8 $< >$@
+	iconv -f latin1 -t UTF-8 $? >$@
 
 xxd-it.UTF-8.1: xxd-it.1
-	iconv -f latin1 -t utf-8 $< >$@
+	iconv -f latin1 -t UTF-8 $? >$@
 
 vim-pl.UTF-8.1: vim-pl.1
-	iconv -f latin2 -t utf-8 $< >$@
+	iconv -f latin2 -t UTF-8 $? >$@
 
 evim-pl.UTF-8.1: evim-pl.1
-	iconv -f latin2 -t utf-8 $< >$@
+	iconv -f latin2 -t UTF-8 $? >$@
 
 vimdiff-pl.UTF-8.1: vimdiff-pl.1
-	iconv -f latin2 -t utf-8 $< >$@
+	iconv -f latin2 -t UTF-8 $? >$@
 
 vimtutor-pl.UTF-8.1: vimtutor-pl.1
-	iconv -f latin2 -t utf-8 $< >$@
+	iconv -f latin2 -t UTF-8 $? >$@
 
 xxd-pl.UTF-8.1: xxd-pl.1
-	iconv -f latin2 -t utf-8 $< >$@
+	iconv -f latin2 -t UTF-8 $? >$@
 
 vim-ru.UTF-8.1: vim-ru.1
-	iconv -f KOI8-R -t utf-8 $< >$@
+	iconv -f KOI8-R -t UTF-8 $? >$@
 
 evim-ru.UTF-8.1: evim-ru.1
-	iconv -f KOI8-R -t utf-8 $< >$@
+	iconv -f KOI8-R -t UTF-8 $? >$@
 
 vimdiff-ru.UTF-8.1: vimdiff-ru.1
-	iconv -f KOI8-R -t utf-8 $< >$@
+	iconv -f KOI8-R -t UTF-8 $? >$@
 
 vimtutor-ru.UTF-8.1: vimtutor-ru.1
-	iconv -f KOI8-R -t utf-8 $< >$@
+	iconv -f KOI8-R -t UTF-8 $? >$@
 
 xxd-ru.UTF-8.1: xxd-ru.1
-	iconv -f KOI8-R -t utf-8 $< >$@
+	iconv -f KOI8-R -t UTF-8 $? >$@
 
 vim-tr.UTF-8.1: vim-tr.1
-	iconv -f latin5 -t utf-8 $< >$@
+	iconv -f latin5 -t UTF-8 $? >$@
 
 evim-tr.UTF-8.1: evim-tr.1
-	iconv -f latin5 -t utf-8 $< >$@
+	iconv -f latin5 -t UTF-8 $? >$@
 
 vimdiff-tr.UTF-8.1: vimdiff-tr.1
-	iconv -f latin5 -t utf-8 $< >$@
+	iconv -f latin5 -t UTF-8 $? >$@
 
 vimtutor-tr.UTF-8.1: vimtutor-tr.1
-	iconv -f latin5 -t utf-8 $< >$@
+	iconv -f latin5 -t UTF-8 $? >$@

runtime/doc/autocmd.txt

@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 9.1.  Last change: 2024 Jul 11
+*autocmd.txt*   For Vim version 9.1.  Last change: 2024 Aug 18
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -980,10 +980,11 @@ InsertLeavePre			Just before leaving Insert mode.  Also when
 InsertLeave			Just after leaving Insert mode.  Also when
 				using CTRL-O |i_CTRL-O|.  But not for |i_CTRL-C|.
 							*KeyInputPre*
-KeyInputPre			Just before a key is processed. The pattern is
-				matched against a string that indicates the
-				current mode, which is the same as what is
-				returned by `mode(1)`.
+KeyInputPre			Just before a key is processed after mappings
+				have been applied. The pattern is matched
+				against a string that indicates the current
+				mode, which is the same as what is returned by
+				`mode(1)`.
 				The |v:char| variable indicates the key typed
 				and can be changed during the event to process
 				a different key.  When |v:char| is not a
@@ -991,6 +992,10 @@ KeyInputPre			Just before a key is processed. The pattern is
 				character is used.
 				The following values of |v:event| are set:
 				   typed	The key is typed or not.
+				   typedchar	The (actual) typed key since
+						the last |KeyInputPre| call.
+				Note: "typedchar" may be empty if successive
+				|KeyInputPre| autocmds are processed.
 				It is not allowed to change the text
 				|textlock| or the current mode.
 				{only with the +eval feature}
@@ -1425,8 +1430,10 @@ WinLeave			Before leaving a window.  If the window to be
 							*WinNewPre*
 WinNewPre			Before creating a new window. Triggered
 				before commands that modify window layout by
-				creating a split or new tab page. Not done for
-				the first window, when Vim has just started.
+				creating a split.
+				Not done when creating tab pages and for the
+				first window, as the window structure is not
+				initialized yet and so is generally not safe.
 				It is not allowed to modify window layout
 				while executing commands for the WinNewPre
 				event.

runtime/doc/builtin.txt

@@ -1,4 +1,4 @@
-*builtin.txt*	For Vim version 9.1.  Last change: 2024 Jul 11
+*builtin.txt*	For Vim version 9.1.  Last change: 2024 Sep 23
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -232,8 +232,9 @@ getcharsearch()			Dict	last character search
 getcharstr([{expr}])		String	get one character from the user
 getcmdcompltype()		String	return the type of the current
 					command-line completion
-getcmdline()			String	return the current command-line
+getcmdline()			String	return the current command-line input
 getcmdpos()			Number	return cursor position in command-line
+getcmdprompt()			String	return the current command-line prompt
 getcmdscreenpos()		Number	return cursor screen position in
 					command-line
 getcmdtype()			String	return current command-line type
@@ -279,8 +280,7 @@ gettabvar({nr}, {varname} [, {def}])
 gettabwinvar({tabnr}, {winnr}, {name} [, {def}])
 				any	{name} in {winnr} in tab page {tabnr}
 gettagstack([{nr}])		Dict	get the tag stack of window {nr}
-gettext({text} [, {package}])
-				String	lookup translation of {text}
+gettext({text} [, {package}])	String	lookup translation of {text}
 getwininfo([{winid}])		List	list of info about each window
 getwinpos([{timeout}])		List	X and Y coord in pixels of Vim window
 getwinposx()			Number	X coord in pixels of the Vim window
@@ -1226,7 +1226,7 @@ bindtextdomain({package}, {path})			*bindtextdomain()*
 		Bind a specific {package} to a {path} so that the
 		|gettext()| function can be used to get language-specific
 		translations for a package.  {path} is the directory name
-		for the translations. See |package-translation|.
+		for the translations.  See |package-translation|.
 
 		Returns v:true on success and v:false on failure (out of
 		memory).
@@ -2533,8 +2533,10 @@ executable({expr})					*executable()*
 		This function checks if an executable with the name {expr}
 		exists.  {expr} must be the name of the program without any
 		arguments.
+
 		executable() uses the value of $PATH and/or the normal
-		searchpath for programs.		*PATHEXT*
+		searchpath for programs.
+							*PATHEXT*
 		On MS-Windows the ".exe", ".bat", etc. can optionally be
 		included.  Then the extensions in $PATHEXT are tried.  Thus if
 		"foo.exe" does not exist, "foo.exe.bat" can be found.  If
@@ -2544,11 +2546,14 @@ executable({expr})					*executable()*
 		then the name is also tried without adding an extension.
 		On MS-Windows it only checks if the file exists and is not a
 		directory, not if it's really executable.
-		On MS-Windows an executable in the same directory as Vim is
-		normally found.  Since this directory is added to $PATH it
-		should also work to execute it |win32-PATH|.  This can be
-		disabled by setting the $NoDefaultCurrentDirectoryInExePath
-		environment variable.  *NoDefaultCurrentDirectoryInExePath*
+		On MS-Windows an executable in the same directory as the Vim
+		executable is always found.  Since this directory is added to
+		$PATH it should also work to execute it |win32-PATH|.
+					*NoDefaultCurrentDirectoryInExePath*
+		On MS-Windows an executable in Vim's current working directory
+		is also normally found, but this can be disabled by setting
+		the $NoDefaultCurrentDirectoryInExePath environment variable.
+
 		The result is a Number:
 			1	exists
 			0	does not exist
@@ -3974,21 +3979,21 @@ getcmdcompltype()					*getcmdcompltype()*
 		Only works when the command line is being edited, thus
 		requires use of |c_CTRL-\_e| or |c_CTRL-R_=|.
 		See |:command-completion| for the return string.
-		Also see |getcmdtype()|, |setcmdpos()|, |getcmdline()| and
-		|setcmdline()|.
+		Also see |getcmdtype()|, |setcmdpos()|, |getcmdline()|,
+		|getcmdprompt()| and |setcmdline()|.
 		Returns an empty string when completion is not defined.
 
 		Return type: |String|
 
 
 getcmdline()						*getcmdline()*
-		Return the current command-line.  Only works when the command
-		line is being edited, thus requires use of |c_CTRL-\_e| or
-		|c_CTRL-R_=|.
+		Return the current command-line input.  Only works when the
+		command line is being edited, thus requires use of
+		|c_CTRL-\_e| or |c_CTRL-R_=|.
 		Example: >
 			:cmap <F7> <C-\>eescape(getcmdline(), ' \')<CR>
-<		Also see |getcmdtype()|, |getcmdpos()|, |setcmdpos()| and
-		|setcmdline()|.
+<		Also see |getcmdtype()|, |getcmdpos()|, |setcmdpos()|,
+		|getcmdprompt()| and |setcmdline()|.
 		Returns an empty string when entering a password or using
 		|inputsecret()|.
 
@@ -4001,12 +4006,23 @@ getcmdpos()						*getcmdpos()*
 		Only works when editing the command line, thus requires use of
 		|c_CTRL-\_e| or |c_CTRL-R_=| or an expression mapping.
 		Returns 0 otherwise.
-		Also see |getcmdtype()|, |setcmdpos()|, |getcmdline()| and
-		|setcmdline()|.
+		Also see |getcmdtype()|, |setcmdpos()|, |getcmdline()|,
+		|getcmdprompt()| and |setcmdline()|.
 
 		Return type: |Number|
 
 
+getcmdprompt()						*getcmdprompt()*
+		Return the current command-line prompt when using functions
+		like |input()| or |confirm()|.
+		Only works when the command line is being edited, thus
+		requires use of |c_CTRL-\_e| or |c_CTRL-R_=|.
+		Also see |getcmdtype()|, |getcmdline()|, |getcmdpos()|,
+		|setcmdpos()| and |setcmdline()|.
+
+		Return type: |String|
+
+
 getcmdscreenpos()					*getcmdscreenpos()*
 		Return the screen position of the cursor in the command line
 		as a byte count.  The first column is 1.
@@ -4804,6 +4820,8 @@ getregion({pos1}, {pos2} [, {opts}])			*getregion()*
 <
 		Can also be used as a |method|: >
 			getpos('.')->getregion(getpos("'a"))
+<
+		Return type: list<string>
 
 <
 getregionpos({pos1}, {pos2} [, {opts}])            *getregionpos()*
@@ -4841,7 +4859,7 @@ getregionpos({pos1}, {pos2} [, {opts}])            *getregionpos()*
 		Can also be used as a |method|: >
 			getpos('.')->getregionpos(getpos("'a"))
 <
-		Return type: list<string>
+		Return type: list<list<list<number>>>
 
 
 getregtype([{regname}])					*getregtype()*
@@ -6945,10 +6963,10 @@ matchadd({group}, {pattern} [, {priority} [, {id} [, {dict}]]])
 matchaddpos({group}, {pos} [, {priority} [, {id} [, {dict}]]])
 		Same as |matchadd()|, but requires a list of positions {pos}
 		instead of a pattern. This command is faster than |matchadd()|
-		because it does not require to handle regular expressions and
-		sets buffer line boundaries to redraw screen. It is supposed
-		to be used when fast match additions and deletions are
-		required, for example to highlight matching parentheses.
+		because it does not handle regular expressions and it sets
+		buffer line boundaries to redraw screen. It is supposed to be
+		used when fast match additions and deletions are required, for
+		example to highlight matching parentheses.
 
 		{pos} is a list of positions.  Each position can be one of
 		these:
@@ -8140,7 +8158,7 @@ pyxeval({expr})						*pyxeval()*
 		See also: |pyeval()|, |py3eval()|
 
 		Can also be used as a |method|: >
-	<		GetExpr()->pyxeval()
+			GetExpr()->pyxeval()
 <
 		Return type: any, depending on {expr}
 
@@ -8957,6 +8975,9 @@ search({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])
 		{timeout} is 500 the search stops after half a second.
 		The value must not be negative.  A zero value is like not
 		giving the argument.
+
+		Note: the timeout is only considered when searching, not
+		while evaluating the {skip} expression.
 		{only available when compiled with the |+reltime| feature}
 
 		If the {skip} expression is given it is evaluated with the
@@ -9548,7 +9569,8 @@ setline({lnum}, {text})					*setline()*
 		Set line {lnum} of the current buffer to {text}.  To insert
 		lines use |append()|. To set lines in another buffer use
 		|setbufline()|.
-		Any text properties in {lnum} are cleared |text-prop-cleared|.
+		Any text properties in {lnum} are cleared.  See
+		|text-prop-cleared|
 
 		{lnum} is used like with |getline()|.
 		When {lnum} is just below the last line the {text} will be
@@ -10332,8 +10354,8 @@ spellsuggest({word} [, {max} [, {capital}]])		*spellsuggest()*
 
 split({string} [, {pattern} [, {keepempty}]])			*split()*
 		Make a |List| out of {string}.  When {pattern} is omitted or
-		empty each white-separated sequence of characters becomes an
-		item.
+		empty each white space separated sequence of characters
+		becomes an item.
 		Otherwise the string is split where {pattern} matches,
 		removing the matched characters. 'ignorecase' is not used
 		here, add \c to ignore case. |/\c|
@@ -11101,7 +11123,7 @@ synconcealed({lnum}, {col})				*synconcealed()*
 		Note: Doesn't consider |matchadd()| highlighting items,
 		since syntax and matching highlighting are two different
 		mechanisms |syntax-vs-match|.
-<
+
 		Return type: list<any>
 
 

runtime/doc/change.txt

@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 9.1.  Last change: 2024 Jun 23
+*change.txt*    For Vim version 9.1.  Last change: 2024 Jul 28
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -95,13 +95,14 @@ For inserting text see |insert.txt|.
 These commands delete text.  You can repeat them with the `.` command
 (except `:d`) and undo them.  Use Visual mode to delete blocks of text.  See
 |registers| for an explanation of registers.
-
+							*d-special*
 An exception for the d{motion} command: If the motion is not linewise, the
 start and end of the motion are not in the same line, and there are only
 blanks before the start and there are no non-blanks after the end of the
 motion, the delete becomes linewise.  This means that the delete also removes
 the line of blanks that you might expect to remain. Use the |o_v| operator to
-force the motion to be characterwise.
+force the motion to be characterwise or remove the "z" flag from 'cpoptions'
+(see |cpo-z|) to disable this peculiarity.
 
 Trying to delete an empty region of text (e.g., "d0" in the first column)
 is an error when 'cpoptions' includes the 'E' flag.
@@ -251,7 +252,7 @@ blank; this is probably a bug, because "dw" deletes all the blanks; use the
 
 If you prefer "cw" to include the space after a word, use this mapping: >
 	:map cw dwi
-Or use "caw" (see |aw|).
+Alternatively use "caw" (see also |aw| and |cpo-z|).
 
 							*:c* *:ch* *:change*
 :{range}c[hange][!]	Replace lines of text with some different text.
@@ -1413,7 +1414,7 @@ The next three commands always work on whole lines.
 :[range]m[ove] {address}			*:m* *:mo* *:move* *E134*
 			Move the lines given by [range] to below the line
 			given by {address}.
-			Any text properties in [range] are cleared
+			Any text properties in [range] are cleared.  See
 			|text-prop-cleared|.
 
 ==============================================================================

runtime/doc/channel.txt

@@ -1,4 +1,4 @@
-*channel.txt*      For Vim version 9.1.  Last change: 2024 Jun 13
+*channel.txt*      For Vim version 9.1.  Last change: 2024 Jul 17
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -981,8 +981,9 @@ job_start({command} [, {options}])			*job_start()*
 		invoked.
 
 		{command} can be a String.  This works best on MS-Windows.  On
-		Unix it is split up in white-separated parts to be passed to
-		execvp().  Arguments in double quotes can contain white space.
+		Unix it is split up in white space separated parts to be
+		passed to execvp().  Arguments in double quotes can contain
+		white space.
 
 		{command} can be a List, where the first item is the executable
 		and further items are the arguments.  All items are converted

runtime/doc/cmdline.txt

@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 9.1.  Last change: 2024 Apr 27
+*cmdline.txt*   For Vim version 9.1.  Last change: 2024 Aug 20
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -379,7 +379,8 @@ terminals)
 
 :keepp[atterns] {command}			*:keepp* *:keeppatterns*
 		Execute {command}, without adding anything to the search
-		history
+		history and, in case of |:s| or |:&|, without modifying the
+		last substitute pattern or substitute string.
 
 ==============================================================================
 2. Command-line completion				*cmdline-completion*

runtime/doc/eval.txt

@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 9.1.  Last change: 2024 Jun 01
+*eval.txt*	For Vim version 9.1.  Last change: 2024 Jul 28
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -3124,9 +3124,10 @@ text...
 				let lconst[0] = 2  " Error!
 				let lconst[1][0] = 'b'  " OK
 <							*E995*
-			|:const| does not allow to for changing a variable: >
+			It is an error to specify an existing variable with
+			|:const|. >
 				:let x = 1
-				:const x = 2  " Error!
+				:const x = 1  " Error!
 <							*E996*
 			Note that environment variables, option values and
 			register values cannot be used here, since they cannot

runtime/doc/evim-it.1

@@ -1,4 +1,4 @@
-.TH EVIM 1 "16 febbraio 2002 "
+.TH EVIM 1 "12 agosto 2024"
 .SH NOME
 evim \- Vim "facile", impostato in modo da poter essere usato come editore non-modale
 .SH SINTASSI
@@ -34,8 +34,12 @@ Occorre usare CTRL-Q per ottenere il comportamenti di CTRL-V in Vim nativo.
 Vedere vim(1).
 .SH FILE
 .TP 15
-/usr/local/lib/vim/evim.vim
+/usr/local/share/vim??/evim.vim
 Lo script caricato per inizializzare eVim.
+.br
+.I vim??
+è il numero breve di versione, p.es. vim91 per
+.B Vim 9.1
 .SH AKA
 [Also Known As] noto anche come "Vim per semplici".
 Quando is usa evim si suppone che si prenda un fazzoletto,

runtime/doc/evim-it.UTF-8.1

@@ -1,4 +1,4 @@
-.TH EVIM 1 "16 febbraio 2002 "
+.TH EVIM 1 "12 agosto 2024"
 .SH NOME
 evim \- Vim "facile", impostato in modo da poter essere usato come editore non-modale
 .SH SINTASSI
@@ -34,8 +34,12 @@ Occorre usare CTRL-Q per ottenere il comportamenti di CTRL-V in Vim nativo.
 Vedere vim(1).
 .SH FILE
 .TP 15
-/usr/local/lib/vim/evim.vim
+/usr/local/share/vim??/evim.vim
 Lo script caricato per inizializzare eVim.
+.br
+.I vim??
+è il numero breve di versione, p.es. vim91 per
+.B Vim 9.1
 .SH AKA
 [Also Known As] noto anche come "Vim per semplici".
 Quando is usa evim si suppone che si prenda un fazzoletto,

runtime/doc/evim-ru.1

@@ -1,59 +1,69 @@
-.TH EVIM 1 "2002 February 16"
-.SH ИМЯ
-evim \- простой Vim, позволяет редактировать файл с помощью Vim в безрежимном режиме
-.SH КОМАНДНАЯ СТРОКА
+.TH EVIM 1 "12 августа 2024"
+.SH НАЗНАЧЕНИЕ
+Программа evim \[em] это упрощённый Vim, которая производит запуск редактора Vim
+в безрежимном варианте редактирования файлов.
+.SH КРАТКИЙ ОБЗОР
 .br
 .B evim
-[ключи] [файл ..]
+[аргументы] [файл ...]
 .br
 .B eview
 .SH ОПИСАНИЕ
-Команда
+По команде
 .B evim
-запускает
+запускается редактор
 .B Vim
-и настраивает ряд опций таким образом, что он начинает вести себя
-как обычный безрежимный редактор. В этом режиме Vim напоминает
-Notepad из MS-Windows.
+и выполняется настройка ряда параметров таким образом, чтобы его работа была как
+у простых безрежимных редакторов. В этом режиме редактор Vim напоминает
+редактор Notepad из MS Windows.
+Вариант редактора
 .B eVim
-всегда запускается с поддержкой графического интерфейса, чтобы обеспечить
-использование меню и инструментальной панели.
+всегда запускается с поддержкой графического интерфейса, чтобы была возможность
+взаимодействия с программой через меню и панель инструментов.
 .PP
-Эта команда создана для тех, кто по каким-то причинам не в состоянии 
-работать с Vim в обычном режиме. Редактирование файлов при этом происходит
-гораздо менее эффективно, чем при использовании обычного Vim.
+Этот вариант редактора сделан для тех, кто по каким-то причинам не в состоянии 
+работать с обычным редактором Vim. Редактирование файлов при этом происходит
+гораздо менее эффективно, чем при использовании стандартного варианта редактора.
 .PP
-Команда
+По команде
 .B eview
-выполняет почти ту же самую задачу, но файл открывается в режиме "только
-для чтения". Использование этой команды полностью идентично использованию 
-evim \-R.
+выполняются почти те же самые действия, но файл будет открыт "только для чтения".
+Использование этой команды полностью идентично команде evim \-R.
 .PP
-Подробнее о Vim, ключах запуска и т.п. смотрите на странице справочника 
+Подробнее о редакторе Vim, аргументах запуска и т. п. смотрите в справочнике
 vim(1).
 .PP
-При использовании
+По команде
 .B evim
-включается опция 'insertmode', что позволяет вводить текст напрямую.
+будет установлен параметр 'insertmode', что обеспечивает ввод текста напрямую в
+буфер.
 .br
-Кроме того, настраиваются привязки, позволяющие использовать кнопки MS-Windows
-для выполнения команд копирования и вклейки. CTRL-X используется для вырезания 
-текста, CTRL-C для копирования и CTRL-V для вклейки. Чтобы воспользоваться
-изначальным значением кнопки CTRL-V, используйте CTRL-Q.
-.SH ПАРАМЕТРЫ ЗАПУСКА
-См. vim(1).
+Кроме того, настраиваются клавиатурные команды, позволяющие выполнять
+копирование и вставку текста, используя такие же комбинации клавиш,
+как в MS Windows.
+Клавиши CTRL+X используются для вырезания текста, CTRL+C для копирования
+и CTRL+V для вставки.
+Чтобы выполнить ту же команду, которая раньше была назначена на клавиши CTRL+V,
+используйте клавиши CTRL+Q.
+.SH АРГУМЕНТЫ КОМАНДНОЙ СТРОКИ
+См. справочник vim(1).
 .SH ФАЙЛЫ
 .TP 15
-/usr/local/lib/vim/evim.vim
+/usr/local/share/vim/vim??/evim.vim
 Сценарий, который загружается для инициализации eVim.
-.SH AKA
-eVim также известен как "Vim для чайников".
+.br
+Здесь
+.I "vim??"
+означает сокращённую запись номера версии, например, vim91 для версии редактора
+.B Vim 9.1
+.SH ДРУГИМИ СЛОВАМИ
+Вариант eVim также известен как "Vim для чайников".
 Для наилучшего эффекта рекомендуется во время использования повязать
 на голове платок, предварительно завязав на каждом конце по узелку.
-.SH СМОТРИ ТАКЖЕ
+.SH СМОТРИТЕ ТАКЖЕ
 vim(1)
 .SH АВТОРЫ
-Большая часть
+Большая часть редактора
 .B Vim
-создана Брамом Мооленааром (Bram Moolenaar), которому помогает огромное 
-количество людей. См. меню Справка/Благодарности.
+была создана Брамом Моленаром (Bram Moolenaar), которому помогало огромное 
+количество людей. См. меню Справка пункт Соавторы.

runtime/doc/evim-ru.UTF-8.1

@@ -1,59 +1,69 @@
-.TH EVIM 1 "2002 February 16"
-.SH ИМЯ
-evim \- простой Vim, позволяет редактировать файл с помощью Vim в безрежимном режиме
-.SH КОМАНДНАЯ СТРОКА
+.TH EVIM 1 "12 августа 2024"
+.SH НАЗНАЧЕНИЕ
+Программа evim \[em] это упрощённый Vim, которая производит запуск редактора Vim
+в безрежимном варианте редактирования файлов.
+.SH КРАТКИЙ ОБЗОР
 .br
 .B evim
-[ключи] [файл ..]
+[аргументы] [файл ...]
 .br
 .B eview
 .SH ОПИСАНИЕ
-Команда
+По команде
 .B evim
-запускает
+запускается редактор
 .B Vim
-и настраивает ряд опций таким образом, что он начинает вести себя
-как обычный безрежимный редактор. В этом режиме Vim напоминает
-Notepad из MS-Windows.
+и выполняется настройка ряда параметров таким образом, чтобы его работа была как
+у простых безрежимных редакторов. В этом режиме редактор Vim напоминает
+редактор Notepad из MS Windows.
+Вариант редактора
 .B eVim
-всегда запускается с поддержкой графического интерфейса, чтобы обеспечить
-использование меню и инструментальной панели.
+всегда запускается с поддержкой графического интерфейса, чтобы была возможность
+взаимодействия с программой через меню и панель инструментов.
 .PP
-Эта команда создана для тех, кто по каким-то причинам не в состоянии 
-работать с Vim в обычном режиме. Редактирование файлов при этом происходит
-гораздо менее эффективно, чем при использовании обычного Vim.
+Этот вариант редактора сделан для тех, кто по каким-то причинам не в состоянии 
+работать с обычным редактором Vim. Редактирование файлов при этом происходит
+гораздо менее эффективно, чем при использовании стандартного варианта редактора.
 .PP
-Команда
+По команде
 .B eview
-выполняет почти ту же самую задачу, но файл открывается в режиме "только
-для чтения". Использование этой команды полностью идентично использованию 
-evim \-R.
+выполняются почти те же самые действия, но файл будет открыт "только для чтения".
+Использование этой команды полностью идентично команде evim \-R.
 .PP
-Подробнее о Vim, ключах запуска и т.п. смотрите на странице справочника 
+Подробнее о редакторе Vim, аргументах запуска и т. п. смотрите в справочнике
 vim(1).
 .PP
-При использовании
+По команде
 .B evim
-включается опция 'insertmode', что позволяет вводить текст напрямую.
+будет установлен параметр 'insertmode', что обеспечивает ввод текста напрямую в
+буфер.
 .br
-Кроме того, настраиваются привязки, позволяющие использовать кнопки MS-Windows
-для выполнения команд копирования и вклейки. CTRL-X используется для вырезания 
-текста, CTRL-C для копирования и CTRL-V для вклейки. Чтобы воспользоваться
-изначальным значением кнопки CTRL-V, используйте CTRL-Q.
-.SH ПАРАМЕТРЫ ЗАПУСКА
-См. vim(1).
+Кроме того, настраиваются клавиатурные команды, позволяющие выполнять
+копирование и вставку текста, используя такие же комбинации клавиш,
+как в MS Windows.
+Клавиши CTRL+X используются для вырезания текста, CTRL+C для копирования
+и CTRL+V для вставки.
+Чтобы выполнить ту же команду, которая раньше была назначена на клавиши CTRL+V,
+используйте клавиши CTRL+Q.
+.SH АРГУМЕНТЫ КОМАНДНОЙ СТРОКИ
+См. справочник vim(1).
 .SH ФАЙЛЫ
 .TP 15
-/usr/local/lib/vim/evim.vim
+/usr/local/share/vim/vim??/evim.vim
 Сценарий, который загружается для инициализации eVim.
-.SH AKA
-eVim также известен как "Vim для чайников".
+.br
+Здесь
+.I "vim??"
+означает сокращённую запись номера версии, например, vim91 для версии редактора
+.B Vim 9.1
+.SH ДРУГИМИ СЛОВАМИ
+Вариант eVim также известен как "Vim для чайников".
 Для наилучшего эффекта рекомендуется во время использования повязать
 на голове платок, предварительно завязав на каждом конце по узелку.
-.SH СМОТРИ ТАКЖЕ
+.SH СМОТРИТЕ ТАКЖЕ
 vim(1)
 .SH АВТОРЫ
-Большая часть
+Большая часть редактора
 .B Vim
-создана Брамом Мооленааром (Bram Moolenaar), которому помогает огромное 
-количество людей. См. меню Справка/Благодарности.
+была создана Брамом Моленаром (Bram Moolenaar), которому помогало огромное 
+количество людей. См. меню Справка пункт Соавторы.

runtime/doc/evim.1

@@ -1,4 +1,4 @@
-.TH EVIM 1 "2002 February 16"
+.TH EVIM 1 "2024 August 12"
 .SH NAME
 evim \- easy Vim, edit a file with Vim and setup for modeless editing
 .SH SYNOPSIS
@@ -34,8 +34,12 @@ Use CTRL-Q to obtain the original meaning of CTRL-V.
 See vim(1).
 .SH FILES
 .TP 15
-/usr/local/lib/vim/evim.vim
+/usr/local/share/vim/vim??/evim.vim
 The script loaded to initialize eVim.
+.br
+.I vim??
+is short version number, like vim91 for
+.B Vim 9.1
 .SH AKA
 Also Known As "Vim for gumbies".
 When using evim you are expected to take a handkerchief,

runtime/doc/evim.man

@@ -1,4 +1,4 @@
-EVIM(1)                                                                EVIM(1)
+EVIM(1)                     General Commands Manual                    EVIM(1)
 
 
 
@@ -10,7 +10,7 @@ SYNOPSIS
        eview
 
 DESCRIPTION
-       eVim starts Vim and sets options to make it behave like a modeless edi-
+       eVim starts Vim and sets options to make it behave like a modeless edi‐
        tor.  This is still Vim but used as  a  point-and-click  editor.   This
        feels  a lot like using Notepad on MS-Windows.  eVim will always run in
        the GUI, to enable the use of menus and toolbar.
@@ -32,8 +32,9 @@ OPTIONS
        See vim(1).
 
 FILES
-       /usr/local/lib/vim/evim.vim
+       /usr/local/share/vim/vim??/evim.vim
                       The script loaded to initialize eVim.
+                      vim??  is short version number, like vim91 for Vim 9.1
 
 AKA
        Also Known As "Vim for gumbies".  When using evim you are  expected  to
@@ -49,4 +50,4 @@ AUTHOR
 
 
 
-                               2002 February 16                        EVIM(1)
+                                2024 August 12                         EVIM(1)

runtime/doc/filetype.txt

@@ -1,4 +1,4 @@
-*filetype.txt*	For Vim version 9.1.  Last change: 2024 May 23
+*filetype.txt*	For Vim version 9.1.  Last change: 2024 Sep 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -623,6 +623,17 @@ any #lang directive overrides, use the following command: >
 	let g:freebasic_lang = "fblite"
 
 
+GDSCRIPT						*ft-gdscript-plugin*
+
+By default the following options are set, based on Godot official docs: >
+
+	setlocal noexpandtab softtabstop=0 shiftwidth=0
+
+To disable this behavior, set the following variable in your vimrc: >
+
+	let g:gdscript_recommended_style = 0
+
+
 GIT COMMIT                                              *ft-gitcommit-plugin*
 
 One command, :DiffGitCached, is provided to show a diff of the current commit
@@ -630,6 +641,17 @@ in the preview window.  It is equivalent to calling "git diff --cached" plus
 any arguments given to the command.
 
 
+GO							*ft-go-plugin*
+
+By default the following options are set, based on Golang official docs: >
+
+	setlocal noexpandtab softtabstop=0 shiftwidth=0
+
+To disable this behavior, set the following variable in your vimrc: >
+
+	let g:go_recommended_style = 0
+
+
 GPROF							*ft-gprof-plugin*
 
 The gprof filetype plugin defines a mapping <C-]> to jump from a function
@@ -676,6 +698,28 @@ Remember to manually trigger the |FileType| event from a buffer with a Java
 file loaded in it each time after assigning a new value to the variable: >
 	doautocmd FileType
 <
+Markdown documentation comments may contain common runs of vertical leading
+whitespace following the comment marks (`///`) for aesthetic reasons; however,
+some horizontal runs of leading whitespace are significant in Markdown because
+they denote code blocks etc.  For convenience, a 'formatexpr' function is
+provided for the |gq| operator.  As long as neither "g:java_ignore_javadoc"
+nor "g:java_ignore_markdown" is defined, the reformatting of Markdown comments
+can be enabled on demand with: >
+	setlocal formatexpr=g:javaformat#RemoveCommonMarkdownWhitespace()
+<
+Or for Vim versions less than `7.4.265`, with: >
+	setlocal formatexpr=javaformat#RemoveCommonMarkdownWhitespace()
+<
+This function accepts a range of lines, removes a common run of vertical
+leading whitespace, and rewrites the lines of the range.  Depending on the
+author's layout style and the comment contents, which lines to select for
+reformatting can vary from the whole comment to only some portion of it.
+
+To enable the recognition of Markdown comments each time after removing
+"g:java_ignore_markdown" or "g:java_ignore_javadoc", remember to manually
+re-source "javaformat.vim" for Vim versions greater than `8.2.1397`: >
+	runtime autoload/javaformat.vim
+<
 
 JSON-FORMAT						*ft-json-plugin*
 
@@ -731,9 +775,13 @@ Global mapping:
 			nmap <F1> <Plug>ManPreGetPage
 
 Local mappings:
+<Plug>ManBS
+<LocalLeader>h	Clear backspace <BS> characters from the buffer
 CTRL-]		Jump to the manual page for the word under the cursor.
 CTRL-T		Jump back to the previous manual page.
-q		Same as the |:quit| command.
+
+The mappings can be disabled with: >
+	let g:no_man_maps = 1
 
 To use a vertical split instead of horizontal: >
 	let g:ft_man_open_mode = 'vert'
@@ -742,8 +790,8 @@ To use a new tab: >
 
 To enable |folding|, use this: >
 	let g:ft_man_folding_enable = 1
-If you do not like the default folding, use an |autocommand| to add your desired
-folding style instead.  For example: >
+If you do not like the default folding, use an |autocommand| to add your
+desired folding style instead.  For example: >
 	autocmd FileType man setlocal foldmethod=indent foldenable
 
 If you would like :Man {number} {name} to behave like man {number} {name} by
@@ -886,6 +934,10 @@ You can change the default by defining the variable g:tex_flavor to the format
 	let g:tex_flavor = "latex"
 Currently no other formats are recognized.
 
+TYPST							*ft-typst-plugin*
+
+							*g:typst_conceal*
+When |TRUE| the Typst filetype plugin will set the 'conceallevel' option to 2.
 
 VIM							*ft-vim-plugin*
 

runtime/doc/ft_ada.txt

@@ -1,4 +1,4 @@
-*ft_ada.txt*	For Vim version 9.1.  Last change: 2022 Mar 13
+*ft_ada.txt*	For Vim version 9.1.  Last change: 2024 Sep 29
 
 
 		    ADA FILE TYPE PLUG-INS REFERENCE MANUAL~
@@ -48,14 +48,12 @@ ctermfg=White often shows well).
 There are several options you can select in this Ada mode. See |ft-ada-options|
 for a complete list.
 
-To enable them, assign a value to the option.  For example, to turn one on:
- >
-    > let g:ada_standard_types = 1
->
-To disable them use ":unlet".  Example:
->
-    > unlet g:ada_standard_types
-
+To enable them, assign a value to the option.  For example, to turn one on: >
+	let g:ada_standard_types = 1
+<
+To disable them use ":unlet".  Example: >
+	unlet g:ada_standard_types
+<
 You can just use ":" and type these into the command line to set these
 temporarily before loading an Ada file.  You can make these option settings
 permanent by adding the "let" command(s), without a colon, to your "~/.vimrc"
@@ -158,10 +156,9 @@ several versions available which differ in the licence terms used.
 
 The GNAT compiler plug-in will perform a compile on pressing <F7> and then
 immediately shows the result. You can set the project file to be used by
-setting:
- >
- > call g:gnat.Set_Project_File ('my_project.gpr')
-
+setting: >
+		call g:gnat.Set_Project_File ('my_project.gpr')
+<
 Setting a project file will also create a Vim session (|views-sessions|) so -
 like with the GPS - opened files, window positions etc. will be remembered
 separately for all projects.

runtime/doc/gui.txt

@@ -1,4 +1,4 @@
-*gui.txt*       For Vim version 9.1.  Last change: 2024 May 11
+*gui.txt*       For Vim version 9.1.  Last change: 2024 Jul 17
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -970,7 +970,7 @@ name and all existing submenus below it are affected.
 
 5.7 Examples for Menus					*menu-examples*
 
-Here is an example on how to add menu items with menu's!  You can add a menu
+Here is an example on how to add menu items with menus.  You can add a menu
 item for the keyword under the cursor.  The register "z" is used. >
 
   :nmenu Words.Add\ Var		wb"zye:menu! Words.<C-R>z <C-R>z<CR>

runtime/doc/index.txt

@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 9.1.  Last change: 2023 Jul 06
+*index.txt*     For Vim version 9.1.  Last change: 2023 Jul 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -757,7 +757,7 @@ tag		char	      note action in Normal mode	~
 				   search pattern and Visually select it
 |gP|		["x]gP		2  put the text [from register x] before the
 				   cursor N times, leave the cursor after it
-|gQ|		gQ		    switch to "Ex" mode with Vim editing
+|gQ|		gQ		   switch to "Ex" mode with Vim editing
 |gR|		gR		2  enter Virtual Replace mode
 |gT|		gT		   go to the previous tab page
 |gU|		gU{motion}	2  make Nmove text uppercase

runtime/doc/insert.txt

@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 9.1.  Last change: 2024 Jul 13
+*insert.txt*    For Vim version 9.1.  Last change: 2024 Aug 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1183,6 +1183,18 @@ items:
 	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
+	hl_group	an additional highlight group whose attributes are
+			combined with |hl-PmenuSel| and |hl-Pmenu| or
+			|hl-PmenuMatchSel| and |hl-PmenuMatch| highlight
+			attributes in the popup menu to apply cterm and gui
+			properties (with higher priority) like strikethrough
+			to the completion items
+	kind_hlgroup	an additional highlight group specifically for setting
+			the highlight attributes of the completion kind. When
+			this field is present, it will override the
+			|hl-PmenuKind| highlight group, allowing for the
+			customization of ctermfg and guifg properties for the
+			completion kind
 
 All of these except "icase", "equal", "dup" and "empty" must be a string.  If
 an item does not meet these requirements then an error message is given and
@@ -2001,12 +2013,19 @@ command in ex mode: >
 	two
 	.
 	:visual
-<appends the following text, after the cursor line: >
+appends the following text, after the cursor line: >
 	one
 	two
 <
-NOTE: These commands cannot be used with |:global| or |:vglobal|.
-":append" and ":insert" don't work properly in between ":if" and
+In |Ex-mode|, when these commands are used with |:global| or |:vglobal| then
+the lines are obtained from the text following the command.  Separate lines
+with a NL escaped with a backslash: >
+	:global/abc/insert\
+	one line\
+	another line
+The final "." is not needed then.
+
+NOTE: ":append" and ":insert" don't work properly in between ":if" and
 ":endif", ":for" and ":endfor", ":while" and ":endwhile".
 
 							*:start* *:startinsert*

runtime/doc/map.txt

@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 9.1.  Last change: 2024 Jul 11
+*map.txt*       For Vim version 9.1.  Last change: 2024 Sep 26
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1624,12 +1624,14 @@ completion can be enabled:
 
 	-complete=arglist	file names in argument list
 	-complete=augroup	autocmd groups
+	-complete=behave	|:behave| suboptions
+	-complete=breakpoint	|:breakadd| suboptions
 	-complete=buffer	buffer names
-	-complete=behave	:behave suboptions
 	-complete=color		color schemes
 	-complete=command	Ex command (and arguments)
 	-complete=compiler	compilers
 	-complete=cscope	|:cscope| suboptions
+	-complete=diff_buffer	diff buffer names
 	-complete=dir		directory names
 	-complete=dir_in_path	directory names in |'cdpath'|
 	-complete=environment	environment variable names
@@ -1641,7 +1643,7 @@ completion can be enabled:
 	-complete=function	function name
 	-complete=help		help subjects
 	-complete=highlight	highlight groups
-	-complete=history	:history suboptions
+	-complete=history	|:history| suboptions
 	-complete=keymap	keyboard mappings
 	-complete=locale	locale names (as output of locale -a)
 	-complete=mapclear	buffer argument
@@ -1650,6 +1652,8 @@ completion can be enabled:
 	-complete=messages	|:messages| suboptions
 	-complete=option	options
 	-complete=packadd	optional package |pack-add| names
+	-complete=runtime	file and directory names in |'runtimepath'|
+	-complete=scriptnames	sourced script names
 	-complete=shellcmd	Shell command
 	-complete=sign		|:sign| suboptions
 	-complete=syntax	syntax file names |'syntax'|
@@ -1828,7 +1832,7 @@ The valid escape sequences are
 		nothing. Supported modifiers are |:aboveleft|, |:belowright|,
 		|:botright|, |:browse|, |:confirm|, |:hide|, |:horizontal|,
 		|:keepalt|, |:keepjumps|, |:keepmarks|, |:keeppatterns|,
-		|:leftabove|, |:lockmarks|, |:noautocmd|, |:noswapfile|
+		|:leftabove|, |:lockmarks|, |:noautocmd|, |:noswapfile|,
 		|:rightbelow|, |:sandbox|, |:silent|, |:tab|, |:topleft|,
 		|:unsilent|, |:verbose|, and |:vertical|.
 		Note that |:filter| is not supported.

runtime/doc/mbyte.txt

@@ -1,4 +1,4 @@
-*mbyte.txt*     For Vim version 9.1.  Last change: 2024 Jun 09
+*mbyte.txt*     For Vim version 9.1.  Last change: 2024 Jul 17
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar et al.
@@ -493,7 +493,7 @@ The GUI fully supports multibyte characters.  It is also possible in a
 terminal, if the terminal supports the same encoding that Vim uses.  Thus this
 is less flexible.
 
-For example, you can run Vim in a xterm with added multibyte support and/or
+For example, you can run Vim in an xterm with added multibyte support and/or
 |XIM|.  Examples are kterm (Kanji term) and hanterm (for Korean), Eterm
 (Enlightened terminal) and rxvt.
 
@@ -1379,7 +1379,7 @@ Motif.  Use the ":hi Menu font={fontname}" command for this. |:highlight|
 TYPING UTF-8						*utf-8-typing*
 
 If you are using X-Windows, you should find an input method that supports
-UTF-8.
+the UTF-8 encoding.
 
 If your system does not provide support for typing UTF-8, you can use the
 'keymap' feature.  This allows writing a keymap file, which defines a UTF-8

runtime/doc/motion.txt

@@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 9.1.  Last change: 2023 Dec 27
+*motion.txt*    For Vim version 9.1.  Last change: 2024 Aug 28
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -364,11 +364,11 @@ gg			Goto line [count], default first line, on the first
 			See also 'startofline' option.
 
 :[range]go[to] [count]					*:go* *:goto* *go*
-[count]go		Go to [count] byte in the buffer.  Default [count] is
-			one, start of the file.  When giving [range], the
-			last number in it used as the byte count.  End-of-line
-			characters are counted depending on the current
-			'fileformat' setting.
+[count]go		Go to [count] byte in the buffer.  |exclusive| motion.
+			Default [count] is one, start of the file.  When
+			giving [range], the last number in it used as the byte
+			count.  End-of-line characters are counted depending
+			on the current 'fileformat' setting.
 			Also see the |line2byte()| function, and the 'o'
 			option in 'statusline'.
 			{not available when compiled without the
@@ -434,7 +434,7 @@ WORD before the fold.
 
 Special case: "cw" and "cW" are treated like "ce" and "cE" if the cursor is
 on a non-blank.  This is because "cw" is interpreted as change-word, and a
-word does not include the following white space.
+word does not include the following white space (see also |cw|).
 
 Another special case: When using the "w" motion in combination with an
 operator and the last word moved over is at the end of a line, the end of

runtime/doc/options.txt

@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 9.1.  Last change: 2024 Jul 11
+*options.txt*	For Vim version 9.1.  Last change: 2024 Oct 01
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -76,7 +76,8 @@ achieve special effects.  These options come in three forms:
 :se[t] {option}:{value}
 			Set string or number option to {value}.
 			For numeric options the value can be given in decimal,
-			hex (preceded with 0x) or octal (preceded with '0').
+			hex (preceded with 0x) or octal (preceded with '0' or
+			'0o').
 			The old value can be inserted by typing 'wildchar' (by
 			default this is a <Tab> or CTRL-E if 'compatible' is
 			set). Many string options with fixed syntax and names
@@ -395,13 +396,14 @@ between string and number-based options.
 			options which are different from the default.
 
 For buffer-local and window-local options:
-	Command		 global value	    local value ~
-      :set option=value	     set		set
- :setlocal option=value	      -			set
-:setglobal option=value	     set		 -
-      :set option?	      -		       display
- :setlocal option?	      -		       display
-:setglobal option?	    display		 -
+	Command		 global value	  local value	       condition ~
+      :set option=value	     set	      set
+ :setlocal option=value	      -		      set
+:setglobal option=value	     set	       -
+      :set option?	      -		     display	 local value is set
+      :set option?	    display	       -	 local value is not set
+ :setlocal option?	      -		     display
+:setglobal option?	    display	       -
 
 
 Global options with a local value			*global-local*
@@ -1476,7 +1478,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			    applying 'breakindent', even if the resulting
 			    text should normally be narrower. This prevents
 			    text indented almost to the right window border
-			    occupying lot of vertical space when broken.
+			    occupying lots of vertical space when broken.
 			    (default: 20)
 		shift:{n}   After applying 'breakindent', the wrapped line's
 			    beginning will be shifted by the given number of
@@ -1490,9 +1492,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 		list:{n}    Adds an additional indent for lines that match a
 			    numbered or bulleted list (using the
 			    'formatlistpat' setting).
-		list:-1	    Uses the length of a match with 'formatlistpat'
-			    for indentation.
 			    (default: 0)
+		list:-1	    Uses the width of a match with 'formatlistpat' for
+			    indentation.
 		column:{n}  Indent at column {n}. Will overrule the other
 			    sub-options. Note: an additional indent may be
 			    added for the 'showbreak' setting.
@@ -1649,9 +1651,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The default is CTRL-F when 'compatible' is off.
 	Only non-printable keys are allowed.
 	The key can be specified as a single character, but it is difficult to
-	type.  The preferred way is to use the <> notation.  Examples: >
-		:exe "set cedit=\<C-Y>"
-		:exe "set cedit=\<Esc>"
+	type.  The preferred way is to use |key-notation| (e.g. <Up>, <C-F>) or
+	a letter preceded with a caret (e.g. `^F` is CTRL-F).  Examples: >
+		:set cedit=^Y
+		:set cedit=<Esc>
 <	|Nvi| also has this option, but it only uses the first character.
 	See |cmdwin|.
 	NOTE: This option is set to the Vim default value when 'compatible'
@@ -2147,10 +2150,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	   fuzzy    Enable |fuzzy-matching| for completion candidates. This
 		    allows for more flexible and intuitive matching, where
 		    characters can be skipped and matches can be found even
-		    if the exact sequence is not typed.  Only makes a
-		    difference how completion candidates are reduced from the
-		    list of alternatives, but not how the candidates are
-		    collected (using different completion types).
+		    if the exact sequence is not typed.
 
 					*'completepopup'* *'cpp'*
 'completepopup' 'cpp'	string (default empty)
@@ -2257,8 +2257,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Also see 'preserveindent'.
 
 						*'cpoptions'* *'cpo'* *cpo*
-'cpoptions' 'cpo'	string	(Vim default: "aABceFs",
-				 Vi default:  all flags)
+'cpoptions' 'cpo'	string	(Vim default: "aABceFsz",
+				 Vi default:  all flags, except "#{|&/\."
+				 |$VIM_POSIX|:  all flags)
 			global
 	A sequence of single character flags.  When a character is present
 	this indicates Vi-compatible behavior.  This is used for things where
@@ -2486,6 +2487,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 								*cpo-Z*
 		Z	When using "w!" while the 'readonly' option is set,
 			don't reset 'readonly'.
+								*cpo-z*
+		z	Special casing the "cw" and "d" command (see |cw| and
+			|d-special|).
 								*cpo-!*
 		!	When redoing a filter command, use the last used
 			external command, whatever it was.  Otherwise the last
@@ -4727,7 +4731,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	in Insert mode as specified with the 'indentkeys' option.
 	When this option is not empty, it overrules the 'cindent' and
 	'smartindent' indenting.  When 'lisp' is set, this option is
-	is only used when 'lispoptions' contains "expr:1".
+	only used when 'lispoptions' contains "expr:1".
 	When 'paste' is set this option is not used for indenting.
 	The expression is evaluated with |v:lnum| set to the line number for
 	which the indent is to be computed.  The cursor is also in this line
@@ -5090,7 +5094,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	part can be in one of two forms:
 	1.  A list of pairs.  Each pair is a "from" character immediately
 	    followed by the "to" character.  Examples: "aA", "aAbBcC".
-	2.  A list of "from" characters, a semi-colon and a list of "to"
+	2.  A list of "from" characters, a semicolon and a list of "to"
 	    characters.  Example: "abc;ABC"
 	Example: "aA,fgh;FGH,cCdDeE"
 	Special characters need to be preceded with a backslash.  These are
@@ -5172,7 +5176,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	update use |:redraw|.
 	This may occasionally cause display errors.  It is only meant to be set
 	temporarily when performing an operation where redrawing may cause
-	flickering or cause a slow down.
+	flickering or cause a slowdown.
 
 			*'linebreak'* *'lbr'* *'nolinebreak'* *'nolbr'*
 'linebreak' 'lbr'	boolean	(default off)
@@ -5914,17 +5918,17 @@ A jump table for the options with a short description can be found at |Q_op|.
 		    Using CTRL-X on "0" or CTRL-A on "18446744073709551615"
 		    (2^64 - 1) has no effect, overflow is prevented.
 	blank	If included, treat numbers as signed or unsigned based on
-		preceding whitespace. If a number with a leading dash has its
+		preceding whitespace.  If a number with a leading dash has its
 		dash immediately preceded by a non-whitespace character (i.e.,
 		not a tab or a " "), the negative sign won't be considered as
 		part of the number.  For example:
 		    Using CTRL-A on "14" in "Carbon-14" results in "Carbon-15"
 		    (without "blank" it would become "Carbon-13").
 		    Using CTRL-X on "8" in "Carbon -8" results in "Carbon -9"
-		    (because -8 is preceded by whitespace. If "unsigned" was
+		    (because -8 is preceded by whitespace.  If "unsigned" was
 		    set, it would result in "Carbon -7").
 		If this format is included, overflow is prevented as if
-		"unsigned" were set. If both this format and "unsigned" are
+		"unsigned" were set.  If both this format and "unsigned" are
 		included, "unsigned" will take precedence.
 
 	Numbers which simply begin with a digit in the range 1-9 are always
@@ -6174,7 +6178,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		:set path+=
 <	To use an environment variable, you probably need to replace the
 	separator.  Here is an example to append $INCL, in which directory
-	names are separated with a semi-colon: >
+	names are separated with a semicolon: >
 		:let &path = &path .. "," .. substitute($INCL, ';', ',', 'g')
 <	Replace the ';' with a ':' or whatever separator is used.  Note that
 	this doesn't work when $INCL contains a comma or white space.
@@ -7241,7 +7245,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 							POSIX default: "AS")
 			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.
+	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)"		*shm-f*
@@ -7698,7 +7702,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			minus two.
 
 	timeout:{millisec}   Limit the time searching for suggestions to
-			{millisec} milli seconds.  Applies to the following
+			{millisec} milliseconds.  Applies to the following
 			methods.  When omitted the limit is 5000. When
 			negative there is no limit.  {only works when built
 			with the |+reltime| feature}

runtime/doc/os_dos.txt

@@ -1,4 +1,4 @@
-*os_dos.txt*    For Vim version 9.1.  Last change: 2024 Apr 25
+*os_dos.txt*    For Vim version 9.1.  Last change: 2024 Sep 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -195,8 +195,8 @@ The defaults for the various highlight modes are:
 	t_so	 31	 standout mode: White (15) text on DarkBlue (16)
 	t_se	  0	 standout mode end (revert to default)
 
-	t_czh	225	 italic mode: DarkBlue text (1) on Yellow (224)
-	t_czr	  0	 italic mode end (revert to default)
+	t_ZH	225	 italic mode: DarkBlue text (1) on Yellow (224)
+	t_ZR	  0	 italic mode end (revert to default)
 
 	t_us	 67	 underline mode: DarkCyan text (3) on DarkRed (64)
 	t_ue	  0	 underline mode end (revert to default)

runtime/doc/pi_getscript.txt

@@ -1,8 +1,8 @@
-*pi_getscript.txt*  For Vim version 9.1.  Last change: 2017 Aug 01
+*pi_getscript.txt*  For Vim version 9.1.  Last change: 2024 Sep 27
 >
 		GETSCRIPT REFERENCE MANUAL  by Charles E. Campbell
 <
-Author:  Charles E. Campbell  <NcampObell@SdrPchip.AorgM-NOSPAM>
+Original Author:  Charles E. Campbell  <NcampObell@SdrPchip.AorgM-NOSPAM>
 	 (remove NOSPAM from the email address)
 						*GetLatestVimScripts-copyright*
 Copyright: (c) 2004-2012 by Charles E. Campbell	*glvs-copyright*
@@ -20,7 +20,7 @@ Copyright: (c) 2004-2012 by Charles E. Campbell	*glvs-copyright*
 Getscript is a plugin that simplifies retrieval of the latest versions of the
 scripts that you yourself use!  Typing |:GLVS| will invoke getscript; it will
 then use the <GetLatestVimScripts.dat> (see |GetLatestVimScripts_dat|) file to
-get the latest versions of scripts listed therein from http://vim.sf.net/.
+get the latest versions of scripts listed therein from https://www.vim.org/.
 
 ==============================================================================
 1. Contents				*glvs-contents* *glvs* *getscript*
@@ -59,9 +59,9 @@ the "important" part of it is the first two lines.
 
 Your computer needs to have wget or curl for GetLatestVimScripts to do its work.
 
-	1. if compressed:  gunzip getscript.vba.gz
+	1. if compressed:  gunzip getscript.vmb.gz
 	2. Unix:
-		vim getscript.vba
+		vim getscript.vmb
 		:so %
 		:q
 		cd ~/.vim/GetLatest
@@ -70,7 +70,7 @@ Your computer needs to have wget or curl for GetLatestVimScripts to do its work.
 		list of desired plugins -- see |GetLatestVimScripts_dat|)
 
 	3. Windows:
-		vim getscript.vba
+		vim getscript.vmb
 		:so %
 		:q
 		cd **path-to-vimfiles**/GetLatest
@@ -281,11 +281,14 @@ With :AutoInstall: enabled, as it is by default, files which end with
 
 	---.tar.bz2  : decompressed & untarred in .vim/ directory
 	---.vba.bz2  : decompressed in .vim/ directory, then vimball handles it
+	---.vmb.bz2  : decompressed in .vim/ directory, then vimball handles it
 	---.vim.bz2  : decompressed & moved into .vim/plugin directory
 	---.tar.gz   : decompressed & untarred in .vim/ directory
 	---.vba.gz   : decompressed in .vim/ directory, then vimball handles it
+	---.vmb.gz   : decompressed in .vim/ directory, then vimball handles it
 	---.vim.gz   : decompressed & moved into .vim/plugin directory
-	---.vba      : unzipped in .vim/ directory
+	---.vba      : moved to .vim/ directory, then vimball handles it
+	---.vmb      : moved to .vim/ directory, then vimball handles it
 	---.vim      : moved to .vim/plugin directory
 	---.zip      : unzipped in .vim/ directory
 
@@ -300,7 +303,7 @@ When is a script not auto-installable?  Let me give an example:
 The <blockhl.vim> script provides block highlighting for C/C++ programs; it is
 available at:
 
-	http://vim.sourceforge.net/scripts/script.php?script_id=104
+	https://www.vim.org/scripts/script.php?script_id=104
 
 Currently, vim's after/syntax only supports by-filetype scripts (in
 blockhl.vim's case, that's after/syntax/c.vim).  Hence, auto-install would
@@ -309,7 +312,7 @@ possibly overwrite the current user's after/syntax/c.vim file.
 In my own case, I use <aftersyntax.vim> (renamed to after/syntax/c.vim) to
 allow a after/syntax/c/ directory:
 
-	http://vim.sourceforge.net/scripts/script.php?script_id=1023
+	https://www.vim.org/scripts/script.php?script_id=1023
 
 The script allows multiple syntax files to exist separately in the
 after/syntax/c subdirectory.  I can't bundle aftersyntax.vim in and build an
@@ -345,17 +348,51 @@ after/syntax/c.vim contained in it to overwrite a user's c.vim.
 		Doesn't override vimball installation.
 >
 	g:GetLatestVimScripts_scriptaddr
-<       default='http://vim.sourceforge.net/script.php?script_id='
+<        default='https://www.vim.org/scripts/script.php?script_id='
 		Override this if your system needs
-	  ...  ='http://vim.sourceforge.net/script/script.php?script_id='
+	  ...  ='http://vim.sourceforge.net/script.php?script_id='
+>
+	g:GetLatestVimScripts_downloadaddr
+<        default='https://www.vim.org/scripts/download_script.php?src_id='
+		Override this if your system needs
+	  ...  ='http://vim.sourceforge.net/scripts/download_script.php?src_id='
+>
+	g:GetLatestVimScripts_bunzip2
+<        default= bunzip2
+		This variable holds the name of the command to decompress .bz2
+		files
+>
+	g:GetLatestVimScripts_gunzip
+<        default= gunzip
+		This variable holds the name of the command to decompress .gz
+		files
+>
+	g:GetLatestVimScripts_unxz
+<        default= unxz
+		This variable holds the name of the command to decompress .xz
+		files
+>
+	g:GetLatestVimScripts_unzip
+<        default= unzip
+		This variable holds the name of the command to decompress .zip
+		files
 
+Note: The variables associated with decompression commands help workaround
+      crossplatform issues. For example, on Windows is possible to delegate this
+      calls into `wsl` by doing: >
+
+	let g:GetLatestVimScripts_bunzip2= "wsl -e bunzip2"
+	let g:GetLatestVimScripts_gunzip= "wsl -e gunzip"
+	let g:GetLatestVimScripts_unxz= "wsl -e unxz"
+	let g:GetLatestVimScripts_unzip= "wsl -e unzip"
+<
 ==============================================================================
 8. GetLatestVimScripts Algorithm		*glvs-algorithm* *glvs-alg*
 
 The Vim sourceforge page dynamically creates a page by keying off of the
 so-called script-id.  Within the webpage of
 
-	http://vim.sourceforge.net/scripts/script.php?script_id=40
+	https://www.vim.org/scripts/script.php?script_id=40
 
 is a line specifying the latest source-id (src_id).  The source identifier
 numbers are always increasing, hence if the src_id is greater than the one
@@ -385,6 +422,11 @@ The AutoInstall process will:
 ==============================================================================
 9. GetLatestVimScripts History		*getscript-history* *glvs-hist* {{{1
 
+v37 Sep 23, 2024 : * Support for the new vimball's .vmb extension (old .vba
+		     extension conflicted with visual basic).
+		   * Support for |glvs-autoinstall| in ftplugins and packages.
+		   * Allow platform driven customization of decompressing
+		     commands.
 v36 Apr 22, 2013 : * (glts) suggested use of plugin/**/*.vim instead of
 		     plugin/*.vim in globpath() call.
 		   * (Andy Wokula) got warning message when setting

runtime/doc/pi_netrw.txt

@@ -3868,7 +3868,7 @@ netrw:
 				  netrw-safe guioptions
 		Nov 15, 2021	* removed netrw_localrm and netrw_localrmdir
 				  references
-		Aug 18, 2022	* (Miguel Barro) improving compatability with
+		Aug 18, 2022	* (Miguel Barro) improving compatibility with
 				  powershell
 	v171:	Oct 09, 2020	* included code in s:NetrwOptionsSafe()
 				  to allow |'bh'| to be set to delete when
@@ -4099,7 +4099,7 @@ netrw:
 				  The "<nowait>" modifier has been included
 				  with most of netrw's mappings to avoid that
 				  delay.
-		Jun 26, 2015	* |netrw-gn| mapping implemted
+		Jun 26, 2015	* |netrw-gn| mapping implemented
 				* :Ntree NotADir resulted in having
 				  the tree listing expand in the error messages
 				  window.  Fixed.

runtime/doc/quickfix.txt

@@ -1,4 +1,4 @@
-*quickfix.txt*  For Vim version 9.1.  Last change: 2024 Jun 16
+*quickfix.txt*  For Vim version 9.1.  Last change: 2024 Sep 10
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1006,7 +1006,7 @@ Another option is using 'makeencoding'.
 ==============================================================================
 5. Using :vimgrep and :grep				*grep* *lid*
 
-Vim has two ways to find matches for a pattern: Internal and external.  The
+Vim has two ways to find matches for a pattern: internal and external.  The
 advantage of the internal grep is that it works on all systems and uses the
 powerful Vim search patterns.  An external grep program can be used when the
 Vim grep does not do what you want.
@@ -1035,7 +1035,7 @@ commands can be combined to create a NewGrep command: >
         command! -nargs=+ NewGrep execute 'silent grep! <args>' | copen 42
 
 
-5.1 using Vim's internal grep
+5.1 Using Vim's internal grep
 
 					*:vim* *:vimgrep* *E682* *E683*
 :vim[grep][!] /{pattern}/[g][j][f] {file} ...
@@ -1092,8 +1092,8 @@ commands can be combined to create a NewGrep command: >
 
 :vim[grep][!] {pattern} {file} ...
 			Like above, but instead of enclosing the pattern in a
-			non-ID character use a white-separated pattern.  The
-			pattern must start with an ID character.
+			non-ID character use a white space separated pattern.
+			The pattern must start with an ID character.
 			Example: >
 				:vimgrep Error *.c
 <
@@ -1276,6 +1276,7 @@ not "b:current_compiler".  What the command actually does is the following:
 
 For writing a compiler plugin, see |write-compiler-plugin|.
 
+Use the |compiler-make| plugin to undo the effect of a compiler plugin.
 
 DOTNET							*compiler-dotnet*
 
@@ -1291,7 +1292,6 @@ Example: limit output to only display errors, and suppress the project name: >
 	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:
@@ -1302,7 +1302,6 @@ g:compiler_gcc_ignore_unmatched_lines
 				commands run from make are generating false
 				positives.
 
-
 JAVAC							*compiler-javac*
 
 Commonly used compiler options can be added to 'makeprg' by setting the
@@ -1310,6 +1309,12 @@ g:javac_makeprg_params variable.  For example: >
 
 	let g:javac_makeprg_params = "-Xlint:all -encoding utf-8"
 <
+GNU MAKE						*compiler-make*
+
+Since the default make program is "make", the compiler plugin for make,
+:compiler make, will reset the 'makeprg' and 'errorformat' option to
+the default values and unlet any variables that may have been set by a
+previous compiler plugin.
 
 MANX AZTEC C				*quickfix-manx* *compiler-manx*
 
@@ -1335,6 +1340,18 @@ If Vim was started from the compiler, the :sh and some :!  commands will not
 work, because Vim is then running in the same process as the compiler and
 stdin (standard input) will not be interactive.
 
+GROFF					*quickfix-groff* *compiler-groff*
+
+The GROFF compiler plugin uses the mom macro set (documented in the groff_mom
+manpage) as input and expects that the output file type extension is passed to
+make, say :make html or :make pdf.
+
+Additional arguments can be passed to groff by setting them in
+`b:groff_compiler_args` or `g:groff_compiler_args`. The `language` argument
+passed to groff is set using 'spelllang'; it can be overridden by setting
+`b:groff_compiler_lang`. The default encoding is `UTF-8` and can be changed
+by setting `b:groff_compiler_encoding` or `g:groff_compiler_encoding`.
+
 PANDOC					*quickfix-pandoc* *compiler-pandoc*
 
 The Pandoc compiler plugin expects that an output file type extension is
@@ -1345,6 +1362,12 @@ Additional arguments can be passed to pandoc:
 - either by appending them to make, say `:make html --self-contained` .
 - or setting them in `b:pandoc_compiler_args` or `g:pandoc_compiler_args`.
 
+The `--from` argument is an educated guess using the buffer file type;
+it can be overridden by setting `b:pandoc_compiler_from`.
+The `--metadata lang` argument is set using 'spelllang';
+If `--from=markdown` is assumed and no title set in a title header or
+YAML block, then the filename (without extension) is used as the title.
+
 PERL					*quickfix-perl* *compiler-perl*
 
 The Perl compiler plugin doesn't actually compile, but invokes Perl's internal
@@ -1414,6 +1437,17 @@ shells and OSes and also does not allow to use other available TeX options,
 if any.  If your TeX doesn't support "-interaction=nonstopmode", please
 report it with different means to express \nonstopmode from the command line.
 
+TYPST COMPILER						*compiler-typst*
+
+Vim includes a compiler plugin for Typst files. This compiler is enabled
+automatically in Typst buffers by the Typst filetype plugin |ft-typst-plugin|.
+Run |:make| to compile the current Typst file.
+
+							*g:typst_cmd*
+By default Vim will use "typst" as the command to run the Typst compiler. This
+can be changed by setting the |g:typst_cmd| variable: >
+	let g:typst_cmd = "/path/to/other/command"
+
 =============================================================================
 7. The error format					*error-file-format*
 

runtime/doc/repeat.txt

@@ -1,4 +1,4 @@
-*repeat.txt*    For Vim version 9.1.  Last change: 2024 Jul 11
+*repeat.txt*    For Vim version 9.1.  Last change: 2024 Aug 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -793,7 +793,8 @@ messages: >
 	:echo gettext("Hello", "foobar")
 <
 Where:
-  "Hello"	the message "Hello" to be translated into the user's language |:lang|
+  "Hello"	the message "Hello" to be translated into the user's language
+		|:lang|
   "foobar"	the package identifier, which was previously defined using the
 		|bindtextdomain()| function.
 

runtime/doc/sponsor.txt

@@ -1,4 +1,4 @@
-*sponsor.txt*   For Vim version 9.1.  Last change: 2024 Apr 22
+*sponsor.txt*   For Vim version 9.1.  Last change: 2024 Aug 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -76,16 +76,14 @@ How much money should I send?
 
 That is up to you.  The more you give, the more children will be helped.
 An indication for individuals that use Vim at home: 10 Euro per year.  For
-professional use: 30 Euro per year per person.  Send at least 10 euro to be
-able to vote for features.
+professional use: 30 Euro per year per person.
 
 
 How do I become a Vim sponsor or registered Vim user?
 
 Send money, as explained above |send-money| and include your e-mail address.
 When the money has been received you will receive a unique registration key.
-This key can be used on the Vim website to activate voting on your Vim
-account.  You will then get an extra page where you can vote for features and
+This key can be used on the Vim website to get an extra page where you can
 choose whether others will be able to see that you donated.  There is a link
 to this page on your "My Account" page.
 
@@ -127,8 +125,7 @@ the developer |maillist|, for reporting bugs see |bugs|.
 How about Charityware?
 
 Currently the Vim donations go to |uganda| anyway.  Thus it doesn't matter if
-you sponsor Vim or ICCF.  Except that Vim sponsoring will allow you to vote
-for features.
+you sponsor Vim or ICCF.
 
 
 I donated $$$, now please add feature XYZ!

runtime/doc/starting.txt

@@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 9.1.  Last change: 2024 Jul 08
+*starting.txt*  For Vim version 9.1.  Last change: 2024 Sep 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -540,6 +540,7 @@ a slash.  Thus "-R" means recovery and "-/R" readonly.
 		not needed when reading a file, because there is a check if
 		the file that is being read has been encrypted, and Vim asks
 		for a key automatically. |encryption|
+		{only available when compiled with the |+cryptv| feature}
 
 							*-X*
 -X		Do not try connecting to the X server to get the current
@@ -827,8 +828,8 @@ accordingly.  Vim proceeds in this order:
 	easy to copy it to another system.
 
 	If Vim was started with "-u filename", the file "filename" is used.
-	All following initializations until 4. are skipped. $MYVIMRC is not
-	set.
+	All following initializations until 4. are skipped. $MYVIMRC and
+	$MYVIMDIR are not set.
 	"vim -u NORC" can be used to skip these initializations without
 	reading a file.  "vim -u NONE" also skips loading plugins.  |-u|
 
@@ -846,11 +847,13 @@ accordingly.  Vim proceeds in this order:
 	'compatible' is only done later.  Add a ":set nocp" command if you
 	like.  For the Macintosh the $VIMRUNTIME/macmap.vim is read.
 
-	  *VIMINIT* *.vimrc* *_vimrc* *EXINIT* *.exrc* *_exrc* *$MYVIMRC*
+	  *VIMINIT* *.vimrc* *_vimrc* *EXINIT* *.exrc* *_exrc* *$MYVIMRC* *$MYVIMDIR*
      c. Five places are searched for initializations.  The first that exists
 	is used, the others are ignored.  The $MYVIMRC environment variable is
 	set to the file that was first found, unless $MYVIMRC was already set
-	and when using VIMINIT.
+	and when using VIMINIT.  The $MYVIMDIR environment variable is
+	set to the personal 'rtp' directory, however it is not verified
+	that the directory actually exists.
 	I   The environment variable VIMINIT (see also |compatible-default|) (*)
 	    The value of $VIMINIT is used as an Ex command line.
 	II  The user vimrc file(s):
@@ -970,7 +973,8 @@ accordingly.  Vim proceeds in this order:
 	The |VimEnter| autocommands are executed.
 
 The $MYVIMRC or $MYGVIMRC file will be set to the first found vimrc and/or
-gvimrc file.
+gvimrc file while $MYVIMDIR is set to the users personal runtime directory
+'rtp' (typically the first entry in 'runtimepath').
 
 
 Some hints on using initializations ~
@@ -1073,9 +1077,10 @@ This should work well for new Vim users.  If you create your own .vimrc, it is
 recommended to add these lines somewhere near the top: >
 	unlet! skip_defaults_vim
 	source $VIMRUNTIME/defaults.vim
-Then Vim works like before you had a .vimrc. Copying $VIMRUNTIME/vimrc_example
-is way to do this.  Alternatively, you can copy defaults.vim to your .vimrc
-and modify it (but then you won't get updates when it changes).
+Then Vim works like before you had a .vimrc.
+Copying $VIMRUNTIME/vimrc_example.vim to your .vimrc is another way to do
+this. Alternatively, you can copy defaults.vim to your .vimrc and modify it
+(but then you won't get updates when it changes).
 
 If you don't like some of the defaults, you can still source defaults.vim and
 revert individual settings.  See the defaults.vim file for hints on how to

runtime/doc/syntax.txt

@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 9.1.  Last change: 2024 Jul 08
+*syntax.txt*	For Vim version 9.1.  Last change: 2024 Sep 28
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -179,8 +179,7 @@ add a few items or change the highlighting, follow these steps:
 1. Create your user directory from 'runtimepath', see above.
 
 2. Create a directory in there called "after/syntax".  For Unix: >
-	mkdir ~/.vim/after
-	mkdir ~/.vim/after/syntax
+	mkdir -p ~/.vim/after/syntax
 
 3. Write a Vim script that contains the commands you want to use.  For
    example, to change the colors for the C syntax: >
@@ -958,6 +957,25 @@ For Visual Basic use: >
 	:let g:filetype_asa = "aspvbs"
 	:let g:filetype_asp = "aspvbs"
 
+ASYMPTOTE					*asy.vim* *ft-asy-syntax*
+
+By default, only basic Asymptote keywords are highlighted. To highlight
+extended geometry keywords: >
+
+	:let g:asy_syn_plain = 1
+
+and for highlighting keywords related to 3D constructions: >
+
+	:let g:asy_syn_three = 1
+
+By default, Asymptote-defined colors (e.g: lightblue) are highlighted. To
+highlight TeX-defined colors (e.g: BlueViolet) use: >
+
+	:let g:asy_syn_texcolors = 1
+
+or for Xorg colors (e.g: AliceBlue): >
+
+	:let g:asy_syn_x11colors = 1
 
 BAAN						    *baan.vim* *baan-syntax*
 
@@ -1889,6 +1907,10 @@ You can also disable this rendering by adding the following line to your
 vimrc file: >
 	:let html_no_rendering=1
 
+By default Vim synchronises the syntax to 250 lines before the first displayed
+line.  This can be configured using: >
+	:let html_minlines = 500
+<
 HTML comments are rather special (see an HTML reference document for the
 details), and the syntax coloring scheme will highlight all errors.
 However, if you prefer to use the wrong style (starts with <!-- and
@@ -2008,47 +2030,50 @@ idlsyntax_showerror_soft	Use softer colours by default for errors
 
 JAVA						*java.vim* *ft-java-syntax*
 
-The java.vim syntax highlighting file offers several options:
+The java.vim syntax highlighting file offers several options.
 
-In Java 1.0.2 it was never possible to have braces inside parens, so this was
-flagged as an error.  Since Java 1.1 this is possible (with anonymous
-classes), and therefore is no longer marked as an error.  If you prefer the
-old way, put the following line into your vim startup file: >
-	:let java_mark_braces_in_parens_as_errors=1
+In Java 1.0.2, it was never possible to have braces inside parens, so this was
+flagged as an error.  Since Java 1.1, this is possible (with anonymous
+classes); and, therefore, is no longer marked as an error.  If you prefer the
+old way, put the following line into your Vim startup file: >
+	:let g:java_mark_braces_in_parens_as_errors = 1
 
-All identifiers in java.lang.* are always visible in all classes.  To
-highlight them use: >
-	:let java_highlight_java_lang_ids=1
+All (exported) public types declared in `java.lang` are always automatically
+imported and available as simple names.  To highlight them, use: >
+	:let g:java_highlight_java_lang_ids = 1
 
-You can also highlight identifiers of most standard Java packages if you
-download the javaid.vim script at http://www.fleiner.com/vim/download.html.
-If you prefer to only highlight identifiers of a certain package, say java.io
-use the following: >
-	:let java_highlight_java_io=1
+You can also highlight types of most standard Java packages if you download
+the javaid.vim script at http://www.fleiner.com/vim/download.html.  If you
+prefer to only highlight types of a certain package, say `java.io`, use the
+following: >
+	:let g:java_highlight_java_io = 1
 Check the javaid.vim file for a list of all the packages that are supported.
 
-Function names are not highlighted, as the way to find functions depends on
-how you write Java code.  The syntax file knows two possible ways to highlight
-headers of function declarations:
+Headers of indented function declarations can be highlighted (along with parts
+of lambda expressions and method reference expressions), but it depends on how
+you write Java code.  Two formats are recognized:
 
-If you write function declarations that are consistently indented by either
-a tab, or a space . . . or eight space character(s), you may want to set >
-	:let java_highlight_functions="indent"
-	:let java_highlight_functions="indent1"
-	:let java_highlight_functions="indent2"
-	:let java_highlight_functions="indent3"
-	:let java_highlight_functions="indent4"
-	:let java_highlight_functions="indent5"
-	:let java_highlight_functions="indent6"
-	:let java_highlight_functions="indent7"
-	:let java_highlight_functions="indent8"
+1) If you write function declarations that are consistently indented by either
+a tab, or a space . . . or eight space character(s), you may want to set one
+of >
+	:let g:java_highlight_functions = "indent"
+	:let g:java_highlight_functions = "indent1"
+	:let g:java_highlight_functions = "indent2"
+	:let g:java_highlight_functions = "indent3"
+	:let g:java_highlight_functions = "indent4"
+	:let g:java_highlight_functions = "indent5"
+	:let g:java_highlight_functions = "indent6"
+	:let g:java_highlight_functions = "indent7"
+	:let g:java_highlight_functions = "indent8"
 Note that in terms of 'shiftwidth', this is the leftmost step of indentation.
-However, if you follow the Java guidelines about how functions and classes are
-supposed to be named (with respect to upper- and lowercase) and there is any
-amount of indentation, you may want to set >
-	:let java_highlight_functions="style"
-In addition, you can combine any value of "java_highlight_functions" with >
-	:let java_highlight_signature=1
+
+2) However, if you follow the Java guidelines about how functions and types
+are supposed to be named (with respect to upper- and lowercase) and there is
+any amount of indentation, you may want to set >
+	:let g:java_highlight_functions = "style"
+
+In addition, you can combine any value of "g:java_highlight_functions" with >
+	:let g:java_highlight_signature = 1
 to have the name of a function with its parameter list parens distinctly
 highlighted from its type parameters, return type, and formal parameters; and
 to have the parameter list parens of a lambda expression with its arrow
@@ -2061,60 +2086,117 @@ or compose new ones.
 Higher-order function types can be hard to parse by eye, so uniformly toning
 down some of their components may be of value.  Provided that such type names
 conform to the Java naming guidelines, you may arrange it with >
-	:let java_highlight_generics=1
+	:let g:java_highlight_generics = 1
 
-In Java 1.1 the functions System.out.println() and System.err.println() should
-only be used for debugging.  Therefore it is possible to highlight debugging
-statements differently.  To do this you must add the following definition in
-your startup file: >
-	:let java_highlight_debug=1
-The result will be that those statements are highlighted as 'Special'
-characters.  If you prefer to have them highlighted differently you must define
-new highlightings for the following groups.:
-    Debug, DebugSpecial, DebugString, DebugBoolean, DebugType
-which are used for the statement itself, special characters used in debug
-strings, strings, boolean constants and types (this, super) respectively.  I
-have opted to choose another background for those statements.
+In Java 1.1, the functions `System.out.println()` and `System.err.println()`
+should only be used for debugging.  Consider adding the following definition
+in your startup file: >
+	:let g:java_highlight_debug = 1
+to have the bulk of those statements colored as
+	*Debug		debugging statements,
+and to make some of their own items further grouped and linked:
+	*Special	as DebugSpecial,
+	*String		as DebugString,
+	*Boolean	as DebugBoolean,
+	*Type		as DebugType,
+which are used for special characters appearing in strings, strings proper,
+boolean literals, and special instance references (`super`, `this`, `null`),
+respectively.
 
 Javadoc is a program that takes special comments out of Java program files and
 creates HTML pages.  The standard configuration will highlight this HTML code
-similarly to HTML files (see |html.vim|).  You can even add Javascript
-and CSS inside this code (see below).  There are four differences however:
-  1. The title (all characters up to the first '.' which is followed by
-     some white space or up to the first '@') is colored differently (to change
-     the color change the group CommentTitle).
-  2. The text is colored as 'Comment'.
-  3. HTML comments are colored as 'Special'
-  4. The special Javadoc tags (@see, @param, ...) are highlighted as specials
-     and the argument (for @see, @param, @exception) as Function.
-To turn this feature off add the following line to your startup file: >
-	:let java_ignore_javadoc=1
+similarly to HTML files (see |html.vim|).  You can even add JavaScript and CSS
+inside this code (see below).  The HTML rendering and the Markdown rendering
+diverge as follows:
+  1. The first sentence (all characters up to the first period `.`, which is
+     followed by a whitespace character or a line terminator, or up to the
+     first block tag, e.g. `@param`, `@return`) is colored as
+	*SpecialComment	special comments.
+  2. The text is colored as
+	*Comment	comments.
+  3. HTML comments are colored as
+	*Special	special symbols.
+  4. The standard Javadoc tags (`@code`, `@see`, etc.) are colored as
+	*Special	special symbols
+     and some of their arguments are colored as
+	*Function	function names.
+To turn this feature off for both HTML and Markdown, add the following line to
+your startup file: >
+	:let g:java_ignore_javadoc = 1
+Alternatively, only suppress HTML comments or Markdown comments: >
+	:let g:java_ignore_html = 1
+	:let g:java_ignore_markdown = 1
 
-If you use the special Javadoc comment highlighting described above you
-can also turn on special highlighting for Javascript, visual basic
-scripts and embedded CSS (stylesheets).  This makes only sense if you
-actually have Javadoc comments that include either Javascript or embedded
-CSS.  The options to use are >
-	:let java_javascript=1
-	:let java_css=1
-	:let java_vb=1
+See |ft-java-plugin| for additional support available for Markdown comments.
 
-In order to highlight nested parens with different colors define colors
-for javaParen, javaParen1 and javaParen2, for example with >
+If you use the special Javadoc comment highlighting described above, you can
+also turn on special highlighting for JavaScript, Visual Basic scripts, and
+embedded CSS (stylesheets).  This only makes sense if any of these languages
+actually appear in Javadoc comments.  The variables to use are >
+	:let g:java_javascript = 1
+	:let g:java_css = 1
+	:let g:java_vb = 1
+Note that these three variables are maintained in the HTML syntax file.
+
+Numbers and strings can be recognized in non-Javadoc comments with >
+	:let g:java_comment_strings = 1
+
+When 'foldmethod' is set to "syntax", blocks of code and multi-line comments
+will be folded.  No text is usually written in the first line of a multi-line
+comment, making folded contents of Javadoc comments less informative with the
+default 'foldtext' value; you may opt for showing the contents of a second
+line for any comments written in this way, and showing the contents of a first
+line otherwise, with >
+	:let g:java_foldtext_show_first_or_second_line = 1
+
+Trailing whitespace characters or a run of space characters before a tab
+character can be marked as an error with >
+	:let g:java_space_errors = 1
+but either kind of an error can be suppressed by also defining one of >
+	:let g:java_no_trail_space_error = 1
+	:let g:java_no_tab_space_error = 1
+
+In order to highlight nested parens with different colors, define colors for
+`javaParen`, `javaParen1`, and `javaParen2`.  For example, >
 	:hi link javaParen Comment
 or >
 	:hi javaParen ctermfg=blue guifg=#0000ff
 
+Certain modifiers are incompatible with each other, e.g. `abstract` and
+`final`: >
+	:syn list javaConceptKind
+and can be differently highlighted as a group than other modifiers with >
+	:hi link javaConceptKind NonText
+
 If you notice highlighting errors while scrolling backwards, which are fixed
-when redrawing with CTRL-L, try setting the "java_minlines" internal variable
-to a larger number: >
-	:let java_minlines = 50
+when redrawing with CTRL-L, try setting the "g:java_minlines" variable to
+a larger number: >
+	:let g:java_minlines = 50
 This will make the syntax synchronization start 50 lines before the first
 displayed line.  The default value is 10.  The disadvantage of using a larger
 number is that redrawing can become slow.
 
+Significant changes to the Java platform are gradually introduced in the form
+of JDK Enhancement Proposals (JEPs) that can be implemented for a release and
+offered as its preview features.  It may take several JEPs and a few release
+cycles for such a feature to become either integrated into the platform or
+withdrawn from this effort.  To cater for early adopters, there is optional
+support in Vim for syntax related preview features that are implemented.  You
+can request it by specifying a list of preview feature numbers as follows: >
+	:let g:java_syntax_previews = [455, 476]
 
-JSON						*json.vim* *ft-json-syntax*
+The supported JEP numbers are to be drawn from this table:
+	`430`: String Templates [JDK 21]
+	`455`: Primitive types in Patterns, instanceof, and switch
+	`476`: Module Import Declarations
+
+Note that as soon as the particular preview feature will have been integrated
+into the Java platform, its entry will be removed from the table and related
+optionality will be discontinued.
+
+
+JSON			*json.vim* *ft-json-syntax* *g:vim_json_conceal*
+					       *g:vim_json_warnings*
 
 The json syntax file provides syntax highlighting with conceal support by
 default. To disable concealment: >
@@ -2257,7 +2339,7 @@ By default mail.vim synchronises syntax to 100 lines before the first
 displayed line.  If you have a slow machine, and generally deal with emails
 with short headers, you can change this to a smaller value: >
 
-    :let mail_minlines = 30
+	:let mail_minlines = 30
 
 
 MAKE						*make.vim* *ft-make-syntax*
@@ -2268,6 +2350,16 @@ feature off by using: >
 
 	:let make_no_commands = 1
 
+Comments are also highlighted by default.  You can turn this off by using: >
+
+	:let make_no_comments = 1
+
+Microsoft Makefile handles variable expansion and comments differently
+(backslashes are not used for escape).  If you see any wrong highlights
+because of this, you can try this: >
+
+	:let make_microsoft = 1
+
 
 MAPLE						*maple.vim* *ft-maple-syntax*
 
@@ -2294,7 +2386,8 @@ $VIMRUNTIME/syntax/syntax.vim).
   mv_finance	 mv_logic	mv_powseries
 
 
-MARKDOWN						*ft-markdown-syntax*
+MARKDOWN			*ft-markdown-syntax* *g:markdown_minlines*
+		 *g:markdown_fenced_languages* *g:markdown_syntax_conceal*
 
 If you have long regions there might be wrong highlighting.  At the cost of
 slowing down displaying, you can have the engine look further back to sync on
@@ -2319,6 +2412,17 @@ have the following in your .vimrc: >
 
 	let filetype_m = "mma"
 
+MEDIAWIKI					*ft-mediawiki-syntax*
+
+By default, syntax highlighting includes basic HTML tags like style and
+headers |html.vim|. For strict Mediawiki syntax highlighting: >
+
+	let g:html_no_rendering = 1
+
+If HTML highlighting is desired, terminal-based text formatting such as bold
+and italic is possible by: >
+
+	let g:html_style_rendering = 1
 
 MODULA2					*modula2.vim* *ft-modula2-syntax*
 
@@ -3810,6 +3914,15 @@ are highlighted. To disable set it to zero in your .vimrc: >
 <
 The default value is 1.
 
+TYPST						    *ft-typst-syntax*
+
+						*g:typst_embedded_languages*
+Typst files can embed syntax highlighting for other languages by setting the
+|g:typst_embedded_languages| variable. This variable is a list of language
+names whose syntax definitions will be included in Typst files. Example: >
+
+    let g:typst_embedded_languages = ['python', 'r']
+
 VIM			*vim.vim*		*ft-vim-syntax*
 			*g:vimsyn_minlines*	*g:vimsyn_maxlines*
 There is a trade-off between more accurate syntax highlighting versus screen
@@ -5070,7 +5183,7 @@ matches, nextgroup, etc.  But there are a few differences:
   line (or group of continued lines).
 - When a match with a sync pattern is found, the rest of the line (or group of
   continued lines) is searched for another match.  The last match is used.
-  This is used when a line can contain both the start end the end of a region
+  This is used when a line can contain both the start and the end of a region
   (e.g., in a C-comment like /* this */, the last "*/" is used).
 
 There are two ways how a match with a sync pattern can be used:

runtime/doc/tags

@@ -7,6 +7,7 @@ $HOME	options.txt	/*$HOME*
 $HOME-use	version5.txt	/*$HOME-use*
 $HOME-windows	options.txt	/*$HOME-windows*
 $MYGVIMRC	gui.txt	/*$MYGVIMRC*
+$MYVIMDIR	starting.txt	/*$MYVIMDIR*
 $MYVIMRC	starting.txt	/*$MYVIMRC*
 $VIM	starting.txt	/*$VIM*
 $VIM-use	version5.txt	/*$VIM-use*
@@ -6065,6 +6066,7 @@ assert_notmatch()	testing.txt	/*assert_notmatch()*
 assert_report()	testing.txt	/*assert_report()*
 assert_true()	testing.txt	/*assert_true()*
 astro.vim	syntax.txt	/*astro.vim*
+asy.vim	syntax.txt	/*asy.vim*
 at	motion.txt	/*at*
 atan()	builtin.txt	/*atan()*
 atan2()	builtin.txt	/*atan2()*
@@ -6190,6 +6192,7 @@ bufexists()	builtin.txt	/*bufexists()*
 buffer-functions	usr_41.txt	/*buffer-functions*
 buffer-hidden	windows.txt	/*buffer-hidden*
 buffer-list	windows.txt	/*buffer-list*
+buffer-reuse	windows.txt	/*buffer-reuse*
 buffer-variable	eval.txt	/*buffer-variable*
 buffer-write	editing.txt	/*buffer-write*
 buffer_exists()	builtin.txt	/*buffer_exists()*
@@ -6542,14 +6545,17 @@ 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-groff	quickfix.txt	/*compiler-groff*
 compiler-hpada	ft_ada.txt	/*compiler-hpada*
 compiler-javac	quickfix.txt	/*compiler-javac*
+compiler-make	quickfix.txt	/*compiler-make*
 compiler-manx	quickfix.txt	/*compiler-manx*
 compiler-pandoc	quickfix.txt	/*compiler-pandoc*
 compiler-perl	quickfix.txt	/*compiler-perl*
 compiler-pyunit	quickfix.txt	/*compiler-pyunit*
 compiler-select	quickfix.txt	/*compiler-select*
 compiler-tex	quickfix.txt	/*compiler-tex*
+compiler-typst	quickfix.txt	/*compiler-typst*
 compiler-vaxada	ft_ada.txt	/*compiler-vaxada*
 compl-current	insert.txt	/*compl-current*
 compl-define	insert.txt	/*compl-define*
@@ -6671,6 +6677,7 @@ cpo-v	options.txt	/*cpo-v*
 cpo-w	options.txt	/*cpo-w*
 cpo-x	options.txt	/*cpo-x*
 cpo-y	options.txt	/*cpo-y*
+cpo-z	options.txt	/*cpo-z*
 cpo-{	options.txt	/*cpo-{*
 cpp.vim	syntax.txt	/*cpp.vim*
 crash-recovery	recover.txt	/*crash-recovery*
@@ -6733,6 +6740,7 @@ cw	change.txt	/*cw*
 cweb.vim	syntax.txt	/*cweb.vim*
 cynlib.vim	syntax.txt	/*cynlib.vim*
 d	change.txt	/*d*
+d-special	change.txt	/*d-special*
 daB	motion.txt	/*daB*
 daW	motion.txt	/*daW*
 dab	motion.txt	/*dab*
@@ -7250,6 +7258,7 @@ ft-asmh8300-syntax	syntax.txt	/*ft-asmh8300-syntax*
 ft-aspperl-syntax	syntax.txt	/*ft-aspperl-syntax*
 ft-aspvbs-syntax	syntax.txt	/*ft-aspvbs-syntax*
 ft-astro-syntax	syntax.txt	/*ft-astro-syntax*
+ft-asy-syntax	syntax.txt	/*ft-asy-syntax*
 ft-awk-plugin	filetype.txt	/*ft-awk-plugin*
 ft-bash-syntax	syntax.txt	/*ft-bash-syntax*
 ft-basic-syntax	syntax.txt	/*ft-basic-syntax*
@@ -7296,7 +7305,9 @@ ft-fortran-syntax	syntax.txt	/*ft-fortran-syntax*
 ft-freebasic-plugin	filetype.txt	/*ft-freebasic-plugin*
 ft-freebasic-syntax	syntax.txt	/*ft-freebasic-syntax*
 ft-fvwm-syntax	syntax.txt	/*ft-fvwm-syntax*
+ft-gdscript-plugin	filetype.txt	/*ft-gdscript-plugin*
 ft-gitcommit-plugin	filetype.txt	/*ft-gitcommit-plugin*
+ft-go-plugin	filetype.txt	/*ft-go-plugin*
 ft-gprof-plugin	filetype.txt	/*ft-gprof-plugin*
 ft-groff-syntax	syntax.txt	/*ft-groff-syntax*
 ft-gsp-syntax	syntax.txt	/*ft-gsp-syntax*
@@ -7332,6 +7343,7 @@ ft-markdown-syntax	syntax.txt	/*ft-markdown-syntax*
 ft-masm-syntax	syntax.txt	/*ft-masm-syntax*
 ft-mathematica-syntax	syntax.txt	/*ft-mathematica-syntax*
 ft-matlab-indent	indent.txt	/*ft-matlab-indent*
+ft-mediawiki-syntax	syntax.txt	/*ft-mediawiki-syntax*
 ft-metafont	ft_mp.txt	/*ft-metafont*
 ft-metafont-intro	ft_mp.txt	/*ft-metafont-intro*
 ft-metafont-mappings	ft_mp.txt	/*ft-metafont-mappings*
@@ -7410,6 +7422,8 @@ ft-tex-syntax	syntax.txt	/*ft-tex-syntax*
 ft-tf-syntax	syntax.txt	/*ft-tf-syntax*
 ft-typescript-syntax	syntax.txt	/*ft-typescript-syntax*
 ft-typescriptreact-syntax	syntax.txt	/*ft-typescriptreact-syntax*
+ft-typst-plugin	filetype.txt	/*ft-typst-plugin*
+ft-typst-syntax	syntax.txt	/*ft-typst-syntax*
 ft-vb-syntax	syntax.txt	/*ft-vb-syntax*
 ft-verilog-indent	indent.txt	/*ft-verilog-indent*
 ft-vhdl-indent	indent.txt	/*ft-vhdl-indent*
@@ -7564,6 +7578,9 @@ g:html_use_encoding	syntax.txt	/*g:html_use_encoding*
 g:html_use_input_for_pc	syntax.txt	/*g:html_use_input_for_pc*
 g:html_use_xhtml	syntax.txt	/*g:html_use_xhtml*
 g:html_whole_filler	syntax.txt	/*g:html_whole_filler*
+g:markdown_fenced_languages	syntax.txt	/*g:markdown_fenced_languages*
+g:markdown_minlines	syntax.txt	/*g:markdown_minlines*
+g:markdown_syntax_conceal	syntax.txt	/*g:markdown_syntax_conceal*
 g:netrw_altfile	pi_netrw.txt	/*g:netrw_altfile*
 g:netrw_alto	pi_netrw.txt	/*g:netrw_alto*
 g:netrw_altv	pi_netrw.txt	/*g:netrw_altv*
@@ -7718,9 +7735,14 @@ g:tex_subscripts	syntax.txt	/*g:tex_subscripts*
 g:tex_superscripts	syntax.txt	/*g:tex_superscripts*
 g:tex_verbspell	syntax.txt	/*g:tex_verbspell*
 g:typescript_host_keyword	syntax.txt	/*g:typescript_host_keyword*
+g:typst_cmd	quickfix.txt	/*g:typst_cmd*
+g:typst_conceal	filetype.txt	/*g:typst_conceal*
+g:typst_embedded_languages	syntax.txt	/*g:typst_embedded_languages*
 g:var	eval.txt	/*g:var*
 g:vim_indent	indent.txt	/*g:vim_indent*
 g:vim_indent_cont	indent.txt	/*g:vim_indent_cont*
+g:vim_json_conceal	syntax.txt	/*g:vim_json_conceal*
+g:vim_json_warnings	syntax.txt	/*g:vim_json_warnings*
 g:vimball_home	pi_vimball.txt	/*g:vimball_home*
 g:vimball_mkdir	pi_vimball.txt	/*g:vimball_mkdir*
 g:vimsyn_comment_strings	syntax.txt	/*g:vimsyn_comment_strings*
@@ -7805,6 +7827,7 @@ getcharstr()	builtin.txt	/*getcharstr()*
 getcmdcompltype()	builtin.txt	/*getcmdcompltype()*
 getcmdline()	builtin.txt	/*getcmdline()*
 getcmdpos()	builtin.txt	/*getcmdpos()*
+getcmdprompt()	builtin.txt	/*getcmdprompt()*
 getcmdscreenpos()	builtin.txt	/*getcmdscreenpos()*
 getcmdtype()	builtin.txt	/*getcmdtype()*
 getcmdwintype()	builtin.txt	/*getcmdwintype()*
@@ -9620,6 +9643,7 @@ quickfix-directory-stack	quickfix.txt	/*quickfix-directory-stack*
 quickfix-error-lists	quickfix.txt	/*quickfix-error-lists*
 quickfix-functions	usr_41.txt	/*quickfix-functions*
 quickfix-gcc	quickfix.txt	/*quickfix-gcc*
+quickfix-groff	quickfix.txt	/*quickfix-groff*
 quickfix-index	quickfix.txt	/*quickfix-index*
 quickfix-manx	quickfix.txt	/*quickfix-manx*
 quickfix-pandoc	quickfix.txt	/*quickfix-pandoc*
@@ -10831,6 +10855,7 @@ using-menus	gui.txt	/*using-menus*
 using-scripts	repeat.txt	/*using-scripts*
 using-xxd	tips.txt	/*using-xxd*
 using_CTRL-V	map.txt	/*using_CTRL-V*
+usr	usr_toc.txt	/*usr*
 usr_01.txt	usr_01.txt	/*usr_01.txt*
 usr_02.txt	usr_02.txt	/*usr_02.txt*
 usr_03.txt	usr_03.txt	/*usr_03.txt*

runtime/doc/tagsrch.txt

@@ -1,4 +1,4 @@
-*tagsrch.txt*   For Vim version 9.1.  Last change: 2024 Mar 16
+*tagsrch.txt*   For Vim version 9.1.  Last change: 2024 Aug 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -588,12 +588,12 @@ ctags).
 {term}		;" The two characters semicolon and double quote.  This is
 		interpreted by Vi as the start of a comment, which makes the
 		following be ignored.  This is for backwards compatibility
-		with Vi, it ignores the following fields. Example:
+		with Vi, it ignores the following fields. Example: >
 			APP	file	/^static int APP;$/;"	v
-		When {tagaddress} is not a line number or search pattern, then
+<		When {tagaddress} is not a line number or search pattern, then
 		{term} must be |;".  Here the bar ends the command (excluding
 		the bar) and ;" is used to have Vi ignore the rest of the
-		line.  Example:
+		line.  Example: >
 			APP	file.c	call cursor(3, 4)|;"	v
 
 {field} ..	A list of optional fields.  Each field has the form:
@@ -611,7 +611,9 @@ ctags).
 
 		There is one field that doesn't have a ':'.  This is the kind
 		of the tag.  It is handled like it was preceded with "kind:".
-		See the documentation of ctags for the kinds it produces.
+		In the above example, this was "kind:v" (typically variable).
+		See the documentation of ctags for the kinds it produces, with
+		ctags you can use `ctags --list-kinds` .
 
 		The only other field currently recognized by Vim is "file:"
 		(with an empty value).  It is used for a static tag.
@@ -656,14 +658,14 @@ If the command is a normal search command (it starts and ends with "/" or
   The direction of the search is forward for "/", backward for "?".
   Note that 'wrapscan' does not matter, the whole file is always searched.
 - If the search fails, another try is done ignoring case.  If that fails too,
-  a search is done for:
+  a search is done for: >
 	"^tagname[ \t]*("
-  (the tag with '^' prepended and "[ \t]*(" appended).  When using function
+<  (the tag with '^' prepended and "[ \t]*(" appended).  When using function
   names, this will find the function name when it is in column 0.  This will
   help when the arguments to the function have changed since the tags file was
-  made.  If this search also fails another search is done with:
+  made.  If this search also fails another search is done with: >
 	"^[#a-zA-Z_].*\<tagname[ \t]*("
-  This means: A line starting with '#' or an identifier and containing the tag
+<  This means: A line starting with '#' or an identifier and containing the tag
   followed by white space and a '('.  This will find macro names and function
   names with a type prepended.
 

runtime/doc/terminal.txt

@@ -1,4 +1,4 @@
-*terminal.txt*	For Vim version 9.1.  Last change: 2024 Jul 04
+*terminal.txt*	For Vim version 9.1.  Last change: 2024 Jul 28
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1253,6 +1253,8 @@ Starting ~
 							*termdebug-starting*
 Load the plugin with this command: >
 	packadd termdebug
+When loading the plugin from the |.vimrc| file, add the "!" attribute: >
+	packadd! termdebug
 <							*:Termdebug*
 To start debugging use `:Termdebug` or `:TermdebugCommand` followed by the
 command name, for example: >
@@ -1528,9 +1530,9 @@ in a buffer with 'buftype' set to "prompt".  This works slightly differently:
 
 						*termdebug_use_prompt*
 Prompt mode can be used even when the |+terminal| feature is present with: >
-	let g:termdebug_config['use_prompt'] = 1
+	let g:termdebug_config['use_prompt'] = v:true
 If there is no g:termdebug_config you can use: >
-	let g:termdebug_use_prompt = 1
+	let g:termdebug_use_prompt = v:true
 
 <
 However, the latter form will be deprecated in future releases.
@@ -1542,26 +1544,26 @@ are reset to their original values once the termdebug session concludes.
 					*termdebug_map_K* *termdebug-mappings*
 The K key is normally mapped to |:Evaluate| unless a buffer local (|:map-local|)
 mapping to K already exists.  If you do not want this use: >
-	let g:termdebug_config['map_K'] = 0
+	let g:termdebug_config['map_K'] = v:false
 If there is no g:termdebug_config you can use: >
-	let g:termdebug_map_K = 0
+	let g:termdebug_map_K = v:false
 <
 However, the latter form will be deprecated in future releases.
 
 						*termdebug_map_minus*
 The - key is normally mapped to |:Down| unless a buffer local mapping to the -
 key already exists.  If you do not want this use: >
-	let g:termdebug_config['map_minus'] = 0
+	let g:termdebug_config['map_minus'] = v:false
 <
 						*termdebug_map_plus*
 The + key is normally mapped to |:Up| unless a buffer local mapping to the +
 key already exists.  If you do not want this use: >
-	let g:termdebug_config['map_plus'] = 0
+	let g:termdebug_config['map_plus'] = v:false
 <
 						*termdebug_disasm_window*
 If you want the Asm window shown by default, set the "disasm_window" flag to
 1.  The "disasm_window_height" entry can be used to set the window height: >
-	let g:termdebug_config['disasm_window'] = 1
+	let g:termdebug_config['disasm_window'] = v:true
 	let g:termdebug_config['disasm_window_height'] = 15
 If there is no g:termdebug_config you can use: >
 	let g:termdebug_disasm_window = 15
@@ -1577,7 +1579,7 @@ the height option won't be used).
 If you want the Var window shown by default, set the "variables_window" flag
 to 1.  The "variables_window_height" entry can be used to set the window
 height: >
-	let g:termdebug_config['variables_window'] = 1
+	let g:termdebug_config['variables_window'] = v:true
 	let g:termdebug_config['variables_window_height'] = 15
 If there is no g:termdebug_config you can use: >
 	let g:termdebug_variables_window = 15

runtime/doc/testing.txt

@@ -1,4 +1,4 @@
-*testing.txt*	For Vim version 9.1.  Last change: 2024 Jun 17
+*testing.txt*	For Vim version 9.1.  Last change: 2024 Jul 18
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -506,16 +506,17 @@ assert_equal({expected}, {actual} [, {msg}])
 		added to |v:errors| and 1 is returned.  Otherwise zero is
 		returned. |assert-return|
 		The error is in the form "Expected {expected} but got
-		{actual}".  When {msg} is present it is prefixed to that.
+		{actual}".  When {msg} is present it is prefixed to that,
+		along with the location of the assert when run from a script.
 
 		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.
 		Example: >
-	assert_equal('foo', 'bar')
-<		Will result in a string to be added to |v:errors|:
-	test.vim line 12: Expected 'foo' but got 'bar' ~
+			call assert_equal('foo', 'bar', 'baz')
+<		Will add the following to |v:errors|:
+			test.vim line 12: baz: Expected 'foo' but got 'bar' ~
 
 		Can also be used as a |method|, the base is passed as the
 		second argument: >
@@ -561,19 +562,19 @@ assert_fails({cmd} [, {error} [, {msg} [, {lnum} [, {context}]]]])
 		When {error} is a string it must be found literally in the
 		first reported error. Most often this will be the error code,
 		including the colon, e.g. "E123:". >
-			assert_fails('bad cmd', 'E987:')
+			call assert_fails('bad cmd', 'E987:')
 <
 		When {error} is a |List| with one or two strings, these are
 		used as patterns.  The first pattern is matched against the
 		first reported error: >
-			assert_fails('cmd', ['E987:.*expected bool'])
+			call assert_fails('cmd', ['E987:.*expected bool'])
 <		The second pattern, if present, is matched against the last
 		reported error.
 		If there is only one error then both patterns must match. This
 		can be used to check that there is only one error.
 		To only match the last error use an empty string for the first
 		error: >
-			assert_fails('cmd', ['', 'E987:'])
+			call assert_fails('cmd', ['', 'E987:'])
 <
 		If {msg} is empty then it is not used.  Do this to get the
 		default message when passing the {lnum} argument.
@@ -599,7 +600,8 @@ 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.
+		When {msg} is present it is prefixed to that, along with the
+		location of the assert when run from a script.
 		Also see |assert-return|.
 
 		A value is false when it is zero. When {actual} is not a
@@ -625,7 +627,8 @@ 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.
+		{actual}".  When {msg} is present it is prefixed to that,
+		along with the location of the assert when run from a script.
 
 		{pattern} is used as with |=~|: The matching is always done
 		like 'magic' was set and 'cpoptions' is empty, no matter what
@@ -636,9 +639,9 @@ assert_match({pattern}, {actual} [, {msg}])
 		Use both to match the whole text.
 
 		Example: >
-	assert_match('^f.*o$', 'foobar')
+			call assert_match('^f.*o$', 'foobar')
 <		Will result in a string to be added to |v:errors|:
-	test.vim line 12: Pattern '^f.*o$' does not match 'foobar' ~
+			test.vim line 12: Pattern '^f.*o$' does not match 'foobar' ~
 
 		Can also be used as a |method|: >
 			getFile()->assert_match('foo.*')
@@ -693,7 +696,8 @@ 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 given it precedes the default message.
+		When {msg} is given it is prefixed to the default message,
+		along with the location of the assert when run from a script.
 
 		Can also be used as a |method|: >
 			GetResult()->assert_true()

runtime/doc/textprop.txt

@@ -1,4 +1,4 @@
-*textprop.txt*  For Vim version 9.1.  Last change: 2024 Jun 08
+*textprop.txt*  For Vim version 9.1.  Last change: 2024 Sep 08
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -140,10 +140,10 @@ prop_add({lnum}, {col}, {props})
 		   bufnr	buffer to add the property to; when omitted
 				the current buffer is used
 		   id		user defined ID for the property; must be a
-				number, should be positive; when using "text"
-				then "id" must not be present and will be set
-				automatically to a negative number; otherwise
-				zero is used
+				number, should be positive |E1510|;
+				when using "text" then "id" must not be
+				present and will be set automatically to a
+				negative number; otherwise zero is used
 							*E1305*
 		   text		text to be displayed before {col}, or
 				above/below the line if {col} is zero; prepend
@@ -271,7 +271,7 @@ prop_add_list({props}, [{item}, ...])			*prop_add_list()*
 			call prop_add_list(#{type: 'MyProp', id: 2},
 					\ [[1, 4, 1, 7],
 					\  [1, 15, 1, 20],
-					\  [2, 30, 3, 30]]
+					\  [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.1.  Last change: 2024 Jul 11
+*todo.txt*      For Vim version 9.1.  Last change: 2024 Sep 29
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -38,9 +38,6 @@ browser use: https://github.com/vim/vim/issues/1234
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-FILETYPE_FILE is defined to the same value in multiple places.
-Only use the one in feature.h.  Others too.
-
 Mapping with modifier is not recognized after a partial mapping.  Probably
 because the typeahead was simplified when looking for a matching mapping.
 Need to somehow undo the simplification.  #12002
@@ -86,8 +83,8 @@ 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
+    command line..script /home/mool/vim/vim91/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/vim91/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():
 

runtime/doc/uganda.rux

@@ -1,4 +1,4 @@
-*uganda.txt*    для Vim version 9.1		 редакция от 02 марта 2022 г.
+*uganda.txt*    для Vim version 9.1		 редакция от 14 авг 2024 г.
 
 
 			 СПРАВОЧНИК ПО РЕДАКТОРУ VIM
@@ -18,10 +18,8 @@
 	https://www.vim.org/iccf/
 	https://www.iccf.nl/
 
-Также возможно оказание финансовой помощи для разработки программы Vim.
-Люди, пожертвовавшие на развитие программы, получают право голосовать за
-внедрение в редактор функциональных возможностей. См. раздел |sponsor|.
-В любом случае деньги направляются в Уганду.
+Также возможно оказание финансовой помощи для разработки программы Vim,
+см. раздел |sponsor|. В любом случае деньги направляются в Уганду.
 
 Документация, поставляемая в составе программы Vim, распространяется на
 условиях лицензии на Открытые публикации, см. раздел |manual-copyright|.
@@ -58,7 +56,7 @@ II) Изменённую (или дополненную) версию прогр
 	  согласованы. Если согласование не проводилось, сделанные изменения
 	  будут распространяться на условиях настоящей лицензии или более
 	  поздней её версии. Лица, в данное время являющиеся ответственными
-	  за рабзработку, указаны в перечне по следующему адресу:
+	  за разработку, указаны в перечне, размещённом по следующему адресу:
 	  https://github.com/orgs/vim/people. В случае изменения этой
 	  информации, актуальные данные будут опубликованы на
 	  соответствующих ресурсах (вероятнее всего по интернет‐адресам
@@ -288,9 +286,7 @@ KCC предоставляет школам помощь по улучшению
 		помощи детям в гор. Кибаале. Команда Kuwasha переводит 100%
 		средств, поступивших в пользу проекта в Уганде.
 		Единовременное пожертвование может быть отправлено им
-		напрямую. При этом прошу отправлять мне сообщение, для учёта
-		информации о количестве средств, пожертвованных благодаря
-		программе Vim.
+		напрямую.
 		На их веб-сайте также можно ознакомиться с информацией по
 		оказанию финансовой поддержки https://www.kuwasha.net/
 		При отправке пожертвований через Kuwasha вы получите
@@ -309,7 +305,7 @@ KCC предоставляет школам помощь по улучшению
 			https://iccf-holland.org/germany.html
 
  Европа
-		Банковский перевод. См. далее рубрику «Другие варианты»,
+		Банковский перевод. См. далее «Другие варианты»,
 		где указан код Swift и номер IBAN.
 		Любые другие платёжные методы также должны работать.
 		Проконсультируйтесь по вопросу отправки средств на
@@ -334,7 +330,8 @@ KCC предоставляет школам помощь по улучшению
 		Чеки не принимаются.
 
 =============================================================================
+
 © Казорин Сергей, перевод на русский язык, 2022, <kazorin@basealt.ru>
-© Restorer, редакторская правка, 2022, <restorer@mail2k.ru>
+© Restorer, редакторская правка, 2024, <restorer@mail2k.ru>
 
  vim:tw=78:ts=8:noet:ft=help:norl:

runtime/doc/uganda.txt

@@ -1,4 +1,4 @@
-*uganda.txt*    For Vim version 9.1.  Last change: 2024 Apr 22
+*uganda.txt*    For Vim version 9.1.  Last change: 2024 Aug 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -15,8 +15,8 @@ below or visit the ICCF web site, available at these URLs:
 	https://www.vim.org/iccf/
 	https://www.iccf.nl/
 
-You can also sponsor the development of Vim.  Vim sponsors can vote for
-features.  See |sponsor|.  The money goes to Uganda anyway.
+You can also sponsor the development of Vim, see |sponsor|.  The money goes to
+Uganda anyway.
 
 The Open Publication License applies to the Vim documentation, see
 |manual-copyright|.

runtime/doc/undo.txt

@@ -1,4 +1,4 @@
-*undo.txt*      For Vim version 9.1.  Last change: 2022 Jun 02
+*undo.txt*      For Vim version 9.1.  Last change: 2024 Sep 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -164,13 +164,13 @@ This is explained in the user manual: |usr_32.txt|.
 g-			Go to older text state.  With a count repeat that many
 			times.
 							*:ea* *:earlier*
-:earlier {count}	Go to older text state {count} times.
-:earlier {N}s		Go to older text state about {N} seconds before.
-:earlier {N}m		Go to older text state about {N} minutes before.
-:earlier {N}h		Go to older text state about {N} hours before.
-:earlier {N}d		Go to older text state about {N} days before.
+:ea[rlier] {count}	Go to older text state {count} times.
+:ea[rlier] {N}s		Go to older text state about {N} seconds before.
+:ea[rlier] {N}m		Go to older text state about {N} minutes before.
+:ea[rlier] {N}h		Go to older text state about {N} hours before.
+:ea[rlier] {N}d		Go to older text state about {N} days before.
 
-:earlier {N}f		Go to older text state {N} file writes before.
+:ea[rlier] {N}f		Go to older text state {N} file writes before.
 			When changes were made since the last write
 			":earlier 1f" will revert the text to the state when
 			it was written.  Otherwise it will go to the write
@@ -183,13 +183,13 @@ g-			Go to older text state.  With a count repeat that many
 g+			Go to newer text state.  With a count repeat that many
 			times.
 							*:lat* *:later*
-:later {count}		Go to newer text state {count} times.
-:later {N}s		Go to newer text state about {N} seconds later.
-:later {N}m		Go to newer text state about {N} minutes later.
-:later {N}h		Go to newer text state about {N} hours later.
-:later {N}d		Go to newer text state about {N} days later.
+:lat[er] {count}		Go to newer text state {count} times.
+:lat[er] {N}s		Go to newer text state about {N} seconds later.
+:lat[er] {N}m		Go to newer text state about {N} minutes later.
+:lat[er] {N}h		Go to newer text state about {N} hours later.
+:lat[er] {N}d		Go to newer text state about {N} days later.
 
-:later {N}f		Go to newer text state {N} file writes later.
+:lat[er] {N}f		Go to newer text state {N} file writes later.
 			When at the state of the last file write, ":later 1f"
 			will go to the newest text state.
 

runtime/doc/usr_05.txt

@@ -1,4 +1,4 @@
-*usr_05.txt*	For Vim version 9.1.  Last change: 2024 Jun 19
+*usr_05.txt*	For Vim version 9.1.  Last change: 2024 Jun 28
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -455,7 +455,8 @@ Adding nohlsearch package				*nohlsearch-install*
 Load the plugin with this command: >
 	packadd nohlsearch
 <
-Automatically execute |:nohlsearch| after 'updatetime' or getting into |Insert| mode.
+Automatically execute |:nohlsearch| after 'updatetime' or getting into
+|Insert| mode.
 Thus assuming default updatetime, hlsearch would be suspended/turned off after
 4 seconds of idle time.
 

runtime/doc/usr_41.txt

@@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 9.1.  Last change: 2024 Jun 09
+*usr_41.txt*	For Vim version 9.1.  Last change: 2024 Sep 23
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -1070,7 +1070,8 @@ Buffers, windows and the argument list:
 Command line:					*command-line-functions*
 	getcmdcompltype()	get the type of the current command line
 				completion
-	getcmdline()		get the current command line
+	getcmdline()		get the current command line input
+	getcmdprompt()		get the current command line prompt
 	getcmdpos()		get position of the cursor in the command line
 	getcmdscreenpos()	get screen position of the cursor in the
 				command line

runtime/doc/usr_toc.txt

@@ -1,8 +1,8 @@
-*usr_toc.txt*	For Vim version 9.1.  Last change: 2022 Jun 20
+*usr_toc.txt*	For Vim version 9.1.  Last change: 2024 Oct 01
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
-			      Table Of Contents			*user-manual*
+			      Table Of Contents		       *user-manual* *usr*
 
 ==============================================================================
 Overview ~

runtime/doc/various.txt

@@ -1,4 +1,4 @@
-*various.txt*   For Vim version 9.1.  Last change: 2024 Jun 17
+*various.txt*   For Vim version 9.1.  Last change: 2024 Jul 17
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -19,9 +19,8 @@ CTRL-L			Clear and redraw the screen.  The redraw may happen
 							*:redr* *:redraw*
 :redr[aw][!]		Redraw the screen right now.  When ! is included it is
 			cleared first.
-			Useful to update the screen halfway executing a script
-			or function.  Also when halfway a mapping and
-			'lazyredraw' is set.
+			It can be used to redraw the screen in a script
+			or function (or a mapping if |'lazyredraw'| is set).
 
 						*:redraws* *:redrawstatus*
 :redraws[tatus][!]	Redraw the status line of the current window.  When !

runtime/doc/version9.txt

@@ -1,4 +1,4 @@
-*version9.txt*  For Vim version 9.1.  Last change: 2024 Jul 12
+*version9.txt*  For Vim version 9.1.  Last change: 2024 Sep 23
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -41563,6 +41563,9 @@ Support for the XDG Desktop Specification |xdg-base-dir|
 Support highlighting the matched text for insert-mode completion and
 command-line completion in |ins-completion-menu|.
 
+Support highlighting the completion kind in |ins-completion-menu|, see
+|complete-items|.
+
 Support for translating messages in Vim script plugins using the |gettext()|
 and |bindtextdomain()| functions.
 
@@ -41574,18 +41577,25 @@ Changed~
 - the default for 'commentstring' contains whitespace padding to have
   automatic comments look nicer |comment-install|
 - 'completeopt' is now a |global-local| option.
-- 'nrformat' accepts the new "blank" suboption, to determine a signed or
+- 'nrformats' accepts the new "blank" suboption, to determine a signed or
   unsigned number based on whitespace in front of a minus sign.
 - allow to specify a priority when defining a new sign |:sign-define|
 - provide information about function arguments using the get(func, "arity")
   function |get()-func|
 - |:bwipe| also wipes jumplist and tagstack data
 - moving in the buffer list using |:bnext| and similar commands, behaves as
-  documented and skips help buffers (if not run from a help buffer, else 
+  documented and skips help buffers (if not run from a help buffer, else
   moves to the next/previous help buffer).
 - allow to complete directories from 'cdpath' for |:cd| and similar commands,
   add the "cd_in_path" completion type for e.g. |:command-complete| and
   |getcompletion()|
+- add 'cpoptions' flag "z" |cpo-z|, to disable some (traditional) vi
+  behaviour/inconsistency (see |d-special| and |cw|).
+- allow to specify additional attributes in the completion menu (allows to
+  mark deprecated attributes from LSP server) |complete-items|
+- the regex engines match correctly case-insensitive multi-byte characters
+  (and apply proper case folding)
+- |:keeppatterns| preserves the last substitute pattern when used with |:s|
 
 							*added-9.2*
 Added ~
@@ -41598,6 +41608,7 @@ Functions: ~
 |diff()|		diff two Lists of strings
 |filecopy()|		copy a file {from} to {to}
 |foreach()|		apply function to List items
+|getcmdprompt()|        get prompt for input()/confirm()
 |getregion()|		get a region of text from a buffer
 |getregionpos()|	get a list of positions for a region
 |id()|			get unique identifier for a Dict, List, Object,
@@ -41609,8 +41620,8 @@ Functions: ~
 
 Autocommands: ~
 
-|CursorMovedC|		after the cursor was moved in the comamnd-line
-|KeyInputPre|		process any Key event in any mode
+|CursorMovedC|		after the cursor was moved in the command-line
+|KeyInputPre|		before processing any key event in any mode
 |SessionWritePost|	after writing the session file |:mksession|
 |TermResponseAll|	after the terminal response to |t_RV| and others is
 			received
@@ -41658,6 +41669,10 @@ Python3 support in OpenVMS.
 Support for |fuzzy-matching| during |ins-completion| with the "fuzzy"
 values of the 'completeopt' setting
 
+The environment variable |$MYVIMDIR| is set to the users personal runtime
+directory ($HOME/.vim or $HOME/.config/vim on Linux, $HOME/vimfiles
+on Windows)
+
 ==============================================================================
 COMPILE TIME CHANGES					*compile-changes-9.2*
 

runtime/doc/vim-it.1

@@ -1,4 +1,4 @@
-.TH VIM 1 "4 giugno 2024"
+.TH VIM 1 "12 agosto 2024"
 .SH NOME
 vim \- VI Migliorato, un editor di testi per programmatori
 .SH SINTASSI
@@ -31,7 +31,7 @@ vim \- VI Migliorato, un editor di testi per programmatori
 .B rgview
 .SH DESCRIZIONE
 .B Vim
-Un editore di testi, compatibile con, e migliore di, Vi.
+è un editore di testi, compatibile con, e migliore di, Vi.
 Può essere usato per editare qualsiasi file di testo.
 Particolarmente utile per editare programmi.
 .PP
@@ -150,18 +150,6 @@ Esempio: vim "+set si" main.c
 .br
 Note: Si possono avere fino a 10 comandi "+" o "\-c".
 .TP
-\-S {file}
-I comandi contenuti in {file} sono eseguiti dopo la lettura del primo file.
-Equivalente a \-c "source {file}".
-{file} non può avere un nome che inizia per '\-'.
-Se {file} è omesso si usa "Session.vim" (funziona solo se \-S è l'ultimo
-argomento specificato).
-.TP
-\-\-cmd {comando}
-Come "\-c", ma il comando è eseguito PRIMA
-di eseguire qualsiasi file vimrc.
-Si possono usare fino a 10 di questi comandi, indipendentemente dai comandi "\-c".
-.TP
 \-A
 Se
 .B Vim
@@ -224,11 +212,6 @@ Opzione da usare quando
 sessione di edit (p.es., mail).
 Sull'Amiga i comandi ":sh" e ":!" non sono disponibili.
 .TP
-\-\-nofork
-Direttamente [Foreground].  Per la versione GUI,
-.B Vim
-non crea [fork] una nuova finestra, indipendente dalla shell di invocazione.
-.TP
 \-F
 Se
 .B Vim
@@ -239,6 +222,8 @@ in Modo Farsi, cio
 Altrimenti viene dato un messaggio di errore e
 .B Vim
 termina in modo anormale.
+.br
+Nota: Il supporto Farsi è stato rimosso a partire dalla patch 8.1.0932.
 .TP
 \-g
 Se
@@ -248,19 +233,6 @@ Se Vim
 .B Vim
 termina in modo anormale.
 .TP
-\-\-gui-dialog-file {nome}
-Quando si usa la GUI, invece di visualizzare un dialogo, il titolo e il
-messaggio del dialogo sono scritti sul file {nome}.  Il file viene creato o,
-se già esistente, viene esteso.  Quest'opzione serve solo in fase di test,
-per evitare di restare bloccati da un dialogo che non si riesce a visualizzare.
-Se si sta lavorando senza la GUI l'argomento viene ignorato.
-.TP
-\-\-help, \-h, \-?
-Un po' di aiuto su opzioni e argomenti che si possono dare invocando Vim.
-Subito dopo
-.B Vim
-esce.
-.TP
 \-H
 Se
 .B Vim
@@ -278,13 +250,13 @@ del file da usare invece di quello predefinito "~/.viminfo".
 Si può anche evitare l'uso di un file .viminfo, dando come nome
 "NONE".
 .TP
-\-L
-Equivalente a \-r.
-.TP
 \-l
 Modo Lisp.
 Imposta le opzioni 'lisp' e 'showmatch'.
 .TP
+\-L
+Equivalente a \-r.
+.TP
 \-m
 Inibisce modifica file.
 Inibisce l'opzione 'write'.
@@ -295,6 +267,13 @@ Modifiche non permesse.  Le opzioni 'modifiable' e 'write' sono annullate,
 in modo da impedire sia modifiche che riscritture.  Da notare che queste
 opzioni possono essere abilitate in seguito, permettendo così modifiche.
 .TP
+\-n
+Inibisce l'uso di un file di swap.
+Il recupero dopo una caduta di macchina sarà impossibile.
+Utile per editare un file su un supporto molto lento (p.es., floppy).
+Il comando ":set uc=0" ha lo stesso effetto.
+Per abilitare il recupero usare ":set uc=200".
+.TP
 \-N
 Modo "Non-compatibile".  Annulla l'opzione 'compatible'.
 Così
@@ -302,13 +281,6 @@ Cos
 si comporta un po' meglio, ma è meno compatibile con Vi, anche in assenza di un
 file .vimrc.
 .TP
-\-n
-Inibisce l'uso di un file di swap.
-Il recupero dopo una caduta di macchina diventa impossibile.
-Utile per editare un file su un supporto molto lento (p.es., floppy).
-Il comando ":set uc=0" ha lo stesso effetto.
-Per abilitare il recupero usare ":set uc=200".
-.TP
 \-nb
 Diviene un Editor server per NetBeans.  Vedere la documentazione per dettagli.
 .TP
@@ -331,6 +303,16 @@ Vim viene eseguito in una finestra MDI (Multiple-Document Interface).
 che sia sufficientemente esplicativo.  Notare che l'implementazione è ancora
 rudimentale.  Non funziona per tutte le applicazioni, e il menù non funziona.
 .TP
+\-r
+Lista file di swap, e informazioni su come usarli per ripristinare file.
+.TP
+\-r {file}
+Modo Recovery (ripristino).
+Il file di swap è usato per recuperare una sessione di edit finita male.
+Il file di swap è un file con lo stesso nome file del file di testo
+editato, col suffisso ".swp".
+Vedere ":help recovery".
+.TP
 \-R
 Modo Read-only (Sola Lettura).
 Imposta l'opzione 'readonly'.
@@ -342,16 +324,6 @@ L'opzione \-R implica anche l'opzione \-n (vedere sopra).
 L'opzione 'readonly' può essere annullata con ":set noro".
 Vedere ":help 'readonly'".
 .TP
-\-r
-Lista file di swap, e informazioni su come usarli per ripristinare file.
-.TP
-\-r {file}
-Modo Recovery (ripristino).
-Il file di swap è usato per recuperare una sessione di edit finita male.
-Il file di swap è un file con lo stesso nome file del file di testo
-editato, col suffisso ".swp".
-Vedere ":help recovery".
-.TP
 \-s
 Modo silenzioso.  Solo quando invocato come "Ex" o quando l'opzione
 "\-e" è stata data prima dell'opzione "\-s".
@@ -363,6 +335,13 @@ Lo stesso risultato si pu
 Se la fine del file di input viene raggiunta prima che Vim termini,
 l'ulteriore input verrà preso dalla tastiera.
 .TP
+\-S {file}
+I comandi contenuti in {file} sono eseguiti dopo la lettura del primo file.
+Equivalente a \-c "source {file}".
+{file} non può avere un nome che inizia per '\-'.
+Se {file} è omesso si usa "Session.vim" (funziona solo se \-S è l'ultimo
+argomento specificato).
+.TP
 \-T {terminale}
 Dice a
 .B Vim
@@ -372,16 +351,6 @@ Dovrebbe essere un terminale noto a
 .B Vim
 (predefinito) o definito nei file termcap o terminfo.
 .TP
-\-\-not-a-term
-Da usare per specifica a
-.B Vim
-che l'utente è consapevole che l'input e l'output non avvengono con un terminale
-vero e proprio.  Ciò serve per evitare il messaggio di avvertimento e il ritardo
-di due secondi che avverrebbero in assenza di questo argomento.
-.TP
-\-\-ttyfail
-Quando stdin o stdout non sono un terminale (tty) esci subito da Vim.
-.TP
 \-u {vimrc}
 Usa i comandi nel file {vimrc} per inizializzazioni.
 Tutte le altre inizializzazioni non sono eseguite.
@@ -393,7 +362,13 @@ Vedere ":help initialization" da vim per ulteriori dettagli.
 Usa i comandi nel file {gvimrc} per inizializzazioni GUI.
 Tutte le altre inizializzazioni GUI non sono eseguite.
 Si possono anche omettere tutte le inizializzazioni GUI dando come nome "NONE".
-Vedere ":help gui-init" da vim per ulteriori dettagli.
+Vedere ":help gui\-init" da vim per ulteriori dettagli.
+.TP
+\-v
+Inizia
+.B Vim
+in Modo Vi, come se il programma eseguibile fosse "vi".  Questo ha
+effetto solo quando Vim viene invocato con il nome "ex".
 .TP
 \-V[N]
 Verboso.  Vim manda messaggi relativi ai file di script che esegue
@@ -401,24 +376,10 @@ e quando legge o scrive un file viminfo.  Il numero opzionale N
 dell'opzione 'verbose'.  Il valore predefinito è 10.
 .TP
 \-V[N]{nome_file}
-Comw \-V  imposta 'verbosefile' a {nome_file}.  Il risultato è che i messaggi
+Come \-V  imposta 'verbosefile' a {nome_file}.  Il risultato è che i messaggi
 non sono visualizzati, ma scritti sul file {nome_file}.  Il {nome_file} non
 deve iniziare con un numero.
 .TP
-\-\-log {nome_file}
-Se
-.B Vim
-è stato compilato con le funzionalità eval e channel, inizia a registrare
-e scrive le registrazioni a {nome_file}.  Ciò equivale a chiamare
-.I ch_logfile({nome_file}, 'ao')
-in una fase molto iniziale dell'avvio del programma.
-.TP
-\-v
-Inizia
-.B Vim
-in Modo Vi, come se il programma eseguibile fosse "vi".  Questo ha
-effetto solo quando Vim viene invocato con il nome "ex".
-.TP
 \-w{numero}
 Imposta l'opzione 'window' a {numero}.
 .TP
@@ -434,7 +395,10 @@ Se il file {script_file} esiste, il testo immesso viene aggiunto in fondo.
 Come \-w, ma uno script file esistente viene sovrascritto.
 .TP
 \-x
-Uso di cifratura nella scrittura dei file.  Verrà chiesta una chiave di cifratura.
+Se
+.B Vim
+è stato compilato con il supporto per la cifratura, usare cifratura
+nella scrittura dei file.  Verrà chiesta una chiave di cifratura.
 .TP
 \-X
 Non connettersi al server X.  Vim parte più rapidamente,
@@ -460,16 +424,54 @@ Si pu
 Richiede di non usare alcun file di personalizzazione (vimrc, plugin, etc.).
 Utile per verificare se un problema persiste invocando Vim "originale".
 .TP
+\-\-cmd {comando}
+Come "\-c", ma il comando è eseguito subito PRIMA
+di eseguire qualsiasi file vimrc.
+Si possono usare fino a 10 di questi comandi, indipendentemente dai comandi "\-c".
+.TP
 \-\-echo\-wid
 Solo per GUI GTK: Visualizza ID di Window su stdout.
 .TP
+\-\-gui-dialog-file {nome}
+Quando si usa la GUI, invece di visualizzare un dialogo, il titolo e il
+messaggio del dialogo sono scritti sul file {nome}.  Il file viene creato o,
+se già esistente, viene esteso.  Quest'opzione serve solo in fase di test,
+per evitare di restare bloccati da un dialogo che non si riesce a visualizzare.
+Se si sta lavorando senza la GUI l'argomento viene ignorato.
+.TP
+\-\-help, \-h, \-?
+Un po' di aiuto su opzioni e argomenti che si possono dare invocando Vim.
+Subito dopo
+.B Vim
+esce.
+.TP
 \-\-literal
 Considera i nomi passati come argomenti letterali, senza espandere metacaratteri.
 Non ha effetto in Unix, dove la shell espande comunque i metacaratteri.
 .TP
+\-\-log {nome_file}
+Se
+.B Vim
+è stato compilato con le funzionalità eval e channel, inizia a registrare
+e scrive le registrazioni a {nome_file}.  Ciò equivale a chiamare
+.I ch_logfile({nome_file}, 'ao')
+in una fase molto iniziale dell'avvio del programma.
+.TP
+\-\-nofork
+Direttamente [Foreground].  Per la versione GUI,
+.B Vim
+non crea [fork] una nuova finestra, indipendente dalla shell di invocazione.
+.TP
 \-\-noplugin
 Non caricare plugin.  Implicito se si specifica \-u NONE.
 .TP
+\-\-not\-a\-term
+Da usare per specificare a
+.B Vim
+che l'utente è consapevole che l'input e l'output non avvengono con un terminale
+vero e proprio.  Ciò serve per evitare il messaggio di avvertimento e il ritardo
+di due secondi che avverrebbero in assenza di questo argomento.
+.TP
 \-\-remote
 Connettersi a un server Vim e chiedere di editare i file elencati come altri
 argomenti.  Se non si trova un server viene dato un messaggio e i file sono
@@ -498,16 +500,19 @@ Usa {nome} come nome server.  Usato per il Vim corrente, a meno che sia usato
 con l'argomento \-\-remote, nel qual caso indica il server a cui connettersi.
 .TP
 \-\-socketid {id}
-Solo per GUI GTK: Usa meccanismo GtkPlug per eseguire gvim in un'altra finestra.
+Solo per GUI GTK: Usa meccanismo GtkPlug per eseguire gVim in un'altra finestra.
 .TP
 \-\-startuptime {nome_file}
 Durante la fase iniziale, scrive messaggi di log al file {nome_file}.
 .TP
+\-\-ttyfail
+Quando stdin o stdout non sono un terminale (tty) esce subito da Vim.
+.TP
 \-\-version
 Stampa la versione di Vim ed esce.
 .TP
 \-\-windowid {id}
-Solo per GUI Win32: Chiede a gvim di provare a user l'ID di window {id}
+Solo per GUI Win32: Chiede a gVim di provare a user l'ID di window {id}
 come padre, in modo da venir eseguito all'interno della finestra specificata.
 .SH AIUTO ONLINE
 Battere ":help" in
@@ -555,13 +560,17 @@ Inizializzazioni personali di
 Inizializzazioni gvim a livello di sistema.
 .TP
 ~/.gvimrc, ~/.vim/gvimrc, $XDG_CONFIG_HOME/vim/gvimrc
-Inizializzazioni personali di gvim (viene utilizzata la prima trovata).
+Inizializzazioni personali di
+.B gVim
+(viene utilizzata la prima trovata).
 .TP
 /usr/local/share/vim/optwin.vim
 Script Vim usato dal comando ":options", maniera elegante per visualizzare e impostare opzioni.
 .TP
 /usr/local/share/vim/vim??/menu.vim
-Inizializzazioni del menù gvim a livello di sistema.
+Inizializzazioni del menù
+.B gVim
+a livello di sistema.
 .TP
 /usr/local/share/vim/vim??/bugreport.vim
 Script Vim per generare una segnalazione di errore.  Vedere ":help bugs".

runtime/doc/vim-it.UTF-8.1

@@ -1,4 +1,4 @@
-.TH VIM 1 "4 giugno 2024"
+.TH VIM 1 "12 agosto 2024"
 .SH NOME
 vim \- VI Migliorato, un editor di testi per programmatori
 .SH SINTASSI
@@ -31,7 +31,7 @@ vim \- VI Migliorato, un editor di testi per programmatori
 .B rgview
 .SH DESCRIZIONE
 .B Vim
-Un editore di testi, compatibile con, e migliore di, Vi.
+è un editore di testi, compatibile con, e migliore di, Vi.
 Può essere usato per editare qualsiasi file di testo.
 Particolarmente utile per editare programmi.
 .PP
@@ -150,18 +150,6 @@ Esempio: vim "+set si" main.c
 .br
 Note: Si possono avere fino a 10 comandi "+" o "\-c".
 .TP
-\-S {file}
-I comandi contenuti in {file} sono eseguiti dopo la lettura del primo file.
-Equivalente a \-c "source {file}".
-{file} non può avere un nome che inizia per '\-'.
-Se {file} è omesso si usa "Session.vim" (funziona solo se \-S è l'ultimo
-argomento specificato).
-.TP
-\-\-cmd {comando}
-Come "\-c", ma il comando è eseguito PRIMA
-di eseguire qualsiasi file vimrc.
-Si possono usare fino a 10 di questi comandi, indipendentemente dai comandi "\-c".
-.TP
 \-A
 Se
 .B Vim
@@ -224,11 +212,6 @@ Opzione da usare quando
 sessione di edit (p.es., mail).
 Sull'Amiga i comandi ":sh" e ":!" non sono disponibili.
 .TP
-\-\-nofork
-Direttamente [Foreground].  Per la versione GUI,
-.B Vim
-non crea [fork] una nuova finestra, indipendente dalla shell di invocazione.
-.TP
 \-F
 Se
 .B Vim
@@ -239,6 +222,8 @@ in Modo Farsi, cioè impostando 'fkmap' e 'rightleft'.
 Altrimenti viene dato un messaggio di errore e
 .B Vim
 termina in modo anormale.
+.br
+Nota: Il supporto Farsi è stato rimosso a partire dalla patch 8.1.0932.
 .TP
 \-g
 Se
@@ -248,19 +233,6 @@ Se Vim è stato compilato senza supporto GUI viene dato un messaggio di errore e
 .B Vim
 termina in modo anormale.
 .TP
-\-\-gui-dialog-file {nome}
-Quando si usa la GUI, invece di visualizzare un dialogo, il titolo e il
-messaggio del dialogo sono scritti sul file {nome}.  Il file viene creato o,
-se già esistente, viene esteso.  Quest'opzione serve solo in fase di test,
-per evitare di restare bloccati da un dialogo che non si riesce a visualizzare.
-Se si sta lavorando senza la GUI l'argomento viene ignorato.
-.TP
-\-\-help, \-h, \-?
-Un po' di aiuto su opzioni e argomenti che si possono dare invocando Vim.
-Subito dopo
-.B Vim
-esce.
-.TP
 \-H
 Se
 .B Vim
@@ -278,13 +250,13 @@ del file da usare invece di quello predefinito "~/.viminfo".
 Si può anche evitare l'uso di un file .viminfo, dando come nome
 "NONE".
 .TP
-\-L
-Equivalente a \-r.
-.TP
 \-l
 Modo Lisp.
 Imposta le opzioni 'lisp' e 'showmatch'.
 .TP
+\-L
+Equivalente a \-r.
+.TP
 \-m
 Inibisce modifica file.
 Inibisce l'opzione 'write'.
@@ -295,6 +267,13 @@ Modifiche non permesse.  Le opzioni 'modifiable' e 'write' sono annullate,
 in modo da impedire sia modifiche che riscritture.  Da notare che queste
 opzioni possono essere abilitate in seguito, permettendo così modifiche.
 .TP
+\-n
+Inibisce l'uso di un file di swap.
+Il recupero dopo una caduta di macchina sarà impossibile.
+Utile per editare un file su un supporto molto lento (p.es., floppy).
+Il comando ":set uc=0" ha lo stesso effetto.
+Per abilitare il recupero usare ":set uc=200".
+.TP
 \-N
 Modo "Non-compatibile".  Annulla l'opzione 'compatible'.
 Così
@@ -302,13 +281,6 @@ Così
 si comporta un po' meglio, ma è meno compatibile con Vi, anche in assenza di un
 file .vimrc.
 .TP
-\-n
-Inibisce l'uso di un file di swap.
-Il recupero dopo una caduta di macchina diventa impossibile.
-Utile per editare un file su un supporto molto lento (p.es., floppy).
-Il comando ":set uc=0" ha lo stesso effetto.
-Per abilitare il recupero usare ":set uc=200".
-.TP
 \-nb
 Diviene un Editor server per NetBeans.  Vedere la documentazione per dettagli.
 .TP
@@ -331,6 +303,16 @@ Vim viene eseguito in una finestra MDI (Multiple-Document Interface).
 che sia sufficientemente esplicativo.  Notare che l'implementazione è ancora
 rudimentale.  Non funziona per tutte le applicazioni, e il menù non funziona.
 .TP
+\-r
+Lista file di swap, e informazioni su come usarli per ripristinare file.
+.TP
+\-r {file}
+Modo Recovery (ripristino).
+Il file di swap è usato per recuperare una sessione di edit finita male.
+Il file di swap è un file con lo stesso nome file del file di testo
+editato, col suffisso ".swp".
+Vedere ":help recovery".
+.TP
 \-R
 Modo Read-only (Sola Lettura).
 Imposta l'opzione 'readonly'.
@@ -342,16 +324,6 @@ L'opzione \-R implica anche l'opzione \-n (vedere sopra).
 L'opzione 'readonly' può essere annullata con ":set noro".
 Vedere ":help 'readonly'".
 .TP
-\-r
-Lista file di swap, e informazioni su come usarli per ripristinare file.
-.TP
-\-r {file}
-Modo Recovery (ripristino).
-Il file di swap è usato per recuperare una sessione di edit finita male.
-Il file di swap è un file con lo stesso nome file del file di testo
-editato, col suffisso ".swp".
-Vedere ":help recovery".
-.TP
 \-s
 Modo silenzioso.  Solo quando invocato come "Ex" o quando l'opzione
 "\-e" è stata data prima dell'opzione "\-s".
@@ -363,6 +335,13 @@ Lo stesso risultato si può ottenere col comando ":source! {script_in_input}".
 Se la fine del file di input viene raggiunta prima che Vim termini,
 l'ulteriore input verrà preso dalla tastiera.
 .TP
+\-S {file}
+I comandi contenuti in {file} sono eseguiti dopo la lettura del primo file.
+Equivalente a \-c "source {file}".
+{file} non può avere un nome che inizia per '\-'.
+Se {file} è omesso si usa "Session.vim" (funziona solo se \-S è l'ultimo
+argomento specificato).
+.TP
 \-T {terminale}
 Dice a
 .B Vim
@@ -372,16 +351,6 @@ Dovrebbe essere un terminale noto a
 .B Vim
 (predefinito) o definito nei file termcap o terminfo.
 .TP
-\-\-not-a-term
-Da usare per specifica a
-.B Vim
-che l'utente è consapevole che l'input e l'output non avvengono con un terminale
-vero e proprio.  Ciò serve per evitare il messaggio di avvertimento e il ritardo
-di due secondi che avverrebbero in assenza di questo argomento.
-.TP
-\-\-ttyfail
-Quando stdin o stdout non sono un terminale (tty) esci subito da Vim.
-.TP
 \-u {vimrc}
 Usa i comandi nel file {vimrc} per inizializzazioni.
 Tutte le altre inizializzazioni non sono eseguite.
@@ -393,7 +362,13 @@ Vedere ":help initialization" da vim per ulteriori dettagli.
 Usa i comandi nel file {gvimrc} per inizializzazioni GUI.
 Tutte le altre inizializzazioni GUI non sono eseguite.
 Si possono anche omettere tutte le inizializzazioni GUI dando come nome "NONE".
-Vedere ":help gui-init" da vim per ulteriori dettagli.
+Vedere ":help gui\-init" da vim per ulteriori dettagli.
+.TP
+\-v
+Inizia
+.B Vim
+in Modo Vi, come se il programma eseguibile fosse "vi".  Questo ha
+effetto solo quando Vim viene invocato con il nome "ex".
 .TP
 \-V[N]
 Verboso.  Vim manda messaggi relativi ai file di script che esegue
@@ -401,24 +376,10 @@ e quando legge o scrive un file viminfo.  Il numero opzionale N è il valore
 dell'opzione 'verbose'.  Il valore predefinito è 10.
 .TP
 \-V[N]{nome_file}
-Comw \-V  imposta 'verbosefile' a {nome_file}.  Il risultato è che i messaggi
+Come \-V  imposta 'verbosefile' a {nome_file}.  Il risultato è che i messaggi
 non sono visualizzati, ma scritti sul file {nome_file}.  Il {nome_file} non
 deve iniziare con un numero.
 .TP
-\-\-log {nome_file}
-Se
-.B Vim
-è stato compilato con le funzionalità eval e channel, inizia a registrare
-e scrive le registrazioni a {nome_file}.  Ciò equivale a chiamare
-.I ch_logfile({nome_file}, 'ao')
-in una fase molto iniziale dell'avvio del programma.
-.TP
-\-v
-Inizia
-.B Vim
-in Modo Vi, come se il programma eseguibile fosse "vi".  Questo ha
-effetto solo quando Vim viene invocato con il nome "ex".
-.TP
 \-w{numero}
 Imposta l'opzione 'window' a {numero}.
 .TP
@@ -434,7 +395,10 @@ Se il file {script_file} esiste, il testo immesso viene aggiunto in fondo.
 Come \-w, ma uno script file esistente viene sovrascritto.
 .TP
 \-x
-Uso di cifratura nella scrittura dei file.  Verrà chiesta una chiave di cifratura.
+Se
+.B Vim
+è stato compilato con il supporto per la cifratura, usare cifratura
+nella scrittura dei file.  Verrà chiesta una chiave di cifratura.
 .TP
 \-X
 Non connettersi al server X.  Vim parte più rapidamente,
@@ -460,16 +424,54 @@ Si può usare per editare un file il cui nome inizi per '-'.
 Richiede di non usare alcun file di personalizzazione (vimrc, plugin, etc.).
 Utile per verificare se un problema persiste invocando Vim "originale".
 .TP
+\-\-cmd {comando}
+Come "\-c", ma il comando è eseguito subito PRIMA
+di eseguire qualsiasi file vimrc.
+Si possono usare fino a 10 di questi comandi, indipendentemente dai comandi "\-c".
+.TP
 \-\-echo\-wid
 Solo per GUI GTK: Visualizza ID di Window su stdout.
 .TP
+\-\-gui-dialog-file {nome}
+Quando si usa la GUI, invece di visualizzare un dialogo, il titolo e il
+messaggio del dialogo sono scritti sul file {nome}.  Il file viene creato o,
+se già esistente, viene esteso.  Quest'opzione serve solo in fase di test,
+per evitare di restare bloccati da un dialogo che non si riesce a visualizzare.
+Se si sta lavorando senza la GUI l'argomento viene ignorato.
+.TP
+\-\-help, \-h, \-?
+Un po' di aiuto su opzioni e argomenti che si possono dare invocando Vim.
+Subito dopo
+.B Vim
+esce.
+.TP
 \-\-literal
 Considera i nomi passati come argomenti letterali, senza espandere metacaratteri.
 Non ha effetto in Unix, dove la shell espande comunque i metacaratteri.
 .TP
+\-\-log {nome_file}
+Se
+.B Vim
+è stato compilato con le funzionalità eval e channel, inizia a registrare
+e scrive le registrazioni a {nome_file}.  Ciò equivale a chiamare
+.I ch_logfile({nome_file}, 'ao')
+in una fase molto iniziale dell'avvio del programma.
+.TP
+\-\-nofork
+Direttamente [Foreground].  Per la versione GUI,
+.B Vim
+non crea [fork] una nuova finestra, indipendente dalla shell di invocazione.
+.TP
 \-\-noplugin
 Non caricare plugin.  Implicito se si specifica \-u NONE.
 .TP
+\-\-not\-a\-term
+Da usare per specificare a
+.B Vim
+che l'utente è consapevole che l'input e l'output non avvengono con un terminale
+vero e proprio.  Ciò serve per evitare il messaggio di avvertimento e il ritardo
+di due secondi che avverrebbero in assenza di questo argomento.
+.TP
 \-\-remote
 Connettersi a un server Vim e chiedere di editare i file elencati come altri
 argomenti.  Se non si trova un server viene dato un messaggio e i file sono
@@ -498,16 +500,19 @@ Usa {nome} come nome server.  Usato per il Vim corrente, a meno che sia usato
 con l'argomento \-\-remote, nel qual caso indica il server a cui connettersi.
 .TP
 \-\-socketid {id}
-Solo per GUI GTK: Usa meccanismo GtkPlug per eseguire gvim in un'altra finestra.
+Solo per GUI GTK: Usa meccanismo GtkPlug per eseguire gVim in un'altra finestra.
 .TP
 \-\-startuptime {nome_file}
 Durante la fase iniziale, scrive messaggi di log al file {nome_file}.
 .TP
+\-\-ttyfail
+Quando stdin o stdout non sono un terminale (tty) esce subito da Vim.
+.TP
 \-\-version
 Stampa la versione di Vim ed esce.
 .TP
 \-\-windowid {id}
-Solo per GUI Win32: Chiede a gvim di provare a user l'ID di window {id}
+Solo per GUI Win32: Chiede a gVim di provare a user l'ID di window {id}
 come padre, in modo da venir eseguito all'interno della finestra specificata.
 .SH AIUTO ONLINE
 Battere ":help" in
@@ -555,13 +560,17 @@ Inizializzazioni personali di
 Inizializzazioni gvim a livello di sistema.
 .TP
 ~/.gvimrc, ~/.vim/gvimrc, $XDG_CONFIG_HOME/vim/gvimrc
-Inizializzazioni personali di gvim (viene utilizzata la prima trovata).
+Inizializzazioni personali di
+.B gVim
+(viene utilizzata la prima trovata).
 .TP
 /usr/local/share/vim/optwin.vim
 Script Vim usato dal comando ":options", maniera elegante per visualizzare e impostare opzioni.
 .TP
 /usr/local/share/vim/vim??/menu.vim
-Inizializzazioni del menù gvim a livello di sistema.
+Inizializzazioni del menù
+.B gVim
+a livello di sistema.
 .TP
 /usr/local/share/vim/vim??/bugreport.vim
 Script Vim per generare una segnalazione di errore.  Vedere ":help bugs".