patch 9.0.0804: crash when trying to divide a number by -1

Problem:    Crash when trying to divice the largest negative number by -1.
Solution:   Handle this case specifically.

.appveyor.yml

@@ -7,7 +7,6 @@ environment:
     - FEATURE: HUGE
 # disabled
 #    - FEATURE: TINY
-#    - FEATURE: SMALL
 #    - FEATURE: NORMAL
 #    - FEATURE: BIG
 
@@ -15,9 +14,8 @@ matrix:
   fast_finish: true
 
 before_build:
-  # Use Windows SDK 7.1 (= MSVC 2010)
-  - '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /release'
-  - 'set INCLUDE=%INCLUDE%C:\Program Files (x86)\Windows Kits\8.1\Include\um'
+  # Use Visual Studio 2015 compiler tools (default is 2012)
+  - '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64'
 
 build_script:
   - ci/appveyor.bat

.cirrus.yml

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

.github/CODEOWNERS

@@ -57,6 +57,7 @@ runtime/compiler/gawk.vim		@dkearns
 runtime/compiler/gjs.vim		@dkearns
 runtime/compiler/go.vim			@dbarnett
 runtime/compiler/haml.vim		@tpope
+runtime/compiler/hare.vim		@rsaihe
 runtime/compiler/icon.vim		@dkearns
 runtime/compiler/javac.vim		@dkearns
 runtime/compiler/jest.vim		@dkearns
@@ -107,6 +108,7 @@ runtime/ftplugin/awk.vim		@dkearns
 runtime/ftplugin/basic.vim		@dkearns
 runtime/ftplugin/bst.vim		@tpope
 runtime/ftplugin/cfg.vim		@chrisbra
+runtime/ftplugin/chatito.vim		@ObserverOfTime
 runtime/ftplugin/clojure.vim		@axvr
 runtime/ftplugin/cs.vim			@nickspoons
 runtime/ftplugin/csh.vim		@dkearns
@@ -116,9 +118,9 @@ runtime/ftplugin/desktop.vim		@e-kwsm
 runtime/ftplugin/dosbatch.vim		@mrdubya
 runtime/ftplugin/eiffel.vim		@dkearns
 runtime/ftplugin/elixir.vim		@mhanberg
-runtime/ftplugin/expect.vim		@dkearns
 runtime/ftplugin/erlang.vim		@hcs42
 runtime/ftplugin/eruby.vim		@tpope @dkearns
+runtime/ftplugin/expect.vim		@dkearns
 runtime/ftplugin/fennel.vim		@gpanders
 runtime/ftplugin/fetchmail.vim		@dkearns
 runtime/ftplugin/fpcmake.vim		@dkearns
@@ -134,9 +136,11 @@ runtime/ftplugin/gitconfig.vim		@tpope
 runtime/ftplugin/gitignore.vim		@ObserverOfTime
 runtime/ftplugin/gitrebase.vim		@tpope
 runtime/ftplugin/gitsendemail.vim	@tpope
+runtime/ftplugin/gyp.vim		@ObserverOfTime
 runtime/ftplugin/go.vim			@dbarnett
 runtime/ftplugin/gprof.vim		@dpelle
 runtime/ftplugin/haml.vim		@tpope
+runtime/ftplugin/hare.vim		@rsaihe
 runtime/ftplugin/hgcommit.vim		@k-takata
 runtime/ftplugin/html.vim		@dkearns
 runtime/ftplugin/i3config.vim		@hiqua
@@ -167,6 +171,7 @@ runtime/ftplugin/pbtxt.vim		@lakshayg
 runtime/ftplugin/pdf.vim		@tpope
 runtime/ftplugin/perl.vim		@petdance @dkearns
 runtime/ftplugin/pod.vim		@petdance @dkearns
+runtime/ftplugin/poefilter.vim		@ObserverOfTime
 runtime/ftplugin/postscr.vim		@mrdubya
 runtime/ftplugin/ps1.vim		@heaths
 runtime/ftplugin/ps1xml.vim		@heaths
@@ -188,6 +193,7 @@ runtime/ftplugin/sdoc.vim		@gpanders
 runtime/ftplugin/sh.vim			@dkearns
 runtime/ftplugin/solution.vim		@dkearns
 runtime/ftplugin/spec.vim		@ignatenkobrain
+runtime/ftplugin/ssa.vim		@ObserverOfTime
 runtime/ftplugin/swayconfig.vim		@jamespeapen
 runtime/ftplugin/systemverilog.vim	@Kocha
 runtime/ftplugin/tap.vim		@petdance
@@ -198,6 +204,7 @@ runtime/ftplugin/toml.vim		@averms
 runtime/ftplugin/tt2html.vim		@petdance
 runtime/ftplugin/typescript.vim		@dkearns
 runtime/ftplugin/typescriptreact.vim	@dkearns
+runtime/ftplugin/vdf.vim		@ObserverOfTime
 runtime/ftplugin/wast.vim		@rhysd
 runtime/ftplugin/wget.vim		@dkearns
 runtime/ftplugin/wget2.vim		@dkearns
@@ -207,6 +214,7 @@ runtime/ftplugin/zsh.vim		@chrisbra
 runtime/indent/basic.vim		@dkearns
 runtime/indent/bst.vim			@tpope
 runtime/indent/cdl.vim			@dkearns
+runtime/indent/chatito.vim		@ObserverOfTime
 runtime/indent/clojure.vim		@axvr
 runtime/indent/config.vim		@dkearns
 runtime/indent/cs.vim			@nickspoons
@@ -228,7 +236,9 @@ runtime/indent/gdscript.vim		@habamax
 runtime/indent/gitconfig.vim		@tpope
 runtime/indent/gitolite.vim		@sitaramc
 runtime/indent/go.vim			@dbarnett
+runtime/indent/gyp.vim			@ObserverOfTime
 runtime/indent/haml.vim			@tpope
+runtime/indent/hare.vim			@rsaihe
 runtime/indent/idlang.vim		@dkearns
 runtime/indent/j.vim			@glts
 runtime/indent/java.vim			@xuhdev
@@ -302,6 +312,7 @@ runtime/syntax/cabal.vim		@coot
 runtime/syntax/cabalconfig.vim		@coot
 runtime/syntax/cabalproject.vim		@coot
 runtime/syntax/cf.vim			@ernstvanderlinden
+runtime/syntax/chatito.vim		@ObserverOfTime
 runtime/syntax/clojure.vim		@axvr
 runtime/syntax/cs.vim			@nickspoons
 runtime/syntax/csh.vim			@cecamp
@@ -344,7 +355,9 @@ runtime/syntax/go.vim			@bhcleek
 runtime/syntax/godoc.vim		@dbarnett
 runtime/syntax/gprof.vim		@dpelle
 runtime/syntax/groff.vim		@jmarshall
+runtime/syntax/gyp.vim			@ObserverOfTime
 runtime/syntax/haml.vim			@tpope
+runtime/syntax/hare.vim			@rsaihe
 runtime/syntax/haskell.vim		@coot
 runtime/syntax/hgcommit.vim		@k-takata
 runtime/syntax/html.vim			@dkearns
@@ -361,6 +374,7 @@ runtime/syntax/less.vim			@genoma
 runtime/syntax/lex.vim			@cecamp
 runtime/syntax/liquid.vim		@tpope
 runtime/syntax/lisp.vim			@cecamp
+runtime/syntax/lyrics.vim		@ObserverOfTime
 runtime/syntax/lynx.vim			@dkearns
 runtime/syntax/m3build.vim		@dkearns
 runtime/syntax/m3quake.vim		@dkearns
@@ -385,6 +399,7 @@ runtime/syntax/perl.vim			@petdance
 runtime/syntax/php.vim			@TysonAndre
 runtime/syntax/plsql.vim		@lee-lindley
 runtime/syntax/pod.vim			@petdance
+runtime/syntax/poefilter.vim		@ObserverOfTime
 runtime/syntax/postscr.vim		@mrdubya
 runtime/syntax/privoxy.vim		@dkearns
 runtime/syntax/prolog.vim		@XVilka
@@ -412,11 +427,14 @@ runtime/syntax/sass.vim			@tpope
 runtime/syntax/scala.vim		@derekwyatt
 runtime/syntax/scss.vim			@tpope
 runtime/syntax/sdoc.vim			@gpanders
+runtime/syntax/sed.vim			@dkearns
 runtime/syntax/sh.vim			@cecamp
 runtime/syntax/sm.vim			@cecamp
 runtime/syntax/spec.vim			@ignatenkobrain
 runtime/syntax/sqloracle.vim		@chrisbra
 runtime/syntax/squirrel.vim		@zenmatic
+runtime/syntax/srt.vim			@ObserverOfTime
+runtime/syntax/ssa.vim			@ObserverOfTime
 runtime/syntax/sshconfig.vim		@Jakuje
 runtime/syntax/sshdconfig.vim		@Jakuje
 runtime/syntax/sudoers.vim		@e-kwsm
@@ -437,6 +455,7 @@ runtime/syntax/tt2js.vim		@petdance
 runtime/syntax/typescript.vim		@HerringtonDarkholme
 runtime/syntax/typescriptcommon.vim	@HerringtonDarkholme
 runtime/syntax/typescriptreact.vim	@HerringtonDarkholme
+runtime/syntax/vdf.vim			@ObserverOfTime
 runtime/syntax/vim.vim			@cecamp
 runtime/syntax/vroom.vim		@dbarnett
 runtime/syntax/wast.vim			@rhysd

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/ci.yml

@@ -12,6 +12,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
   cancel-in-progress: true
 
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
   linux:
     runs-on: ubuntu-20.04
@@ -30,7 +33,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        features: [tiny, small, normal, huge]
+        features: [tiny, normal, huge]
         compiler: [clang, gcc]
         extra: [none]
         include:
@@ -122,7 +125,7 @@ jobs:
           echo "TMPDIR=${{ runner.temp }}"
 
           case "${{ matrix.features }}" in
-          tiny|small)
+          tiny)
             echo "TEST=testtiny"
             if ${{ contains(matrix.extra, 'nogui') }}; then
               echo "CONFOPT=--disable-gui"
@@ -250,7 +253,7 @@ jobs:
 
       - name: Codecov
         if: matrix.coverage
-        uses: codecov/codecov-action@v3.1.0
+        uses: codecov/codecov-action@v3.1.1
         with:
           flags: linux,${{ matrix.features }}-${{ matrix.compiler }}-${{ matrix.extra }}
 
@@ -301,6 +304,7 @@ jobs:
         run: |
           brew install lua
           echo "LUA_PREFIX=/usr/local" >> $GITHUB_ENV
+          brew uninstall perl
 
       - name: Set up environment
         run: |
@@ -605,7 +609,7 @@ jobs:
 
       - name: Codecov
         if: matrix.coverage
-        uses: codecov/codecov-action@v3.1.0
+        uses: codecov/codecov-action@v3.1.1
         with:
           directory: src
           flags: windows,${{ matrix.toolchain }}-${{ matrix.arch }}-${{ matrix.features }}

.github/workflows/codeql-analysis.yml

@@ -21,8 +21,15 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
   cancel-in-progress: true
 
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
   analyze:
+    permissions:
+      contents: read # to fetch code (actions/checkout)
+      security-events: write #  (github/codeql-action/autobuild)
+
     name: Analyze
     runs-on: ubuntu-latest
 

.github/workflows/coverity.yml

@@ -4,6 +4,9 @@ on:
     - cron: '42 0 * * *'  # Run once per day, to avoid Coverity's submission limits
   workflow_dispatch:
 
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
   scan:
     runs-on: ubuntu-20.04

.gitignore

@@ -44,6 +44,8 @@ gvimext.lib
 gvim.lib
 runtime/doc/uganda.nsis.txt
 nsis/icons/*
+/vim90/
+.vscode/
 
 # NetBeans
 nbproject/*
@@ -83,6 +85,7 @@ src/testdir/messages
 src/testdir/viminfo
 src/testdir/opt_test.vim
 src/testdir/failed
+src/testdir/starttime
 runtime/indent/testdir/*.out
 runtime/indent/testdir/*.fail
 src/memfile_test

Filelist

@@ -209,6 +209,7 @@ SRC_ALL =	\
 		src/testdir/python_before/*.py \
 		src/testdir/pyxfile/*.py \
 		src/testdir/dumps/*.dump \
+		src/testdir/dumps/*.vim \
 		src/testdir/samples/*.txt \
 		src/testdir/samples/test000 \
 		src/testdir/color_ramp.vim \
@@ -538,9 +539,11 @@ SRC_DOS =	\
 		tools/rename.bat \
 		src/bigvim.bat \
 		src/bigvim64.bat \
-		src/msvc2008.bat \
-		src/msvc2010.bat \
+		src/msvc-latest.bat \
 		src/msvc2015.bat \
+		src/msvc2017.bat \
+		src/msvc2019.bat \
+		src/msvc2022.bat \
 		src/msys32.bat \
 		src/msys64.bat \
 		src/dlldata.c \
@@ -553,7 +556,6 @@ SRC_DOS =	\
 		src/if_ole.cpp \
 		src/if_ole.h \
 		src/if_ole.idl \
-		src/if_perl_msvc/stdbool.h \
 		src/iscygpty.c \
 		src/iscygpty.h \
 		src/iid_ole.c \
@@ -588,30 +590,9 @@ SRC_DOS =	\
 		nsis/README.txt \
 		nsis/lang/*.nsi \
 		uninstall.txt \
-		src/VisVim/Commands.cpp \
-		src/VisVim/Commands.h \
-		src/VisVim/DSAddIn.cpp \
-		src/VisVim/DSAddIn.h \
-		src/VisVim/OleAut.cpp \
-		src/VisVim/OleAut.h \
-		src/VisVim/README_VisVim.txt \
-		src/VisVim/Reg.cpp \
-		src/VisVim/Register.bat \
-		src/VisVim/Resource.h \
-		src/VisVim/StdAfx.cpp \
-		src/VisVim/StdAfx.h \
-		src/VisVim/UnRegist.bat \
-		src/VisVim/VisVim.cpp \
-		src/VisVim/VisVim.def \
-		src/VisVim/VisVim.mak \
-		src/VisVim/VisVim.h \
-		src/VisVim/VisVim.odl \
-		src/VisVim/VisVim.rc \
-		src/VisVim/VsReadMe.txt \
 
 # source files for DOS without CR/LF translation (also in the extra archive)
 SRC_DOS_BIN =	\
-		src/VisVim/Res/*.bmp \
 		src/tearoff.bmp \
 		src/tools.bmp \
 		src/vim*.ico \
@@ -622,10 +603,8 @@ SRC_DOS_BIN =	\
 		src/xpm/include/*.h \
 		src/xpm/x64/lib-vc14/libXpm.lib \
 		src/xpm/x64/lib/libXpm.a \
-		src/xpm/x64/lib/libXpm.lib \
 		src/xpm/x86/lib-vc14/libXpm.lib \
 		src/xpm/x86/lib/libXpm.a \
-		src/xpm/x86/lib/libXpm.lib \
 		runtime/bitmaps/vim.ico \
 		nsis/icons.zip \
 
@@ -945,7 +924,6 @@ EXTRA =		\
 		$(RT_EXTRA) \
 		$(SRC_EXTRA) \
 		README_extra.txt \
-		src/VisVim/VisVim.dll \
 		runtime/vimlogo.xpm \
 
 # files in READMEdir that are included from the top dir

Makefile

@@ -198,8 +198,6 @@ MINOR = 0
 # - copy these files (get them from a binary archive or build them):
 #	gvimext.dll in src/GvimExt
 #	gvimext64.dll in src/GvimExt
-#	VisVim.dll in src/VisVim
-#   Note: VisVim needs to be build with MSVC 5, newer versions don't work.
 #   gvimext64.dll can be obtained from:
 #   https://github.com/vim/vim-win32-installer/releases
 #	It is part of gvim_9.0.*_x64.zip as vim/vim90/GvimExt/gvimext64.dll.
@@ -554,8 +552,6 @@ dosbin_ole: dist no_title.vim dist/$(COMMENT_OLE)
 	cp uninstallw32.exe dist/vim/$(VIMRTDIR)/uninstall.exe
 	cp gvimext.dll dist/vim/$(VIMRTDIR)/gvimext.dll
 	cp README_ole.txt dist/vim/$(VIMRTDIR)
-	cp src/VisVim/VisVim.dll dist/vim/$(VIMRTDIR)/VisVim.dll
-	cp src/VisVim/README_VisVim.txt dist/vim/$(VIMRTDIR)
 	cd dist && zip -9 -rD -z gvim$(VERSION)ole.zip vim <$(COMMENT_OLE)
 	cp gvim_ole.pdb dist/gvim$(VERSION)ole.pdb
 

README.md

@@ -28,10 +28,10 @@ All commands are given with normal keyboard characters, so those who can type
 with ten fingers can work very fast.  Additionally, function keys can be
 mapped to commands by the user, and the mouse can be used.
 
-Vim runs under MS-Windows (XP, Vista, 7, 8, 10), macOS, Haiku, VMS and almost
-all flavours of UNIX.  Porting to other systems should not be very difficult.
-Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me/NT/2000, Amiga DOS,
-Atari MiNT, BeOS, RISC OS and OS/2.  These are no longer maintained.
+Vim runs under MS-Windows (7, 8, 10, 11), macOS, Haiku, VMS and almost all
+flavours of UNIX.  Porting to other systems should not be very difficult.
+Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me/NT/2000/XP/Vista,
+Amiga DOS, Atari MiNT, BeOS, RISC OS and OS/2.  These are no longer maintained.
 
 For Vim9 script see [README_VIM9](README_VIM9.md).
 

README.txt

@@ -16,10 +16,10 @@ All commands are given with normal keyboard characters, so those who can type
 with ten fingers can work very fast.  Additionally, function keys can be
 mapped to commands by the user, and the mouse can be used.
 
-Vim runs under MS-Windows (XP, Vista, 7, 8, 10), macOS, VMS and almost all
+Vim runs under MS-Windows (7, 8, 10, 11), macOS, Haiku, VMS and almost all
 flavours of UNIX.  Porting to other systems should not be very difficult.
-Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me/NT/2000, Amiga DOS,
-Atari MiNT, BeOS, RISC OS and OS/2.  These are no longer maintained.
+Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me/NT/2000/XP/Vista,
+Amiga DOS, Atari MiNT, BeOS, RISC OS and OS/2.  These are no longer maintained.
 
 
 DISTRIBUTION

READMEdir/README_extra.txt

@@ -29,9 +29,6 @@ src/Make_mvc.mak	MS Visual C++ makefile for the Win32 GUI.
 
 src/if_ole.*		OLE automation interface, for MS Windows 95 and NT.
 
-src/VisVim/*		Integration of Win32 GUI with MS Visual Developer
-			Studio.
-
 src/GvimExt/*		DLL for the "Edit with Vim" context menu entry
 
 nsis/*			NSIS script to build the self-installing MS-Windows exe

READMEdir/README_ole.txt

@@ -1,6 +1,6 @@
 README_ole.txt for version 9.0 of Vim: Vi IMproved.
 
-This archive contains gvim.exe with OLE interface and VisVim.
+This archive contains gvim.exe with OLE interface.
 This version of gvim.exe can also load a number of interface dynamically (you
 can optionally install the .dll files for each interface).
 It is only for MS-Windows 95/98/ME/NT/2000/XP.
@@ -15,6 +15,3 @@ Win32 with OLE - "MS-Windows 32 bit GUI version with OLE support"
 
 For further information, type this inside Vim:
 	:help if_ole
-
-Furthermore, this archive contains VISVIM.DLL.  It can be used to integrate
-the OLE gvim with Microsoft Visual Developer Studio.  See VisVim/README.txt.

READMEdir/README_srcdos.txt

@@ -6,7 +6,6 @@ These files are in the runtime archive (vim90rt.zip).
 
 
 The DOS source archive contains the files needed to compile Vim on MS-Windows.
-It is packed for MS-Windows systems, with CR-LF.  It also includes the VisVim
-sources.
+It is packed for MS-Windows systems, with CR-LF.
 
 See "src/INSTALLpc.txt" for instructions on how to compile Vim on the PC.

nsis/README.txt

@@ -27,23 +27,20 @@ To build the installable .exe:
 	64-bit: src/GvimExt/gvimext64.dll
 	32-bit: src/GvimExt/gvimext.dll
 
-4.  Go to the VisVim directory and build VisVim.dll (or get it from a binary
-    archive).
-
-5.  Get a "diff.exe" program.  If you skip this the built-in diff will always
+4.  Get a "diff.exe" program.  If you skip this the built-in diff will always
     be used (which is fine for most users).  If you do have your own
     "diff.exe" put it in the "../.." directory (above the "vim82" directory,
     it's the same for all Vim versions).
     You can find one in previous Vim versions or in this archive:
 		http://www.mossbayeng.com/~ron/vim/diffutils.tar.gz
 
-6   Also put winpty32.dll and winpty-agent.exe in "../.." (above the "vim82"
+5   Also put winpty32.dll and winpty-agent.exe in "../.." (above the "vim82"
     directory).  This is required for the terminal window.
 
-7.  Do "make uganda.nsis.txt" in runtime/doc.  This requires sed, you may have
+6.  Do "make uganda.nsis.txt" in runtime/doc.  This requires sed, you may have
     to do this on Unix.  Make sure the file is in DOS file format!
 
-8.  Get gettext and iconv DLLs from the following site:
+7.  Get gettext and iconv DLLs from the following site:
 	https://github.com/mlocati/gettext-iconv-windows/releases
     Both 64- and 32-bit versions are needed.
     Download the files gettextX.X.X.X-iconvX.XX-shared-{32,64}.zip, extract

nsis/gvim.nsi

@@ -36,9 +36,6 @@ Unicode true
 # Comment the next line if you do not want to add Native Language Support
 !define HAVE_NLS
 
-# Uncomment the next line if you want to include VisVim extension:
-#!define HAVE_VIS_VIM
-
 # Comment the following line to create an English-only installer:
 !define HAVE_MULTI_LANG
 
@@ -55,9 +52,6 @@ Unicode true
 # ----------- No configurable settings below this line -----------
 
 !include "Library.nsh"		# For DLL install
-!ifdef HAVE_VIS_VIM
-  !include "UpgradeDLL.nsh"	# for VisVim.dll
-!endif
 !include "LogicLib.nsh"
 !include "MUI2.nsh"
 !include "nsDialogs.nsh"
@@ -536,17 +530,6 @@ SectionGroup $(str_group_plugin) id_group_plugin
 	SectionEnd
 SectionGroupEnd
 
-##########################################################
-!ifdef HAVE_VIS_VIM
-Section "$(str_section_vis_vim)" id_section_visvim
-	SectionIn 3
-
-	SetOutPath $0
-	!insertmacro UpgradeDLL "${VIMSRC}\VisVim\VisVim.dll" "$0\VisVim.dll" "$0"
-	File ${VIMSRC}\VisVim\README_VisVim.txt
-SectionEnd
-!endif
-
 ##########################################################
 !ifdef HAVE_NLS
 Section "$(str_section_nls)" id_section_nls
@@ -634,12 +617,6 @@ Section -post
 	  SectionGetSize ${id_section_editwith} $4
 	  IntOp $3 $3 + $4
 	${EndIf}
-!ifdef HAVE_VIS_VIM
-	${If} ${SectionIsSelected} ${id_section_visvim}
-	  SectionGetSize ${id_section_visvim} $4
-	  IntOp $3 $3 + $4
-	${EndIf}
-!endif
 !ifdef HAVE_NLS
 	${If} ${SectionIsSelected} ${id_section_nls}
 	  SectionGetSize ${id_section_nls} $4
@@ -670,9 +647,6 @@ Section -post
 	!insertmacro SaveSectionSelection ${id_section_vimrc}      "select_vimrc"
 	!insertmacro SaveSectionSelection ${id_section_pluginhome} "select_pluginhome"
 	!insertmacro SaveSectionSelection ${id_section_pluginvim}  "select_pluginvim"
-!ifdef HAVE_VIS_VIM
-	!insertmacro SaveSectionSelection ${id_section_visvim}     "select_visvim"
-!endif
 !ifdef HAVE_NLS
 	!insertmacro SaveSectionSelection ${id_section_nls}        "select_nls"
 !endif
@@ -744,9 +718,6 @@ Function .onInit
   !insertmacro LoadSectionSelection ${id_section_vimrc}      "select_vimrc"
   !insertmacro LoadSectionSelection ${id_section_pluginhome} "select_pluginhome"
   !insertmacro LoadSectionSelection ${id_section_pluginvim}  "select_pluginvim"
-!ifdef HAVE_VIS_VIM
-  !insertmacro LoadSectionSelection ${id_section_visvim}     "select_visvim"
-!endif
 !ifdef HAVE_NLS
   !insertmacro LoadSectionSelection ${id_section_nls}        "select_nls"
 !endif
@@ -921,9 +892,6 @@ FunctionEnd
     !insertmacro MUI_DESCRIPTION_TEXT ${id_group_plugin}        $(str_desc_plugin)
     !insertmacro MUI_DESCRIPTION_TEXT ${id_section_pluginhome}  $(str_desc_plugin_home)
     !insertmacro MUI_DESCRIPTION_TEXT ${id_section_pluginvim}   $(str_desc_plugin_vim)
-!ifdef HAVE_VIS_VIM
-    !insertmacro MUI_DESCRIPTION_TEXT ${id_section_visvim}      $(str_desc_vis_vim)
-!endif
 !ifdef HAVE_NLS
     !insertmacro MUI_DESCRIPTION_TEXT ${id_section_nls}         $(str_desc_nls)
 !endif
@@ -947,13 +915,6 @@ Section "un.$(str_unsection_register)" id_unsection_register
 	# created.  Thus the "vim61" directory is included in it.
 	StrCpy $0 "$INSTDIR"
 
-!ifdef HAVE_VIS_VIM
-	# If VisVim was installed, unregister the DLL.
-	${If} ${FileExists} "$0\VisVim.dll"
-	  ExecWait "regsvr32.exe /u /s $0\VisVim.dll"
-	${EndIf}
-!endif
-
 	# delete the context menu entry and batch files
 	DetailPrint "$(str_msg_unregistering)"
 	nsExec::Exec "$0\uninstall.exe -nsis"
@@ -1046,9 +1007,6 @@ Section "un.$(str_unsection_exe)" id_unsection_exe
 	RMDir /r $0\syntax
 	RMDir /r $0\tools
 	RMDir /r $0\tutor
-!ifdef HAVE_VIS_VIM
-	RMDir /r $0\VisVim
-!endif
 	RMDir /r $0\lang
 	RMDir /r $0\keymap
 	Delete $0\*.exe

nsis/lang/danish.nsi

@@ -79,9 +79,6 @@ LangString str_desc_plugin_home     ${LANG_DANISH}     "Opret plugin-mapper i HO
 LangString str_section_plugin_vim   ${LANG_DANISH}     "Delte"
 LangString str_desc_plugin_vim      ${LANG_DANISH}     "Opret plugin-mapper i Vim-installationsmappe, det bruges af alle på systemet."
 
-LangString str_section_vis_vim      ${LANG_DANISH}     "VisVim-udvidelser"
-LangString str_desc_vis_vim         ${LANG_DANISH}     "VisVim-udvidelser til integrering i Microsoft Visual Studio."
-
 LangString str_section_nls          ${LANG_DANISH}     "Understøttelse af modersmål"
 LangString str_desc_nls             ${LANG_DANISH}     "Installer filer til understøttelse af modersmål."
 

nsis/lang/dutch.nsi

@@ -123,11 +123,6 @@ LangString str_desc_plugin_vim      ${LANG_DUTCH} \
     "Creëer plugin mappen in Vim installatie map, deze worden gebruikt \
      voor iedereen op het systeem."
 
-LangString str_section_vis_vim      ${LANG_DUTCH} \
-    "VisVim extensie"
-LangString str_desc_vis_vim         ${LANG_DUTCH} \
-    "VisVim extensie voor Microsoft Visual Studio integratie."
-
 LangString str_section_nls          ${LANG_DUTCH} \
     "Ondersteuning voor andere talen"
 LangString str_desc_nls             ${LANG_DUTCH} \

nsis/lang/english.nsi

@@ -121,11 +121,6 @@ LangString str_desc_plugin_vim      ${LANG_ENGLISH} \
     "Create plugin directories in Vim install directory, it is used for \
      everybody on the system."
 
-LangString str_section_vis_vim      ${LANG_ENGLISH} \
-    "VisVim Extension"
-LangString str_desc_vis_vim         ${LANG_ENGLISH} \
-    "VisVim Extension for Microsoft Visual Studio integration."
-
 LangString str_section_nls          ${LANG_ENGLISH} \
     "Native Language Support"
 LangString str_desc_nls             ${LANG_ENGLISH} \

nsis/lang/german.nsi

@@ -122,11 +122,6 @@ LangString str_desc_plugin_vim      ${LANG_GERMAN} \
     "Plugin-Verzeichnisse im Vim-Installationsverzeichnis erstellen. Diese werden \
      für alle Benutzer dieses Systems genutzt."
 
-LangString str_section_vis_vim      ${LANG_GERMAN} \
-    "VisVim-Erweiterung"
-LangString str_desc_vis_vim         ${LANG_GERMAN} \
-    "VisVim-Erweiterung zur Integration in Microsoft Visual Studio."
-
 LangString str_section_nls          ${LANG_GERMAN} \
     "Unterstützung für andere Sprachen"
 LangString str_desc_nls             ${LANG_GERMAN} \

nsis/lang/italian.nsi

@@ -123,11 +123,6 @@ LangString str_desc_plugin_vim      ${LANG_ITALIAN} \
     "Crea directory per plugin nella directory di installazione di Vim \
      per uso da parte di tutti gli utenti di questo sistema."
 
-LangString str_section_vis_vim      ${LANG_ITALIAN} \
-    "Estensione VisVim"
-LangString str_desc_vis_vim         ${LANG_ITALIAN} \
-    "Estensione VisVim per integrazione con Microsoft Visual Studio."
-
 LangString str_section_nls          ${LANG_ITALIAN} \
     "Supporto Multilingue (NLS)"
 LangString str_desc_nls             ${LANG_ITALIAN} \

nsis/lang/japanese.nsi

@@ -128,11 +128,6 @@ LangString str_section_plugin_vim   ${LANG_JAPANESE} \
 LangString str_desc_plugin_vim      ${LANG_JAPANESE} \
     "プラグインディレクトリを Vim のインストールディレクトリに作成します。システムの全員で共有されます。"
 
-LangString str_section_vis_vim      ${LANG_JAPANESE} \
-    "VisVim 拡張"
-LangString str_desc_vis_vim         ${LANG_JAPANESE} \
-    "Microsoft Visual Studio 統合用の VisVim 拡張。"
-
 LangString str_section_nls          ${LANG_JAPANESE} \
     "多言語サポート"
 LangString str_desc_nls             ${LANG_JAPANESE} \

nsis/lang/russian.nsi

@@ -125,11 +125,6 @@ LangString str_desc_plugin_vim      ${LANG_RUSSIAN} \
      Модули в этом каталоге будут доступны для любого пользователя \
      зарегистрировавшегося в системе"
 
-LangString str_section_vis_vim      ${LANG_RUSSIAN} \
-    "Подключаемый модуль VisVim"
-LangString str_desc_vis_vim         ${LANG_RUSSIAN} \
-    "Подключаемый модуль VisVim используется для интеграции с Microsoft Visual Studio"
-
 LangString str_section_nls          ${LANG_RUSSIAN} \
     "Поддержка региональных языков"
 LangString str_desc_nls             ${LANG_RUSSIAN} \

nsis/lang/serbian.nsi

@@ -121,11 +121,6 @@ LangString str_desc_plugin_vim      ${LANG_SERBIAN} \
     "Креира директоријуме додатака у Vim инсталационом директоријуму, користе их сви \
      на систему."
 
-LangString str_section_vis_vim      ${LANG_SERBIAN} \
-    "VisVim проширење"
-LangString str_desc_vis_vim         ${LANG_SERBIAN} \
-    "VisVim проширење за Microsoft Visual Studio интеграцију."
-
 LangString str_section_nls          ${LANG_SERBIAN} \
     "Подршка за домаћи језик"
 LangString str_desc_nls             ${LANG_SERBIAN} \

nsis/lang/simpchinese.nsi

@@ -120,11 +120,6 @@ LangString str_desc_plugin_vim      ${LANG_SIMPCHINESE} \
     "在 Vim 安装目录下创建(空的)插件目录结构，系统上所有用户都能使用安装在\
      该目录下的扩展插件。"
 
-LangString str_section_vis_vim      ${LANG_SIMPCHINESE} \
-    "VisVim 插件"
-LangString str_desc_vis_vim         ${LANG_SIMPCHINESE} \
-    "安装与 Visual Studio 集成的 VisVim 插件。"
-
 LangString str_section_nls          ${LANG_SIMPCHINESE} \
     "安装多语言支持"
 LangString str_desc_nls             ${LANG_SIMPCHINESE} \

nsis/lang/tradchinese.nsi

@@ -121,11 +121,6 @@ LangString str_desc_plugin_vim      ${LANG_TRADCHINESE} \
     "在 Vim 安裝資料夾下建立(空的)插件資料夾結構，電腦上所有用戶都能使用安裝\
      在該資料夾里的擴展插件。"
 
-LangString str_section_vis_vim      ${LANG_TRADCHINESE} \
-    "安裝 VisVim 插件"
-LangString str_desc_vis_vim         ${LANG_TRADCHINESE} \
-    "VisVim 是用于與微軟 Microsoft Visual Studio 軟體進行整合的插件。"
-
 LangString str_section_nls          ${LANG_TRADCHINESE} \
     "安裝本地語言支持"
 LangString str_desc_nls             ${LANG_TRADCHINESE} \

nsis/lang/turkish.nsi

@@ -90,11 +90,6 @@ LangString str_desc_plugin_vim      ${LANG_TURKISH} \
     "Eklenti dizinlerini Vim yükleme dizininde oluşturur. Bu eklentilerden \
      bilgisayarın tüm kullanıcıları yararlanabilir."
 
-LangString str_section_vis_vim      ${LANG_TURKISH} \
-    "VisVim eklentisi"
-LangString str_desc_vis_vim         ${LANG_TURKISH} \
-    "Microsoft Visual Studio entegrasyonu için VisVim eklentisi"
-
 LangString str_section_nls          ${LANG_TURKISH} \
     "Ek dil desteği"
 LangString str_desc_nls             ${LANG_TURKISH} \

runtime/autoload/context.vim

@@ -3,13 +3,18 @@ vim9script
 # Language:           ConTeXt typesetting engine
 # Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
 # Former Maintainers: Nikolai Weibull <now@bitwi.se>
-# Latest Revision:    2022 Aug 12
+# Latest Revision:    2022 Sep 19
 
 # Typesetting {{{
 import autoload './typeset.vim'
 
 export def ConTeXtCmd(path: string): list<string>
-  return ['mtxrun', '--script', 'context', '--nonstopmode', '--autogenerate', path]
+  var cmd = ['mtxrun', '--script', 'context', '--nonstopmode', '--autogenerate']
+  if !empty(get(g:, 'context_extra_options', ''))
+    cmd += g:context_extra_options
+  endif
+  cmd->add(path)
+  return cmd
 enddef
 
 export def Typeset(bufname: string, env = {}, Cmd = ConTeXtCmd): bool

runtime/autoload/dist/ft.vim

@@ -145,7 +145,7 @@ export def FTcls()
     return
   endif
 
-  if getline(1) =~ '^%'
+  if getline(1) =~ '^\v%(\%|\\)'
     setf tex
   elseif getline(1)[0] == '#' && getline(1) =~ 'rexx'
     setf rexx
@@ -1087,5 +1087,18 @@ export def FTdat()
   endif
 enddef
 
+export def FTlsl()
+  if exists("g:filetype_lsl")
+    exe "setf " .. g:filetype_lsl
+  endif
+
+  var line = getline(nextnonblank(1))
+  if line =~ '^\s*%' || line =~# ':\s*trait\s*$'
+    setf larch
+  else
+    setf lsl
+  endif
+enddef
+
 # Uncomment this line to check for compilation errors early
 # defcompile

runtime/autoload/netrw.vim

@@ -1791,8 +1791,10 @@ fun! s:NetrwOptionsRestore(vt)
 "  call Decho("settings buf#".bufnr("%")."<".bufname("%").">: ".((&l:ma == 0)? "no" : "")."ma ".((&l:mod == 0)? "no" : "")."mod ".((&l:bl == 0)? "no" : "")."bl ".((&l:ro == 0)? "no" : "")."ro fo=".&l:fo." a:vt=".a:vt,'~'.expand("<slnum>"))
   if !exists("{a:vt}netrw_optionsave")
 "   call Decho("case ".a:vt."netrw_optionsave : doesn't exist",'~'.expand("<slnum>"))
-"   call Decho("..doing filetype detect anyway")
-   filetype detect
+   if !isdirectory(expand('%'))
+"    call Decho("..doing filetype detect anyway")
+     filetype detect
+   endif
 "   call Decho("..settings buf#".bufnr("%")."<".bufname("%").">: ".((&l:ma == 0)? "no" : "")."ma ".((&l:mod == 0)? "no" : "")."mod ".((&l:bl == 0)? "no" : "")."bl ".((&l:ro == 0)? "no" : "")."ro fo=".&l:fo." a:vt=".a:vt,'~'.expand("<slnum>"))
 "   call Decho("..ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap." (filename<".expand("%")."> win#".winnr()." ft<".&ft.">)",'~'.expand("<slnum>"))
 "   call Dret("s:NetrwOptionsRestore : ".a:vt."netrw_optionsave doesn't exist")
@@ -1904,9 +1906,11 @@ fun! s:NetrwOptionsRestore(vt)
   " were having their filetype detect-generated settings overwritten by
   " NetrwOptionRestore.
   if &ft != "netrw"
-"   call Decho("before: filetype detect  (ft=".&ft.")",'~'.expand("<slnum>"))
-   filetype detect
-"   call Decho("after : filetype detect  (ft=".&ft.")",'~'.expand("<slnum>"))
+    if !isdirectory(expand('%'))
+"     call Decho("before: filetype detect  (ft=".&ft.")",'~'.expand("<slnum>"))
+      filetype detect
+"     call Decho("after : filetype detect  (ft=".&ft.")",'~'.expand("<slnum>"))
+    endif
   endif
 "  call Decho("(s:NetrwOptionsRestore) lines=".&lines)
 "  call Decho("settings buf#".bufnr("%")."<".bufname("%").">: ".((&l:ma == 0)? "no" : "")."ma ".((&l:mod == 0)? "no" : "")."mod ".((&l:bl == 0)? "no" : "")."bl ".((&l:ro == 0)? "no" : "")."ro fo=".&l:fo." a:vt=".a:vt,'~'.expand("<slnum>"))

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: Sat 03 Sep 2022 14:31:51 MSK
+" Last Updated: Fri 16 Sep 2022 13:15:33 MSK
 
 " Generated by Colortemplate v2.2.0
 
@@ -26,12 +26,15 @@ hi! link fugitiveUnstagedModifier PreProc
 hi! link fugitiveHash Constant
 hi! link diffFile PreProc
 hi! link markdownHeadingDelimiter Special
-hi! link rstSectionDelimiter PreProc
-hi! link rstDirective Special
+hi! link rstSectionDelimiter Statement
+hi! link rstDirective PreProc
 hi! link rstHyperlinkReference Special
-hi! link rstFieldName Special
+hi! link rstFieldName Constant
 hi! link rstDelimiter Special
 hi! link rstInterpretedText Special
+hi! link rstCodeBlock Normal
+hi! link rstLiteralBlock rstCodeBlock
+hi! link markdownUrl String
 hi! link colortemplateKey Statement
 hi! link xmlTagName Statement
 hi! link javaScriptFunction Statement
@@ -92,6 +95,20 @@ hi! link phpOperator Normal
 hi! link phpVarSelector Special
 hi! link phpMemberSelector Special
 hi! link phpDocCustomTags phpDocTags
+hi! link javaExternal Statement
+hi! link javaType Statement
+hi! link javaScopeDecl Statement
+hi! link javaClassDecl Statement
+hi! link javaStorageClass Statement
+hi! link javaDocParam PreProc
+hi! link csStorage Statement
+hi! link csAccessModifier Statement
+hi! link csClass Statement
+hi! link csModifier Statement
+hi! link csAsyncModifier Statement
+hi! link csLogicSymbols Normal
+hi! link csClassType Normal
+hi! link csType Statement
 hi! link Terminal Normal
 hi! link StatuslineTerm Statusline
 hi! link StatuslineTermNC StatuslineNC
@@ -101,7 +118,7 @@ hi! link MessageWindow PMenu
 hi! link PopupNotification Todo
 if &background ==# 'dark'
   if (has('termguicolors') && &termguicolors) || has('gui_running')
-    let g:terminal_ansi_colors = ['#000000', '#af5f5f', '#5faf5f', '#af875f', '#5f87af', '#d787af', '#5fafaf', '#c6c6c6', '#767676', '#ff5f5f', '#5fd75f', '#ffd787', '#87afd7', '#ffafd7', '#5fd7d7', '#ffffff']
+    let g:terminal_ansi_colors = ['#000000', '#af5f5f', '#5faf5f', '#af875f', '#5f87af', '#d787d7', '#5fafaf', '#c6c6c6', '#767676', '#ff5f5f', '#5fd75f', '#ffd787', '#5fafff', '#ff87ff', '#5fd7d7', '#ffffff']
   endif
   hi Normal guifg=#c6c6c6 guibg=#000000 gui=NONE cterm=NONE
   hi Statusline guifg=#c6c6c6 guibg=#000000 gui=bold,reverse cterm=bold,reverse
@@ -112,7 +129,7 @@ if &background ==# 'dark'
   hi TabLineSel guifg=#ffffff guibg=#000000 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 QuickFixLine guifg=#000000 guibg=#87afd7 gui=NONE cterm=NONE
+  hi QuickFixLine guifg=#000000 guibg=#5fafff gui=NONE cterm=NONE
   hi CursorLineNr guifg=#ffffff guibg=NONE gui=bold cterm=bold
   hi LineNr guifg=#585858 guibg=NONE gui=NONE cterm=NONE
   hi NonText guifg=#585858 guibg=NONE gui=NONE cterm=NONE
@@ -128,7 +145,7 @@ if &background ==# 'dark'
   hi ErrorMsg guifg=#ffffff guibg=#ff5f5f gui=NONE cterm=NONE
   hi ModeMsg guifg=#ffd787 guibg=NONE gui=reverse cterm=reverse
   hi MoreMsg guifg=#5fd75f guibg=NONE gui=NONE cterm=NONE
-  hi Question guifg=#ffafd7 guibg=NONE gui=NONE cterm=NONE
+  hi Question guifg=#ff87ff guibg=NONE gui=NONE cterm=NONE
   hi WarningMsg guifg=#ff5f5f guibg=NONE gui=NONE cterm=NONE
   hi Todo guifg=#5fd7d7 guibg=#000000 gui=reverse cterm=reverse
   hi Search guifg=#000000 guibg=#ffd787 gui=NONE cterm=NONE
@@ -137,7 +154,7 @@ if &background ==# 'dark'
   hi WildMenu guifg=#000000 guibg=#ffd787 gui=bold cterm=bold
   hi debugPC guifg=#5f87af guibg=NONE gui=reverse cterm=reverse
   hi debugBreakpoint guifg=#5fafaf guibg=NONE gui=reverse cterm=reverse
-  hi Cursor guifg=#ffffff guibg=#000000 gui=reverse cterm=reverse
+  hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
   hi lCursor guifg=#ff5fff guibg=#000000 gui=reverse cterm=reverse
   hi Visual guifg=#ffffff guibg=#005f87 gui=NONE cterm=NONE
   hi MatchParen guifg=#c5e7c5 guibg=#000000 gui=reverse cterm=reverse
@@ -149,17 +166,18 @@ if &background ==# 'dark'
   hi SpellBad guifg=NONE guibg=NONE guisp=#ff5f5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
   hi SpellCap guifg=NONE guibg=NONE guisp=#5fafaf gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
   hi SpellLocal guifg=NONE guibg=NONE guisp=#5faf5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi SpellRare guifg=NONE guibg=NONE guisp=#ffafd7 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Comment guifg=#87afd7 guibg=NONE gui=NONE cterm=NONE
-  hi Constant guifg=#ffd787 guibg=NONE gui=NONE cterm=NONE
+  hi SpellRare guifg=NONE guibg=NONE guisp=#ff87ff gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Comment guifg=#5fafff guibg=NONE gui=NONE cterm=NONE
+  hi Constant guifg=#ff87ff guibg=NONE gui=NONE cterm=NONE
+  hi String guifg=#ffd787 guibg=NONE gui=NONE cterm=NONE
   hi Identifier guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Statement guifg=#eeeeee guibg=NONE gui=bold cterm=bold
-  hi Type guifg=#5fd75f guibg=NONE gui=bold cterm=bold
-  hi PreProc guifg=#af875f guibg=NONE gui=NONE cterm=NONE
+  hi Statement guifg=#e4e4e4 guibg=NONE gui=bold cterm=bold
+  hi Type guifg=#5fd75f guibg=NONE gui=NONE cterm=NONE
+  hi PreProc guifg=#5fd7d7 guibg=NONE gui=NONE cterm=NONE
   hi Special guifg=#5fafaf 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=#5fd7d7 guibg=NONE gui=bold 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 Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi DiffAdd guifg=#000000 guibg=#af87af gui=NONE cterm=NONE
@@ -168,8 +186,8 @@ if &background ==# 'dark'
   hi DiffDelete guifg=#d78787 guibg=NONE gui=NONE cterm=NONE
   hi diffAdded guifg=#5fd75f guibg=NONE gui=NONE cterm=NONE
   hi diffRemoved guifg=#d78787 guibg=NONE gui=NONE cterm=NONE
-  hi diffSubname guifg=#ffafd7 guibg=NONE gui=NONE cterm=NONE
-  hi dirType guifg=#d787af guibg=NONE gui=NONE cterm=NONE
+  hi diffSubname guifg=#ff87ff guibg=NONE gui=NONE cterm=NONE
+  hi dirType guifg=#d787d7 guibg=NONE gui=NONE cterm=NONE
   hi dirPermissionUser guifg=#5faf5f guibg=NONE gui=NONE cterm=NONE
   hi dirPermissionGroup guifg=#af875f guibg=NONE gui=NONE cterm=NONE
   hi dirPermissionOther guifg=#5fafaf guibg=NONE gui=NONE cterm=NONE
@@ -177,7 +195,7 @@ if &background ==# 'dark'
   hi dirGroup guifg=#767676 guibg=NONE gui=NONE cterm=NONE
   hi dirTime guifg=#767676 guibg=NONE gui=NONE cterm=NONE
   hi dirSize guifg=#ffd787 guibg=NONE gui=NONE cterm=NONE
-  hi dirSizeMod guifg=#d787af guibg=NONE gui=NONE cterm=NONE
+  hi dirSizeMod guifg=#d787d7 guibg=NONE gui=NONE cterm=NONE
   hi FilterMenuDirectorySubtle guifg=#878787 guibg=NONE gui=NONE cterm=NONE
   hi dirFilterMenuBookmarkPath guifg=#878787 guibg=NONE gui=NONE cterm=NONE
   hi dirFilterMenuHistoryPath guifg=#878787 guibg=NONE gui=NONE cterm=NONE
@@ -186,7 +204,7 @@ if &background ==# 'dark'
 else
   " Light background
   if (has('termguicolors') && &termguicolors) || has('gui_running')
-    let g:terminal_ansi_colors = ['#000000', '#870000', '#008700', '#875f00', '#005faf', '#870087', '#005f5f', '#808080', '#767676', '#d70000', '#87d787', '#d7d787', '#0087d7', '#af00af', '#00afaf', '#ffffff']
+    let g:terminal_ansi_colors = ['#000000', '#af0000', '#008700', '#af5f00', '#005fd7', '#af00af', '#005f5f', '#808080', '#767676', '#d70000', '#87d787', '#ffd787', '#0087d7', '#ff00ff', '#008787', '#ffffff']
   endif
   hi Normal guifg=#000000 guibg=#ffffff gui=NONE cterm=NONE
   hi Statusline guifg=#ffffff guibg=#000000 gui=bold cterm=bold
@@ -211,40 +229,41 @@ else
   hi SignColumn guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Error guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
   hi ErrorMsg guifg=#ffffff guibg=#d70000 gui=NONE cterm=NONE
-  hi ModeMsg guifg=#d7d787 guibg=#000000 gui=reverse cterm=reverse
+  hi ModeMsg guifg=#ffd787 guibg=#000000 gui=reverse cterm=reverse
   hi MoreMsg guifg=#008700 guibg=NONE gui=bold cterm=bold
-  hi Question guifg=#870087 guibg=NONE gui=bold cterm=bold
+  hi Question guifg=#af00af guibg=NONE gui=bold cterm=bold
   hi WarningMsg guifg=#d70000 guibg=NONE gui=bold cterm=bold
-  hi Todo guifg=#005f5f guibg=#ffffff gui=reverse cterm=reverse
-  hi Search guifg=#000000 guibg=#d7d787 gui=NONE cterm=NONE
+  hi Todo guifg=#008787 guibg=#ffffff gui=reverse cterm=reverse
+  hi Search guifg=#000000 guibg=#ffd787 gui=NONE cterm=NONE
   hi IncSearch guifg=#000000 guibg=#87d787 gui=NONE cterm=NONE
   hi CurSearch guifg=#000000 guibg=#87d787 gui=NONE cterm=NONE
-  hi WildMenu guifg=#000000 guibg=#d7d787 gui=bold cterm=bold
-  hi debugPC guifg=#005faf guibg=NONE gui=reverse cterm=reverse
+  hi WildMenu guifg=#000000 guibg=#ffd787 gui=bold cterm=bold
+  hi debugPC guifg=#005fd7 guibg=NONE gui=reverse cterm=reverse
   hi debugBreakpoint guifg=#005f5f guibg=NONE gui=reverse cterm=reverse
-  hi Cursor guifg=#000000 guibg=#ffffff gui=reverse cterm=reverse
+  hi Cursor guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
   hi lCursor guifg=#ff00ff guibg=#000000 gui=reverse cterm=reverse
   hi Visual guifg=#ffffff guibg=#5f87af gui=NONE cterm=NONE
   hi MatchParen guifg=NONE guibg=#c5e7c5 gui=NONE cterm=NONE
-  hi VisualNOS guifg=#ffffff guibg=#00afaf gui=NONE cterm=NONE
+  hi VisualNOS guifg=#ffffff guibg=#008787 gui=NONE cterm=NONE
   hi CursorLine guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
   hi CursorColumn guifg=NONE guibg=#e4e4e4 gui=NONE cterm=NONE
   hi Folded guifg=#767676 guibg=#eeeeee gui=NONE cterm=NONE
   hi ColorColumn guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
-  hi SpellBad guifg=NONE guibg=NONE guisp=#870000 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi SpellBad guifg=NONE guibg=NONE guisp=#af0000 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
   hi SpellCap guifg=NONE guibg=NONE guisp=#005f5f gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
   hi SpellLocal guifg=NONE guibg=NONE guisp=#008700 gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi SpellRare guifg=NONE guibg=NONE guisp=#af00af gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
-  hi Comment guifg=#005faf guibg=NONE gui=NONE cterm=NONE
-  hi Constant guifg=#870000 guibg=NONE gui=NONE cterm=NONE
+  hi SpellRare guifg=NONE guibg=NONE guisp=#ff00ff gui=undercurl ctermfg=NONE ctermbg=NONE cterm=NONE
+  hi Comment guifg=#005fd7 guibg=NONE gui=NONE cterm=NONE
+  hi Constant guifg=#af00af guibg=NONE gui=NONE cterm=NONE
+  hi String guifg=#af5f00 guibg=NONE gui=NONE cterm=NONE
   hi Identifier guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Statement guifg=#000000 guibg=NONE gui=bold cterm=bold
-  hi Type guifg=#008700 guibg=NONE gui=bold cterm=bold
-  hi PreProc guifg=#875f00 guibg=NONE gui=NONE cterm=NONE
-  hi Special guifg=#005f5f guibg=NONE gui=NONE cterm=NONE
+  hi Type guifg=#008700 guibg=NONE gui=NONE cterm=NONE
+  hi PreProc guifg=#005f5f guibg=NONE gui=NONE cterm=NONE
+  hi Special guifg=#008787 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 Directory guifg=#005fd7 guibg=NONE gui=bold cterm=bold
   hi Conceal guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Ignore guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi DiffAdd guifg=#000000 guibg=#d7afd7 gui=NONE cterm=NONE
@@ -253,22 +272,22 @@ else
   hi DiffDelete guifg=#870000 guibg=NONE gui=NONE cterm=NONE
   hi diffAdded guifg=#008700 guibg=NONE gui=NONE cterm=NONE
   hi diffRemoved guifg=#d70000 guibg=NONE gui=NONE cterm=NONE
-  hi diffSubname guifg=#870087 guibg=NONE gui=NONE cterm=NONE
+  hi diffSubname guifg=#af00af guibg=NONE gui=NONE cterm=NONE
   hi dirType guifg=#005f5f guibg=NONE gui=NONE cterm=NONE
-  hi dirPermissionUser guifg=#875f00 guibg=NONE gui=NONE cterm=NONE
+  hi dirPermissionUser guifg=#af5f00 guibg=NONE gui=NONE cterm=NONE
   hi dirPermissionGroup guifg=#008700 guibg=NONE gui=NONE cterm=NONE
-  hi dirPermissionOther guifg=#870087 guibg=NONE gui=NONE cterm=NONE
+  hi dirPermissionOther guifg=#af00af guibg=NONE gui=NONE cterm=NONE
   hi dirOwner guifg=#808080 guibg=NONE gui=NONE cterm=NONE
   hi dirGroup guifg=#808080 guibg=NONE gui=NONE cterm=NONE
   hi dirTime guifg=#808080 guibg=NONE gui=NONE cterm=NONE
-  hi dirSize guifg=#870000 guibg=NONE gui=NONE cterm=NONE
+  hi dirSize guifg=#af0000 guibg=NONE gui=NONE cterm=NONE
   hi dirSizeMod guifg=#005f5f guibg=NONE gui=NONE cterm=NONE
   hi dirLink guifg=#008700 guibg=NONE gui=bold cterm=bold
   hi dirFilterMenuBookmarkPath guifg=#626262 guibg=NONE gui=NONE cterm=NONE
   hi dirFilterMenuHistoryPath guifg=#626262 guibg=NONE gui=NONE cterm=NONE
   hi FilterMenuDirectorySubtle guifg=#626262 guibg=NONE gui=NONE cterm=NONE
   hi FilterMenuLineNr guifg=#626262 guibg=NONE gui=NONE cterm=NONE
-  hi CocSearch guifg=#870000 guibg=NONE gui=NONE cterm=NONE
+  hi CocSearch guifg=#af0000 guibg=NONE gui=NONE cterm=NONE
 endif
 
 if s:t_Co >= 256
@@ -285,12 +304,15 @@ if s:t_Co >= 256
   hi! link fugitiveHash Constant
   hi! link diffFile PreProc
   hi! link markdownHeadingDelimiter Special
-  hi! link rstSectionDelimiter PreProc
-  hi! link rstDirective Special
+  hi! link rstSectionDelimiter Statement
+  hi! link rstDirective PreProc
   hi! link rstHyperlinkReference Special
-  hi! link rstFieldName Special
+  hi! link rstFieldName Constant
   hi! link rstDelimiter Special
   hi! link rstInterpretedText Special
+  hi! link rstCodeBlock Normal
+  hi! link rstLiteralBlock rstCodeBlock
+  hi! link markdownUrl String
   hi! link colortemplateKey Statement
   hi! link xmlTagName Statement
   hi! link javaScriptFunction Statement
@@ -351,6 +373,20 @@ if s:t_Co >= 256
   hi! link phpVarSelector Special
   hi! link phpMemberSelector Special
   hi! link phpDocCustomTags phpDocTags
+  hi! link javaExternal Statement
+  hi! link javaType Statement
+  hi! link javaScopeDecl Statement
+  hi! link javaClassDecl Statement
+  hi! link javaStorageClass Statement
+  hi! link javaDocParam PreProc
+  hi! link csStorage Statement
+  hi! link csAccessModifier Statement
+  hi! link csClass Statement
+  hi! link csModifier Statement
+  hi! link csAsyncModifier Statement
+  hi! link csLogicSymbols Normal
+  hi! link csClassType Normal
+  hi! link csType Statement
   hi! link Terminal Normal
   hi! link StatuslineTerm Statusline
   hi! link StatuslineTermNC StatuslineNC
@@ -368,7 +404,7 @@ if s:t_Co >= 256
     hi TabLineSel ctermfg=231 ctermbg=16 cterm=bold
     hi ToolbarLine ctermfg=NONE ctermbg=NONE cterm=NONE
     hi ToolbarButton ctermfg=16 ctermbg=231 cterm=NONE
-    hi QuickFixLine ctermfg=16 ctermbg=110 cterm=NONE
+    hi QuickFixLine ctermfg=16 ctermbg=75 cterm=NONE
     hi CursorLineNr ctermfg=231 ctermbg=NONE cterm=bold
     hi LineNr ctermfg=240 ctermbg=NONE cterm=NONE
     hi NonText ctermfg=240 ctermbg=NONE cterm=NONE
@@ -384,7 +420,7 @@ if s:t_Co >= 256
     hi ErrorMsg ctermfg=231 ctermbg=203 cterm=NONE
     hi ModeMsg ctermfg=222 ctermbg=NONE cterm=reverse
     hi MoreMsg ctermfg=77 ctermbg=NONE cterm=NONE
-    hi Question ctermfg=218 ctermbg=NONE cterm=NONE
+    hi Question ctermfg=213 ctermbg=NONE cterm=NONE
     hi WarningMsg ctermfg=203 ctermbg=NONE cterm=NONE
     hi Todo ctermfg=116 ctermbg=16 cterm=reverse
     hi Search ctermfg=16 ctermbg=222 cterm=NONE
@@ -403,17 +439,18 @@ if s:t_Co >= 256
     hi SpellBad ctermfg=203 ctermbg=NONE cterm=underline
     hi SpellCap ctermfg=73 ctermbg=NONE cterm=underline
     hi SpellLocal ctermfg=77 ctermbg=NONE cterm=underline
-    hi SpellRare ctermfg=218 ctermbg=NONE cterm=underline
-    hi Comment ctermfg=110 ctermbg=NONE cterm=NONE
-    hi Constant ctermfg=222 ctermbg=NONE cterm=NONE
+    hi SpellRare ctermfg=213 ctermbg=NONE cterm=underline
+    hi Comment ctermfg=75 ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=213 ctermbg=NONE cterm=NONE
+    hi String ctermfg=222 ctermbg=NONE cterm=NONE
     hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Statement ctermfg=255 ctermbg=NONE cterm=bold
-    hi Type ctermfg=77 ctermbg=NONE cterm=bold
-    hi PreProc ctermfg=137 ctermbg=NONE cterm=NONE
+    hi Statement ctermfg=254 ctermbg=NONE cterm=bold
+    hi Type ctermfg=77 ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=116 ctermbg=NONE cterm=NONE
     hi Special ctermfg=73 ctermbg=NONE cterm=NONE
     hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
     hi Title ctermfg=NONE ctermbg=NONE cterm=bold
-    hi Directory ctermfg=116 ctermbg=NONE cterm=bold
+    hi Directory ctermfg=75 ctermbg=NONE cterm=bold
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
     hi DiffAdd ctermfg=16 ctermbg=139 cterm=NONE
@@ -422,8 +459,8 @@ if s:t_Co >= 256
     hi DiffDelete ctermfg=174 ctermbg=NONE cterm=NONE
     hi diffAdded ctermfg=77 ctermbg=NONE cterm=NONE
     hi diffRemoved ctermfg=174 ctermbg=NONE cterm=NONE
-    hi diffSubname ctermfg=218 ctermbg=NONE cterm=NONE
-    hi dirType ctermfg=175 ctermbg=NONE cterm=NONE
+    hi diffSubname ctermfg=213 ctermbg=NONE cterm=NONE
+    hi dirType ctermfg=176 ctermbg=NONE cterm=NONE
     hi dirPermissionUser ctermfg=71 ctermbg=NONE cterm=NONE
     hi dirPermissionGroup ctermfg=137 ctermbg=NONE cterm=NONE
     hi dirPermissionOther ctermfg=73 ctermbg=NONE cterm=NONE
@@ -431,7 +468,7 @@ if s:t_Co >= 256
     hi dirGroup ctermfg=243 ctermbg=NONE cterm=NONE
     hi dirTime ctermfg=243 ctermbg=NONE cterm=NONE
     hi dirSize ctermfg=222 ctermbg=NONE cterm=NONE
-    hi dirSizeMod ctermfg=175 ctermbg=NONE cterm=NONE
+    hi dirSizeMod ctermfg=176 ctermbg=NONE cterm=NONE
     hi FilterMenuDirectorySubtle ctermfg=102 ctermbg=NONE cterm=NONE
     hi dirFilterMenuBookmarkPath ctermfg=102 ctermbg=NONE cterm=NONE
     hi dirFilterMenuHistoryPath ctermfg=102 ctermbg=NONE cterm=NONE
@@ -462,38 +499,39 @@ if s:t_Co >= 256
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Error ctermfg=231 ctermbg=160 cterm=NONE
     hi ErrorMsg ctermfg=231 ctermbg=160 cterm=NONE
-    hi ModeMsg ctermfg=186 ctermbg=16 cterm=reverse
+    hi ModeMsg ctermfg=222 ctermbg=16 cterm=reverse
     hi MoreMsg ctermfg=28 ctermbg=NONE cterm=bold
-    hi Question ctermfg=90 ctermbg=NONE cterm=bold
+    hi Question ctermfg=127 ctermbg=NONE cterm=bold
     hi WarningMsg ctermfg=160 ctermbg=NONE cterm=bold
-    hi Todo ctermfg=23 ctermbg=231 cterm=reverse
-    hi Search ctermfg=16 ctermbg=186 cterm=NONE
+    hi Todo ctermfg=30 ctermbg=231 cterm=reverse
+    hi Search ctermfg=16 ctermbg=222 cterm=NONE
     hi IncSearch ctermfg=16 ctermbg=114 cterm=NONE
     hi CurSearch ctermfg=16 ctermbg=114 cterm=NONE
-    hi WildMenu ctermfg=16 ctermbg=186 cterm=bold
-    hi debugPC ctermfg=25 ctermbg=NONE cterm=reverse
+    hi WildMenu ctermfg=16 ctermbg=222 cterm=bold
+    hi debugPC ctermfg=26 ctermbg=NONE cterm=reverse
     hi debugBreakpoint ctermfg=23 ctermbg=NONE cterm=reverse
     hi Visual ctermfg=231 ctermbg=67 cterm=NONE
     hi MatchParen ctermfg=30 ctermbg=231 cterm=reverse
-    hi VisualNOS ctermfg=231 ctermbg=37 cterm=NONE
+    hi VisualNOS ctermfg=231 ctermbg=30 cterm=NONE
     hi CursorLine ctermfg=NONE ctermbg=254 cterm=NONE
     hi CursorColumn ctermfg=NONE ctermbg=254 cterm=NONE
     hi Folded ctermfg=243 ctermbg=255 cterm=NONE
     hi ColorColumn ctermfg=NONE ctermbg=255 cterm=NONE
-    hi SpellBad ctermfg=88 ctermbg=NONE cterm=underline
+    hi SpellBad ctermfg=124 ctermbg=NONE cterm=underline
     hi SpellCap ctermfg=23 ctermbg=NONE cterm=underline
     hi SpellLocal ctermfg=28 ctermbg=NONE cterm=underline
     hi SpellRare ctermfg=133 ctermbg=NONE cterm=underline
-    hi Comment ctermfg=25 ctermbg=NONE cterm=NONE
-    hi Constant ctermfg=88 ctermbg=NONE cterm=NONE
+    hi Comment ctermfg=26 ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=127 ctermbg=NONE cterm=NONE
+    hi String ctermfg=130 ctermbg=NONE cterm=NONE
     hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Statement ctermfg=16 ctermbg=NONE cterm=bold
-    hi Type ctermfg=28 ctermbg=NONE cterm=bold
-    hi PreProc ctermfg=94 ctermbg=NONE cterm=NONE
-    hi Special ctermfg=23 ctermbg=NONE cterm=NONE
+    hi Type ctermfg=28 ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=23 ctermbg=NONE cterm=NONE
+    hi Special ctermfg=30 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 Directory ctermfg=26 ctermbg=NONE cterm=bold
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
     hi DiffAdd ctermfg=16 ctermbg=182 cterm=NONE
@@ -502,22 +540,22 @@ if s:t_Co >= 256
     hi DiffDelete ctermfg=88 ctermbg=NONE cterm=NONE
     hi diffAdded ctermfg=28 ctermbg=NONE cterm=NONE
     hi diffRemoved ctermfg=160 ctermbg=NONE cterm=NONE
-    hi diffSubname ctermfg=90 ctermbg=NONE cterm=NONE
+    hi diffSubname ctermfg=127 ctermbg=NONE cterm=NONE
     hi dirType ctermfg=23 ctermbg=NONE cterm=NONE
-    hi dirPermissionUser ctermfg=94 ctermbg=NONE cterm=NONE
+    hi dirPermissionUser ctermfg=130 ctermbg=NONE cterm=NONE
     hi dirPermissionGroup ctermfg=28 ctermbg=NONE cterm=NONE
-    hi dirPermissionOther ctermfg=90 ctermbg=NONE cterm=NONE
+    hi dirPermissionOther ctermfg=127 ctermbg=NONE cterm=NONE
     hi dirOwner ctermfg=244 ctermbg=NONE cterm=NONE
     hi dirGroup ctermfg=244 ctermbg=NONE cterm=NONE
     hi dirTime ctermfg=244 ctermbg=NONE cterm=NONE
-    hi dirSize ctermfg=88 ctermbg=NONE cterm=NONE
+    hi dirSize ctermfg=124 ctermbg=NONE cterm=NONE
     hi dirSizeMod ctermfg=23 ctermbg=NONE cterm=NONE
     hi dirLink ctermfg=28 ctermbg=NONE cterm=bold
     hi dirFilterMenuBookmarkPath ctermfg=241 ctermbg=NONE cterm=NONE
     hi dirFilterMenuHistoryPath ctermfg=241 ctermbg=NONE cterm=NONE
     hi FilterMenuDirectorySubtle ctermfg=241 ctermbg=NONE cterm=NONE
     hi FilterMenuLineNr ctermfg=241 ctermbg=NONE cterm=NONE
-    hi CocSearch ctermfg=88 ctermbg=NONE cterm=NONE
+    hi CocSearch ctermfg=124 ctermbg=NONE cterm=NONE
   endif
   unlet s:t_Co
   finish
@@ -571,15 +609,16 @@ if s:t_Co >= 16
     hi SpellLocal ctermfg=green ctermbg=NONE cterm=underline
     hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
     hi Comment ctermfg=blue ctermbg=NONE cterm=NONE
-    hi Constant ctermfg=yellow ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=magenta ctermbg=NONE cterm=NONE
+    hi String ctermfg=yellow ctermbg=NONE cterm=NONE
     hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Statement ctermfg=grey ctermbg=NONE cterm=bold
-    hi Type ctermfg=green ctermbg=NONE cterm=bold
-    hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi Type ctermfg=green ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=cyan ctermbg=NONE cterm=NONE
     hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
     hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
     hi Title ctermfg=NONE ctermbg=NONE cterm=bold
-    hi Directory ctermfg=cyan ctermbg=NONE cterm=bold
+    hi Directory ctermfg=blue ctermbg=NONE cterm=bold
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
     hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
@@ -632,7 +671,7 @@ if s:t_Co >= 16
     hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=bold
     hi Question ctermfg=darkmagenta ctermbg=NONE cterm=bold
     hi WarningMsg ctermfg=red ctermbg=NONE cterm=bold
-    hi Todo ctermfg=darkcyan ctermbg=white cterm=reverse
+    hi Todo ctermfg=cyan ctermbg=white cterm=reverse
     hi Search ctermfg=black ctermbg=yellow cterm=NONE
     hi IncSearch ctermfg=black ctermbg=green cterm=NONE
     hi CurSearch ctermfg=black ctermbg=green cterm=NONE
@@ -651,12 +690,13 @@ if s:t_Co >= 16
     hi SpellLocal ctermfg=darkgreen ctermbg=NONE cterm=underline
     hi SpellRare ctermfg=magenta ctermbg=NONE cterm=underline
     hi Comment ctermfg=darkblue ctermbg=NONE cterm=NONE
-    hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
+    hi Constant ctermfg=darkmagenta ctermbg=NONE cterm=NONE
+    hi String ctermfg=darkyellow ctermbg=NONE cterm=NONE
     hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Statement ctermfg=black ctermbg=NONE cterm=bold
-    hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
-    hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
-    hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
+    hi Special ctermfg=cyan 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
@@ -707,7 +747,7 @@ if s:t_Co >= 8
     hi FoldColumn ctermfg=black ctermbg=NONE cterm=NONE
     hi EndOfBuffer ctermfg=black ctermbg=NONE cterm=NONE
     hi SpecialKey ctermfg=black ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=black ctermbg=grey cterm=NONE
+    hi Pmenu ctermfg=NONE ctermbg=grey cterm=NONE
     hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
     hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
     hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
@@ -725,7 +765,7 @@ if s:t_Co >= 8
     hi WildMenu ctermfg=black ctermbg=darkyellow cterm=bold
     hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse
     hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
-    hi Visual ctermfg=black ctermbg=darkblue cterm=NONE
+    hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
     hi MatchParen ctermfg=darkcyan ctermbg=black cterm=reverse
     hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE
     hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
@@ -740,12 +780,12 @@ if s:t_Co >= 8
     hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
     hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Statement ctermfg=grey ctermbg=NONE cterm=bold
-    hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
-    hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
     hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
     hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
     hi Title ctermfg=NONE ctermbg=NONE cterm=bold
-    hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
+    hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
     hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
@@ -770,10 +810,10 @@ if s:t_Co >= 8
     hi FoldColumn ctermfg=black ctermbg=NONE cterm=NONE
     hi EndOfBuffer ctermfg=black ctermbg=NONE cterm=NONE
     hi SpecialKey ctermfg=black ctermbg=NONE cterm=NONE
-    hi Pmenu ctermfg=grey ctermbg=black cterm=NONE
+    hi Pmenu ctermfg=NONE ctermbg=black cterm=NONE
     hi PmenuThumb ctermfg=NONE ctermbg=darkgreen cterm=NONE
     hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi PmenuSel ctermfg=black ctermbg=darkcyan cterm=NONE
+    hi PmenuSel ctermfg=NONE ctermbg=darkcyan cterm=NONE
     hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Error ctermfg=grey ctermbg=darkred cterm=NONE
     hi ErrorMsg ctermfg=grey ctermbg=darkred cterm=NONE
@@ -788,7 +828,7 @@ if s:t_Co >= 8
     hi WildMenu ctermfg=black ctermbg=darkyellow cterm=bold
     hi debugPC ctermfg=darkblue ctermbg=NONE cterm=reverse
     hi debugBreakpoint ctermfg=darkcyan ctermbg=NONE cterm=reverse
-    hi Visual ctermfg=grey ctermbg=darkblue cterm=NONE
+    hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
     hi MatchParen ctermfg=darkcyan ctermbg=grey cterm=reverse
     hi VisualNOS ctermfg=black ctermbg=darkcyan cterm=NONE
     hi CursorLine ctermfg=NONE ctermbg=NONE cterm=underline
@@ -803,12 +843,12 @@ if s:t_Co >= 8
     hi Constant ctermfg=darkred ctermbg=NONE cterm=NONE
     hi Identifier ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Statement ctermfg=black ctermbg=NONE cterm=bold
-    hi Type ctermfg=darkgreen ctermbg=NONE cterm=bold
-    hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
+    hi Type ctermfg=darkgreen ctermbg=NONE cterm=NONE
+    hi PreProc ctermfg=darkcyan ctermbg=NONE cterm=NONE
     hi Special ctermfg=darkcyan ctermbg=NONE cterm=NONE
     hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline
     hi Title ctermfg=black ctermbg=NONE cterm=bold
-    hi Directory ctermfg=darkcyan ctermbg=NONE cterm=bold
+    hi Directory ctermfg=darkblue ctermbg=NONE cterm=bold
     hi Conceal ctermfg=NONE ctermbg=NONE cterm=NONE
     hi Ignore ctermfg=NONE ctermbg=NONE cterm=NONE
     hi DiffAdd ctermfg=black ctermbg=darkmagenta cterm=NONE
@@ -899,14 +939,14 @@ endif
 " Color: color03                 #AF875F        137            darkyellow
 " Color: color11                 #FFD787        222            yellow
 " Color: color04                 #5F87AF        67             darkblue
-" Color: color12                 #87AFD7        110            blue
-" Color: color05                 #D787AF        175            darkmagenta
-" Color: color13                 #FFAFD7        218            magenta
+" Color: color12                 #5FAFFF        75             blue
+" Color: color05                 #D787D7        176            darkmagenta
+" Color: color13                 #FF87FF        213            magenta
 " Color: color06                 #5FAFAF        73             darkcyan
 " Color: color14                 #5FD7D7        116            cyan
 " Color: color07                 #C6C6C6        251            grey
 " Color: color15                 #FFFFFF        231            white
-" Color: colorDimWhite           #EEEEEE        255            grey
+" Color: colorDimWhite           #E4E4E4        254            grey
 " Color: colorLine               #262626        235            darkgrey
 " Color: colorB                  #1C1C1C        234            darkgrey
 " Color: colorNonT               #585858        240            grey
@@ -927,18 +967,18 @@ endif
 " Background: light
 " Color: color00                 #000000        16             black
 " Color: color08                 #767676        243            darkgrey
-" Color: color01                 #870000        88             darkred
+" Color: color01                 #AF0000        124            darkred
 " Color: color09                 #D70000        160            red
 " Color: color02                 #008700        28             darkgreen
 " Color: color10                 #87D787        114            green
-" Color: color03                 #875F00        94             darkyellow
-" Color: color11                 #D7D787        186            yellow
-" Color: color04                 #005FAF        25             darkblue
+" Color: color03                 #AF5F00        130            darkyellow
+" Color: color11                 #FFD787        222            yellow
+" Color: color04                 #005FD7        26             darkblue
 " Color: color12                 #0087D7        32             blue
-" Color: color05                 #870087        90             darkmagenta
-" Color: color13                 #AF00AF        133            magenta
+" Color: color05                 #AF00AF        127            darkmagenta
+" Color: color13                 #FF00FF        133            magenta
 " Color: color06                 #005F5F        23             darkcyan
-" Color: color14                 #00AFAF        37             cyan
+" Color: color14                 #008787        30             cyan
 " Color: color07                 #808080        244            grey
 " Color: color15                 #FFFFFF        231            white
 " Color: colorLine               #E4E4E4        254            grey

runtime/colors/pablo.vim

@@ -3,7 +3,7 @@
 " Maintainer:   Original maintainerRon Aaron <ron@ronware.org>
 " Website:      https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Updated: Sun 04 Sep 2022 09:53:40 MSK
+" Last Updated: Wed 14 Sep 2022 19:05:27 MSK
 
 " Generated by Colortemplate v2.2.0
 
@@ -280,7 +280,6 @@ if s:t_Co >= 8
   hi SpellLocal ctermfg=darkmagenta ctermbg=darkyellow cterm=reverse
   hi SpellRare ctermfg=darkgreen ctermbg=NONE cterm=reverse
   hi Comment ctermfg=grey ctermbg=NONE cterm=bold
-  hi Comment ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi Constant ctermfg=darkcyan ctermbg=NONE cterm=bold
   hi Identifier ctermfg=darkcyan ctermbg=NONE cterm=NONE
   hi Statement ctermfg=darkyellow ctermbg=NONE cterm=bold

runtime/colors/quiet.vim

@@ -4,7 +4,7 @@
 " Maintainer:   neutaaaaan <neutaaaaan-gh@protonmail.com>
 " Website:      https://github.com/vim/colorschemes
 " License:      Vim License (see `:help license`)`
-" Last Updated: Fri 02 Sep 2022 09:55:30 MSK
+" Last Updated: Fri 16 Sep 2022 09:52:50 MSK
 
 " Generated by Colortemplate v2.2.0
 
@@ -61,8 +61,8 @@ if &background ==# 'dark'
   hi DiffChange guifg=#87afd7 guibg=#080808 gui=reverse cterm=reverse
   hi DiffDelete guifg=#d75f5f guibg=#080808 gui=reverse cterm=reverse
   hi DiffText guifg=#d787d7 guibg=#080808 gui=reverse cterm=reverse
-  hi Directory guifg=#dadada guibg=#080808 gui=NONE cterm=NONE
-  hi EndOfBuffer guifg=#dadada guibg=#080808 gui=NONE cterm=NONE
+  hi Directory guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi EndOfBuffer guifg=#dadada guibg=NONE gui=NONE cterm=NONE
   hi ErrorMsg guifg=#dadada guibg=#080808 gui=reverse cterm=reverse
   hi FoldColumn guifg=#707070 guibg=NONE gui=NONE cterm=NONE
   hi Folded guifg=#707070 guibg=#080808 gui=NONE cterm=NONE
@@ -86,13 +86,13 @@ if &background ==# 'dark'
   hi SpellLocal guifg=#d787d7 guibg=NONE guisp=#d787d7 gui=undercurl cterm=underline
   hi SpellRare guifg=#00afaf guibg=NONE guisp=#00afaf gui=undercurl cterm=underline
   hi StatusLine guifg=#080808 guibg=#dadada gui=bold cterm=bold
-  hi StatusLineNC guifg=#707070 guibg=#080808 gui=underline cterm=underline
-  hi TabLine guifg=#707070 guibg=#080808 gui=underline cterm=underline
+  hi StatusLineNC guifg=#707070 guibg=#080808 gui=reverse cterm=reverse
+  hi TabLine guifg=#707070 guibg=#080808 gui=reverse cterm=reverse
   hi TabLineFill guifg=#dadada guibg=NONE gui=NONE cterm=NONE
   hi TabLineSel guifg=#080808 guibg=#dadada gui=bold cterm=bold
-  hi Title guifg=#dadada guibg=NONE gui=NONE cterm=NONE
+  hi Title guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi VertSplit guifg=#707070 guibg=#080808 gui=NONE cterm=NONE
-  hi Visual guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Visual guifg=#ffaf00 guibg=#080808 gui=reverse cterm=reverse
   hi VisualNOS guifg=NONE guibg=#303030 gui=NONE cterm=NONE
   hi WarningMsg guifg=#dadada guibg=NONE gui=NONE cterm=NONE
   hi WildMenu guifg=#00afff guibg=#080808 gui=bold cterm=bold
@@ -155,9 +155,9 @@ else
   hi TabLine guifg=#080808 guibg=#a8a8a8 gui=NONE cterm=NONE
   hi TabLineFill guifg=#080808 guibg=#d7d7d7 gui=NONE cterm=NONE
   hi TabLineSel guifg=#eeeeee guibg=#080808 gui=bold cterm=bold
-  hi Title guifg=#080808 guibg=NONE gui=NONE cterm=NONE
+  hi Title guifg=NONE guibg=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
   hi VertSplit guifg=#626262 guibg=#d7d7d7 gui=NONE cterm=NONE
-  hi Visual guifg=NONE guibg=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi Visual guifg=#ffaf00 guibg=#080808 gui=reverse cterm=reverse
   hi VisualNOS guifg=NONE guibg=#eeeeee gui=NONE cterm=NONE
   hi WarningMsg guifg=#080808 guibg=NONE gui=NONE cterm=NONE
   hi WildMenu guifg=#080808 guibg=#eeeeee gui=bold cterm=bold
@@ -190,8 +190,8 @@ if s:t_Co >= 256
     hi DiffChange ctermfg=110 ctermbg=232 cterm=reverse
     hi DiffDelete ctermfg=167 ctermbg=232 cterm=reverse
     hi DiffText ctermfg=176 ctermbg=232 cterm=reverse
-    hi Directory ctermfg=253 ctermbg=232 cterm=NONE
-    hi EndOfBuffer ctermfg=253 ctermbg=232 cterm=NONE
+    hi Directory ctermfg=253 ctermbg=NONE cterm=NONE
+    hi EndOfBuffer ctermfg=253 ctermbg=NONE cterm=NONE
     hi ErrorMsg ctermfg=253 ctermbg=232 cterm=reverse
     hi FoldColumn ctermfg=242 ctermbg=NONE cterm=NONE
     hi Folded ctermfg=242 ctermbg=232 cterm=NONE
@@ -215,13 +215,13 @@ if s:t_Co >= 256
     hi SpellLocal ctermfg=176 ctermbg=NONE cterm=underline
     hi SpellRare ctermfg=37 ctermbg=NONE cterm=underline
     hi StatusLine ctermfg=232 ctermbg=253 cterm=bold
-    hi StatusLineNC ctermfg=242 ctermbg=232 cterm=underline
-    hi TabLine ctermfg=242 ctermbg=232 cterm=underline
+    hi StatusLineNC ctermfg=242 ctermbg=232 cterm=reverse
+    hi TabLine ctermfg=242 ctermbg=232 cterm=reverse
     hi TabLineFill ctermfg=253 ctermbg=NONE cterm=NONE
     hi TabLineSel ctermfg=232 ctermbg=253 cterm=bold
-    hi Title ctermfg=253 ctermbg=NONE cterm=NONE
+    hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
     hi VertSplit ctermfg=242 ctermbg=232 cterm=NONE
-    hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=214 ctermbg=232 cterm=reverse
     hi VisualNOS ctermfg=NONE ctermbg=236 cterm=NONE
     hi WarningMsg ctermfg=253 ctermbg=NONE cterm=NONE
     hi WildMenu ctermfg=39 ctermbg=232 cterm=bold
@@ -281,9 +281,9 @@ if s:t_Co >= 256
     hi TabLine ctermfg=232 ctermbg=248 cterm=NONE
     hi TabLineFill ctermfg=232 ctermbg=188 cterm=NONE
     hi TabLineSel ctermfg=255 ctermbg=232 cterm=bold
-    hi Title ctermfg=232 ctermbg=NONE cterm=NONE
+    hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
     hi VertSplit ctermfg=241 ctermbg=188 cterm=NONE
-    hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=214 ctermbg=232 cterm=reverse
     hi VisualNOS ctermfg=NONE ctermbg=255 cterm=NONE
     hi WarningMsg ctermfg=232 ctermbg=NONE cterm=NONE
     hi WildMenu ctermfg=232 ctermbg=255 cterm=bold
@@ -350,7 +350,7 @@ if s:t_Co >= 16
     hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
     hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse
     hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
     hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
     hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
@@ -412,7 +412,7 @@ if s:t_Co >= 16
     hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
     hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse
     hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
     hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
     hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
@@ -479,7 +479,7 @@ if s:t_Co >= 8
     hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
     hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse
     hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
     hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
     hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
@@ -541,7 +541,7 @@ if s:t_Co >= 8
     hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold,reverse
     hi Title ctermfg=NONE ctermbg=NONE cterm=NONE
     hi VertSplit ctermfg=NONE ctermbg=NONE cterm=NONE
-    hi Visual ctermfg=NONE ctermbg=NONE cterm=reverse
+    hi Visual ctermfg=darkyellow ctermbg=black cterm=reverse
     hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=NONE
     hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=standout
     hi WildMenu ctermfg=NONE ctermbg=NONE cterm=bold
@@ -652,7 +652,7 @@ endif
 " Color: diffred       #d75f5f           167               darkred
 " Color: diffgreen     #00af00           34                darkgreen
 " Color: diffblue      #87afd7           110               darkblue
-" Color: diffpink 	   #d787d7           176               darkmagenta
+" Color: diffpink      #d787d7           176               darkmagenta
 " Color: uipink        #ff00af           199               magenta
 " Color: uilime        #afff00           154               green
 " Color: uiteal        #00ffaf           49                green

runtime/compiler/hare.vim

@@ -0,0 +1,31 @@
+" Vim compiler file
+" Compiler: Hare Compiler
+" Maintainer: Amelia Clarke <me@rsaihe.dev>
+" Last Change: 2022-09-21
+
+if exists("g:current_compiler")
+  finish
+endif
+let g:current_compiler = "hare"
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+if exists(':CompilerSet') != 2
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+if filereadable("Makefile") || filereadable("makefile")
+  CompilerSet makeprg=make
+else
+  CompilerSet makeprg=hare\ build
+endif
+
+CompilerSet errorformat=
+  \Error\ %f:%l:%c:\ %m,
+  \Syntax\ error:\ %.%#\ at\ %f:%l:%c\\,\ %m,
+  \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim: tabstop=2 shiftwidth=2 expandtab

runtime/doc/autocmd.txt

@@ -409,6 +409,7 @@ Name			triggered by ~
 			when popup menu is not visible
 |TextChangedP|		after a change was made to the text in Insert mode
 			when popup menu visible
+|TextChangedT|		after a change was made to the text in Terminal mode
 |TextYankPost|		after text has been yanked or deleted
 
 |SafeState|		nothing pending, going to wait for the user to type a
@@ -1237,6 +1238,10 @@ TextChangedP			After a change was made to the text in the
 				current buffer in Insert mode, only when the
 				popup menu is visible.  Otherwise the same as
 				TextChanged.
+							*TextChangedT*
+TextChangedT			After a change was made to the text in the
+				current buffer in Terminal mode.
+				Otherwise the same as TextChanged.
 							*TextYankPost*
 TextYankPost			After text has been yanked or deleted in the
 				current buffer.  The following values of

runtime/doc/builtin.txt

@@ -1,4 +1,4 @@
-*builtin.txt*	For Vim version 9.0.  Last change: 2022 Sep 10
+*builtin.txt*	For Vim version 9.0.  Last change: 2022 Oct 14
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -6,9 +6,10 @@
 
 Builtin functions				*builtin-functions*
 
-Note: Expression evaluation can be disabled at compile time.  If this has been
-done, the builtin functions are not available.  See |+eval| and
-|no-eval-feature|.
+Note: Expression evaluation can be disabled at compile time, the builtin
+functions are not available then.  See |+eval| and |no-eval-feature|.
+
+For functions grouped by what they are used for see |function-list|.
 
 1. Overview				|builtin-function-list|
 2. Details				|builtin-function-details|
@@ -395,6 +396,7 @@ popup_create({what}, {options}) Number	create a popup window
 popup_dialog({what}, {options}) Number	create a popup window used as a dialog
 popup_filter_menu({id}, {key})  Number	filter for a menu popup window
 popup_filter_yesno({id}, {key}) Number	filter for a dialog popup window
+popup_findecho()		Number	get window ID of popup for `:echowin`
 popup_findinfo()		Number	get window ID of info popup window
 popup_findpreview()		Number	get window ID of preview popup window
 popup_getoptions({id})		Dict	get options of popup window {id}
@@ -443,7 +445,8 @@ pyxeval({expr})			any	evaluate |python_x| expression
 rand([{expr}])			Number	get pseudo-random number
 range({expr} [, {max} [, {stride}]])
 				List	items from {expr} to {max}
-readblob({fname})		Blob	read a |Blob| from {fname}
+readblob({fname} [, {offset} [, {size}]])
+				Blob	read a |Blob| from {fname}
 readdir({dir} [, {expr} [, {dict}]])
 				List	file names in {dir} selected by {expr}
 readdirex({dir} [, {expr} [, {dict}]])
@@ -753,8 +756,6 @@ abs({expr})							*abs()*
 		Can also be used as a |method|: >
 			Compute()->abs()
 
-<		{only available when compiled with the |+float| feature}
-
 
 acos({expr})							*acos()*
 		Return the arc cosine of {expr} measured in radians, as a
@@ -770,8 +771,6 @@ acos({expr})							*acos()*
 		Can also be used as a |method|: >
 			Compute()->acos()
 
-<		{only available when compiled with the |+float| feature}
-
 
 add({object}, {expr})					*add()*
 		Append the item {expr} to |List| or |Blob| {object}.  Returns
@@ -904,8 +903,6 @@ asin({expr})						*asin()*
 
 		Can also be used as a |method|: >
 			Compute()->asin()
-<
-		{only available when compiled with the |+float| feature}
 
 
 assert_ functions are documented here: |assert-functions-details|
@@ -925,8 +922,6 @@ atan({expr})						*atan()*
 
 		Can also be used as a |method|: >
 			Compute()->atan()
-<
-		{only available when compiled with the |+float| feature}
 
 
 atan2({expr1}, {expr2})					*atan2()*
@@ -943,8 +938,6 @@ atan2({expr1}, {expr2})					*atan2()*
 
 		Can also be used as a |method|: >
 			Compute()->atan2(1)
-<
-		{only available when compiled with the |+float| feature}
 
 
 autocmd_add({acmds})					*autocmd_add()*
@@ -1428,8 +1421,6 @@ ceil({expr})							*ceil()*
 
 		Can also be used as a |method|: >
 			Compute()->ceil()
-<
-		{only available when compiled with the |+float| feature}
 
 
 ch_ functions are documented here: |channel-functions-details|
@@ -1801,8 +1792,6 @@ cos({expr})						*cos()*
 
 		Can also be used as a |method|: >
 			Compute()->cos()
-<
-		{only available when compiled with the |+float| feature}
 
 
 cosh({expr})						*cosh()*
@@ -1818,8 +1807,6 @@ cosh({expr})						*cosh()*
 
 		Can also be used as a |method|: >
 			Compute()->cosh()
-<
-		{only available when compiled with the |+float| feature}
 
 
 count({comp}, {expr} [, {ic} [, {start}]])			*count()*
@@ -1896,10 +1883,10 @@ cursor({list})
 		|setcursorcharpos()|.
 
 		Does not change the jumplist.
-		{lnum} is used like with |getline()|.
+		{lnum} is used like with |getline()|, except that if {lnum} is
+		zero, the cursor will stay in the current line.
 		If {lnum} is greater than the number of lines in the buffer,
 		the cursor will be positioned at the last line in the buffer.
-		If {lnum} is zero, the cursor will stay in the current line.
 		If {col} is greater than the number of bytes in the line,
 		the cursor will be positioned at the last character in the
 		line.
@@ -2405,8 +2392,6 @@ exp({expr})							*exp()*
 
 		Can also be used as a |method|: >
 			Compute()->exp()
-<
-		{only available when compiled with the |+float| feature}
 
 
 expand({string} [, {nosuf} [, {list}]])				*expand()*
@@ -2807,8 +2792,6 @@ float2nr({expr})					*float2nr()*
 
 		Can also be used as a |method|: >
 			Compute()->float2nr()
-<
-		{only available when compiled with the |+float| feature}
 
 
 floor({expr})							*floor()*
@@ -2826,8 +2809,6 @@ floor({expr})							*floor()*
 
 		Can also be used as a |method|: >
 			Compute()->floor()
-<
-		{only available when compiled with the |+float| feature}
 
 
 fmod({expr1}, {expr2})					*fmod()*
@@ -2848,8 +2829,6 @@ fmod({expr1}, {expr2})					*fmod()*
 
 		Can also be used as a |method|: >
 			Compute()->fmod(1.22)
-<
-		{only available when compiled with |+float| feature}
 
 
 fnameescape({string})					*fnameescape()*
@@ -5050,8 +5029,6 @@ isinf({expr})						*isinf()*
 
 		Can also be used as a |method|: >
 			Compute()->isinf()
-<
-		{only available when compiled with the |+float| feature}
 
 islocked({expr})					*islocked()* *E786*
 		The result is a Number, which is |TRUE| when {expr} is the
@@ -5080,8 +5057,6 @@ isnan({expr})						*isnan()*
 
 		Can also be used as a |method|: >
 			Compute()->isnan()
-<
-		{only available when compiled with the |+float| feature}
 
 items({dict})						*items()*
 		Return a |List| with all the key-value pairs of {dict}.  Each
@@ -5430,7 +5405,8 @@ listener_add({callback} [, {buf}])			*listener_add()*
 				the change; one if unknown or the whole line
 				was affected; this is a byte index, first
 				character has a value of one.
-		When lines are inserted the values are:
+		When lines are inserted (not when a line is split, e.g. by
+		typing CR in Insert mode) the values are:
 		    lnum	line above which the new line is added
 		    end		equal to "lnum"
 		    added	number of lines inserted
@@ -5510,8 +5486,6 @@ log({expr})						*log()*
 
 		Can also be used as a |method|: >
 			Compute()->log()
-<
-		{only available when compiled with the |+float| feature}
 
 
 log10({expr})						*log10()*
@@ -5526,8 +5500,6 @@ log10({expr})						*log10()*
 
 		Can also be used as a |method|: >
 			Compute()->log10()
-<
-		{only available when compiled with the |+float| feature}
 
 luaeval({expr} [, {expr}])					*luaeval()*
 		Evaluate Lua expression {expr} and return its result converted
@@ -5535,8 +5507,7 @@ luaeval({expr} [, {expr}])					*luaeval()*
 		argument accessible as _A inside first {expr}.
 		Strings are returned as they are.
 		Boolean objects are converted to numbers.
-		Numbers are converted to |Float| values if vim was compiled
-		with |+float| and to numbers otherwise.
+		Numbers are converted to |Float| values.
 		Dictionaries and lists obtained by vim.eval() are returned
 		as-is.
 		Other objects are returned as zero without any errors.
@@ -5897,7 +5868,7 @@ matchadd({group}, {pattern} [, {priority} [, {id} [, {dict}]]])
 		respectively.  3 is reserved for use by the |matchparen|
 		plugin.
 		If the {id} argument is not specified or -1, |matchadd()|
-		automatically chooses a free ID.
+		automatically chooses a free ID, which is at least 1000.
 
 		The optional {dict} argument allows for further custom
 		values. Currently this is used to specify a match specific
@@ -5951,8 +5922,6 @@ matchaddpos({group}, {pos} [, {priority} [, {id} [, {dict}]]])
 		- A list with three numbers, e.g., [23, 11, 3]. As above, but
 		  the third number gives the length of the highlight in bytes.
 
-		The maximum number of positions in {pos} is 8.
-
 		Returns -1 on error.
 
 		Example: >
@@ -6483,8 +6452,6 @@ pow({x}, {y})						*pow()*
 
 		Can also be used as a |method|: >
 			Compute()->pow(3)
-<
-		{only available when compiled with the |+float| feature}
 
 prevnonblank({lnum})					*prevnonblank()*
 		Return the line number of the first line at or above {lnum}
@@ -6881,10 +6848,26 @@ range({expr} [, {max} [, {stride}]])				*range()*
 			GetExpr()->range()
 <
 
-readblob({fname})					*readblob()*
+readblob({fname} [, {offset} [, {size}]])			*readblob()*
 		Read file {fname} in binary mode and return a |Blob|.
-		When the file can't be opened an error message is given and
+		If {offset} is specified, read the file from the specified
+		offset.  If it is a negative value, it is used as an offset
+		from the end of the file.  E.g., to read the last 12 bytes: >
+			readblob('file.bin', -12)
+<		If {size} is specified, only the specified size will be read.
+		E.g. to read the first 100 bytes of a file: >
+			readblob('file.bin', 0, 100)
+<		If {size} is -1 or omitted, the whole data starting from
+		{offset} will be read.
+		This can be also used to read the data from a character device
+		on Unix when {size} is explicitly set.  Only if the device
+		supports seeking {offset} can be used.  Otherwise it should be
+		zero.  E.g. to read 10 bytes from a serial console: >
+			readblob('/dev/ttyS0', 0, 10)
+<		When the file can't be opened an error message is given and
 		the result is an empty |Blob|.
+		When trying to read bytes beyond the end of the file the
+		result is an empty blob.
 		Also see |readfile()| and |writefile()|.
 
 
@@ -7072,13 +7055,19 @@ reg_recording()						*reg_recording()*
 		Returns the single letter name of the register being recorded.
 		Returns an empty string when not recording.  See |q|.
 
-reltime([{start} [, {end}]])				*reltime()*
+reltime()
+reltime({start})
+reltime({start}, {end})					*reltime()*
 		Return an item that represents a time value.  The item is a
 		list with items that depend on the system.  In Vim 9 script
 		list<any> can be used.
 		The item can be passed to |reltimestr()| to convert it to a
-		string or |reltimefloat()| to convert to a Float.
-
+		string or |reltimefloat()| to convert to a Float.  For
+		example, to see the time spent in function Work(): >
+			var startTime = reltime()
+			Work()
+			echo startTime->reltime()->reltimestr()
+<
 		Without an argument reltime() returns the current time (the
 		representation is system-dependent, it can not be used as the
 		wall-clock time, see |localtime()| for that).
@@ -7199,8 +7188,8 @@ remote_peek({serverid} [, {retvar}])		*remote_peek()*
 		This function is not available in the |sandbox|.
 		{only available when compiled with the |+clientserver| feature}
 		Examples: >
-			:let repl = ""
-			:echo "PEEK: " .. remote_peek(id, "repl") .. ": " .. repl
+		   :let repl = ""
+		   :echo "PEEK: " .. remote_peek(id, "repl") .. ": " .. repl
 
 <		Can also be used as a |method|: >
 			ServerId()->remote_peek()
@@ -7260,7 +7249,8 @@ remote_startserver({name})
 
 <		{only available when compiled with the |+clientserver| feature}
 
-remove({list}, {idx} [, {end}])				*remove()*
+remove({list}, {idx})
+remove({list}, {idx}, {end})				*remove()*
 		Without {end}: Remove the item at {idx} from |List| {list} and
 		return the item.
 		With {end}: Remove items from {idx} to {end} (inclusive) and
@@ -7278,7 +7268,8 @@ remove({list}, {idx} [, {end}])				*remove()*
 		Can also be used as a |method|: >
 			mylist->remove(idx)
 
-remove({blob}, {idx} [, {end}])
+remove({blob}, {idx})
+remove({blob}, {idx}, {end})
 		Without {end}: Remove the byte at {idx} from |Blob| {blob} and
 		return the byte.
 		With {end}: Remove bytes from {idx} to {end} (inclusive) and
@@ -7366,8 +7357,6 @@ round({expr})							*round()*
 
 		Can also be used as a |method|: >
 			Compute()->round()
-<
-		{only available when compiled with the |+float| feature}
 
 rubyeval({expr})					*rubyeval()*
 		Evaluate Ruby expression {expr} and return its result
@@ -8536,8 +8525,6 @@ sin({expr})						*sin()*
 
 		Can also be used as a |method|: >
 			Compute()->sin()
-<
-		{only available when compiled with the |+float| feature}
 
 
 sinh({expr})						*sinh()*
@@ -8553,8 +8540,6 @@ sinh({expr})						*sinh()*
 
 		Can also be used as a |method|: >
 			Compute()->sinh()
-<
-		{only available when compiled with the |+float| feature}
 
 
 slice({expr}, {start} [, {end}])			*slice()*
@@ -8664,6 +8649,9 @@ sound_playevent({name} [, {callback}])
 <		On MS-Windows, {name} can be SystemAsterisk, SystemDefault,
 		SystemExclamation, SystemExit, SystemHand, SystemQuestion,
 		SystemStart, SystemWelcome, etc.
+		On macOS, {name} refers to files located in
+		/System/Library/Sounds (e.g. "Tink").  It will also work for
+		custom installed sounds in folders like ~/Library/Sounds.
 
 		When {callback} is specified it is invoked when the sound is
 		finished.  The first argument is the sound ID, the second
@@ -8821,8 +8809,6 @@ sqrt({expr})						*sqrt()*
 
 		Can also be used as a |method|: >
 			Compute()->sqrt()
-<
-		{only available when compiled with the |+float| feature}
 
 
 srand([{expr}])						*srand()*
@@ -8896,8 +8882,6 @@ str2float({string} [, {quoted}])				*str2float()*
 
 		Can also be used as a |method|: >
 			let f = text->substitute(',', '', 'g')->str2float()
-<
-		{only available when compiled with the |+float| feature}
 
 str2list({string} [, {utf8}])					*str2list()*
 		Return a list containing the number values which represent
@@ -9643,8 +9627,6 @@ tan({expr})						*tan()*
 
 		Can also be used as a |method|: >
 			Compute()->tan()
-<
-		{only available when compiled with the |+float| feature}
 
 
 tanh({expr})						*tanh()*
@@ -9660,8 +9642,6 @@ tanh({expr})						*tanh()*
 
 		Can also be used as a |method|: >
 			Compute()->tanh()
-<
-		{only available when compiled with the |+float| feature}
 
 
 tempname()					*tempname()* *temp-file-name*
@@ -9897,8 +9877,6 @@ trunc({expr})							*trunc()*
 		Can also be used as a |method|: >
 			Compute()->trunc()
 <
-		{only available when compiled with the |+float| feature}
-
 							*type()*
 type({expr})	The result is a Number representing the type of {expr}.
 		Instead of using the number directly, it is better to use the

runtime/doc/change.txt

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

runtime/doc/cmdline.txt

@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 9.0.  Last change: 2022 Jun 16
+*cmdline.txt*   For Vim version 9.0.  Last change: 2022 Sep 26
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -806,7 +806,7 @@ Count and Range						*N:*
 
 When giving a count before entering ":", this is translated into:
 		:.,.+(count - 1)
-In words: The 'count' lines at and after the cursor.  Example: To delete
+In words: The "count" lines at and after the cursor.  Example: To delete
 three lines: >
 		3:d<CR>		is translated into: .,.+2d<CR>
 <
@@ -1124,7 +1124,6 @@ Also see |`=|.
 In the command-line window the command line can be edited just like editing
 text in any window.  It is a special kind of window, because you cannot leave
 it in a normal way.
-{not available when compiled without the |+cmdwin| feature}
 
 
 OPEN						*c_CTRL-F* *q:* *q/* *q?*

runtime/doc/develop.txt

@@ -1,4 +1,4 @@
-*develop.txt*   For Vim version 9.0.  Last change: 2020 Aug 15
+*develop.txt*   For Vim version 9.0.  Last change: 2022 Sep 20
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -188,8 +188,8 @@ C COMPILER				*style-compiler* *ANSI-C* *C89* *C99*
 
 The minimal C compiler version supported is C89, also known as ANSI C.
 Later standards, such as C99, are not widely supported, or at least not 100%
-supported.  Therefore we use only some of the C99 features and disallow some
-(at least for now).
+supported.  Therefore we use only some of the C99 features and explicitly
+disallow some (this will gradually be adjusted over time).
 
 Please don't make changes everywhere to use the C99 features, it causes merge
 problems for existing patches.  Only use them for new and changed code.
@@ -215,12 +215,21 @@ Types ~
 "long long" is allowed and can be expected to be 64 bits.  Use %lld in printf
 formats.  Also "long long unsigned" with %llu.
 
+Declarations ~
+
+Now that the minimal supported compiler is MSVC 2015 declarations do not need
+to be at the start of a block.  However, it is often a good idea to do this
+anyway.
+
+Declaration of the for loop variable inside the loop is recommended:
+	for (int i = 0; i < len; ++i)
+Since this is clearly an advantage we'll use this more often.
+
+
 Not to be used ~
 
 These C99 features are not to be used, because not enough compilers support
 them:
-- Declaration after Statements (MSVC 2012 does not support it).  All
-  declarations need to be at the start of the block.
 - Variable length arrays (even in C11 this is an optional feature).
 - _Bool and _Complex types.
 - "inline" (it's hardly ever needed, let the optimizer do its work)

runtime/doc/diff.txt

@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 9.0.  Last change: 2022 Jan 22
+*diff.txt*      For Vim version 9.0.  Last change: 2022 Oct 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -376,6 +376,9 @@ Additionally, 'diffexpr' should take care of "icase" and "iwhite" in the
 'diffopt' option.  'diffexpr' cannot change the value of 'lines' and
 'columns'.
 
+The advantage of using a function call without arguments is that it is faster,
+see |expr-option-function|.
+
 Example (this does almost the same as 'diffexpr' being empty): >
 
 	set diffexpr=MyDiff()
@@ -441,6 +444,9 @@ will have the same effect.  These variables are set to the file names used:
 	v:fname_diff		patch file
 	v:fname_out		resulting patched file
 
+The advantage of using a function call without arguments is that it is faster,
+see |expr-option-function|.
+
 Example (this does the same as 'patchexpr' being empty): >
 
 	set patchexpr=MyPatch()

runtime/doc/eval.txt

@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 9.0.  Last change: 2022 Sep 09
+*eval.txt*	For Vim version 9.0.  Last change: 2022 Oct 07
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -54,7 +54,6 @@ Number		A 32 or 64 bit signed number.  |expr-number|
 		Examples:  -123  0x10  0177  0o177 0b1011
 
 Float		A floating point number. |floating-point-format| *Float*
-		{only when compiled with the |+float| feature} *E1076*
 		Examples: 123.456  1.15e-6  -1.1e3
 
 String		A NUL terminated string of 8-bit unsigned characters (bytes).
@@ -1441,7 +1440,6 @@ digits are ignored.
 {exp} is the exponent, power of 10.
 Only a decimal point is accepted, not a comma.  No matter what the current
 locale is.
-{only when compiled with the |+float| feature}
 
 Examples:
 	123.456
@@ -3394,7 +3392,7 @@ text...
 			when the screen is redrawn.
 
 					*:echow* *:echowin* *:echowindow*
-:echow[indow] {expr1} ..
+:[N]echow[indow] {expr1} ..
 			Like |:echomsg| but when the messages popup window is
 			available the message is displayed there.  This means
 			it will show for three seconds and avoid a
@@ -3402,6 +3400,9 @@ text...
 			that, press Esc in Normal mode (when it would
 			otherwise beep).  If it disappears too soon you can
 			use `:messages` to see the text.
+			When [N] is given then the window will show up for
+			this number of seconds.  The last `:echowindow` with a
+			count matters, it is used once only.
 			The message window is available when Vim was compiled
 			with the +timer and the +popupwin features.
 

runtime/doc/filetype.txt

@@ -150,6 +150,7 @@ variables can be used to overrule the filetype used for certain extensions:
 	*.fs		g:filetype_fs	|ft-forth-syntax|
 	*.i		g:filetype_i	|ft-progress-syntax|
 	*.inc		g:filetype_inc
+	*.lsl		g:filetype_lsl
 	*.m		g:filetype_m	|ft-mathematica-syntax|
 	*.mod		g:filetype_mod
 	*.p		g:filetype_p	|ft-pascal-syntax|

runtime/doc/fold.txt

@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 9.0.  Last change: 2022 Jan 22
+*fold.txt*      For Vim version 9.0.  Last change: 2022 Oct 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -74,8 +74,6 @@ method.  The value of the 'foldexpr' option is evaluated to get the foldlevel
 of a line.  Examples:
 This will create a fold for all consecutive lines that start with a tab: >
 	:set foldexpr=getline(v:lnum)[0]==\"\\t\"
-This will call a function to compute the fold level: >
-	:set foldexpr=MyFoldLevel(v:lnum)
 This will make a fold out of paragraphs separated by blank lines: >
 	:set foldexpr=getline(v:lnum)=~'^\\s*$'&&getline(v:lnum+1)=~'\\S'?'<1':1
 This does the same: >
@@ -84,6 +82,10 @@ This does the same: >
 Note that backslashes must be used to escape characters that ":set" handles
 differently (space, backslash, double quote, etc., see |option-backslash|).
 
+The most efficient is to call a compiled function without arguments: >
+	:set foldexpr=MyFoldLevel()
+The function must use v:lnum.  See |expr-option-function|.
+
 These are the conditions with which the expression is evaluated:
 - The current buffer and window are set for the line.
 - The variable "v:lnum" is set to the line number.
@@ -501,7 +503,7 @@ is evaluated to obtain the text displayed for a closed fold.  Example: >
 
 This shows the first line of the fold, with "/*", "*/" and "{{{" removed.
 Note the use of backslashes to avoid some characters to be interpreted by the
-":set" command.  It's simpler to define a function and call that: >
+":set" command.  It is much simpler to define a function and call it: >
 
     :set foldtext=MyFoldText()
     :function MyFoldText()
@@ -510,6 +512,9 @@ Note the use of backslashes to avoid some characters to be interpreted by the
     :  return v:folddashes .. sub
     :endfunction
 
+The advantage of using a function call without arguments is that it is faster,
+see |expr-option-function|.
+
 Evaluating 'foldtext' is done in the |sandbox|.  The current window is set to
 the window that displays the line.  The context is set to the script where the
 option was last set.

runtime/doc/ft_context.txt

@@ -1,4 +1,4 @@
-*ft_context.txt*	For Vim version 9.0.  Last change: 2022 Aug 12
+*ft_context.txt*	For Vim version 9.0.  Last change: 2022 Sep 27
 
 This is the documentation for the ConTeXt filetype plugin.
 
@@ -23,13 +23,12 @@ ConTeXt, similarly to LaTeX, is a macro-based typesetting system built on TeX:
 <
 The ConTeXt plugin provides syntax highlighting, completion and support for
 typesetting ConTeXt documents. The recommended way to typeset a document is to
-use |:ConTeXt|. This will invoke the `mtxrun` script that is found in $PATH.
+use |:ConTeXt|. This will invoke the `mtxrun` script that is found in `$PATH`.
 
-For more fine grained control over the command and its environment, you may
-invoke `context.Typeset()` directly (or `context#Typeset()` from legacy Vim
-script). For instance, if you have installed a version of ConTeXt in
-`~/context`, you may define a function to use it (you may put the following
-code in `~/.vim/after/ftplugin/context.vim`) similar to the following:
+For more fine grained control over the command and its environment,
+`context.Typeset()` can be used directly (or `context#Typeset()` from legacy
+Vim script). For instance, if a version of ConTeXt is installed in
+`~/context`, you may define a function to use it similar to the following:
 >
 	import autoload 'context.vim'
 
@@ -38,14 +37,15 @@ code in `~/.vim/after/ftplugin/context.vim`) similar to the following:
 	      printf("%s/context/tex/texmf-<os>-<arch>/bin:%s", $HOME, $PATH)}
 	    context.Typeset("%", env)
 	enddef
-<
-and perhaps use it with a mapping:
+
+This code may go in `~/.vim/after/ftplugin/context.vim`. A mapping can then be
+defined to invoke the custom command:
 >
 	nnoremap <silent><buffer><leader>t <scriptcmd>MyConTeXt()<cr>
 <
 `context.Typeset()` accepts a third optional argument to specify a custom
-typesetting command. Such argument must be a function that takes a path and
-returns the command as a List. For example:
+typesetting command. That must be a function that takes a path and returns the
+command as a List. For example:
 >
 	def ConTeXtCustomCommand(path: string): list<string>
 	  return ['mtxrun', '--script', 'context', '--nonstopmode, path]
@@ -103,14 +103,20 @@ Stop all the ConTeXt jobs currently running in the background.
 Settings ~
 					*'b:context_ignore_makefile'*
 					*'g:context_ignore_makefile'*
-`make` can be used to (synchronously) typeset a document. If a Makefile exists
+`:make` can be used to (synchronously) typeset a document. If a Makefile exists
 and this option is not set, standard `make` is used. If this option is set,
 `mtxrun` is invoked instead, even if a Makefile exists.
 >
 	g:context_ignore_makefile = 0
 <
-NOTE: before using `make`, set the working directory of the buffer to the
+NOTE: before using `:make`, set the working directory of the buffer to the
 directory of the file to be typeset.
+
+					*'g:context_extra_options'*
+A list of additional options to pass to `mtxrun`.
+>
+	g:context_extra_options = []
+<
 					*'b:context_include'*
 					*'g:context_include'*
 Dictionary of filetype/GROUP pairs for which syntax highlighting should be

runtime/doc/gui_w32.txt

@@ -106,8 +106,7 @@ when you have got a new version):
 You can also install Vim in the "Send To" menu:
 1. Start a Windows Explorer
 2. Navigate to your sendto directory:
-   Windows XP: C:\Documents and Settings\%user%\SendTo
-   Windows Vista: C:\Users\%user%\AppData\Roaming\Microsoft\Windows\SendTo .
+   C:\Users\%user%\AppData\Roaming\Microsoft\Windows\SendTo .
 3. Right-click in the file pane and select New->Shortcut
 4. Follow the shortcut wizard, using the full path to VIM/GVIM.
 

runtime/doc/if_ole.txt

@@ -1,4 +1,4 @@
-*if_ole.txt*    For Vim version 9.0.  Last change: 2019 Dec 07
+*if_ole.txt*    For Vim version 9.0.  Last change: 2022 Oct 08
 
 
 		  VIM REFERENCE MANUAL    by Paul Moore
@@ -156,18 +156,14 @@ To avoid the message box that pops up to report the result, prepend "-silent":
 	gvim -silent -unregister
 
 ==============================================================================
-5. MS Visual Studio integration			*MSVisualStudio* *VisVim*
+5. MS Visual Studio integration				*MSVisualStudio*
 
-The OLE version can be used to run Vim as the editor in Microsoft Visual
-Studio.  This is called "VisVim".  It is included in the archive that contains
-the OLE version.  The documentation can be found in the runtime directory, the
-README_VisVim.txt file.
+The old "VisVim" integration was removed from Vim in patch 9.0.0698.
 
 
 Using Vim with Visual Studio .Net~
 
-With .Net you no longer really need VisVim, since .Net studio has support for
-external editors.  Follow these directions:
+.Net studio has support for external editors.  Follow these directions:
 
 In .Net Studio choose from the menu Tools->External Tools...
 Add

runtime/doc/indent.txt

@@ -1,4 +1,4 @@
-*indent.txt*    For Vim version 9.0.  Last change: 2022 May 21
+*indent.txt*    For Vim version 9.0.  Last change: 2022 Oct 10
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -982,9 +982,12 @@ indentation: >
 
 PYTHON							*ft-python-indent*
 
-The amount of indent can be set for the following situations.  The examples
-given are the defaults.  Note that the dictionary values are set to an
-expression, so that you can change the value of 'shiftwidth' later.
+The amount of indent can be set with the `g:python_indent` |Dictionary|, which
+needs to be created before adding the items: >
+	let g:python_indent = {}
+The examples given are the defaults.  Note that the dictionary values are set
+to an expression, so that you can change the value of 'shiftwidth' later
+without having to update these values.
 
 Indent after an open paren: >
 	let g:python_indent.open_paren = 'shiftwidth() * 2'
@@ -1227,13 +1230,31 @@ comments will be indented according to the correctly indented code.
 
 
 VIM							*ft-vim-indent*
+							*g:vim_indent*
+Vim scripts indentation can be configured with the `g:vim_indent` dictionary
+variable.  It supports 3 keys, `line_continuation`, `more_in_bracket_block`,
+and `searchpair_timeout`.
+`line_continuation` expects a number which will be added to the indent level of
+a continuation line starting with a backslash, and defaults to
+`shiftwidth() * 3`.  It also accepts a string, which is evaluated at runtime.
+`more_in_bracket_block` expects a boolean value; when on, an extra
+`shiftwidth()` is added inside blocks surrounded with brackets.  It defaults to
+`v:false`.
+`searchpair_timeout` expects a number which will be passed to `searchpair()` as
+a timeout.  Increasing the value might give more accurate results, but also
+causes the indentation to take more time.  It defaults to 100 (milliseconds).
+
+Example of configuration:
+
+	let g:vim_indent = #{
+	    \ line_continuation: shiftwidth() * 3,
+	    \ more_in_bracket_block: v:false,
+	    \ searchpair_timeout: 100,
+	    \ }
+
 							*g:vim_indent_cont*
-For indenting Vim scripts there is one variable that specifies the amount of
-indent for a continuation line, a line that starts with a backslash: >
-
-	:let g:vim_indent_cont = shiftwidth() * 3
-
-Three times shiftwidth is the default value.
+This variable is equivalent to `g:vim_indent.line_continuation`.
+It's supported for backward compatibility.
 
 
  vim:tw=78:ts=8:noet:ft=help:norl:

runtime/doc/index.txt

@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 9.0.  Last change: 2022 Jun 11
+*index.txt*     For Vim version 9.0.  Last change: 2022 Oct 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1150,7 +1150,7 @@ tag		command		action ~
 |:!!|		:!!		repeat last ":!" command
 |:#|		:#		same as ":number"
 |:&|		:&		repeat last ":substitute"
-|:star|		:*		execute contents of a register
+|:star|		:*		use the last Visual area, like :'<,'>
 |:<|		:<		shift lines one 'shiftwidth' left
 |:=|		:=		print the last line number
 |:>|		:>		shift lines one 'shiftwidth' right
@@ -1277,6 +1277,7 @@ tag		command		action ~
 |:debuggreedy|	:debugg[reedy]	read debug mode commands from normal input
 |:def|		:def		define a Vim9 user function
 |:defcompile|	:defc[ompile]	compile Vim9 user functions in current script
+|:defer|	:defer		call function when current function is done
 |:delcommand|	:delc[ommand]	delete user-defined command
 |:delfunction|	:delf[unction]	delete a user function
 |:delmarks|	:delm[arks]	delete marks
@@ -1308,6 +1309,7 @@ tag		command		action ~
 |:echohl|	:echoh[l]	set highlighting for echo commands
 |:echomsg|	:echom[sg]	same as :echo, put message in history
 |:echon|	:echon		same as :echo, but without <EOL>
+|:echowindow|	:echow[indow]	same as :echomsg, but use a popup window
 |:else|		:el[se]		part of an :if command
 |:elseif|	:elsei[f]	part of an :if command
 |:emenu|	:em[enu]	execute a menu by name
@@ -1356,6 +1358,7 @@ tag		command		action ~
 |:highlight|	:hi[ghlight]	specify highlighting methods
 |:hide|		:hid[e]		hide current buffer for a command
 |:history|	:his[tory]	print a history list
+|:horizontal|	:hor[izontal]	following window command work horizontally
 |:insert|	:i[nsert]	insert text
 |:iabbrev|	:ia[bbrev]	like ":abbrev" but for Insert mode
 |:iabclear|	:iabc[lear]	like ":abclear" but for Insert mode

runtime/doc/insert.txt

@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 9.0.  Last change: 2022 Apr 06
+*insert.txt*    For Vim version 9.0.  Last change: 2022 Sep 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -667,7 +667,7 @@ When the popup menu is displayed there are a few more special keys, see
 |popupmenu-keys|.
 
 Note: The keys that are valid in CTRL-X mode are not mapped.  This allows for
-":map ^F ^X^F" to work (where ^F is CTRL-F and ^X is CTRL-X).  The key that
+`:map <C-F> <C-X><C-F>` to work (assuming "<" is not in 'cpo').  The key that
 ends CTRL-X mode (any key that is not a valid CTRL-X mode command) is mapped.
 Also, when doing completion with 'complete' mappings apply as usual.
 
@@ -677,11 +677,12 @@ buffer text cannot be changed.  Mappings that somehow invoke ":normal i.."
 will generate an E565 error.
 
 The following mappings are suggested to make typing the completion commands
-a bit easier (although they will hide other commands): >
-    :inoremap ^] ^X^]
-    :inoremap ^F ^X^F
-    :inoremap ^D ^X^D
-    :inoremap ^L ^X^L
+a bit easier (although they will hide other commands; this requires "<" is not
+in 'cpo'): >
+    :inoremap <C-]> <C-X><C-]>
+    :inoremap <C-F> <C-X><C-F>
+    :inoremap <C-D> <C-X><C-D>
+    :inoremap <C-L> <C-X><C-L>
 
 As a special case, typing CTRL-R to perform register insertion (see
 |i_CTRL-R|) will not exit CTRL-X mode.  This is primarily to allow the use of

runtime/doc/intro.txt

@@ -1,4 +1,4 @@
-*intro.txt*     For Vim version 9.0.  Last change: 2022 Apr 03
+*intro.txt*     For Vim version 9.0.  Last change: 2022 Oct 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -122,10 +122,10 @@ http://www.vim.org/maillist.php
 Bug reports:				*bugs* *bug-reports* *bugreport.vim*
 
 There are three ways to report bugs:
-1. Open an issue on GitHub: https://github.com/vim/vim/issues
-   The text will be forwarded to the vim-dev maillist.
-2. For issues with runtime files, look in the header for an email address or
+1. For issues with runtime files, look in the header for an email address or
    any other way to report it to the maintainer.
+2. Open an issue on GitHub: https://github.com/vim/vim/issues
+   The text will be forwarded to the vim-dev maillist.
 3. Send bug reports to: Vim Developers <vim-dev@vim.org>
    This is a maillist, you need to become a member first and many people will
    see the message.  If you don't want that, e.g. because it is a security
@@ -533,6 +533,10 @@ examples and use them directly.  Or type them literally, including the '<' and
 '>' characters.  This does NOT work for other commands, like ":set" and
 ":autocmd"!
 
+The notation can be used in a double quoted strings, using "\<" at the start,
+e.g. "\<C-Space>".  This results in a special key code.  To convert this back
+to readable text use `keytrans()`.
+
 ==============================================================================
 5. Modes, introduction				*vim-modes-intro* *vim-modes*
 

runtime/doc/map.txt

@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 9.0.  Last change: 2022 Jun 18
+*map.txt*       For Vim version 9.0.  Last change: 2022 Sep 26
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -989,6 +989,11 @@ mapping, see |map-bar|.
 WARNING: if you map <C-[> you may very well break any key codes that start
 with Esc.  Make sure it comes AFTER other mappings.
 
+Vim automatically detects if the modifyOtherKeys mode was enabled when it
+spots an escape sequence that must have been created by it.  To see if Vim
+detected such an escape sequence use `:verbose map`, the first line will then
+show "Seen modifyOtherKeys: true" (possibly translated).
+
 A known side effect is that in Insert mode the raw escape sequence is inserted
 after the CTRL-V key.  This can be used to check whether modifyOtherKeys is
 enabled: In Insert mode type CTRL-SHIFT-V CTRL-V, if you get one byte then
@@ -1583,7 +1588,7 @@ completion candidates as the return value.
 
 For the "custom" argument, the function should return the completion
 candidates one per line in a newline separated string.
-
+							*E1303*
 For the "customlist" argument, the function should return the completion
 candidates as a Vim List.  Non-string items in the list are ignored.
 
@@ -1761,7 +1766,8 @@ The valid escape sequences are
 If the first two characters of an escape sequence are "q-" (for example,
 <q-args>) then the value is quoted in such a way as to make it a valid value
 for use in an expression.  This uses the argument as one single value.
-When there is no argument <q-args> is an empty string.
+When there is no argument <q-args> is an empty string.  See the
+|q-args-example| below.
 							*<f-args>*
 To allow commands to pass their arguments on to a user-defined function, there
 is a special form <f-args> ("function args").  This splits the command
@@ -1771,7 +1777,7 @@ See the Mycmd example below.  If no arguments are given <f-args> is removed.
    To embed whitespace into an argument of <f-args>, prepend a backslash.
 <f-args> replaces every pair of backslashes (\\) with one backslash.  A
 backslash followed by a character other than white space or a backslash
-remains unmodified.  Overview:
+remains unmodified.  Also see |f-args-example| below.  Overview:
 
 	command		   <f-args> ~
 	XX ab		   'ab'
@@ -1785,7 +1791,8 @@ remains unmodified.  Overview:
 	XX a\\\\b	   'a\\b'
 	XX a\\\\ b	   'a\\', 'b'
 
-Examples >
+
+Examples for user commands: >
 
    " Delete everything after here to the end
    :com Ddel +,$d
@@ -1801,7 +1808,8 @@ Examples >
    " Count the number of lines in the range
    :com! -range -nargs=0 Lines  echo <line2> - <line1> + 1 "lines"
 
-   " Call a user function (example of <f-args>)
+<						*f-args-example*
+Call a user function (example of <f-args>) >
    :com -nargs=* Mycmd call Myfunc(<f-args>)
 
 When executed as: >
@@ -1809,7 +1817,8 @@ When executed as: >
 This will invoke: >
 	:call Myfunc("arg1","arg2")
 
-   :" A more substantial example
+<						*q-args-example* 
+A more substantial example: >
    :function Allargs(command)
    :   let i = 0
    :   while i < argc()

runtime/doc/mlang.txt

@@ -1,4 +1,4 @@
-*mlang.txt*     For Vim version 9.0.  Last change: 2020 Aug 15
+*mlang.txt*     For Vim version 9.0.  Last change: 2022 Sep 17
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -82,9 +82,9 @@ use of "-" and "_".
 			characters. This sets $LC_COLLATE.
 			Without an argument all are set, and additionally
 			$LANG is set.
-			When compiled with the |+float| feature the LC_NUMERIC
-			value will always be set to "C", so that floating
-			point numbers use '.' as the decimal point.
+			If available the LC_NUMERIC value will always be set
+			to "C", so that floating point numbers use '.' as the
+			decimal point.
 			This will make a difference for items that depend on
 			the language (some messages, time and date format).
 			Not fully supported on all systems

runtime/doc/motion.txt

@@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 9.0.  Last change: 2022 Apr 18
+*motion.txt*    For Vim version 9.0.  Last change: 2022 Sep 26
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1145,7 +1145,7 @@ g;			Go to [count] older position in change list.
 			(not a motion command)
 
 							*g,* *E663*
-g,			Go to [count] newer cursor position in change list.
+g,			Go to [count] newer position in change list.
 			Just like |g;| but in the opposite direction.
 			(not a motion command)
 

runtime/doc/options.txt

@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 9.0.  Last change: 2022 Sep 09
+*options.txt*	For Vim version 9.0.  Last change: 2022 Oct 15
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1626,6 +1626,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Note that v:charconvert_from and v:charconvert_to may be different
 	from 'encoding'.  Vim internally uses UTF-8 instead of UCS-2 or UCS-4.
 
+	The advantage of using a function call without arguments is that it is
+	faster, see |expr-option-function|.
+
 	Encryption is not done by Vim when using 'charconvert'.  If you want
 	to encrypt the file after conversion, 'charconvert' should take care
 	of this.
@@ -1702,7 +1705,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	after that.  Therefore do not append an item with += but use ^= to
 	prepend, e.g.: >
 		set clipboard^=unnamed
-<	These names are recognized:
+<	When using the GUI see |'go-A'|.
+	These names are recognized:
 
 						*clipboard-unnamed*
 	unnamed		When included, Vim will use the clipboard register '*'
@@ -2938,7 +2942,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 'display' 'dy'		string	(default "", set to "truncate" in
 							       |defaults.vim|)
 			global
-	Change the way text is displayed.  This is comma-separated list of
+	Change the way text is displayed.  This is a comma-separated list of
 	flags:
 	lastline	When included, as much as possible of the last line
 			in a window will be displayed.  "@@@" is put in the
@@ -2952,6 +2956,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	When neither "lastline" nor "truncate" is included, a last line that
 	doesn't fit is replaced with "@" lines.
 
+	The "@" character can be changed by setting the "lastline" item in
+	'fillchars'.  The character is highlighted with |hl-NonText|.
+
 						*'eadirection'* *'ead'*
 'eadirection' 'ead'	string	(default "both")
 			global
@@ -3416,6 +3423,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	  foldsep	'|'		open fold middle character
 	  diff		'-'		deleted lines of the 'diff' option
 	  eob		'~'		empty lines below the end of a buffer
+	  lastline	'@'		'display' contains lastline/truncate
 
 	Any one that is omitted will fall back to the default.  For "stl" and
 	"stlnc" the space will be used when there is highlighting, '^' or '='
@@ -3438,6 +3446,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	  fold		Folded			|hl-Folded|
 	  diff		DiffDelete		|hl-DiffDelete|
 	  eob		EndOfBuffer		|hl-EndOfBuffer|
+	  lastline	NonText			|hl-NonText|
 
 		*'fixendofline'* *'fixeol'* *'nofixendofline'* *'nofixeol'*
 'fixendofline' 'fixeol'	boolean	(default on)
@@ -3663,6 +3672,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 <	This will invoke the mylang#Format() function in the
 	autoload/mylang.vim file in 'runtimepath'. |autoload|
 
+	The advantage of using a function call without arguments is that it is
+	faster, see |expr-option-function|.
+
 	The expression is also evaluated when 'textwidth' is set and adding
 	text beyond that limit.  This happens under the same conditions as
 	when internal formatting is used.  Make sure the cursor is kept in the
@@ -3978,6 +3990,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 			 "A"		 -			yes
 			 "aA"		yes			yes
 
+		When using a terminal see the 'clipboard' option.
+
 								*'go-c'*
 	  'c'	Use console dialogs instead of popup dialogs for simple
 		choices.
@@ -4531,11 +4545,14 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 	If the expression starts with s: or |<SID>|, then it is replaced with
 	the script ID (|local-function|). Example: >
-		set includeexpr=s:MyIncludeExpr(v:fname)
-		set includeexpr=<SID>SomeIncludeExpr(v:fname)
+		set includeexpr=s:MyIncludeExpr()
+		set includeexpr=<SID>SomeIncludeExpr()
 <	Otherwise, the expression is evaluated in the context of the script
 	where the option was set, thus script-local items are available.
 
+	It is more efficient if the value is just a function call without
+	arguments, see |expr-option-function|.
+
 	The expression will be evaluated in the |sandbox| when set from a
 	modeline, see |sandbox-option|.
 	This option cannot be set in a modeline when 'modelineexpr' is off.
@@ -4604,7 +4621,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
-	overridden by the Lisp indentation algorithm.
+	is 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
@@ -4617,6 +4634,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 <	Otherwise, the expression is evaluated in the context of the script
 	where the option was set, thus script-local items are available.
 
+	The advantage of using a function call without arguments is that it is
+	faster, see |expr-option-function|.
+
 	The expression must return the number of spaces worth of indent.  It
 	can return "-1" to keep the current indent (this means 'autoindent' is
 	used for the indent).
@@ -5043,6 +5063,17 @@ A jump table for the options with a short description can be found at |Q_op|.
 	calling an external program if 'equalprg' is empty.
 	This option is not used when 'paste' is set.
 
+						*'lispoptions'* *'lop'*
+'lispoptions' 'lop'	string	(default "")
+			local to buffer
+	Comma-separated list of items that influence the Lisp indenting when
+	enabled with the |'lisp'| option.  Currently only one item is
+	supported:
+		expr:1	use 'indentexpr' for Lisp indenting when it is set
+		expr:0	do not use 'indentexpr' for Lisp indenting (default)
+	Note that when using 'indentexpr' the `=` operator indents all the
+	lines, otherwise the first line is not indented (Vi-compatible).
+
 						*'lispwords'* *'lw'*
 'lispwords' 'lw'	string	(default is very long)
 			global or local to buffer |global-local|
@@ -6456,8 +6487,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 					 *'ruler'* *'ru'* *'noruler'* *'noru'*
 'ruler' 'ru'		boolean	(default off, set in |defaults.vim|)
 			global
-			{not available when compiled without the
-			|+cmdline_info| feature}
 	Show the line and column number of the cursor position, separated by a
 	comma.  When there is room, the relative position of the displayed
 	text in the file is shown on the far right:
@@ -7059,6 +7088,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	  c	don't give |ins-completion-menu| messages.  For example,
 		"-- XXX completion (YYY)", "match 1 of 2", "The only match",
 		"Pattern not found", "Back at original", etc.
+	  C	don't give messages while scanning for ins-completion items,
+		for instance "scanning tags"
 	  q	use "recording" instead of "recording @a"
 	  F	don't give the file info when editing a file, like `:silent`
 		was used for the command; note that this also affects messages
@@ -7115,8 +7146,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 'showcmd' 'sc'		boolean	(Vim default: on, off for Unix,
 				       Vi default: off, set in |defaults.vim|)
 			global
-			{not available when compiled without the
-			|+cmdline_info| feature}
 	Show (partial) command in the last line of the screen.  Set this
 	option off if your terminal is slow.
 	In Visual mode the size of the selected area is shown:
@@ -7287,6 +7316,16 @@ A jump table for the options with a short description can be found at |Q_op|.
 	reset.
 	NOTE: This option is reset when 'compatible' is set.
 
+			*'smoothscroll'* *'sms'* *'nosmoothscroll'* *'nosms'*
+'smoothscroll' 'sms'	boolean  (default off)
+			local to window
+	Scrolling works with screen lines.  When 'wrap' is set and the first
+	line in the window wraps part of it may not be visible, as if it is
+	above the window. "<<<" is displayed at the start of the first line,
+	highlighted with |hl-NonText|.
+	NOTE: only partly implemented, currently works with CTRL-E, CTRL-Y
+	and scrolling with the mouse.
+
 					*'softtabstop'* *'sts'*
 'softtabstop' 'sts'	number	(default 0)
 			local to buffer
@@ -7467,9 +7506,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 			The file is used for all languages.
 
 	expr:{expr}	Evaluate expression {expr}.  Use a function to avoid
-			trouble with spaces.  |v:val| holds the badly spelled
-			word.  The expression must evaluate to a List of
-			Lists, each with a suggestion and a score.
+			trouble with spaces.  Best is to call a function
+			without arguments, see |expr-option-function|.
+			|v:val| holds the badly spelled word.  The expression
+			must evaluate to a List of Lists, each with a
+			suggestion and a score.
 			Example:
 				[['the', 33], ['that', 44]] ~
 			Set 'verbose' and use |z=| to see the scores that the
@@ -7493,24 +7534,28 @@ A jump table for the options with a short description can be found at |Q_op|.
 	When on, splitting a window will put the new window below the current
 	one. |:split|
 
+			*'splitkeep'* *'spk'*
+'splitkeep' 'spk'	string	(default "cursor")
+			global
+	The value of this option determines the scroll behavior when opening,
+	closing or resizing horizontal splits.
+
+	Possible values are:
+	  cursor	Keep the same relative cursor position.
+	  screen	Keep the text on the same screen line.
+	  topline	Keep the topline the same.
+
+	For the "screen" and "topline" values, the cursor position will be
+	changed when necessary. In this case, the jumplist will be populated
+	with the previous cursor position. For "screen", the text cannot always
+	be kept on the same screen line when 'wrap' is enabled.
+
 			*'splitright'* *'spr'* *'nosplitright'* *'nospr'*
 'splitright' 'spr'	boolean	(default off)
 			global
 	When on, splitting a window will put the new window right of the
 	current one. |:vsplit|
 
-			*'splitscroll'* *'spsc'* *'nosplitscroll'* *'nospsc'*
-'splitscroll' 'spsc'	boolean	(default on)
-			global
-	The value of this option determines the scroll behavior when opening,
-	closing or resizing horizontal splits. When "on", splitting a window
-	horizontally will keep the same relative cursor position in the old and
-	new window, as well windows that are resized. When "off", scrolling
-	will be avoided to stabilize the window content. Instead, the cursor
-	position will be changed when necessary. In this case, the jumplist
-	will be populated with the previous cursor position. Scrolling cannot
-	be guaranteed to be avoided when 'wrap' is enabled.
-
 			   *'startofline'* *'sol'* *'nostartofline'* *'nosol'*
 'startofline' 'sol'	boolean	(default on)
 			global

runtime/doc/os_haiku.txt

@@ -47,7 +47,7 @@ features you can enable/disable.
 
 Haiku uses "ncurses6" as its terminal library, therefore you need to have
 "ncurses6_devel" package installed from HaikuDepot in order to configure
-the Haiku build.  Just append "--with-tlib=ncurses6" to ./configure command
+the Haiku build.  Just append "--with-tlib=ncurses" to ./configure command.
 
 Now you should use "make" to compile Vim, then "make install" to install it.
 For seamless integration into Haiku, the GUI-less vim binary should be
@@ -56,12 +56,14 @@ additionally installed over the GUI version.  Typical build commands are:
   ./configure --prefix=`finddir B_SYSTEM_NONPACKAGED_DIRECTORY` \
     --datarootdir=`finddir B_SYSTEM_NONPACKAGED_DATA_DIRECTORY` \
     --mandir=`finddir B_SYSTEM_NONPACKAGED_DIRECTORY`/documentation/man \
+    --with-tlib=ncurses \
   make clean
   make install
 
   ./configure --prefix=`finddir B_SYSTEM_NONPACKAGED_DIRECTORY`  \
     --datarootdir=`finddir B_SYSTEM_NONPACKAGED_DATA_DIRECTORY` \
     --mandir=`finddir B_SYSTEM_NONPACKAGED_DIRECTORY`/documentation/man \
+    --with-tlib=ncurses \
     --disable-gui
   make clean
   make install

runtime/doc/os_vms.txt

@@ -1,4 +1,4 @@
-*os_vms.txt*    For Vim version 9.0.  Last change: 2021 Jan 04
+*os_vms.txt*    For Vim version 9.0.  Last change: 2022 Sep 30
 
 
 		  VIM REFERENCE MANUAL
@@ -331,10 +331,10 @@ features, it is worth to choose non GUI executables.
 8.1 Backspace/delete
 
 There are backspace/delete key inconsistencies with VMS.
-:fixdel doesn't do the trick, but the solution is: >
+:fixdel doesn't do the trick, but the solution is (without "<" in 'cpo'): >
 
-	:inoremap ^? ^H		" for terminal mode
-	:inoremap <Del> ^H	" for gui mode
+	:inoremap <C-?> <C-H>	" for terminal mode
+	:inoremap <Del> <C-H>	" for gui mode
 
 Read more in ch: 8.6 (Terminal problems).
 (Bruce Hunsaker <BNHunsaker@chq.byu.edu> Vim 5.3)

runtime/doc/os_win32.txt

@@ -1,4 +1,4 @@
-*os_win32.txt*  For Vim version 9.0.  Last change: 2022 May 24
+*os_win32.txt*  For Vim version 9.0.  Last change: 2022 Sep 18
 
 
 		  VIM REFERENCE MANUAL    by George Reilly
@@ -7,8 +7,11 @@
 						*win32* *Win32* *MS-Windows*
 This file documents the idiosyncrasies of the Win32 version of Vim.
 
-The Win32 version of Vim works on Windows XP, Vista, 7, 8, 10 and 11.  There are
-both console and GUI versions.
+The Win32 version of Vim works on Windows 7, 8, 10 and 11.  There are both
+console and GUI versions.
+
+If you have Windows XP or Vista then Vim 9.0 up to patch level 495 can be
+used.
 
 The 32 bit version also runs on 64 bit MS-Windows systems.
 

runtime/doc/pattern.txt

@@ -1,4 +1,4 @@
-*pattern.txt*   For Vim version 9.0.  Last change: 2022 Mar 04
+*pattern.txt*   For Vim version 9.0.  Last change: 2022 Sep 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -134,6 +134,11 @@ gD			Goto global Declaration.  When the cursor is on a
 CTRL-C			Interrupt current (search) command.  Use CTRL-Break on
 			MS-Windows |dos-CTRL-Break|.
 			In Normal mode, any pending command is aborted.
+			When Vim was started with output redirected and there
+			are no changed buffers CTRL-C exits Vim.  That is to
+			help users who use "vim file | grep word" and don't
+			know how to get out (blindly typing :qa<CR> would
+			work).
 
 							*:noh* *:nohlsearch*
 :noh[lsearch]		Stop the highlighting for the 'hlsearch' option.  It

runtime/doc/popup.txt

@@ -1,4 +1,4 @@
-*popup.txt*  For Vim version 9.0.  Last change: 2022 Jun 16
+*popup.txt*  For Vim version 9.0.  Last change: 2022 Oct 07
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -347,6 +347,12 @@ popup_filter_yesno({id}, {key})				*popup_filter_yesno()*
 		See the example here: |popup_dialog-example|
 
 
+popup_findecho()					*popup_findecho()*
+		Get the |window-ID| for the popup that shows messages for the
+		`:echowindow` command.  Return zero if there is none.
+		Mainly useful to hide the popup.
+
+
 popup_findinfo()					*popup_findinfo()*
 		Get the |window-ID| for the popup info window, as it used by
 		the popup menu.  See |complete-popup|.  The info popup is
@@ -360,7 +366,6 @@ popup_findpreview()					*popup_findpreview()*
 		Get the |window-ID| for the popup preview window.
 		Return zero if there is none.
 
-
 popup_getoptions({id})					*popup_getoptions()*
 		Return the {options} for popup {id} in a Dict.
 		A zero value means the option was not set.  For "zindex" the

runtime/doc/print.txt

@@ -1,4 +1,4 @@
-*print.txt*     For Vim version 9.0.  Last change: 2022 Jan 23
+*print.txt*     For Vim version 9.0.  Last change: 2022 Oct 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -158,13 +158,16 @@ currently specified printdevice: >
 If you change this option, using a function is an easy way to avoid having to
 escape all the spaces.  Example: >
 
-	:set printexpr=PrintFile(v:fname_in)
-	:function PrintFile(fname)
-	:  call system("ghostview " .. a:fname)
-	:  call delete(a:fname)
+	:set printexpr=PrintFile()
+	:function PrintFile()
+	:  call system("ghostview " .. v:fname_in)
+	:  call delete(v:fname_in)
 	:  return v:shell_error
 	:endfunc
 
+It is more efficient if the option is set to just a function call,
+see |expr-option-function|.
+
 Be aware that some print programs return control before they have read the
 file.  If you delete the file too soon it will not be printed.  These programs
 usually offer an option to have them remove the file when printing is done.

runtime/doc/quickfix.txt

@@ -1,4 +1,4 @@
-*quickfix.txt*  For Vim version 9.0.  Last change: 2022 Feb 22
+*quickfix.txt*  For Vim version 9.0.  Last change: 2022 Sep 26
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -478,7 +478,7 @@ You can parse a list of lines using 'errorformat' without creating or
 modifying a quickfix list using the |getqflist()| function. Examples: >
 	echo getqflist({'lines' : ["F1:10:Line10", "F2:20:Line20"]})
 	echo getqflist({'lines' : systemlist('grep -Hn quickfix *')})
-This returns a dictionary where the 'items' key contains the list of quickfix
+This returns a dictionary where the "items" key contains the list of quickfix
 entries parsed from lines. The following shows how to use a custom
 'errorformat' to parse the lines without modifying the 'errorformat' option: >
 	echo getqflist({'efm' : '%f#%l#%m', 'lines' : ['F1#10#Line']})
@@ -597,7 +597,7 @@ can go back to the unfiltered list using the |:colder|/|:lolder| command.
 			quickfix command or function, the |b:changedtick|
 			variable is incremented.  You can get the number of
 			this buffer using the getqflist() and getloclist()
-			functions by passing the 'qfbufnr' item. For a
+			functions by passing the "qfbufnr" item. For a
 			location list, this buffer is wiped out when the
 			location list is removed.
 
@@ -2011,7 +2011,7 @@ The function should return a single line of text to display in the quickfix
 window for each entry from start_idx to end_idx. The function can obtain
 information about the entries using the |getqflist()| function and specifying
 the quickfix list identifier "id". For a location list, getloclist() function
-can be used with the 'winid' argument. If an empty list is returned, then the
+can be used with the "winid" argument. If an empty list is returned, then the
 default format is used to display all the entries. If an item in the returned
 list is an empty string, then the default format is used to display the
 corresponding entry.

runtime/doc/quickref.txt

@@ -1,4 +1,4 @@
-*quickref.txt*  For Vim version 9.0.  Last change: 2022 May 05
+*quickref.txt*  For Vim version 9.0.  Last change: 2022 Oct 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -785,6 +785,7 @@ Short explanation of each option:		*option-list*
 'lines'			    number of lines in the display
 'linespace'	  'lsp'     number of pixel lines to use between characters
 'lisp'			    automatic indenting for Lisp
+'lispoptions'	  'lop'     changes how Lisp indenting is done
 'lispwords'	  'lw'	    words that change how lisp indenting works
 'list'			    show <Tab> and <EOL>
 'listchars'	  'lcs'     characters for displaying in list mode
@@ -910,6 +911,7 @@ Short explanation of each option:		*option-list*
 'smartcase'	  'scs'     no ignore case when pattern has uppercase
 'smartindent'	  'si'	    smart autoindenting for C programs
 'smarttab'	  'sta'     use 'shiftwidth' when inserting <Tab>
+'smoothscroll'	  'sms'     scroll by screen lines when 'wrap' is set
 'softtabstop'	  'sts'     number of spaces that <Tab> uses while editing
 'spell'			    enable spell checking
 'spellcapcheck'   'spc'     pattern to locate end of a sentence
@@ -918,8 +920,8 @@ Short explanation of each option:		*option-list*
 'spelloptions'	  'spo'     options for spell checking
 'spellsuggest'	  'sps'     method(s) used to suggest spelling corrections
 'splitbelow'	  'sb'	    new window from split is below the current one
+'splitkeep'	  'spk'     determines scroll behavior for split windows
 'splitright'	  'spr'     new window is put right of the current one
-'splitscroll'	  'spsc'    determines scroll behavior when splitting windows
 'startofline'	  'sol'     commands move cursor to first non-blank in line
 'statusline'	  'stl'     custom format for the status line
 'suffixes'	  'su'	    suffixes that are ignored with multiple match

runtime/doc/repeat.txt

@@ -1,4 +1,4 @@
-*repeat.txt*    For Vim version 9.0.  Last change: 2022 Jun 18
+*repeat.txt*    For Vim version 9.0.  Last change: 2022 Sep 22
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -92,7 +92,8 @@ pattern and do not match another pattern: >
 This first finds all lines containing "found", but only executes {cmd} when
 there is no match for "notfound".
 
-To execute a non-Ex command, you can use the `:normal` command: >
+Any Ex command can be used, see |ex-cmd-index|.  To execute a Normal mode
+command, you can use the `:normal` command: >
 	:g/pat/normal {commands}
 Make sure that {commands} ends with a whole command, otherwise Vim will wait
 for you to type the rest of the command for each match.  The screen will not
@@ -200,7 +201,8 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 							*:source-range*
 :[range]so[urce] [++clear]
 			Read Ex commands from the [range] of lines in the
-			current buffer.
+			current buffer.  When [range] is omitted read all
+			lines.
 
 			When sourcing commands from the current buffer, the
 			same script-ID |<SID>| is used even if the buffer is
@@ -626,6 +628,11 @@ When Vim starts up, after processing your .vimrc, it scans all directories in
 directories are added to 'runtimepath'.  Then all the plugins are loaded.
 See |packload-two-steps| for how these two steps can be useful.
 
+To allow for calling into package functionality while parsing your .vimrc,
+|:colorscheme| and |autoload| will both automatically search under 'packpath'
+as well in addition to 'runtimepath'.  See the documentation for each for
+details.
+
 In the example Vim will find "pack/foo/start/foobar/plugin/foo.vim" and adds
 "~/.vim/pack/foo/start/foobar" to 'runtimepath'.
 
@@ -904,6 +911,11 @@ executed like a normal Ex command, "step" will stop once in the compiled
 context, where local variables can be inspected, and once just before
 executing the command.
 
+In a :def function variables that haven't been declared yet cannot be
+inspected.  Variables that have been declared can be inspected, also when the
+block they were declared in has finished.  In commands this would not be
+possible, thus is slightly misleading (but can be useful).
+
 The backtrace shows the hierarchy of function calls, e.g.:
 	>bt ~
 	  3 function One[3] ~

runtime/doc/rileft.txt

@@ -1,4 +1,4 @@
-*rileft.txt*    For Vim version 9.0.  Last change: 2022 Apr 03
+*rileft.txt*    For Vim version 9.0.  Last change: 2022 Oct 12
 
 
 		  VIM REFERENCE MANUAL    by Avner Lottem
@@ -35,6 +35,11 @@ encoded for every character (or group of characters) are not supported either
 as this kind of support is out of the scope of a simple addition to an
 existing editor (and it's not sanctioned by Unicode either).
 
+As many people working on the code do not use the right-to-left mode, this
+feature may not work in some situations.  If you can describe what is wrong
+and how it would work when fixed, please create an issue on github, see
+|bug-reports|.
+
 
 Highlights
 ----------

runtime/doc/spell.txt

@@ -1600,7 +1600,7 @@ CHECKCOMPOUNDTRIPLE  (Hunspell)			*spell-CHECKCOMPOUNDTRIPLE*
 		Forbid three identical characters when compounding.  Not
 		supported.
 
-CHECKSHARPS  (Hunspell))			*spell-CHECKSHARPS*
+CHECKSHARPS  (Hunspell)				*spell-CHECKSHARPS*
 		SS letter pair in uppercased (German) words may be upper case
 		sharp s (ß). Not supported.
 

runtime/doc/syntax.txt

@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 9.0.  Last change: 2022 Jun 10
+*syntax.txt*	For Vim version 9.0.  Last change: 2022 Oct 14
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -3021,16 +3021,25 @@ satisfied with it for my own projects.
 SED						*sed.vim* *ft-sed-syntax*
 
 To make tabs stand out from regular blanks (accomplished by using Todo
-highlighting on the tabs), define "highlight_sedtabs" by putting >
-
-	:let highlight_sedtabs = 1
+highlighting on the tabs), define "g:sed_highlight_tabs" by putting >
 
+	:let g:sed_highlight_tabs = 1
+<
 in the vimrc file.  (This special highlighting only applies for tabs
 inside search patterns, replacement texts, addresses or text included
 by an Append/Change/Insert command.)  If you enable this option, it is
 also a good idea to set the tab width to one character; by doing that,
 you can easily count the number of tabs in a string.
 
+GNU sed allows comments after text on the same line.  BSD sed only allows
+comments where "#" is the first character of the line.  To enforce BSD-style
+comments, i.e. mark end-of-line comments as errors, use: >
+
+	:let g:sed_dialect = "bsd"
+<
+Note that there are other differences between GNU sed and BSD sed which are
+not (yet) affected by this setting.
+
 Bugs:
 
   The transform command (y) is treated exactly like the substitute
@@ -3153,7 +3162,7 @@ The default is to use the twice sh_minlines.  Set it to a smaller number to
 speed up displaying.  The disadvantage is that highlight errors may appear.
 
 syntax/sh.vim tries to flag certain problems as errors; usually things like
-extra ']'s, 'done's, 'fi's, etc.  If you find the error handling problematic
+unmatched "]", "done", "fi", etc.  If you find the error handling problematic
 for your purposes, you may suppress such error highlighting by putting
 the following line in your .vimrc: >
 
@@ -5376,10 +5385,11 @@ ModeMsg		'showmode' message (e.g., "-- INSERT --").
 							*hl-MoreMsg*
 MoreMsg		|more-prompt|
 							*hl-NonText*
-NonText		'@' at the end of the window, characters from 'showbreak'
-		and other characters that do not really exist in the text
-		(e.g., ">" displayed when a double-wide character doesn't
-		fit at the end of the line).
+NonText		'@' at the end of the window, "<<<" at the start of the window
+		for 'smoothscroll', characters from 'showbreak' and other
+		characters that do not really exist in the text, such as the
+		">" displayed when a double-wide character doesn't fit at the
+		end of the line.
 							*hl-Normal*
 Normal		Normal text.
 							*hl-Pmenu*

runtime/doc/tags

@@ -302,6 +302,7 @@ $quote	eval.txt	/*$quote*
 'fs'	options.txt	/*'fs'*
 'fsync'	options.txt	/*'fsync'*
 'ft'	options.txt	/*'ft'*
+'g:context_extra_options'	ft_context.txt	/*'g:context_extra_options'*
 'g:context_ignore_makefile'	ft_context.txt	/*'g:context_ignore_makefile'*
 'g:context_include'	ft_context.txt	/*'g:context_include'*
 'g:mf_other_macros'	ft_mp.txt	/*'g:mf_other_macros'*
@@ -450,6 +451,7 @@ $quote	eval.txt	/*$quote*
 'lines'	options.txt	/*'lines'*
 'linespace'	options.txt	/*'linespace'*
 'lisp'	options.txt	/*'lisp'*
+'lispoptions'	options.txt	/*'lispoptions'*
 'lispwords'	options.txt	/*'lispwords'*
 'list'	options.txt	/*'list'*
 'listchars'	options.txt	/*'listchars'*
@@ -457,6 +459,7 @@ $quote	eval.txt	/*$quote*
 'lmap'	options.txt	/*'lmap'*
 'lnr'	options.txt	/*'lnr'*
 'loadplugins'	options.txt	/*'loadplugins'*
+'lop'	options.txt	/*'lop'*
 'lpl'	options.txt	/*'lpl'*
 'lrm'	options.txt	/*'lrm'*
 'ls'	options.txt	/*'ls'*
@@ -713,6 +716,8 @@ $quote	eval.txt	/*$quote*
 'nosmartindent'	options.txt	/*'nosmartindent'*
 'nosmarttab'	options.txt	/*'nosmarttab'*
 'nosmd'	options.txt	/*'nosmd'*
+'nosmoothscroll'	options.txt	/*'nosmoothscroll'*
+'nosms'	options.txt	/*'nosms'*
 'nosn'	options.txt	/*'nosn'*
 'nosol'	options.txt	/*'nosol'*
 'nospell'	options.txt	/*'nospell'*
@@ -935,6 +940,8 @@ $quote	eval.txt	/*$quote*
 'smarttab'	options.txt	/*'smarttab'*
 'smc'	options.txt	/*'smc'*
 'smd'	options.txt	/*'smd'*
+'smoothscroll'	options.txt	/*'smoothscroll'*
+'sms'	options.txt	/*'sms'*
 'sn'	options.txt	/*'sn'*
 'so'	options.txt	/*'so'*
 'softtabstop'	options.txt	/*'softtabstop'*
@@ -949,8 +956,10 @@ $quote	eval.txt	/*$quote*
 'spelloptions'	options.txt	/*'spelloptions'*
 'spellsuggest'	options.txt	/*'spellsuggest'*
 'spf'	options.txt	/*'spf'*
+'spk'	options.txt	/*'spk'*
 'spl'	options.txt	/*'spl'*
 'splitbelow'	options.txt	/*'splitbelow'*
+'splitkeep'	options.txt	/*'splitkeep'*
 'splitright'	options.txt	/*'splitright'*
 'spo'	options.txt	/*'spo'*
 'spr'	options.txt	/*'spr'*
@@ -4087,7 +4096,6 @@ E1072	eval.txt	/*E1072*
 E1073	vim9.txt	/*E1073*
 E1074	vim9.txt	/*E1074*
 E1075	vim9.txt	/*E1075*
-E1076	eval.txt	/*E1076*
 E1077	vim9.txt	/*E1077*
 E1078	autocmd.txt	/*E1078*
 E1079	vim9.txt	/*E1079*
@@ -4335,7 +4343,13 @@ E1298	vim9.txt	/*E1298*
 E1299	tagsrch.txt	/*E1299*
 E13	message.txt	/*E13*
 E1300	userfunc.txt	/*E1300*
+E1301	vim9.txt	/*E1301*
 E1302	eval.txt	/*E1302*
+E1303	map.txt	/*E1303*
+E1304	vim9.txt	/*E1304*
+E1305	textprop.txt	/*E1305*
+E1306	vim9.txt	/*E1306*
+E1307	vim9.txt	/*E1307*
 E131	userfunc.txt	/*E131*
 E132	userfunc.txt	/*E132*
 E133	userfunc.txt	/*E133*
@@ -5536,6 +5550,7 @@ TerminalWinOpen	autocmd.txt	/*TerminalWinOpen*
 TextChanged	autocmd.txt	/*TextChanged*
 TextChangedI	autocmd.txt	/*TextChangedI*
 TextChangedP	autocmd.txt	/*TextChangedP*
+TextChangedT	autocmd.txt	/*TextChangedT*
 TextYankPost	autocmd.txt	/*TextYankPost*
 Transact-SQL	ft_sql.txt	/*Transact-SQL*
 U	undo.txt	/*U*
@@ -5563,7 +5578,6 @@ VimResume	autocmd.txt	/*VimResume*
 VimSuspend	autocmd.txt	/*VimSuspend*
 Vimball-copyright	pi_vimball.txt	/*Vimball-copyright*
 Virtual-Replace-mode	insert.txt	/*Virtual-Replace-mode*
-VisVim	if_ole.txt	/*VisVim*
 Visual	visual.txt	/*Visual*
 Visual-mode	visual.txt	/*Visual-mode*
 W	motion.txt	/*W*
@@ -5922,6 +5936,7 @@ blob-modification	eval.txt	/*blob-modification*
 blob2list()	builtin.txt	/*blob2list()*
 blockwise-examples	visual.txt	/*blockwise-examples*
 blockwise-operators	visual.txt	/*blockwise-operators*
+blockwise-put	change.txt	/*blockwise-put*
 blockwise-register	change.txt	/*blockwise-register*
 blockwise-visual	visual.txt	/*blockwise-visual*
 blowfish	options.txt	/*blowfish*
@@ -6767,6 +6782,7 @@ expr-lambda	eval.txt	/*expr-lambda*
 expr-nesting	eval.txt	/*expr-nesting*
 expr-number	eval.txt	/*expr-number*
 expr-option	eval.txt	/*expr-option*
+expr-option-function	vim9.txt	/*expr-option-function*
 expr-quote	eval.txt	/*expr-quote*
 expr-register	eval.txt	/*expr-register*
 expr-star	eval.txt	/*expr-star*
@@ -6794,6 +6810,7 @@ extendnew()	builtin.txt	/*extendnew()*
 extension-removal	cmdline.txt	/*extension-removal*
 extensions-improvements	todo.txt	/*extensions-improvements*
 f	motion.txt	/*f*
+f-args-example	map.txt	/*f-args-example*
 false	vim9.txt	/*false*
 false-variable	eval.txt	/*false-variable*
 falsy	eval.txt	/*falsy*
@@ -7391,6 +7408,7 @@ 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:var	eval.txt	/*g:var*
+g:vim_indent	indent.txt	/*g:vim_indent*
 g:vim_indent_cont	indent.txt	/*g:vim_indent_cont*
 g:vimball_home	pi_vimball.txt	/*g:vimball_home*
 g:vimball_mkdir	pi_vimball.txt	/*g:vimball_mkdir*
@@ -8122,6 +8140,7 @@ keypad-page-up	intro.txt	/*keypad-page-up*
 keypad-plus	intro.txt	/*keypad-plus*
 keypad-point	intro.txt	/*keypad-point*
 keys()	builtin.txt	/*keys()*
+keytrans()	builtin.txt	/*keytrans()*
 known-bugs	todo.txt	/*known-bugs*
 l	motion.txt	/*l*
 l:	eval.txt	/*l:*
@@ -9018,6 +9037,7 @@ popup_dialog()	popup.txt	/*popup_dialog()*
 popup_dialog-example	popup.txt	/*popup_dialog-example*
 popup_filter_menu()	popup.txt	/*popup_filter_menu()*
 popup_filter_yesno()	popup.txt	/*popup_filter_yesno()*
+popup_findecho()	popup.txt	/*popup_findecho()*
 popup_findinfo()	popup.txt	/*popup_findinfo()*
 popup_findpreview()	popup.txt	/*popup_findpreview()*
 popup_getoptions()	popup.txt	/*popup_getoptions()*
@@ -9164,6 +9184,7 @@ pythonx	if_pyth.txt	/*pythonx*
 pythonx-directory	if_pyth.txt	/*pythonx-directory*
 pyxeval()	builtin.txt	/*pyxeval()*
 q	repeat.txt	/*q*
+q-args-example	map.txt	/*q-args-example*
 q/	cmdline.txt	/*q\/*
 q:	cmdline.txt	/*q:*
 q?	cmdline.txt	/*q?*
@@ -10714,6 +10735,7 @@ vim9-literal-dict	vim9.txt	/*vim9-literal-dict*
 vim9-mix	vim9.txt	/*vim9-mix*
 vim9-namespace	vim9.txt	/*vim9-namespace*
 vim9-no-dict-function	vim9.txt	/*vim9-no-dict-function*
+vim9-no-shorten	vim9.txt	/*vim9-no-shorten*
 vim9-rationale	vim9.txt	/*vim9-rationale*
 vim9-reload	vim9.txt	/*vim9-reload*
 vim9-s-namespace	vim9.txt	/*vim9-s-namespace*

runtime/doc/terminal.txt

@@ -1,4 +1,4 @@
-*terminal.txt*	For Vim version 9.0.  Last change: 2022 Jun 09
+*terminal.txt*	For Vim version 9.0.  Last change: 2022 Oct 10
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -288,9 +288,8 @@ way to kill or interrupt the job.  For example: >
 
 So long as the job is running the window behaves like it contains a modified
 buffer.  Trying to close the window with `CTRL-W :quit` fails.  When using
-`CTRL-W :quit!` the job is ended.  The text in the window is lost.  The buffer
-still exists, but getting it in a window with `:buffer` will show an empty
-buffer.
+`CTRL-W :quit!` the job is ended.  The text in the window is lost, the buffer
+is deleted.  With `CTRL-W :bunload!` the buffer remains but will be empty.
 
 Trying to close the window with `CTRL-W :close` also fails.   Using
 `CTRL-W :close!` will close the window and make the buffer hidden.

runtime/doc/textprop.txt

@@ -1,4 +1,4 @@
-*textprop.txt*  For Vim version 9.0.  Last change: 2021 Nov 23
+*textprop.txt*  For Vim version 9.0.  Last change: 2022 Oct 13
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -142,9 +142,12 @@ prop_add({lnum}, {col}, {props})
 				then "id" must not be present and will be set
 				automatically to a negative number; otherwise
 				zero is used
-		   text		text to be displayed before {col}, or after the
-				line if {col} is zero; prepend and/or append
-				spaces for padding with highlighting
+							*E1305*
+		   text		text to be displayed before {col}, or
+				above/below the line if {col} is zero; prepend
+				and/or append spaces for padding with
+				highlighting; cannot be used with "length",
+				"end_lnum" and "end_col" |virtual-text|
 		   					*E1294*
 		   text_align	when "text" is present and {col} is zero;
 				specifies where to display the text:
@@ -156,7 +159,7 @@ prop_add({lnum}, {col}, {props})
 				   above   just above the line
 				When omitted "after" is used.  Only one
 				"right" property can fit in each line, if
-				there are two ore more these will go in a
+				there are two or more these will go in a
 				separate line (still right aligned).
 		   text_padding_left				*E1296*
 				used when "text" is present and {col} is zero;
@@ -169,6 +172,9 @@ prop_add({lnum}, {col}, {props})
 				   wrap      wrap the text to the next line
 				   truncate  truncate the text to make it fit
 		   		When omitted "truncate" is used.
+				Note that this applies to the individual text
+				property, the 'wrap' option sets the overall
+				behavior
 		All fields except "type" are optional.
 
 		It is an error when both "length" and "end_lnum" or "end_col"
@@ -189,12 +195,23 @@ prop_add({lnum}, {col}, {props})
 		If not found an error is given.
 							*virtual-text*
 		When "text" is used and the column is non-zero then this text
-		will be displayed at the start location of the text property
-		after the text.  The text of the buffer line will be shifted
-		to make room.  This is called "virtual text".
-		When the column is zero the virtual text will appear after the
-		buffer text.  The "text_align" and "text_wrap" arguments
-		determine how it is displayed.
+		will be displayed at the specified start location of the text
+		property.  The text of the buffer line will be shifted to make
+		room.  This is called "virtual text".
+		When the column is zero the virtual text will appear above,
+		after or below the buffer text.  The "text_align" and
+		"text_wrap" arguments determine how it is displayed.
+		To separate the virtual text from the buffer text prepend
+		and/or append spaces to the "text" field or use the
+		"text_padding_left" value.
+
+		Make sure to use a highlight that makes clear to the user that
+		this is virtual text, otherwise it will be very confusing that
+		the text cannot be edited.  When using "above" you need to
+		make clear this text belongs to the text line below it, when
+		using "below" you need to make sure it belongs to the text
+		line above it.
+
 		The text will be displayed but it is not part of the actual
 		buffer line, the cursor cannot be placed on it.  A mouse click
 		in the text will move the cursor to the first character after
@@ -206,17 +223,12 @@ prop_add({lnum}, {col}, {props})
 		property with "text" has been added for a buffer then using a
 		negative "id" for any other property will give an error:
 		*E1293*
-		Make sure to use a highlight that makes clear to the user that
-		this is virtual text, otherwise it will be very confusing that
-		the text cannot be edited.
-		To separate the virtual text from the buffer text prepend
-		and/or append spaces to the "text" field.
 
 		Can also be used as a |method|: >
 			GetLnum()->prop_add(col, props)
 <
 						*prop_add_list()*
-prop_add_list({props}, [[{lnum}, {col}, {end-lnum}, {end-col}], ...])
+prop_add_list({props}, [{item}, ...])
 		Similar to prop_add(), but attaches a text property at
 		multiple positions in a buffer.
 
@@ -228,12 +240,18 @@ prop_add_list({props}, [[{lnum}, {col}, {end-lnum}, {end-col}], ...])
 		   type		name of the text property type
 		All fields except "type" are optional.
 
-		The second argument is a List of Lists where each list
-		specifies the starting and ending position of the text.  The
-		first two items {lnum} and {col} specify the starting position
-		of the text where the property will be attached and the last
-		two items {end-lnum} and {end-col} specify the position just
-		after the text.
+		The second argument is a List of items, where each {item} is a
+		list that specifies the starting and ending position of the
+		text: [{lnum}, {col}, {end-lnum}, {end-col}]
+		or:   [{lnum}, {col}, {end-lnum}, {end-col}, {id}]
+
+		The first two items {lnum} and {col} specify the starting
+		position of the text where the property will be attached.
+		The next two items {end-lnum} and {end-col} specify the
+		position just after the text.
+		An optional fifth item {id} can be used to give a different ID
+		to a property.  When omitted the ID from {props} is used,
+		falling back to zero if none are present.
 
 		It is not possible to add a text property with a "text" field
 		here.

runtime/doc/todo.txt

@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 9.0.  Last change: 2022 Sep 10
+*todo.txt*      For Vim version 9.0.  Last change: 2022 Oct 16
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -38,50 +38,31 @@ browser use: https://github.com/vim/vim/issues/1234
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Use :defer command:
-    - Use "D" flag of writefile() and mkdir() in tests.
-	(testdir/test_c*.vim done)
+'smoothscroll':
+- CTRL-E and gj in long line with 'scrolloff' 5 not working well yet.
+- computing 'scrolloff' position row use w_skipcol
 
-When using :echomessage do use msg_row and msg_col, but save and restore.
-How to test any failure?  If nothing fails perhaps it's OK alrady.
+Check textprop right/above/below with 'number' set and "n" in 'cpo'.
+
+Don't do anything for ":!". #11372
 
-Drop Windows XP?  #11089
 
 Further Vim9 improvements, possibly after launch:
 - Use Vim9 for more runtime files.
-- Check performance with callgrind and kcachegrind.
-    getline()/substitute()/setline() in #5632
-- Better implementation for partial and tests for that.
-- when using "const" mark the variable type as const with TTFLAG_CONST, so
-  that an error is given at compile time when trying to change it.  E.g. for a
-  const list and trying to call add().
-- Compile options that are an expression, e.g. "expr:" in 'spellsuggest',
-  'foldexpr', 'foldtext', 'printexpr', 'diffexpr', 'patchexpr', 'charconvert',
-  'balloonexpr', 'includeexpr', 'indentexpr', 'formatexpr'.
-  Give an error if compilation fails. (#7625)
-  Alternatively: Detect a compiled function call and skip the expression
-  evaluation.
-  Use the location where the option was set for deciding whether it's to be
-  evaluated in Vim9 script context.
 - implement :type
 - implement :enum
 - implement :class and :interface: See |vim9-classes|
-- For range: make table of first ASCII character with flag to quickly check if
-  it can be a Vim9 command. E.g. "+" can, but "." can't.
 - Inline call to map() and filter(), better type checking.
-- Make accessing varargs faster: arg[expr]
-	EVAL expr
-	LOADVARARG (varargs idx)
 - When evaluating constants for script variables, some functions could work:
     has(featureName), len(someString)
 - Implement as part of an expression: ++expr, --expr, expr++, expr--.
 
 Popup windows:
-- Preview popup not properly updated when it overlaps with completion menu.
-  (Yegappan Lakshmanan, 2021 May 22)
-- Scrollbar thumb sometimes not visible  #10492
 - Add a function to redraw a specific popup window.  Esp. to be used when
   editing the command line, when screen updating doesn't happen. (Shougo)
+  #10210  Example that shows the need on the issue.
+  Probably need to update all popup windows (they may overlap)
+  If the display is scrolled need to redraw everything later.
 - Add a flag to make a popup window focusable?
     CTRL-W P cycle over any preview window or focusable popup, end up back in
 	     current window.
@@ -108,8 +89,6 @@ Popup windows:
     - put popup menu also in popup_mask?
 - Match does not have right BG color if line length equals popup width.
   (#5658)
-- Any other commands to disable in a popup window?
-  Use ERROR_IF_POPUP_WINDOW for these.
 - Figure out the size and position better if wrapping inserts indent
 
 'incsearch' with :s:
@@ -185,10 +164,11 @@ Terminal emulator window:
 - When 'encoding' is not utf-8, or the job is using another encoding, setup
   conversions.
 
-Add 'splitscroll'  #10682  Anything remaining
-
 Autoconf: must use autoconf 2.69, later version generates lots of warnings
-- try using autoconf 2.71 and fix all "obsolete" warnings
+- try using autoconf 2.71 and fix all "obsolete" warnings  #11322
+
+Problem with Visual highlight when 'linebreak' and 'showbreak' are set.
+#11272
 
 Can deref_func_name() and deref_function_name() be merged?
 
@@ -197,6 +177,9 @@ reduced?
 
 Add BufDeletePost.  #11041
 
+Test property disappears when using CR twice in a row.  OK when some text was
+entered. (#11151)
+
 NFA regexp does not handle composing characters well: #10286
     [ɔ̃] matches both ɔ and ɔ̃
     \(ɔ\|ɔ̃\) matches ɔ and not ɔ̃
@@ -207,10 +190,17 @@ feature is supported or not.  Replaces the xterm mechanism to request each
 entry separately. #6609
 Multiplexers (screen, tmux) can request it to the underlying terminal, and
 pass it on with modifications.
+How to get all the text quickly (also over ssh)?  Can we use a side channel?
 
 Using "A" and "o" in manually created fold (in empty buffer) does not behave
 consistenly (James McCoy, #10698)
 
+In a timer callback, when using ":echo" and then input() the message is
+overwritten.  Could use ":echowin" and call redraw_cmd() in get_user_input().
+#11299
+
+Syntax include problem: #11277.  Related to Patch 8.2.2761
+
 To avoid flicker: add an option that when a screen clear is requested, instead
 of clearing it draws everything and uses "clear to end of line" for every line.
 Resetting 't_ut' already causes this?
@@ -244,11 +234,10 @@ MS-Windows: did path modifier :p:8 stop working?  #8600
 Version of getchar() that does not move the cursor - #10603 Use a separate
 argument for the new flag.
 
-Add "lastline" entry to 'fillchars' to specify a character instead of '@'.
-#10963
-
 test_arglist func Test_all_not_allowed_from_cmdwin() hangs on MS-Windows.
 
+Can we add highlighting to ":echowindow"?
+
 Information for a specific terminal (e.g. gnome, tmux, konsole, alacritty) is
 spread out.  Make a section with copy/paste examples of script and pointers to
 more information.
@@ -274,7 +263,9 @@ Adding "10" to 'spellsuggest' causes spell suggestions to become very slow.
 Also, z= in German on a long word can take a very long time, but CTRL-C to
 interrupt does not work. Where to add ui_breakcheck()?
 New English spell files also have very slow suggestions.
+
 French spell files don't work correctly.  #4916
+    Make Vim understand the format somehow?
 
 Make "g>" and "g<" in Visual mode move the text right or left.
 Also for a block selection.  #8558
@@ -459,8 +450,6 @@ find them. (Max Kukartsev, #6218)
 
 Enable 'termbidi' if $VTE_VERSION >= 5703 ?
 
-Sound: support on Mac?  Or does libcanberra work there?
-
 Python 3.8 doesn't work. (Antonios Hadjigeorgalis, #5509)
 
 "--cleanFOO" does not result in an error. (#5537)
@@ -556,12 +545,6 @@ Bug: script written with "-W scriptout" contains Key codes, while the script
 read with "-s scriptin" expects escape codes.  Probably "scriptout" needs to
 be adjusted. (Daniel Steinberg, 2019 Feb 24, #4041)
 
-Add a string to the 'display' option ("smoothscroll" ?) to make CTRL-E and
-CTRL-Y scroll one screen line, also if this means the first line doesn't start
-with the first character (like what happens with a last line that doesn't
-fit).  Display "<<<" at the start of the first visible line (like "@@@" is
-displayed in the last line). (Arseny Nasokin,  #5154)
-
 Window size changes after closing a tab. (#4741)
 
 Problem with colors in terminal window. (Jason Franklin, 2019 May 12)
@@ -616,6 +599,11 @@ negative. (see #4326)
 tab page. (Ingo Karkat, #4324)
 :call settabwinvar(1, 1, '&cmdheight', 2) also doesn't work well.
 
+When opening a file, allow for specifying the initial column position:
+    vim +12:5 file.txt   line 12 column 5
+    :edit +12:5 file.txt
+Should probably use the column as the character index.
+
 This modeline throws unexpected errors: (#4165)
     vim: syn=nosyntax
 
@@ -672,9 +660,6 @@ when possible. (Dylan Lloyd, #3973)
 Make ":interactive !cmd" stop termcap mode, also when used in an autocommand.
 (#3692)
 
-matchaddpos() gets slow with many matches.  Proposal by Rick Howe, 2018 Jul
-19.
-
 Add something like 'fillchars' local to window, but allow for specifying a
 highlight name.  Esp. for the statusline.
 And "extends" and "precedes" are also useful without 'list' set.  Also in
@@ -3092,9 +3077,6 @@ Macintosh:
     line is too short.  Add a word in 'scrollopt' to allow moving the cursor
     to longer line that is visible.  A similar thing is done for the GUI when
     using the horizontal scrollbar.
-7   VisVim can only open one file.  Hard to solve: each opened file is passed
-    with a separate invocation, would need to use timestamps to know the
-    invocations belong together.
 8   When giving a ":bwipeout" command a file-changed dialog may popup for this
     buffer, which is pointless.  (Mike Williams)
 8   On MS-Windows ":make" doesn't show output while it is working.  Use the

runtime/doc/userfunc.txt

@@ -15,7 +15,7 @@ This is introduced in section |41.7| of the user manual.
 
 ==============================================================================
 
-1. Defining a fuction ~
+1. Defining a function ~
 						*define-function*
 New functions can be defined.  These can be called just like builtin
 functions.  The function executes a sequence of Ex commands.  Normal mode
@@ -308,7 +308,7 @@ This function can then be called with: >
 <
 ==============================================================================
 
-2. Calling a fuction ~
+2. Calling a function ~
 						*:cal* *:call* *E107*
 :[range]cal[l] {name}([arguments])
 		Call a function.  The name of the function and its arguments
@@ -482,6 +482,10 @@ then define the function like this: >
 	   echo "Done!"
 	endfunction
 
+If the file doesn't exist, Vim will also search in 'packpath' (under "start")
+to allow calling packages' functions from your .vimrc when the packages have
+not been added to 'runtimepath' yet (see |packages|).
+
 The file name and the name used before the # in the function must match
 exactly, and the defined function must have the name exactly as it will be
 called.  In Vim9 script the "g:" prefix must be used: >

runtime/doc/usr_41.txt

@@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 9.0.  Last change: 2022 Jun 23
+*usr_41.txt*	For Vim version 9.0.  Last change: 2022 Oct 07
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -1289,6 +1289,7 @@ Popup window:					*popup-window-functions*
 	popup_filter_yesno()	block until 'y' or 'n' is pressed
 	popup_getoptions()	get current options for a popup
 	popup_getpos()		get actual position and size of a popup
+	popup_findecho()	get window ID for popup used for `:echowindow`
 	popup_findinfo()	get window ID for popup info window
 	popup_findpreview()	get window ID for popup preview window
 	popup_list()		get list of all popup window IDs

runtime/doc/usr_52.txt

@@ -159,6 +159,7 @@ relative path: >
 
 This will search for the script "monthlib.vim" in the autoload directories of
 'runtimepath'.  With Unix one of the directories often is "~/.vim/autoload".
+It will also search under 'packpath', under "start".
 
 The main advantage of this is that this script can be easily shared with other
 scripts.  You do need to make sure that the script name is unique, since Vim

runtime/doc/various.txt

@@ -1,4 +1,4 @@
-*various.txt*   For Vim version 9.0.  Last change: 2022 Jun 25
+*various.txt*   For Vim version 9.0.  Last change: 2022 Oct 13
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -29,6 +29,8 @@ CTRL-L			Clear and redraw the screen.  The redraw may happen
 			Useful to update the status line(s) when 'statusline'
 			includes an item that doesn't cause automatic
 			updating.
+			If the command line is being edited the redraw is
+			postponed until later.
 
 						*:redrawt* *:redrawtabline*
 :redrawt[abline]	Redraw the tabline.  Useful to update the tabline when
@@ -247,7 +249,8 @@ g8			Print the hex values of the bytes used in the
 
 							*:!cmd* *:!*
 :!{cmd}			Execute {cmd} with the shell.  See also the 'shell'
-			and 'shelltype' option.
+			and 'shelltype' option. `:!` without a {cmd} is a no-op,
+			it does nothing.
 							*E34*
 			Any '!' in {cmd} is replaced with the previous
 			external command (see also 'cpoptions').  But not when
@@ -330,8 +333,8 @@ g8			Print the hex values of the bytes used in the
 							*+feature-list*
    *+acl*		|ACL| support included
    *+ARP*		Amiga only: ARP support included
-B  *+arabic*		|Arabic| language support
-B  *+autochdir*		support 'autochdir' option
+H  *+arabic*		|Arabic| language support
+N  *+autochdir*		support 'autochdir' option
 T  *+autocmd*		|:autocmd|, automatic commands.  Always enabled since
 			8.0.1564
 H  *+autoservername*	Automatically enable |clientserver|
@@ -347,18 +350,19 @@ T  *++builtin_terms*	maximal terminals builtin |builtin-terms| Always
 N  *+byte_offset*	support for 'o' flag in 'statusline' option, "go"
 			and ":goto" commands.
 m  *+channel*		inter process communication |channel|
-6  *+cindent*		|'cindent'|, C indenting
+T  *+cindent*		|'cindent'|, C indenting; Always enabled
 N  *+clientserver*	Unix and Win32: Remote invocation |clientserver|
    *+clipboard*		|clipboard| support compiled-in
    *+clipboard_working*	|clipboard| support compiled-in and working
 T  *+cmdline_compl*	command line completion |cmdline-completion|
 T  *+cmdline_hist*	command line history |cmdline-history|
-N  *+cmdline_info*	|'showcmd'| and |'ruler'|
-S  *+cmdwin*		|cmdline-window| support
+T  *+cmdline_info*	|'showcmd'| and |'ruler'|; Always enabled since
+			9.0.0747
+T  *+cmdwin*		|cmdline-window| support; Always enabled since 9.0.0657
 T  *+comments*		|'comments'| support
-B  *+conceal*		"conceal" support, see |conceal| |:syn-conceal| etc.
+N  *+conceal*		"conceal" support, see |conceal| |:syn-conceal| etc.
 N  *+cryptv*		encryption support |encryption|
-B  *+cscope*		|cscope| support
+H  *+cscope*		|cscope| support
 T  *+cursorbind*	|'cursorbind'| support
 m  *+cursorshape*	|termcap-cursor-shape| support
 m  *+debug*		Compiled for debugging.
@@ -369,7 +373,7 @@ N  *+diff*		|vimdiff| and 'diff'
 N  *+digraphs*		|digraphs| *E196*
    *+directx*		Win32 GUI only: DirectX and |'renderoptions'|
    *+dnd*		Support for DnD into the "~ register |quote_~|.
-B  *+emacs_tags*	|emacs-tags| files
+H  *+emacs_tags*	|emacs-tags| files
 N  *+eval*		expression evaluation |eval.txt|
 T  *+ex_extra*		always on now, used to be for Vim's extra Ex commands
 N  *+extra_search*	|'hlsearch'| and |'incsearch'| options.
@@ -381,7 +385,7 @@ N  *+find_in_path*	include file searches: |[I|, |:isearch|,
 N  *+folding*		|folding|
    *+footer*		|gui-footer|
    *+fork*		Unix only: |fork| shell commands
-   *+float*		Floating point support
+T  *+float*		Floating point support  Always enabled since 9.0.0491
 N  *+gettext*		message translations |multi-lang|
 -  *+GUI_Athena*	Unix only: Athena |GUI|
    *+GUI_neXtaw*	Unix only: neXtaw |GUI|
@@ -395,12 +399,12 @@ T  *+insert_expand*	|insert_expand| Insert mode completion
 m  *+ipv6*		Support for IPv6 networking |channel|
 m  *+job*		starting and stopping jobs |job|
 T  *+jumplist*		|jumplist|; Always enabled since 8.2.3795
-B  *+keymap*		|'keymap'|
+H  *+keymap*		|'keymap'|
 N  *+lambda*		|lambda| and |closure|
-B  *+langmap*		|'langmap'|
+H  *+langmap*		|'langmap'|
 N  *+libcall*		|libcall()|
 N  *+linebreak*		|'linebreak'|, |'breakat'| and |'showbreak'|
-t  *+lispindent*	|'lisp'|
+T  *+lispindent*	|'lisp'|
 T  *+listcmds*		Vim commands for the list of buffers |buffer-hidden|
 			and argument list |:argdelete|
 T  *+localmap*		Support for mappings local to a buffer |:map-local|
@@ -411,16 +415,16 @@ N  *+mksession*		|:mksession|
 T  *+modify_fname*	|filename-modifiers|
 T  *+mouse*		Mouse handling |mouse-using|
 N  *+mouseshape*	|'mouseshape'|
-B  *+mouse_dec*		Unix only: Dec terminal mouse handling |dec-mouse|
+N  *+mouse_dec*		Unix only: Dec terminal mouse handling |dec-mouse|
 N  *+mouse_gpm*		Unix only: Linux console mouse handling |gpm-mouse|
 m  *+mouse_gpm/dyn*	Same as |+mouse_gpm| with optional library dependency
 			|/dyn|
 N  *+mouse_jsbterm*	JSB mouse handling |jsbterm-mouse|
-B  *+mouse_netterm*	Unix only: netterm mouse handling |netterm-mouse|
+N  *+mouse_netterm*	Unix only: netterm mouse handling |netterm-mouse|
 N  *+mouse_pterm*	QNX only: pterm mouse handling |qnx-terminal|
 N  *+mouse_sysmouse*	Unix only: *BSD console mouse handling |sysmouse|
-B  *+mouse_sgr*		Unix only: sgr mouse handling |sgr-mouse|
-B  *+mouse_urxvt*	Unix only: urxvt mouse handling |urxvt-mouse|
+N  *+mouse_sgr*		Unix only: sgr mouse handling |sgr-mouse|
+N  *+mouse_urxvt*	Unix only: urxvt mouse handling |urxvt-mouse|
 N  *+mouse_xterm*	Unix only: xterm mouse handling |xterm-mouse|
 T  *+multi_byte*	Unicode support, 16 and 32 bit characters |multibyte|
    *+multi_byte_ime*	Win32 input method for multibyte chars |multibyte-ime|
@@ -449,14 +453,14 @@ m  *+python3/dyn*	Python 3 interface |python-dynamic| |/dyn|
 N  *+quickfix*		|:make| and |quickfix| commands
 N  *+reltime*		|reltime()| function, 'hlsearch'/'incsearch' timeout,
 			'redrawtime' option
-B  *+rightleft*		Right to left typing |'rightleft'|
+H  *+rightleft*		Right to left typing |'rightleft'|
 m  *+ruby*		Ruby interface |ruby|
 m  *+ruby/dyn*		Ruby interface |ruby-dynamic| |/dyn|
 T  *+scrollbind*	|'scrollbind'|
-B  *+signs*		|:sign|
-t  *+smartindent*	|'smartindent'|
-B  *+sodium*		compiled with libsodium for better encryption support
-B  *+sound*		|sound_playevent()|, |sound_playfile()| functions, etc.
+N  *+signs*		|:sign|
+T  *+smartindent*	|'smartindent'|
+H  *+sodium*		compiled with libsodium for better encryption support
+H  *+sound*		|sound_playevent()|, |sound_playfile()| functions, etc.
 N  *+spell*		spell checking support, see |spell|
 N  *+startuptime*	|--startuptime| argument
 N  *+statusline*	Options 'statusline', 'rulerformat' and special
@@ -472,7 +476,7 @@ m  *+tcl/dyn*		Tcl interface |tcl-dynamic| |/dyn|
 m  *+terminal*		Support for terminal window |terminal|
    *+terminfo*		uses |terminfo| instead of termcap
 N  *+termresponse*	support for |t_RV| and |v:termresponse|
-B  *+termguicolors*	24-bit color in xterm-compatible terminals support
+N  *+termguicolors*	24-bit color in xterm-compatible terminals support
 T  *+textobjects*	|text-objects| selection. Always enabled since 9.0.0222.
 N  *+textprop*		|text-properties|
    *+tgetent*		non-Unix only: able to use external termcap
@@ -481,7 +485,7 @@ T  *+title*		Setting the window 'title' and 'icon'; Always enabled
 N  *+toolbar*		|gui-toolbar|
 T  *+user_commands*	User-defined commands. |user-commands|
 			Always enabled since 8.1.1210.
-B  *+vartabs*		Variable-width tabstops. |'vartabstop'|
+H  *+vartabs*		Variable-width tabstops. |'vartabstop'|
 T  *+vertsplit*		Vertically split windows |:vsplit|; Always enabled
 			since 8.0.1118.
 T  *+vim9script*	|Vim9| script

runtime/doc/vim9.txt

@@ -1,4 +1,4 @@
-*vim9.txt*	For Vim version 9.0.  Last change: 2022 Sep 10
+*vim9.txt*	For Vim version 9.0.  Last change: 2022 Oct 11
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -107,7 +107,7 @@ script and `:def` functions; details are below:
 	`:t`
   	`:xit`
 - Some commands, especially those used for flow control, cannot be shortened.
-  E.g., `:throw` cannot be written as `:th`.
+  E.g., `:throw` cannot be written as `:th`.  *vim9-no-shorten*
 - You cannot use curly-braces names.
 - A range before a command must be prefixed with a colon: >
 	:%s/this/that
@@ -502,7 +502,7 @@ How constants work varies between languages.  Some consider a variable that
 can't be assigned another value a constant.  JavaScript is an example.  Others
 also make the value immutable, thus when a constant uses a list, the list
 cannot be changed.  In Vim9 we can use both.
-							*E1021*
+							*E1021* *E1307*
 `:const` is used for making both the variable and the value a constant.  Use
 this for composite structures that you want to make sure will not be modified.
 Example: >
@@ -962,6 +962,10 @@ In compiled Vim9 script you get:
 	3
 Generally, you should not change the list that is iterated over.  Make a copy
 first if needed.
+When looping over a list of lists, the nested lists can be changed.  The loop
+variable is "final", it cannot be changed but what its value can be changed.
+							*E1306*
+The depth of loops, :for and :while loops added together, cannot exceed 10.
 
 
 Conditions and expressions ~
@@ -1336,16 +1340,15 @@ This will generate error |E1302|: >
 	       })
 	endfor
 
-You need to create a closure to store the current value of "n", so that it is
-evaluated at the time the closure is created: >
-	def GetClosure(nr: number): func
-	  return (_) => {
-	    echowindow nr
-	  }
-	enddef
-
+You need to use a block and define a variable there, and use that one in the
+closure: >
 	for n in range(4)
-	    timer_start(500 * n, GetClosure(n))
+	{
+	   var nr = n
+	   timer_start(500 * n, (_) => {
+	          echowin nr
+	      })
+	}
 	endfor
 
 Using `echowindow` is useful in a timer, the messages go into a popup and will
@@ -1409,6 +1412,21 @@ to a Vim9 function:
 		'three'
 		]
 
+
+Calling a function in an expr option ~
+							*expr-option-function*
+The value of a few options, such as 'foldexpr', is an expression that is
+evaluated to get a value.  The evaluation can have quite a bit of overhead.
+One way to minimize the overhead, and also to keep the option value very
+simple, is to define a compiled function and set the option to call it
+without arguments.  Example: >
+	vim9script
+	def MyFoldFunc(): any
+	   ... compute fold level for line v:lnum
+	   return level
+	enddef
+	set foldexpr=s:MyFoldFunc()
+
 ==============================================================================
 
 4. Types					*vim9-types*
@@ -1684,7 +1702,7 @@ deleted.
 
 In Vim9 script the global "g:" namespace can still be used as before.  And the
 "w:", "b:" and "t:" namespaces.  These have in common that variables are not
-declared and they can be deleted.
+declared, have no specific type and they can be deleted.  *E1304*
 
 A side effect of `:vim9script` is that the 'cpoptions' option is set to the
 Vim default value, like with: >
@@ -1825,7 +1843,7 @@ And using the "as name" form: >
 	import "otherfile.vim9script" as that
 	call s:that.OtherFunc()
 
-However, the namespace cannot be resolved on it's own: >
+However, the namespace cannot be resolved on its own: >
 	import "that.vim"
 	echo s:that
 	" ERROR: E1060: Expected dot after name: s:that

runtime/filetype.vim

@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2022 Sep 09
+" Last Change:	2022 Oct 12
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -299,6 +299,9 @@ au BufNewFile,BufRead cfengine.conf		setf cfengine
 " ChaiScript
 au BufRead,BufNewFile *.chai			setf chaiscript
 
+" Chatito
+au BufNewFile,BufRead *.chatito			setf chatito
+
 " Comshare Dimension Definition Language
 au BufNewFile,BufRead *.cdl			setf cdl
 
@@ -366,6 +369,12 @@ au BufNewFile,BufRead *.ch			call dist#ft#FTchange()
 " ChordPro
 au BufNewFile,BufRead *.chopro,*.crd,*.cho,*.crdpro,*.chordpro	setf chordpro
 
+" Clang-format
+au BufNewFile,BufRead .clang-format		setf yaml
+
+" Clang-tidy
+au BufNewFile,BufRead .clang-tidy		setf yaml
+
 " Clean
 au BufNewFile,BufRead *.dcl,*.icl		setf clean
 
@@ -448,6 +457,9 @@ endif
 " Lynx config files
 au BufNewFile,BufRead lynx.cfg			setf lynx
 
+" LyRiCs
+au BufNewFile,BufRead *.lrc			setf lyrics
+
 " Modula-3 configuration language (must be before *.cfg and *makefile)
 au BufNewFile,BufRead *.quake,cm3.cfg		setf m3quake
 au BufNewFile,BufRead m3makefile,m3overrides	setf m3build
@@ -764,8 +776,8 @@ au BufNewFile,BufRead gitolite.conf		setf gitolite
 au BufNewFile,BufRead {,.}gitolite.rc,example.gitolite.rc	setf perl
 
 " Glimmer-flavored TypeScript and JavaScript
-au BufNewFile,BufRead *.gts	setf typescript.glimmer
-au BufNewFile,BufRead *.gjs	setf javascript.glimmer
+au BufNewFile,BufRead *.gts			setf typescript.glimmer
+au BufNewFile,BufRead *.gjs			setf javascript.glimmer
 
 " Gnuplot scripts
 au BufNewFile,BufRead *.gpi,.gnuplot		setf gnuplot
@@ -796,6 +808,9 @@ au BufNewFile,BufRead */etc/group,*/etc/group-,*/etc/group.edit,*/etc/gshadow,*/
 " GTK RC
 au BufNewFile,BufRead .gtkrc,gtkrc		setf gtkrc
 
+" GYP
+au BufNewFile,BufRead *.gyp,*.gypi		setf gyp
+
 " Hack
 au BufRead,BufNewFile *.hack,*.hackpartial			setf hack
 
@@ -838,6 +853,9 @@ au BufNewFile,BufRead *.hex,*.h32		setf hex
 " Hjson
 au BufNewFile,BufRead *.hjson			setf hjson
 
+" HLS Playlist (or another form of playlist)
+au BufNewFile,BufRead *.m3u,*.m3u8		setf hlsplaylist
+
 " Hollywood
 au BufRead,BufNewFile *.hws			setf hollywood
 
@@ -1017,6 +1035,12 @@ au BufNewFile,BufRead Kconfig,Kconfig.debug	setf kconfig
 " Lace (ISE)
 au BufNewFile,BufRead *.ace,*.ACE		setf lace
 
+" Larch Shared Language
+au BufNewFile,BufRead .lsl			call dist#ft#FTlsl()
+
+" Latexmkrc
+au BufNewFile,BufRead .latexmkrc,latexmkrc	setf perl
+
 " Latte
 au BufNewFile,BufRead *.latte,*.lte		setf latte
 
@@ -1097,11 +1121,14 @@ au BufNewFile,BufRead *.lou,*.lout		setf lout
 " Lua
 au BufNewFile,BufRead *.lua			setf lua
 
+" Luacheck
+au BufNewFile,BufRead .luacheckrc		setf lua
+
 " Luarocks
 au BufNewFile,BufRead *.rockspec		setf lua
 
 " Linden Scripting Language (Second Life)
-au BufNewFile,BufRead *.lsl			setf lsl
+au BufNewFile,BufRead *.lsl			call dist#ft#FTlsl()
 
 " Lynx style file (or LotusScript!)
 au BufNewFile,BufRead *.lss			setf lss
@@ -1199,6 +1226,9 @@ au BufNewFile,BufRead *.m2,*.DEF,*.mi		setf modula2
 " Modula-3 (.m3, .i3, .mg, .ig)
 au BufNewFile,BufRead *.[mi][3g]		setf modula3
 
+" Larch/Modula-3
+au BufNewFile,BufRead *.lm3			setf modula3
+
 " Monk
 au BufNewFile,BufRead *.isc,*.monk,*.ssc,*.tsc	setf monk
 
@@ -1269,6 +1299,9 @@ au BufNewFile,BufRead .netrc			setf netrc
 " Nginx
 au BufNewFile,BufRead *.nginx,nginx*.conf,*nginx.conf,*/etc/nginx/*,*/usr/local/nginx/conf/*,*/nginx/*.conf			setf nginx
 
+" Nim file
+au BufNewFile,BufRead *.nim,*.nims,*.nimble	setf nim
+
 " Ninja file
 au BufNewFile,BufRead *.ninja			setf ninja
 
@@ -1370,6 +1403,9 @@ au BufNewFile,BufRead *.dpr,*.lpr			setf pascal
 " Free Pascal makefile definition file
 au BufNewFile,BufRead *.fpc				setf fpcmake
 
+" Path of Exile item filter
+au BufNewFile,BufRead *.filter				setf poefilter
+
 " PDF
 au BufNewFile,BufRead *.pdf				setf pdf
 
@@ -1601,6 +1637,9 @@ else
   au BufNewFile,BufRead *.rmd,*.smd			setf rmd
 endif
 
+" R profile file
+au BufNewFile,BufRead .Rprofile,Rprofile,Rprofile.site	setf r
+
 " RSS looks like XML
 au BufNewFile,BufRead *.rss				setf xml
 
@@ -1726,6 +1765,9 @@ au BufNewFile,BufRead *.sed			setf sed
 " SubRip
 au BufNewFile,BufRead *.srt			setf srt
 
+" SubStation Alpha
+au BufNewFile,BufRead *.ass,*.ssa		setf ssa
+
 " svelte
 au BufNewFile,BufRead *.svelte			setf svelte
 
@@ -1921,6 +1963,10 @@ au BufNewFile,BufRead */etc/ssh/ssh_config.d/*.conf		setf sshconfig
 au BufNewFile,BufRead sshd_config			setf sshdconfig
 au BufNewFile,BufRead */etc/ssh/sshd_config.d/*.conf	setf sshdconfig
 
+" OpenVPN configuration
+au BufNewFile,BufRead *.ovpn			setf openvpn
+au BufNewFile,BufRead */openvpn/*/*.conf	setf openvpn
+
 " Stata
 au BufNewFile,BufRead *.ado,*.do,*.imata,*.mata	setf stata
 " Also *.class, but not when it's a Java bytecode file
@@ -2068,7 +2114,7 @@ au BufNewFile,BufRead *.tsv			setf tsv
 " TWIG files
 au BufNewFile,BufReadPost *.twig		setf twig
 
-" Typescript or Qt translation file (which is XML)
+" TypeScript or Qt translation file (which is XML)
 au BufNewFile,BufReadPost *.ts
 	\ if getline(1) =~ '<?xml' |
 	\   setf xml |
@@ -2076,6 +2122,9 @@ au BufNewFile,BufReadPost *.ts
 	\   setf typescript |
 	\ endif
 
+" TypeScript module and common
+au BufNewFile,BufRead *.mts,*.cts		setf typescript
+
 " TypeScript with React
 au BufNewFile,BufRead *.tsx			setf typescriptreact
 
@@ -2267,7 +2316,7 @@ au BufNewFile,BufRead *.fsproj,*.fsproj.user	setf xml
 au BufNewFile,BufRead *.vbproj,*.vbproj.user	setf xml
 
 " Qt Linguist translation source and Qt User Interface Files are XML
-" However, for .ts Typescript is more common.
+" However, for .ts TypeScript is more common.
 au BufNewFile,BufRead *.ui			setf xml
 
 " TPM's are RDF-based descriptions of TeX packages (Nikolai Weibull)

runtime/ftplugin/abaqus.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:     Abaqus finite element input file (www.abaqus.com)
 " Maintainer:   Carl Osterwisch <costerwi@gmail.com>
-" Last Change:  2022 Aug 03
+" Last Change:  2022 Oct 08
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin") | finish | endif
@@ -66,25 +66,44 @@ if exists("loaded_matchit") && !exists("b:match_words")
 endif
 
 if !exists("no_plugin_maps") && !exists("no_abaqus_maps")
-  " Define keys used to move [count] keywords backward or forward.
-  noremap <silent><buffer> [[ ?^\*\a<CR>:nohlsearch<CR>
-  noremap <silent><buffer> ]] /^\*\a<CR>:nohlsearch<CR>
+  " Map [[ and ]] keys to move [count] keywords backward or forward
+  nnoremap <silent><buffer> ]] :call <SID>Abaqus_NextKeyword(1)<CR>
+  nnoremap <silent><buffer> [[ :call <SID>Abaqus_NextKeyword(-1)<CR>
+  function! <SID>Abaqus_NextKeyword(direction)
+    .mark '
+    if a:direction < 0
+      let flags = 'b'
+    else
+      let flags = ''
+    endif
+    let l:count = abs(a:direction) * v:count1
+    while l:count > 0 && search("^\\*\\a", flags)
+      let l:count -= 1
+    endwhile
+  endfunction
 
-  " Define key to toggle commenting of the current line or range
+  " Map \\ to toggle commenting of the current line or range
   noremap <silent><buffer> <LocalLeader><LocalLeader>
       \ :call <SID>Abaqus_ToggleComment()<CR>j
   function! <SID>Abaqus_ToggleComment() range
-      if strpart(getline(a:firstline), 0, 2) == "**"
-	  " Un-comment all lines in range
-	  silent execute a:firstline . ',' . a:lastline . 's/^\*\*//'
-      else
-	  " Comment all lines in range
-	  silent execute a:firstline . ',' . a:lastline . 's/^/**/'
-      endif
+    if strpart(getline(a:firstline), 0, 2) == "**"
+      " Un-comment all lines in range
+      silent execute a:firstline . ',' . a:lastline . 's/^\*\*//'
+    else
+      " Comment all lines in range
+      silent execute a:firstline . ',' . a:lastline . 's/^/**/'
+    endif
+  endfunction
+
+  " Map \s to swap first two comma separated fields
+  noremap <silent><buffer> <LocalLeader>s :call <SID>Abaqus_Swap()<CR>
+  function! <SID>Abaqus_Swap() range
+    silent execute a:firstline . ',' . a:lastline . 's/\([^*,]*\),\([^,]*\)/\2,\1/'
   endfunction
 
   let b:undo_ftplugin .= "|unmap <buffer> [[|unmap <buffer> ]]"
       \ . "|unmap <buffer> <LocalLeader><LocalLeader>"
+      \ . "|unmap <buffer> <LocalLeader>s"
 endif
 
 " Undo must be done in nocompatible mode for <LocalLeader>.

runtime/ftplugin/chatito.vim

@@ -0,0 +1,15 @@
+" Vim filetype plugin
+" Language:	Chatito
+" Maintainer:	ObserverOfTime <chronobserver@disroot.org>
+" Last Change:	2022 Sep 19
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal comments=:#,:// commentstring=#\ %s
+" indent of 4 spaces is mandated by the spec
+setlocal expandtab softtabstop=4 shiftwidth=4
+
+let b:undo_ftplugin = 'setl com< cms< et< sts< sw<'

runtime/ftplugin/crontab.vim

@@ -0,0 +1,16 @@
+" Vim filetype plugin
+" Language:    crontab
+" Maintainer:  Keith Smiley <keithbsmiley@gmail.com>
+" Last Change: 2022 Sep 11
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Don't load another plugin for this buffer
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl commentstring<"
+
+setlocal commentstring=#\ %s

runtime/ftplugin/elixir.vim

@@ -1,7 +1,7 @@
 " Elixir filetype plugin
 " Language: Elixir
 " Maintainer:	Mitchell Hanberg <vimNOSPAM@mitchellhanberg.com>
-" Last Change: 2022 August 10
+" Last Change: 2022 Sep 20
 
 if exists("b:did_ftplugin")
   finish
@@ -23,7 +23,11 @@ if exists('loaded_matchit') && !exists('b:match_words')
         \ ',{:},\[:\],(:)'
 endif
 
+setlocal shiftwidth=2 softtabstop=2 expandtab iskeyword+=!,?
+setlocal comments=:#
 setlocal commentstring=#\ %s
 
+let b:undo_ftplugin = 'setlocal sw< sts< et< isk< com< cms<'
+
 let &cpo = s:save_cpo
 unlet s:save_cpo

runtime/ftplugin/erlang.vim

@@ -5,7 +5,7 @@
 " Contributors: Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
 "               Eduardo Lopez (http://github.com/tapichu)
 "               Arvid Bjurklint (http://github.com/slarwise)
-" Last Update:  2021-Jan-08
+" Last Update:  2021-Nov-22
 " License:      Vim license
 " URL:          https://github.com/vim-erlang/vim-erlang-runtime
 
@@ -30,6 +30,28 @@ setlocal commentstring=%%s
 
 setlocal formatoptions+=ro
 
+if get(g:, 'erlang_extend_path', 1)
+  " typical erlang.mk paths
+  let &l:path = join([
+        \ 'deps/*/include',
+        \ 'deps/*/src',
+        \ 'deps/*/test',
+        \ 'deps/*/apps/*/include',
+        \ 'deps/*/apps/*/src',
+        \ &g:path], ',')
+  " typical rebar3 paths
+  let &l:path = join([
+        \ 'apps/*/include',
+        \ 'apps/*/src',
+        \ '_build/default/lib/*/src',
+        \ '_build/default/*/include',
+        \ &l:path], ',')
+  " typical erlang paths
+  let &l:path = join(['include', 'src', 'test', &l:path], ',')
+
+  set wildignore+=*/.erlang.mk/*,*.beam
+endif
+
 setlocal suffixesadd=.erl,.hrl
 
 let &l:include = '^\s*-\%(include\|include_lib\)\s*("\zs\f*\ze")'

runtime/ftplugin/gdscript.vim

@@ -41,14 +41,19 @@ def GDScriptFoldLevel(): string
 enddef
 
 
-# Next/Previous section
-def NextSection(back: bool, cnt: number)
-    for n in range(cnt)
-        search('^\s*func\s', back ? 'bW' : 'W')
-    endfor
-enddef
+if !exists("g:no_plugin_maps")
+    # Next/Previous section
+    def NextSection(back: bool, cnt: number)
+        for n in range(cnt)
+            search('^\s*func\s', back ? 'bW' : 'W')
+        endfor
+    enddef
 
-nnoremap <silent><buffer>   ]] <scriptcmd>NextSection(false, v:count1)<CR>
-nnoremap <silent><buffer>   [[ <scriptcmd>NextSection(true, v:count1)<CR>
-xmap <buffer><expr> ]] $'<C-\><C-N>{v:count1}]]m>gv'
-xmap <buffer><expr> [[ $'<C-\><C-N>{v:count1}[[m>gv'
+    nnoremap <silent><buffer> ]] <scriptcmd>NextSection(false, v:count1)<CR>
+    nnoremap <silent><buffer> [[ <scriptcmd>NextSection(true, v:count1)<CR>
+    xmap <buffer><expr> ]] $'<C-\><C-N>{v:count1}]]m>gv'
+    xmap <buffer><expr> [[ $'<C-\><C-N>{v:count1}[[m>gv'
+    b:undo_ftplugin ..=
+          \    " | silent exe 'unmap <buffer> [['"
+          \ .. " | silent exe 'unmap <buffer> ]]'"
+endif

runtime/ftplugin/gdshader.vim

@@ -3,6 +3,7 @@ vim9script
 # Vim filetype plugin file
 # Language: Godot shading language
 # Maintainer: Maxim Kim <habamax@gmail.com>
+# Website: https://github.com/habamax/vim-gdscript
 
 if exists("b:did_ftplugin") | finish | endif
 b:did_ftplugin = 1

runtime/ftplugin/gyp.vim

@@ -0,0 +1,14 @@
+" Vim filetype plugin
+" Language:	GYP
+" Maintainer:	ObserverOfTime <chronobserver@disroot.org>
+" Last Change:	2022 Sep 27
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal formatoptions-=t
+setlocal commentstring=#\ %s comments=b:#,fb:-
+
+let b:undo_ftplugin = 'setlocal fo< cms< com<'

runtime/ftplugin/hare.vim

@@ -0,0 +1,27 @@
+" Vim filetype plugin
+" Language: Hare
+" Maintainer: Amelia Clarke <me@rsaihe.dev>
+" Previous Maintainer: Drew DeVault <sir@cmpwn.com>
+" Last Updated: 2022-09-21
+
+" Only do this when not done yet for this buffer
+if exists('b:did_ftplugin')
+  finish
+endif
+
+" Don't load another plugin for this buffer
+let b:did_ftplugin = 1
+
+setlocal noexpandtab
+setlocal tabstop=8
+setlocal shiftwidth=0
+setlocal softtabstop=0
+setlocal textwidth=80
+setlocal commentstring=//\ %s
+
+" Set 'formatoptions' to break comment lines but not other lines,
+" and insert the comment leader when hitting <CR> or using "o".
+setlocal fo-=t fo+=croql
+
+compiler hare
+" vim: tabstop=2 shiftwidth=2 expandtab

runtime/ftplugin/heex.vim

@@ -0,0 +1,16 @@
+" Elixir filetype plugin
+" Language: HEEx
+" Maintainer:	Mitchell Hanberg <vimNOSPAM@mitchellhanberg.com>
+" Last Change: 2022 Sep 21
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal shiftwidth=2 softtabstop=2 expandtab
+
+setlocal comments=:<%!--
+setlocal commentstring=<%!--\ %s\ --%>
+
+let b:undo_ftplugin = 'set sw< sts< et< com< cms<'

runtime/ftplugin/lua.vim

@@ -3,7 +3,8 @@
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainer:	Max Ischenko <mfi@ukr.net>
 " Contributor:		Dorai Sitaram <ds26@gte.com>
-" Last Change:		2022 Sep 05
+"			C.D. MacEachern <craig.daniel.maceachern@gmail.com>
+" Last Change:		2022 Oct 15
 
 if exists("b:did_ftplugin")
   finish
@@ -19,9 +20,11 @@ setlocal formatoptions-=t formatoptions+=croql
 
 let &l:define = '\<function\|\<local\%(\s\+function\)\='
 
+" TODO: handle init.lua
+setlocal includeexpr=substitute(v:fname,'\\.','/','g')
 setlocal suffixesadd=.lua
 
-let b:undo_ftplugin = "setlocal cms< com< def< fo< sua<"
+let b:undo_ftplugin = "setlocal cms< com< def< fo< inex< sua<"
 
 if exists("loaded_matchit") && !exists("b:match_words")
   let b:match_ignorecase = 0

runtime/ftplugin/man.vim

@@ -3,7 +3,7 @@
 " Maintainer:	Jason Franklin <vim@justemail.net>
 " Maintainer:	SungHyun Nam <goweol@gmail.com>
 " Autoload Split: Bram Moolenaar
-" Last Change: 	2022 Jun 18
+" Last Change: 	2022 Sep 30
 
 " To make the ":Man" command available before editing a manual page, source
 " this script from your startup vimrc file.
@@ -23,8 +23,9 @@ let s:cpo_save = &cpo
 set cpo-=C
 
 if &filetype == "man"
-  " allow dot and dash in manual page name.
-  setlocal iskeyword+=\.,-
+  " Allow hyphen, plus, colon, dot, and commercial at in manual page name.
+  " Allow parentheses for references.
+  setlocal iskeyword=48-57,_,a-z,A-Z,-,+,:,.,@-@,(,)
   let b:undo_ftplugin = "setlocal iskeyword<"
 
   " Add mappings, unless the user didn't want this.

runtime/ftplugin/markdown.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin
-" Language:		Markdown
-" Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:		2019 Dec 05
+" Language:     Markdown
+" Maintainer:   Tim Pope <https://github.com/tpope/vim-markdown>
+" Last Change:  2022 Oct 13
 
 if exists("b:did_ftplugin")
   finish
@@ -9,18 +9,33 @@ endif
 
 runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
 
+let s:keepcpo= &cpo
+set cpo&vim
+
 setlocal comments=fb:*,fb:-,fb:+,n:> commentstring=<!--%s-->
 setlocal formatoptions+=tcqln formatoptions-=r formatoptions-=o
-setlocal formatlistpat=^\\s*\\d\\+\\.\\s\\+\\\|^[-*+]\\s\\+\\\|^\\[^\\ze[^\\]]\\+\\]:
+setlocal formatlistpat=^\\s*\\d\\+\\.\\s\\+\\\|^\\s*[-*+]\\s\\+\\\|^\\[^\\ze[^\\]]\\+\\]:\\&^.\\{4\\}
 
 if exists('b:undo_ftplugin')
-  let b:undo_ftplugin .= "|setl cms< com< fo< flp<"
+  let b:undo_ftplugin .= "|setl cms< com< fo< flp< et< ts< sts< sw<"
 else
-  let b:undo_ftplugin = "setl cms< com< fo< flp<"
+  let b:undo_ftplugin = "setl cms< com< fo< flp< et< ts< sts< sw<"
+endif
+
+if get(g:, 'markdown_recommended_style', 1)
+  setlocal expandtab tabstop=4 softtabstop=4 shiftwidth=4
+endif
+
+if !exists("g:no_plugin_maps") && !exists("g:no_markdown_maps")
+  nnoremap <silent><buffer> [[ :<C-U>call search('\%(^#\{1,5\}\s\+\S\\|^\S.*\n^[=-]\+$\)', "bsW")<CR>
+  nnoremap <silent><buffer> ]] :<C-U>call search('\%(^#\{1,5\}\s\+\S\\|^\S.*\n^[=-]\+$\)', "sW")<CR>
+  xnoremap <silent><buffer> [[ :<C-U>exe "normal! gv"<Bar>call search('\%(^#\{1,5\}\s\+\S\\|^\S.*\n^[=-]\+$\)', "bsW")<CR>
+  xnoremap <silent><buffer> ]] :<C-U>exe "normal! gv"<Bar>call search('\%(^#\{1,5\}\s\+\S\\|^\S.*\n^[=-]\+$\)', "sW")<CR>
+  let b:undo_ftplugin .= '|sil! nunmap <buffer> [[|sil! nunmap <buffer> ]]|sil! xunmap <buffer> [[|sil! xunmap <buffer> ]]'
 endif
 
 function! s:NotCodeBlock(lnum) abort
-  return synIDattr(synID(v:lnum, 1, 1), 'name') !=# 'markdownCode'
+  return synIDattr(synID(a:lnum, 1, 1), 'name') !=# 'markdownCode'
 endfunction
 
 function! MarkdownFold() abort
@@ -64,11 +79,14 @@ function! MarkdownFoldText() abort
   return hash_indent.' '.title.' '.linecount
 endfunction
 
-if has("folding") && exists("g:markdown_folding")
+if has("folding") && get(g:, "markdown_folding", 0)
   setlocal foldexpr=MarkdownFold()
   setlocal foldmethod=expr
   setlocal foldtext=MarkdownFoldText()
-  let b:undo_ftplugin .= " foldexpr< foldmethod< foldtext<"
+  let b:undo_ftplugin .= "|setl foldexpr< foldmethod< foldtext<"
 endif
 
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
 " vim:set sw=2:

runtime/ftplugin/poefilter.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin
+" Language:	PoE item filter
+" Maintainer:	ObserverOfTime <chronobserver@disroot.org>
+" Last Change:	2022 Oct 07
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal comments=:# commentstring=#\ %s
+
+let b:undo_ftplugin = 'setl com< cms<'

runtime/ftplugin/ssa.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin
+" Language:	SubStation Alpha
+" Maintainer:	ObserverOfTime <chronobserver@disroot.org>
+" Last Change:	2022 Oct 10
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal comments=:;,:!: commentstring=;\ %s
+
+let b:undo_ftplugin = 'setl com< cms<'

runtime/ftplugin/vdf.vim

@@ -0,0 +1,14 @@
+" Vim filetype plugin
+" Language:	Valve Data Format
+" Maintainer:	ObserverOfTime <chronobserver@disroot.org>
+" Last Change:	2022 Sep 15
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+setl comments=:// commentstring=//\ %s
+setl foldmethod=syntax
+
+let b:undo_ftplugin = 'setl com< cms< fdm<'

runtime/ftplugin/vim.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin
 " Language:	Vim
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2022 Sep 09
+" Last Change:	2022 Sep 20
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -74,14 +74,14 @@ if !exists("no_plugin_maps") && !exists("no_vim_maps")
   let b:did_add_maps = 1
 
   " Move around functions.
-  nnoremap <silent><buffer> [[ m':call search('^\s*\(fu\%[nction]\\|def\)\>', "bW")<CR>
-  vnoremap <silent><buffer> [[ m':<C-U>exe "normal! gv"<Bar>call search('^\s*\(fu\%[nction]\\|def\)\>', "bW")<CR>
-  nnoremap <silent><buffer> ]] m':call search('^\s*\(fu\%[nction]\\|def\)\>', "W")<CR>
-  vnoremap <silent><buffer> ]] m':<C-U>exe "normal! gv"<Bar>call search('^\s*\(fu\%[nction]\\|def\)\>', "W")<CR>
-  nnoremap <silent><buffer> [] m':call search('^\s*end\(f\%[unction]\\|def\)\>', "bW")<CR>
-  vnoremap <silent><buffer> [] m':<C-U>exe "normal! gv"<Bar>call search('^\s*end\(f\%[unction]\\|def\)\>', "bW")<CR>
-  nnoremap <silent><buffer> ][ m':call search('^\s*end\(f\%[unction]\\|def\)\>', "W")<CR>
-  vnoremap <silent><buffer> ][ m':<C-U>exe "normal! gv"<Bar>call search('^\s*end\(f\%[unction]\\|def\)\>', "W")<CR>
+  nnoremap <silent><buffer> [[ m':call search('^\s*\(fu\%[nction]\\|\(export\s\+\)\?def\)\>', "bW")<CR>
+  vnoremap <silent><buffer> [[ m':<C-U>exe "normal! gv"<Bar>call search('^\s*\(fu\%[nction]\\|\(export\s\+\)\?def\)\>', "bW")<CR>
+  nnoremap <silent><buffer> ]] m':call search('^\s*\(fu\%[nction]\\|\(export\s\+\)\?def\)\>', "W")<CR>
+  vnoremap <silent><buffer> ]] m':<C-U>exe "normal! gv"<Bar>call search('^\s*\(fu\%[nction]\\|\(export\s\+\)\?def\)\>', "W")<CR>
+  nnoremap <silent><buffer> [] m':call search('^\s*end\(f\%[unction]\\|\(export\s\+\)\?def\)\>', "bW")<CR>
+  vnoremap <silent><buffer> [] m':<C-U>exe "normal! gv"<Bar>call search('^\s*end\(f\%[unction]\\|\(export\s\+\)\?def\)\>', "bW")<CR>
+  nnoremap <silent><buffer> ][ m':call search('^\s*end\(f\%[unction]\\|\(export\s\+\)\?def\)\>', "W")<CR>
+  vnoremap <silent><buffer> ][ m':<C-U>exe "normal! gv"<Bar>call search('^\s*end\(f\%[unction]\\|\(export\s\+\)\?def\)\>', "W")<CR>
 
   " Move around comments
   nnoremap <silent><buffer> ]" :call search('^\(\s*".*\n\)\@<!\(\s*"\)', "W")<CR>

runtime/indent/chatito.vim

@@ -0,0 +1,32 @@
+" Vim indent file
+" Language:	Chatito
+" Maintainer:	ObserverOfTime <chronobserver@disroot.org>
+" Last Change:	2022 Sep 20
+
+if exists('b:did_indent')
+    finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetChatitoIndent()
+setlocal indentkeys=o,O,*<Return>,0#,!^F
+
+let b:undo_indent = 'setl inde< indk<'
+
+if exists('*GetChatitoIndent')
+    finish
+endif
+
+function GetChatitoIndent()
+    let l:prev = v:lnum - 1
+    if getline(prevnonblank(l:prev)) =~# '^[~%@]\['
+        " shift indent after definitions
+        return shiftwidth()
+    elseif getline(l:prev) !~# '^\s*$'
+        " maintain indent in sentences
+        return indent(l:prev)
+    else
+        " reset indent after a blank line
+        return 0
+    end
+endfunction

runtime/indent/erlang.vim

@@ -4,7 +4,7 @@
 " Contributors: Edwin Fine <efine145_nospam01 at usa dot net>
 "               Pawel 'kTT' Salata <rockplayer.pl@gmail.com>
 "               Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
-" Last Update:  2020-Jun-11
+" Last Update:  2022-Sep-06
 " License:      Vim license
 " URL:          https://github.com/vim-erlang/vim-erlang-runtime
 
@@ -30,7 +30,9 @@ else
 endif
 
 setlocal indentexpr=ErlangIndent()
-setlocal indentkeys+=0=end,0=of,0=catch,0=after,0=when,0=),0=],0=},0=>>
+setlocal indentkeys+=0=end,0=of,0=catch,0=after,0=else,0=when,0=),0=],0=},0=>>
+
+let b:undo_indent = "setl inde< indk<"
 
 " Only define the functions once
 if exists("*ErlangIndent")
@@ -235,8 +237,8 @@ function! s:GetTokensFromLine(line, string_continuation, atom_continuation,
 
     " Two-character tokens
     elseif i + 1 < linelen &&
-         \ index(['->', '<<', '>>', '||', '==', '/=', '=<', '>=', '++', '--',
-         \        '::'],
+         \ index(['->', '<<', '>>', '||', '==', '/=', '=<', '>=', '?=', '++',
+         \        '--', '::'],
          \       a:line[i : i + 1]) != -1
       call add(indtokens, [a:line[i : i + 1], vcol, i])
       let next_i = i + 2
@@ -558,8 +560,8 @@ function! s:IsCatchStandalone(lnum, i)
     let is_standalone = 0
   elseif prev_token =~# '[a-z]'
     if index(['after', 'and', 'andalso', 'band', 'begin', 'bnot', 'bor', 'bsl',
-            \ 'bsr', 'bxor', 'case', 'catch', 'div', 'not', 'or', 'orelse',
-            \ 'rem', 'try', 'xor'], prev_token) != -1
+            \ 'bsr', 'bxor', 'case', 'catch', 'div', 'maybe', 'not', 'or',
+            \ 'orelse', 'rem', 'try', 'xor'], prev_token) != -1
       " If catch is after these keywords, it is standalone
       let is_standalone = 1
     else
@@ -568,7 +570,7 @@ function! s:IsCatchStandalone(lnum, i)
       "
       " Keywords:
       " - may precede 'catch': end
-      " - may not precede 'catch': fun if of receive when
+      " - may not precede 'catch': else fun if of receive when
       " - unused: cond let query
       let is_standalone = 0
     endif
@@ -577,7 +579,7 @@ function! s:IsCatchStandalone(lnum, i)
     let is_standalone = 0
   else
     " This 'else' branch includes the following tokens:
-    "   -> == /= =< < >= > =:= =/= + - * / ++ -- :: < > ; ( [ { ? = ! . |
+    "   -> == /= =< < >= > ?= =:= =/= + - * / ++ -- :: < > ; ( [ { ? = ! . |
     let is_standalone = 1
   endif
 
@@ -590,6 +592,7 @@ endfunction
 " Purpose:
 "   This function is called when a begin-type element ('begin', 'case',
 "   '[', '<<', etc.) is found. It asks the caller to return if the stack
+"   if already empty.
 " Parameters:
 "   stack: [token]
 "   token: string
@@ -758,7 +761,7 @@ endfunction
 function! s:SearchEndPair(lnum, curr_col)
   return s:SearchPair(
          \ a:lnum, a:curr_col,
-         \ '\C\<\%(case\|try\|begin\|receive\|if\)\>\|' .
+         \ '\C\<\%(case\|try\|begin\|receive\|if\|maybe\)\>\|' .
          \ '\<fun\>\%(\s\|\n\|%.*$\|[A-Z_@][a-zA-Z_@]*\)*(',
          \ '',
          \ '\<end\>')
@@ -847,6 +850,7 @@ function! s:ErlangCalcIndent2(lnum, stack)
         if ret | return res | endif
 
       " case EXPR of BRANCHES end
+      " if BRANCHES end
       " try EXPR catch BRANCHES end
       " try EXPR after BODY end
       " try EXPR catch BRANCHES after BODY end
@@ -855,15 +859,17 @@ function! s:ErlangCalcIndent2(lnum, stack)
       " try EXPR of BRANCHES catch BRANCHES after BODY end
       " receive BRANCHES end
       " receive BRANCHES after BRANCHES end
+      " maybe EXPR end
+      " maybe EXPR else BRANCHES end
 
       " This branch is not Emacs-compatible
-      elseif (index(['of', 'receive', 'after', 'if'], token) != -1 ||
+      elseif (index(['of', 'receive', 'after', 'if', 'else'], token) != -1 ||
            \  (token ==# 'catch' && !s:IsCatchStandalone(lnum, i))) &&
            \ !last_token_of_line &&
            \ (empty(stack) || stack ==# ['when'] || stack ==# ['->'] ||
            \  stack ==# ['->', ';'])
 
-        " If we are after of/receive, but these are not the last
+        " If we are after of/receive/etc, but these are not the last
         " tokens of the line, we want to indent like this:
         "
         "   % stack == []
@@ -889,21 +895,21 @@ function! s:ErlangCalcIndent2(lnum, stack)
         " stack = ['when']  =>  LTI is a guard
         if empty(stack) || stack == ['->', ';']
           call s:Log('    LTI is in a condition after ' .
-                    \'"of/receive/after/if/catch" -> return')
+                    \'"of/receive/after/if/else/catch" -> return')
           return stored_vcol
         elseif stack == ['->']
           call s:Log('    LTI is in a branch after ' .
-                    \'"of/receive/after/if/catch" -> return')
+                    \'"of/receive/after/if/else/catch" -> return')
           return stored_vcol + shiftwidth()
         elseif stack == ['when']
           call s:Log('    LTI is in a guard after ' .
-                    \'"of/receive/after/if/catch" -> return')
+                    \'"of/receive/after/if/else/catch" -> return')
           return stored_vcol + shiftwidth()
         else
           return s:UnexpectedToken(token, stack)
         endif
 
-      elseif index(['case', 'if', 'try', 'receive'], token) != -1
+      elseif index(['case', 'if', 'try', 'receive', 'maybe'], token) != -1
 
         " stack = []  =>  LTI is a condition
         " stack = ['->']  =>  LTI is a branch
@@ -913,45 +919,47 @@ function! s:ErlangCalcIndent2(lnum, stack)
           " pass
         elseif (token ==# 'case' && stack[0] ==# 'of') ||
              \ (token ==# 'if') ||
+             \ (token ==# 'maybe' && stack[0] ==# 'else') ||
              \ (token ==# 'try' && (stack[0] ==# 'of' ||
              \                     stack[0] ==# 'catch' ||
              \                     stack[0] ==# 'after')) ||
              \ (token ==# 'receive')
 
           " From the indentation point of view, the keyword
-          " (of/catch/after/end) before the LTI is what counts, so
+          " (of/catch/after/else/end) before the LTI is what counts, so
           " when we reached these tokens, and the stack already had
-          " a catch/after/end, we didn't modify it.
+          " a catch/after/else/end, we didn't modify it.
           "
-          " This way when we reach case/try/receive (i.e. now),
-          " there is at most one of/catch/after/end token in the
+          " This way when we reach case/try/receive/maybe (i.e. now),
+          " there is at most one of/catch/after/else/end token in the
           " stack.
           if token ==# 'case' || token ==# 'try' ||
-           \ (token ==# 'receive' && stack[0] ==# 'after')
+           \ (token ==# 'receive' && stack[0] ==# 'after') ||
+           \ (token ==# 'maybe' && stack[0] ==# 'else')
             call s:Pop(stack)
           endif
 
           if empty(stack)
             call s:Log('    LTI is in a condition; matching ' .
-                      \'"case/if/try/receive" found')
+                      \'"case/if/try/receive/maybe" found')
             let stored_vcol = curr_vcol + shiftwidth()
           elseif stack[0] ==# 'align_to_begin_element'
             call s:Pop(stack)
             let stored_vcol = curr_vcol
           elseif len(stack) > 1 && stack[0] ==# '->' && stack[1] ==# ';'
             call s:Log('    LTI is in a condition; matching ' .
-                      \'"case/if/try/receive" found')
+                      \'"case/if/try/receive/maybe" found')
             call s:Pop(stack)
             call s:Pop(stack)
             let stored_vcol = curr_vcol + shiftwidth()
           elseif stack[0] ==# '->'
             call s:Log('    LTI is in a branch; matching ' .
-                      \'"case/if/try/receive" found')
+                      \'"case/if/try/receive/maybe" found')
             call s:Pop(stack)
             let stored_vcol = curr_vcol + 2 * shiftwidth()
           elseif stack[0] ==# 'when'
             call s:Log('    LTI is in a guard; matching ' .
-                      \'"case/if/try/receive" found')
+                      \'"case/if/try/receive/maybe" found')
             call s:Pop(stack)
             let stored_vcol = curr_vcol + 2 * shiftwidth() + 2
           endif
@@ -1213,7 +1221,7 @@ function! s:ErlangCalcIndent2(lnum, stack)
 
         if empty(stack)
           call s:Push(stack, ';')
-        elseif index([';', '->', 'when', 'end', 'after', 'catch'],
+        elseif index([';', '->', 'when', 'end', 'after', 'catch', 'else'],
                     \stack[0]) != -1
           " Pass:
           "
@@ -1223,10 +1231,10 @@ function! s:ErlangCalcIndent2(lnum, stack)
           "   should keep that, because they signify the type of the
           "   LTI (branch, condition or guard).
           " - From the indentation point of view, the keyword
-          "   (of/catch/after/end) before the LTI is what counts, so
-          "   if the stack already has a catch/after/end, we don't
-          "   modify it. This way when we reach case/try/receive,
-          "   there will be at most one of/catch/after/end token in
+          "   (of/catch/after/else/end) before the LTI is what counts, so
+          "   if the stack already has a catch/after/else/end, we don't
+          "   modify it. This way when we reach case/try/receive/maybe,
+          "   there will be at most one of/catch/after/else/end token in
           "   the stack.
         else
           return s:UnexpectedToken(token, stack)
@@ -1242,7 +1250,8 @@ function! s:ErlangCalcIndent2(lnum, stack)
           " stack = ['->']  ->  LTI is a condition
           " stack = ['->', ';']  -> LTI is a branch
           call s:Push(stack, '->')
-        elseif index(['->', 'when', 'end', 'after', 'catch'], stack[0]) != -1
+        elseif index(['->', 'when', 'end', 'after', 'catch', 'else'],
+                    \stack[0]) != -1
           " Pass:
           "
           " - If the stack top is another '->', then one '->' is
@@ -1250,10 +1259,10 @@ function! s:ErlangCalcIndent2(lnum, stack)
           " - If the stack top is a 'when', then we should keep
           "   that, because this signifies that LTI is a in a guard.
           " - From the indentation point of view, the keyword
-          "   (of/catch/after/end) before the LTI is what counts, so
-          "   if the stack already has a catch/after/end, we don't
-          "   modify it. This way when we reach case/try/receive,
-          "   there will be at most one of/catch/after/end token in
+          "   (of/catch/after/else/end) before the LTI is what counts, so
+          "   if the stack already has a catch/after/else/end, we don't
+          "   modify it. This way when we reach case/try/receive/maybe,
+          "   there will be at most one of/catch/after/else/end token in
           "   the stack.
         else
           return s:UnexpectedToken(token, stack)
@@ -1283,7 +1292,8 @@ function! s:ErlangCalcIndent2(lnum, stack)
             "       LTI
             call s:Push(stack, token)
           endif
-        elseif index(['->', 'when', 'end', 'after', 'catch'], stack[0]) != -1
+        elseif index(['->', 'when', 'end', 'after', 'catch', 'else'],
+                    \stack[0]) != -1
           " Pass:
           " - If the stack top is another 'when', then one 'when' is
           "   enough.
@@ -1291,21 +1301,63 @@ function! s:ErlangCalcIndent2(lnum, stack)
           "   should keep that, because they signify the type of the
           "   LTI (branch, condition or guard).
           " - From the indentation point of view, the keyword
-          "   (of/catch/after/end) before the LTI is what counts, so
-          "   if the stack already has a catch/after/end, we don't
-          "   modify it. This way when we reach case/try/receive,
-          "   there will be at most one of/catch/after/end token in
+          "   (of/catch/after/else/end) before the LTI is what counts, so
+          "   if the stack already has a catch/after/else/end, we don't
+          "   modify it. This way when we reach case/try/receive/maybe,
+          "   there will be at most one of/catch/after/else/end token in
           "   the stack.
         else
           return s:UnexpectedToken(token, stack)
         endif
 
-      elseif token ==# 'of' || token ==# 'after' ||
+      elseif token ==# 'of' || token ==# 'after' || token ==# 'else' ||
            \ (token ==# 'catch' && !s:IsCatchStandalone(lnum, i))
 
-        if token ==# 'after'
-          " If LTI is between an 'after' and the corresponding
-          " 'end', then let's return
+        if token ==# 'after' || token ==# 'else'
+          " If LTI is between an after/else and the corresponding 'end', then
+          " let's return because calculating the indentation based on
+          " after/else is enough.
+          "
+          " Example:
+          "   receive A after
+          "                 LTI
+          "   maybe A else
+          "               LTI
+          "
+          " Note about Emacs compabitility {{{
+          "
+          " It would be fine to indent the examples above the following way:
+          "
+          "   receive A after
+          "       LTI
+          "   maybe A else
+          "       LTI
+          "
+          " We intend it the way above because that is how Emacs does it.
+          " Also, this is a bit faster.
+          "
+          " We are still not 100% Emacs compatible because of placing the
+          " 'end' after the indented blocks.
+          "
+          " Emacs example:
+          "
+          "   receive A after
+          "                 LTI
+          "             end,
+          "   maybe A else
+          "               LTI
+          "               end % Yes, it's here (in OTP 25.0, might change
+          "                   % later)
+          "
+          " vim-erlang example:
+          "
+          "   receive A after
+          "                 LTI
+          "   end,
+          "   maybe A else
+          "               LTI
+          "   end
+          " }}}
           let [ret, res] = s:BeginElementFoundIfEmpty(stack, token, curr_vcol,
                                                      \stored_vcol, shiftwidth())
           if ret | return res | endif
@@ -1313,7 +1365,8 @@ function! s:ErlangCalcIndent2(lnum, stack)
 
         if empty(stack) || stack[0] ==# '->' || stack[0] ==# 'when'
           call s:Push(stack, token)
-        elseif stack[0] ==# 'catch' || stack[0] ==# 'after' || stack[0] ==# 'end'
+        elseif stack[0] ==# 'catch' || stack[0] ==# 'after' ||
+              \stack[0] ==# 'else' || stack[0] ==# 'end'
           " Pass: From the indentation point of view, the keyword
           " (of/catch/after/end) before the LTI is what counts, so
           " if the stack already has a catch/after/end, we don't
@@ -1403,7 +1456,7 @@ function! ErlangIndent()
   endif
 
   let ml = matchlist(currline,
-                    \'^\(\s*\)\(\%(end\|of\|catch\|after\)\>\|[)\]}]\|>>\)')
+                    \'^\(\s*\)\(\%(end\|of\|catch\|after\|else\)\>\|[)\]}]\|>>\)')
 
   " If the line has a special beginning, but not a standalone catch
   if !empty(ml) && !(ml[2] ==# 'catch' && s:IsCatchStandalone(v:lnum, 0))

runtime/indent/gyp.vim

@@ -0,0 +1,7 @@
+" Vim indent file
+" Language:	GYP
+" Maintainer:	ObserverOfTime <chronobserver@disroot.org>
+" Last Change:	2022 Sep 27
+
+" JSON indent works well
+runtime! indent/json.vim

runtime/indent/hare.vim

@@ -0,0 +1,138 @@
+" Vim indent file
+" Language: Hare
+" Maintainer: Amelia Clarke <me@rsaihe.dev>
+" Last Change: 2022 Sep 22
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+if !has("cindent") || !has("eval")
+  finish
+endif
+
+setlocal cindent
+
+" L0 -> don't deindent labels
+" (s -> use one indent after a trailing (
+" m1 -> if ) starts a line, indent it the same as its matching (
+" ks -> add an extra indent to extra lines in an if expression or for expression
+" j1 -> indent code inside {} one level when in parentheses
+" J1 -> see j1
+" *0 -> don't search for unclosed block comments
+" #1 -> don't deindent lines that begin with #
+setlocal cinoptions=L0,(s,m1,ks,j1,J1,*0,#1
+
+" Controls which keys reindent the current line.
+" 0{     -> { at beginning of line
+" 0}     -> } at beginning of line
+" 0)     -> ) at beginning of line
+" 0]     -> ] at beginning of line
+" !^F    -> <C-f> (not inserted)
+" o      -> <CR> or `o` command
+" O      -> `O` command
+" e      -> else
+" 0=case -> case
+setlocal indentkeys=0{,0},0),0],!^F,o,O,e,0=case
+
+setlocal cinwords=if,else,for,switch,match
+
+setlocal indentexpr=GetHareIndent()
+
+function! FloorCindent(lnum)
+  return cindent(a:lnum) / shiftwidth() * shiftwidth()
+endfunction
+
+function! GetHareIndent()
+  let line = getline(v:lnum)
+  let prevlnum = prevnonblank(v:lnum - 1)
+  let prevline = getline(prevlnum)
+  let prevprevline = getline(prevnonblank(prevlnum - 1))
+
+  " This is all very hacky and imperfect, but it's tough to do much better when
+  " working with regex-based indenting rules.
+
+  " If the previous line ended with =, indent by one shiftwidth.
+  if prevline =~# '\v\=\s*(//.*)?$'
+    return indent(prevlnum) + shiftwidth()
+  endif
+
+  " If the previous line ended in a semicolon and the line before that ended
+  " with =, deindent by one shiftwidth.
+  if prevline =~# '\v;\s*(//.*)?$' && prevprevline =~# '\v\=\s*(//.*)?$'
+    return indent(prevlnum) - shiftwidth()
+  endif
+
+  " TODO: The following edge-case is still indented incorrectly:
+  " case =>
+  "         if (foo) {
+  "                 bar;
+  "         };
+  " | // cursor is incorrectly deindented by one shiftwidth.
+  "
+  " This only happens if the {} block is the first statement in the case body.
+  " If `case` is typed, the case will also be incorrectly deindented by one
+  " shiftwidth. Are you having fun yet?
+
+  " Deindent cases.
+  if line =~# '\v^\s*case'
+    " If the previous line was also a case, don't do any special indenting.
+    if prevline =~# '\v^\s*case'
+      return indent(prevlnum)
+    end
+
+    " If the previous line was a multiline case, deindent by one shiftwidth.
+    if prevline =~# '\v\=\>\s*(//.*)?$'
+      return indent(prevlnum) - shiftwidth()
+    endif
+
+    " If the previous line started a block, deindent by one shiftwidth.
+    " This handles the first case in a switch/match block.
+    if prevline =~# '\v\{\s*(//.*)?$'
+      return FloorCindent(v:lnum) - shiftwidth()
+    end
+
+    " If the previous line ended in a semicolon and the line before that wasn't
+    " a case, deindent by one shiftwidth.
+    if prevline =~# '\v;\s*(//.*)?$' && prevprevline !~# '\v\=\>\s*(//.*)?$'
+      return FloorCindent(v:lnum) - shiftwidth()
+    end
+
+    let l:indent = FloorCindent(v:lnum)
+
+    " If a normal cindent would indent the same amount as the previous line,
+    " deindent by one shiftwidth. This fixes some issues with `case let` blocks.
+    if l:indent == indent(prevlnum)
+      return l:indent - shiftwidth()
+    endif
+
+    " Otherwise, do a normal cindent.
+    return l:indent
+  endif
+
+  " Don't indent an extra shiftwidth for cases which span multiple lines.
+  if prevline =~# '\v\=\>\s*(//.*)?$' && prevline !~# '\v^\s*case\W'
+    return indent(prevlnum)
+  endif
+
+  " Indent the body of a case.
+  " If the previous line ended in a semicolon and the line before that was a
+  " case, don't do any special indenting.
+  if prevline =~# '\v;\s*(//.*)?$' && prevprevline =~# '\v\=\>\s*(//.*)?$' && line !~# '\v^\s*}'
+    return indent(prevlnum)
+  endif
+
+  let l:indent = FloorCindent(v:lnum)
+
+  " If the previous line was a case and a normal cindent wouldn't indent, indent
+  " an extra shiftwidth.
+  if prevline =~# '\v\=\>\s*(//.*)?$' && l:indent == indent(prevlnum)
+    return l:indent + shiftwidth()
+  endif
+
+  " If everything above is false, do a normal cindent.
+  return l:indent
+endfunction
+
+" vim: tabstop=2 shiftwidth=2 expandtab

runtime/indent/lua.vim

@@ -3,6 +3,7 @@
 " Maintainer:	Marcus Aurelius Farias <marcus.cf 'at' bol.com.br>
 " First Author:	Max Ischenko <mfi 'at' ukr.net>
 " Last Change:	2017 Jun 13
+"		2022 Sep 07: b:undo_indent added by Doug Kearns
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -18,6 +19,8 @@ setlocal indentkeys+=0=end,0=until
 
 setlocal autoindent
 
+let b:undo_indent = "setlocal autoindent< indentexpr< indentkeys<"
+
 " Only define the function once.
 if exists("*GetLuaIndent")
   finish