diff --git a/.cirrus.yml b/.cirrus.yml
deleted file mode 100644
index a97451419e..0000000000
--- a/.cirrus.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-env:
-  CIRRUS_CLONE_DEPTH: 3
-  FEATURES: huge
-
-freebsd_task:
-  name: FreeBSD
-  matrix:
-    - name: FreeBSD 15.0
-      freebsd_instance:
-        image_family: freebsd-15-0-amd64-ufs
-  timeout_in: 20m
-  install_script:
-    - pkg install -y gettext diffutils
-  build_script:
-    - NPROC=$(getconf _NPROCESSORS_ONLN)
-    - ./configure --with-features=${FEATURES}
-    - make -j${NPROC}
-  test_script:
-    - src/vim --version
-      # run tests as user "cirrus" instead of root
-    - pw useradd cirrus -m
-    - chown -R cirrus:cirrus .
-    - sudo -u cirrus make test
-  on_failure:
-    test_artifacts:
-      name: "Cirrus-${CIRRUS_BUILD_ID}-freebsd-failed-tests"
-      path: |
-        runtime/indent/testdir/*.fail
-        runtime/syntax/testdir/failed/*
-        src/testdir/failed/*
-      type: application/octet-stream
diff --git a/.editorconfig b/.editorconfig
index 7b09a2cae1..3225dd7b96 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -41,10 +41,13 @@ trim_trailing_whitespace = false
 trim_trailing_whitespace = false
 
 #
-# Some custom files do not use tabs
+# Some custom files and git commit message do not use tabs
 #
 [src/sign.c]
 indent_style = space
 
 [src/sound.c]
 indent_style = space
+
+[.git/COMMIT_EDITMSG]
+indent_style = space
diff --git a/.github/MAINTAINERS b/.github/MAINTAINERS
index fb7ebddf0c..10f8ecbac3 100644
--- a/.github/MAINTAINERS
+++ b/.github/MAINTAINERS
@@ -9,7 +9,8 @@
 # So if a pull request only touches javascript files, only these owners
 # will be requested to review.
 
-nsis/lang/russian.nsi					@RestorerZ
+runtime/autoload/beancount.vim				@nathangrigg
+runtime/autoload/beancountcomplete.vim			@nathangrigg
 runtime/autoload/context.vim				@lifepillar
 runtime/autoload/freebasic.vim				@dkearns
 runtime/autoload/hare.vim				@selenebun
@@ -50,6 +51,7 @@ runtime/colors/wildcharm.vim				@habamax @romainl @neutaaaaan
 runtime/colors/zaibatsu.vim				@habamax @romainl @neutaaaaan
 runtime/colors/zellner.vim				@habamax @romainl @neutaaaaan
 runtime/compiler/bash.vim				@Konfekt
+runtime/compiler/bean_check.vim				@nathangrigg
 runtime/compiler/biome.vim				@Konfekt
 runtime/compiler/cabal.vim				@mateoxh
 runtime/compiler/checkstyle.vim				@dkearns
@@ -143,6 +145,7 @@ runtime/ftplugin/asy.vim				@avidseeker
 runtime/ftplugin/autohotkey.vim				@telemachus
 runtime/ftplugin/awk.vim				@dkearns
 runtime/ftplugin/basic.vim				@dkearns
+runtime/ftplugin/beancount.vim				@nathangrigg
 runtime/ftplugin/bicep.vim				@scottmckendry
 runtime/ftplugin/bicep-params.vim			@scottmckendry
 runtime/ftplugin/brighterscript.vim			@ribru17
@@ -251,6 +254,7 @@ runtime/ftplugin/liquid.vim				@tpope
 runtime/ftplugin/logtalk.dict				@pmoura
 runtime/ftplugin/logtalk.vim				@pmoura
 runtime/ftplugin/lua.vim				@dkearns
+runtime/ftplugin/luau.vim				@lopi-py
 runtime/ftplugin/lynx.vim				@dkearns
 runtime/ftplugin/m17ndb.vim				@dseomn
 runtime/ftplugin/m3build.vim				@dkearns
@@ -363,6 +367,7 @@ runtime/import/dist/vimhighlight.vim			@lacygoill
 runtime/indent/arduino.vim				@k-takata
 runtime/indent/astro.vim				@wuelnerdotexe
 runtime/indent/basic.vim				@dkearns
+runtime/indent/beancount.vim				@nathangrigg
 runtime/indent/bpftrace.vim				@sgruszka
 runtime/indent/bst.vim					@tpope
 runtime/indent/cdl.vim					@dkearns
@@ -415,6 +420,7 @@ runtime/indent/less.vim					@genoma
 runtime/indent/liquid.vim				@tpope
 runtime/indent/logtalk.vim				@pmoura
 runtime/indent/lua.vim					@marcuscf
+runtime/indent/luau.vim					@lopi-py
 runtime/indent/m17ndb.vim				@dseomn
 runtime/indent/make.vim					@dkearns
 runtime/indent/meson.vim				@Liambeguin
@@ -491,6 +497,7 @@ runtime/syntax/asy.vim					@avidseeker
 runtime/syntax/autohotkey.vim				@mmikeww
 runtime/syntax/awk.vim					@dkearns
 runtime/syntax/basic.vim				@dkearns
+runtime/syntax/beancount.vim				@nathangrigg
 runtime/syntax/bpftrace.vim				@sgruszka
 runtime/syntax/bst.vim					@tpope
 runtime/syntax/bzl.vim					@dbarnett
@@ -603,6 +610,7 @@ runtime/syntax/liquid.vim				@tpope
 runtime/syntax/log.vim					@mao-yining
 runtime/syntax/logtalk.vim				@pmoura
 runtime/syntax/lua.vim					@marcuscf
+runtime/syntax/luau.vim					@lopi-py
 runtime/syntax/lynx.vim					@dkearns
 runtime/syntax/lyrics.vim				@ObserverOfTime
 runtime/syntax/m17ndb.vim				@dseomn
@@ -725,8 +733,9 @@ runtime/syntax/wks.vim					@anakin4747
 runtime/syntax/xbl.vim					@dkearns
 runtime/syntax/xcompose.vim				@ObserverOfTime
 runtime/syntax/xml.vim					@chrisbra
+runtime/syntax/xsd.vim					@chrisbra
 runtime/syntax/xs.vim					@petdance
-runtime/syntax/xslt.vim					@Boobies
+runtime/syntax/xslt.vim					@chrisbra
 runtime/syntax/zserio.vim				@dpelle
 runtime/syntax/zsh.vim					@chrisbra
 runtime/tools/preproc_indent.vim			@h-east
diff --git a/.github/actions/universal-package/action.yml b/.github/actions/universal-package/action.yml
index 24d6f885d0..81a4532dee 100644
--- a/.github/actions/universal-package/action.yml
+++ b/.github/actions/universal-package/action.yml
@@ -60,6 +60,7 @@ runs:
         FORMULA_DIR="$(brew --repository)/Library/Taps/macvim-dev/homebrew-deps/Formula/"
         mkdir -p "$FORMULA_DIR"
         cp ${formula}.rb "$FORMULA_DIR"
+        brew trust macvim-dev/deps
 
         # Uninstall the already installed formula because we want to build our own
         brew uninstall --ignore-dependencies ${formula} || true
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 157f791e70..6ecb29399e 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -4,7 +4,6 @@ CI:
   - all:
     - changed-files:
       - any-glob-to-any-file:
-        - '.cirrus.yml'
         - '.github/dependabot.yml'
         - '.github/labeler.yml'
         - '.github/workflows/*'
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
index 987fcecc8b..2bd08c452a 100644
--- a/.github/workflows/ci-linux.yml
+++ b/.github/workflows/ci-linux.yml
@@ -83,7 +83,7 @@ jobs:
 
     steps:
       - name: Checkout repository from GitHub
-        uses: actions/checkout@v6
+        uses: actions/checkout@v6.0.3
 
       - name: Build
         timeout-minutes: 15
@@ -170,7 +170,7 @@ jobs:
       - name: Codecov
         timeout-minutes: 20
         if: matrix.coverage
-        uses: codecov/codecov-action@v6
+        uses: codecov/codecov-action@v7
         with:
           flags: linux,${{ matrix.features }}-${{ matrix.compiler }}-${{ join(matrix.extra, '-') }}
           token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/ci-linux_asan.yml b/.github/workflows/ci-linux_asan.yml
index daa1e25937..54dcd2dca6 100644
--- a/.github/workflows/ci-linux_asan.yml
+++ b/.github/workflows/ci-linux_asan.yml
@@ -37,7 +37,7 @@ jobs:
 
     steps:
       - name: Checkout repository from GitHub
-        uses: actions/checkout@v6
+        uses: actions/checkout@v6.0.3
 
       - name: Build
         timeout-minutes: 15
diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
index 390f27effa..2ab16012c2 100644
--- a/.github/workflows/ci-macos.yml
+++ b/.github/workflows/ci-macos.yml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: Checkout repository from GitHub
-        uses: actions/checkout@v6
+        uses: actions/checkout@v6.0.3
 
       - name: Install packages
         if: matrix.features == 'huge'
diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
index 1f676b2ca9..013d5142b1 100644
--- a/.github/workflows/ci-windows.yml
+++ b/.github/workflows/ci-windows.yml
@@ -117,7 +117,7 @@ jobs:
           echo "SODIUM_DIR=${SODIUM_DIR}" >> $GITHUB_ENV
           echo "GETTEXT_PATH=D:\gettext${{ matrix.arch == 'x64' && '64' || '32' }}" >> $GITHUB_ENV
 
-      - uses: msys2/setup-msys2@v2.31.1
+      - uses: msys2/setup-msys2@v2.32.0
         if: matrix.toolchain == 'mingw'
         with:
           update: true
@@ -128,7 +128,7 @@ jobs:
           release: false
 
       - name: Checkout repository from GitHub
-        uses: actions/checkout@v6
+        uses: actions/checkout@v6.0.3
 
       - name: Create a list of download URLs
         shell: cmd
@@ -355,7 +355,7 @@ jobs:
       - name: Codecov
         timeout-minutes: 20
         if: matrix.coverage
-        uses: codecov/codecov-action@v6
+        uses: codecov/codecov-action@v7
         with:
           directory: src
           flags: windows,${{ matrix.toolchain }}-${{ matrix.arch }}-${{ matrix.features }}
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 24ef96eaf0..e5c02fbb9a 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -44,11 +44,11 @@ jobs:
 
     steps:
     - name: Checkout repository from github
-      uses: actions/checkout@v6
+      uses: actions/checkout@v6.0.3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v4.36.0
+      uses: github/codeql-action/init@v4.36.2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -59,7 +59,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v4.36.0
+      uses: github/codeql-action/autobuild@v4.36.2
 
     # ℹ� Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -73,4 +73,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v4.36.0
+      uses: github/codeql-action/analyze@v4.36.2
diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
deleted file mode 100644
index 04859a9758..0000000000
--- a/.github/workflows/coverity.yml
+++ /dev/null
@@ -1,85 +0,0 @@
-name: Coverity
-on:
-  schedule:
-    - 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-24.04
-
-    env:
-      CC: gcc
-      DEBIAN_FRONTEND: noninteractive
-      TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
-
-    steps:
-      - name: Checkout repository from github
-        if: env.TOKEN
-        uses: actions/checkout@v6
-
-      - name: Download Coverity
-        if: env.TOKEN
-        run: |
-          wget -q https://scan.coverity.com/download/cxx/linux64 --post-data "token=$TOKEN&project=vim" -O coverity_tool.tgz
-          mkdir cov-scan
-          tar ax -f coverity_tool.tgz --strip-components=1 -C cov-scan
-
-      - name: Install packages
-        if: env.TOKEN
-        run: |
-          sudo apt-get update && sudo apt-get install -y \
-            autoconf \
-            gettext \
-            libcanberra-dev \
-            libperl-dev \
-            python3-dev \
-            liblua5.4-dev \
-            lua5.4 \
-            ruby-dev \
-            tcl-dev \
-            libgtk2.0-dev \
-            desktop-file-utils \
-            libtool-bin \
-            libsodium-dev
-
-      - name: Set up environment
-        if: env.TOKEN
-        run: |
-          echo "$(pwd)/cov-scan/bin" >> $GITHUB_PATH
-          (
-          echo "NPROC=$(getconf _NPROCESSORS_ONLN)"
-          echo "CONFOPT=--enable-perlinterp --enable-python3interp --enable-rubyinterp --enable-luainterp --enable-tclinterp"
-          ) >> $GITHUB_ENV
-
-      - name: Configure
-        if: env.TOKEN
-        run: |
-          ./configure --with-features=huge ${CONFOPT} --enable-fail-if-missing
-          # Append various warning flags to CFLAGS.
-          sed -i -f ci/config.mk.sed src/auto/config.mk
-          sed -i -f ci/config.mk.${CC}.sed src/auto/config.mk
-          # -O2 gives false warning and turns it into an error:
-          # warning: function may return address of local variable [-Wreturn-local-addr]
-          sed -i 's/-O2 \?//' src/auto/config.mk
-
-      - name: Build/scan vim
-        if: env.TOKEN
-        run: |
-          cov-build --dir cov-int make -j${NPROC}
-
-      - name: Submit results
-        if: env.TOKEN
-        run: |
-          tar zcf cov-scan.tgz cov-int
-          curl --form token=$TOKEN \
-            --form email=$EMAIL \
-            --form file=@cov-scan.tgz \
-            --form version="$(git rev-parse HEAD)" \
-            --form description="Automatic GHA scan" \
-            'https://scan.coverity.com/builds?project=vim'
-        env:
-          EMAIL: ${{ secrets.COVERITY_SCAN_EMAIL }}
diff --git a/.github/workflows/link-check.yml b/.github/workflows/link-check.yml
index 4eac572158..da69554647 100644
--- a/.github/workflows/link-check.yml
+++ b/.github/workflows/link-check.yml
@@ -8,7 +8,7 @@ jobs:
   lychee:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v6.0.3
       - name: Run Lychee
         uses: lycheeverse/lychee-action@v2
         with:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6b14c623fe..41de1d0b50 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -130,7 +130,7 @@ can be translated:
 - Menus, see [runtime/lang/README.txt][2]
 - Vim tutor, see [runtime/tutor/README.txt][3]
 - Manual pages, see [runtime/doc/\*.1][4] for examples
-- Installer, see [nsis/lang/README.txt][5]
+- Installer, see [nsis/lang/README.txt][5] in the [vim-win32-installer][20] repository
 
 The help files can be translated and made available separately.
 See https://www.vim.org/translations.php for examples.
@@ -157,7 +157,7 @@ mailing list. For other questions you can join [`#vim`][19], use the
 [2]: https://github.com/vim/vim/blob/master/runtime/lang/README.txt
 [3]: https://github.com/vim/vim/blob/master/runtime/tutor/README.txt
 [4]: https://github.com/vim/vim/blob/master/runtime/doc/vim.1
-[5]: https://github.com/vim/vim/blob/master/nsis/lang/README.txt
+[5]: https://github.com/vim/vim-win32-installer/blob/master/nsis/lang/README.txt
 [6]: https://github.com/vim/vim/discussions/13087
 [7]: https://github.com/vim/vim/blob/master/runtime/doc/develop.txt
 [8]: https://vi.stackexchange.com
@@ -172,3 +172,4 @@ mailing list. For other questions you can join [`#vim`][19], use the
 [17]: https://github.com/vim/vim/issues
 [18]: https://github.com/vim/vim/blob/master/src/testdir/test_codestyle.vim
 [19]: https://web.libera.chat/#vim
+[20]: https://github.com/vim/vim-win32-installer
diff --git a/Filelist b/Filelist
index 53113b456a..8f36b1c66f 100644
--- a/Filelist
+++ b/Filelist
@@ -3,7 +3,6 @@
 
 # Source files for all source archives.
 SRC_ALL =	\
-		.cirrus.yml \
 		.gitattributes \
 		.git-blame-ignore-revs \
 		.github/MAINTAINERS \
@@ -15,7 +14,6 @@ SRC_ALL =	\
 		.github/workflows/ci-windows.yml \
 		.github/workflows/ci.yml \
 		.github/workflows/codeql-analysis.yml \
-		.github/workflows/coverity.yml \
 		.github/workflows/link-check.yml \
 		.github/actions/build_vim_on_linux/action.yml \
 		.github/actions/test_artifacts/action.yml \
@@ -149,6 +147,9 @@ SRC_ALL =	\
 		src/session.c \
 		src/sha256.c \
 		src/sign.c \
+		src/sixel.c \
+		src/kitty.c \
+		src/cairo.c \
 		src/socketserver.c \
 		src/sound.c \
 		src/spell.c \
@@ -349,6 +350,9 @@ SRC_ALL =	\
 		src/proto/session.pro \
 		src/proto/sha256.pro \
 		src/proto/sign.pro \
+		src/proto/sixel.pro \
+		src/proto/kitty.pro \
+		src/proto/cairo.pro \
 		src/proto/socketserver.pro \
 		src/proto/sound.pro \
 		src/proto/spell.pro \
@@ -507,6 +511,12 @@ SRC_UNIX =	\
 		src/gui_gtk4.c \
 		src/gui_gtk4_f.c \
 		src/gui_gtk4_f.h \
+		src/gui_gtk4_cb.c \
+		src/gui_gtk4_cb.h \
+		src/gui_gtk4_da.c \
+		src/gui_gtk4_da.h \
+		src/gui_gtk4_tb.c \
+		src/gui_gtk4_tb.h \
 		src/gui_gtk_res.xml \
 		src/gui_motif.c \
 		src/gui_xmdlg.c \
@@ -652,13 +662,7 @@ SRC_DOS =	\
 		src/tee/tee.c \
 		src/xxd/Make_ming.mak \
 		src/xxd/Make_mvc.mak \
-		nsis/auxiliary.nsh \
-		nsis/gvim.nsi \
-		nsis/Makefile \
-		nsis/Make_mvc.mak \
 		nsis/README.txt \
-		nsis/lang/*.nsi \
-		nsis/lang/README.txt \
 		uninstall.txt \
 
 # Source files for MS Windows without CR/LF translation (also in the extra archive).
@@ -676,7 +680,6 @@ SRC_DOS_BIN =	\
 		src/xpm/x86/lib-vc14/libXpm.lib \
 		src/xpm/x86/lib/libXpm.a \
 		runtime/bitmaps/vim.ico \
-		nsis/icons.zip \
 
 # Source files for Amiga, DOS, etc. (also in the extra archive).
 SRC_AMI_DOS =	\
diff --git a/Makefile b/Makefile
index 94fd244601..2552083a51 100644
--- a/Makefile
+++ b/Makefile
@@ -205,23 +205,7 @@ MINOR = 2
 # - in this directory:
 #   > make dosbin
 # NSIS self installing exe:
-# - To get NSIS see http://nsis.sourceforge.net
-# - Make sure gvim_ole.exe, vimw32.exe, installw32.exe,
-#   uninstallw32.exe, teew32.exe and xxdw32.exe have been build as mentioned
-#   above.
-# - copy these files (get them from a binary archive or build them):
-#	gvimext.dll in src/GvimExt
-#	gvimext64.dll in src/GvimExt
-#   gvimext64.dll can be obtained from:
-#   https://github.com/vim/vim-win32-installer/releases
-#	It is part of gvim_9.1.*_x64.zip as vim/vim91/GvimExt/gvimext64.dll.
-# - Make sure there is a diff.exe two levels up (get it from a previous Vim
-#   version).  Also put winpty32.dll and winpty-agent.exe there.
-# - go to ../nsis and do:
-#   > nmake.exe -f Make_mvc.mak all
-#    (takes a few minutes).
-#    See nsis/README.txt for details.
-# - Copy gvim##.exe to the dist directory.
+#   See https://github.com/vim/vim-win32-installer
 #
 # 64 bit builds (these are not in the normal distribution, the 32 bit build
 # works just fine on 64 bit systems).
@@ -410,7 +394,7 @@ amisrc: dist prepare
 	mv dist/vim$(VERSION)src.tar.gz dist/vim$(VERSION)src.tgz
 
 # MS-DOS sources
-dossrc: dist dist/$(COMMENT_SRC) license
+dossrc: dist dist/$(COMMENT_SRC)
 	-rm -rf dist/vim$(VERSION)src.zip
 	-rm -rf dist/vim
 	mkdir dist/vim
@@ -428,9 +412,6 @@ dossrc: dist dist/$(COMMENT_SRC) license
 	rmdir dist/vim/$(VIMRTDIR)/runtime
 	cd dist && zip -9 -rD -z vim$(VERSION)src.zip vim <$(COMMENT_SRC)
 
-license:
-	cd nsis && $(MAKE) -f Makefile $@
-
 dosrt: dist dist/$(COMMENT_RT) dosrt_files
 	-rm -rf dist/vim$(VERSION)rt.zip
 	cd dist && zip -9 -rD -z vim$(VERSION)rt.zip vim <$(COMMENT_RT)
diff --git a/README_vim.md b/README_vim.md
index 3e57f0e8c6..387e5b2bca 100644
--- a/README_vim.md
+++ b/README_vim.md
@@ -1,9 +1,7 @@
 # [![Vim The editor](https://github.com/vim/vim/raw/master/runtime/vimlogo.gif)](https://www.vim.org)
 
 [![Github Build status](https://github.com/vim/vim/workflows/GitHub%20CI/badge.svg)](https://github.com/vim/vim/actions?query=workflow%3A%22GitHub+CI%22)
-[![Cirrus Build Status](https://api.cirrus-ci.com/github/vim/vim.svg)](https://cirrus-ci.com/github/vim/vim)
 [![Coverage Status](https://codecov.io/gh/vim/vim/coverage.svg?branch=master)](https://codecov.io/gh/vim/vim?branch=master)
-[![Coverity Scan](https://scan.coverity.com/projects/241/badge.svg)](https://scan.coverity.com/projects/vim)
 [![Debian CI](https://badges.debian.net/badges/debian/testing/vim/version.svg)](https://buildd.debian.org/vim)
 [![Packages](https://repology.org/badge/tiny-repos/vim.svg)](https://repology.org/metapackage/vim)
 [![Fossies codespell report](https://fossies.org/linux/test/vim-master.tar.gz/codespell.svg)](https://fossies.org/linux/test/vim-master.tar.gz/codespell.html)
diff --git a/READMEdir/README_extra.txt b/READMEdir/README_extra.txt
index 65372dd7d4..393ca5c6db 100644
--- a/READMEdir/README_extra.txt
+++ b/READMEdir/README_extra.txt
@@ -33,8 +33,6 @@ src/if_ole.*		OLE automation interface, for MS Windows.
 
 src/GvimExt/*		DLL for the "Edit with Vim" context menu entry
 
-nsis/*			NSIS script to build the self-installing MS-Windows exe
-
 runtime/doc/*.man	Preprocessed manual pages.
 
 runtime/macros/file_select.vim	Vim script to browse directories (Unix only).
diff --git a/ci/lychee.toml b/ci/lychee.toml
index 8b9f0099f2..515e4f54d9 100644
--- a/ci/lychee.toml
+++ b/ci/lychee.toml
@@ -26,7 +26,6 @@ exclude = [
   '^file://.*',
   '^https?://(www\.)?badges\.debian\.net/.*$',
   '^https?://(www\.)?repology\.org/.*$',
-  '^https?://scan\.coverity\.com/.*$',
   '^https?://(www\.)?img\.shields\.io/.*$',
   '^https?://(www\.)?fossies\.org/.*$',
   '^https?://(www\.)?adobe\.com.*$',
diff --git a/lang/LICENSE.ja.txt b/lang/LICENSE.ja.txt
new file mode 100644
index 0000000000..700064180d
--- /dev/null
+++ b/lang/LICENSE.ja.txt
@@ -0,0 +1,73 @@
+注�: ��日本語訳��考����示�も���り�法的効力を����ん。
+      必�原文を�照������。
+
+VIM ライセンス
+
+I)  Vim �コピーを変更����布�る������ライセンス文を����れ��
+    ら����以外�制��れ��ん。���変更を加����� Vim �一部分�
+    �を�布�る��も�様����ライセンス文を����れ��ら����以外
+    �制��れ��ん。�布物���変更を加����� Vim �ソース�ら作��
+    �実行�能ファイルや����独自�説明書や Vim script を��る��も���
+    �。
+
+II) 以下� 4 ���件を満��場���り�Vim �変更 (���拡張) を加��物
+    を�実行�能ファイルやソースコードも����布�る�����られ����:
+    1) ��ライセンス文を変更����布物���る��。
+    2) 変更�れ� Vim �以下� 5 ��方法��れ���布���れ��ら��。
+       a) Vim �独自�変更を加��場���布物�����連絡先を明確�示��
+	  ����。メンテナー������布��変更�れ� Vim �コピー���
+	  � (何�を) 尋����������加��変更を�ソースコードも��
+	  ��無償��メンテナー�利用��るよ�����れ��り��ん。メン
+	  テナー�公���ージョン� Vim �����変更を�り込む���権利を
+	  �有���。メンテナー�����変更を��よ���������ライ
+	  センス��布�る�を交渉�る�������。交渉�行�れ��れ��
+	  ��ライセンス�も����れ�新���ージョン�ライセンス����
+	  �変更��用�れ��。�在�メンテナー����リスト�れ����:
+	  https://github.com/orgs/vim/people
+	  �れ�変更�れる����切�場所�告知�れ��(��ら� vim.sf.net
+	  や www.vim.org ��� comp.editors)。も�本当�メンテナー�連絡��
+	  れ��場��������変更を�出�る義務��り��ん。一旦�メンテ
+	  ナー�����変更を�������を確�����ら��度�出�る必�
+	  ��り��ん。
+       b) a) �基����布�れ�変更�れ� Vim を�����場���れを変更
+	  �る������I) �基�����布����。�ら�る変更を加��
+	  場����変更�� a) ��用�れ��。
+       c) 変更�れ� Vim ��布物全���ソースコードも����全��変更点を
+	  �供������。�れ� context diff �形��行��������。
+	  ���������加��新��コード�対����ライセンスを�用�
+	  る��択����。��変更�ライセンス��公���ージョン� Vim
+	  ��り込む����他�も�を制��������ん。
+       d) c) �基����布�れ�変更�れ� Vim ��る���次��件を満��
+	  場���り���ソースコードを�����布�る�������:
+	  - ��変更��用�れ��るライセンス����変更を無償�制����
+	    Vim �メンテナー��供�る��を�������Vim �メンテナー�
+	    ��変更を公���ージョン� Vim ��り込む��を無償�制����
+	    ����る。
+	  - ��変更�れ� Vim �変更点を�最後��布�����ら少���も
+	    3 年���������。��期間内��メンテナーや誰����変更
+	    ���� (何�を) 尋��場��彼ら���変更を利用��るよ���
+	    ��れ��り��ん。
+	  - ���布物�����連絡先を明確�示������。��連絡方法��
+	    ��変更�れ� Vim �相当�る�布物�最後��供�れ��ら�少��
+	    �も 3 年�����能��り長��有効���れ��り��ん。
+       e) ��変更� GNU General Public License (GPL) ��用�れ��る場��
+	  GNU GPL �ージョン 2�����れより新���ージョン�基������
+	  変更�れ� Vim を�布�る�������。
+    3) ��変更�れ� Vim を利用���るユーザー���れ�変更�れ��る�確
+       ���るよ���少���も�":version" コマンドや起動時�挨拶メッセー
+       ジ��変更�れ��る旨を表示���れ��り��ん。���布物� 2)e)
+       �よるも���る場����ライセンス�変更��も��矛盾������
+       ���旨�メッセージ���必���。
+    4) 2)a) � 2)d) �より�求�れ��る連絡方法を���本人�訂正�る以外
+       ��変更��り削除�������ん。
+
+III) 変更�れ� Vim を�布�る場������変更� Vim �ライセンスを使��
+     ��変更を�ソースコードも����メンテナー�利用��るよ���る���
+     奨励�れ����。������電�メール��る��サー�ー�アップロード
+     ���� URL を電�メール�知ら�る��望�����。少��変更�ら (例�
+     � Makefile �変更��) context diff を電�メール��る������ょ�。
+     電�メール��り先� <maintainer@vim.org> ��。
+
+IV)  Vim �ソースや���一部����変更�れ� Vim���布物�ら��ライセン
+     スを削除�る�����られ����ん。望む�ら�以�� Vim リリース��
+     ��時点�ライセンス�������ライセンスを�用�る�������。
diff --git a/lang/README.ja.txt b/lang/README.ja.txt
new file mode 100644
index 0000000000..793282f804
--- /dev/null
+++ b/lang/README.ja.txt
@@ -0,0 +1,146 @@
+Vim �ージョン 9.2 用 README.txt: Vi IMproved
+
+
+VIM ��？
+
+Vim �����ら親��れ��� UNIX エディタ Vi を大幅�改良���ージョン�
+�。多��新機能�追加�れ����。多段階�アンドゥ�構文�イライト�コマンド
+ライン履歴�オンラインヘルプ�スペル�ェック�ファイル�補完�ブロック�作�ス
+クリプト言語����。���グラフィカルユーザーインターフェース (GUI) も利用
+�能��。Vi ��互�性も維��れ��る���Vi を使�慣れ��るユーザー���
+�馴染�る��ょ�。Vi ����������"runtime/doc/vi_diff.txt" を�照�
+�����。
+
+��エディタ��プログラムや��他�プレーンテキストファイル�編集��常�便利
+��。����コマンド�通常�キーボード文字�入力��る���10本�指�タイピ
+ング��るユーザー��常�高速�作業����。�ら��ファンクションキーをコマ
+ンド�割り当�る������マウスも使用����。
+
+Vim ��最���機能セット (通常� vim.tiny �呼�れる) �コンパイル��場��
+(��) POSIX 互�� vi 実装を�供�る��を目指�����。�れ��多��
+Linux ディストリビューション�デフォルト� vi エディタ���使用�れ����。
+
+Vim ��MS-Windows (7�8�10�11)�macOS�Haiku�VMS���������� UNIX
+系 OS �動作���。他�システム��移���れ��難��������。
+���ージョン� Vim ��MS-DOS�MS-Windows 95/98/Me/NT/2000/XP/Vista�Amiga
+DOS�Atari MiNT�BeOS�RISC OS�OS/2 �動作���������れら��在メンテ
+ナンス�れ����ん。
+
+
+�布
+
+多��場���好��パッケージマ�ージャを使用�� Vim をインストール����。
+Mac � Linux ���Vim �軽�版�プリインストール�れ������より多��機
+能�必��場���別途 Vim をインストール�る必���り��。
+
+Unix�PC�Amiga���他�����システム�����れ�れ別�ディストリビュー
+ション�用��れ����。
+�� README.txt ファイル�ランタイムアーカイブ��梱�れ����。�れ���
+ドキュメント�構文ファイル��よ�ランタイム�使用�れる��他�ファイル���
+れ����。Vim を実行�る����イナリアーカイブ���ソースアーカイブ���
+れ�を入手�る必���り��。
+��ら�必����実行���システム��自分�コンパイル�る必���る����
+�よ��異�り��。
+�在利用�能�ディストリビューション�概�������
+"https://www.vim.org/download.php" を�照������。
+
+最新版� Vim を入手��る一般的�場所:
+* GitHub � Git リ�ジトリを確�������: https://github.com/vim/vim
+* ソースコードをアーカイブ���入手����: https://github.com/vim/vim/tags
+* vim-win32-installer リ�ジトリ�ら Windows 実行ファイルを入手����:
+  https://github.com/vim/vim-win32-installer/releases
+
+
+コンパイル
+
+�イナリ版を入手��場���Vim をコンパイル�る必���り��ん。ソース版を入
+手��場���Vim �コンパイル�必������ファイル� "src" ディレクトリ�
+�り��。手順� src/INSTALL ファイルを�照������。
+
+
+インストール
+
+システム固有�インストール手順������以下���れ��ファイルを�照���
+���。READMEdir ディレクトリ（リ�ジトリ内）���最上�ディレクトリ（アーカ
+イブを解���場�）��以下�ファイル��り��。
+
+README_ami.txt		Amiga
+README_unix.txt		Unix
+README_dos.txt		MS-DOS �よ� MS-Windows
+README_mac.txt		Macintosh
+README_haiku.txt	Haiku
+README_vms.txt		VMS
+
+使用���るディストリビューション�よ����他�も README_*.txt ファイル�存
+在�る場���り��。
+
+
+ドキュメント
+
+Vim �ューター���心者��� 1 時間�トレーニングコース��。多��場��
+"vimtutor" �起動����。詳����":help tutor" を�照������。
+
+Vim ���":help" を使用�る��最���。実行ファイル���場���
+"runtime/doc/help.txt" を�読�����。他�ドキュメントファイル��リンク�
+��れ����。
+ユーザーマニュアル��る�本�よ��読�や���Vim �使�方を学����勧��
+�。":help user-manual" を�照������。
+
+
+複製・�布�件
+
+Vim ��ャリティウェア��。自由�利用・コピー������ウガンダ�孤�支��
+���寄付���力����れ�幸���。詳細��"runtime/doc/uganda.txt" ファ
+イルを�覧����（Vim 内� ":help uganda" �入力������）。
+
+ライセンス�概�: Vim �未改変コピー�使用・�布�制���り��ん。Vim �一部
+を�布�る��も�能����ライセンス文を必���る必���り��。改変版��
+�����制���り��。ライセンス� GPL 互���。GPL ライブラリを使用��
+Vim をコンパイル���布�る�������。
+
+
+ス�ンサーシップ
+
+�グ修正や新機能�追加���多��時間�労力�必���。Vim �開発��感��気
+��を表��開発者�モ�ベーションを高�る�������寄付を�願�����
+�。
+
+�寄付�����資金��主�ウガンダ���も���支��活用��������
+�。詳細� "runtime/doc/uganda.txt" を�覧����。�時���寄付�開発�ーム
+� Vim 開発���欲を高�る���も繋�り��。
+
+ス�ンサーシップ�関�る最新情報��Vim ウェブサイトを�覧����。
+	https://www.vim.org/sponsor/
+
+
+貢献����
+
+Vim �改善���力����る方��CONTRIBUTING.md ファイルを�覧����。
+
+
+情報
+
+macOS を�利用�場���MacVim を�利用������: https://macvim.org
+
+Vim �関�る最新情報��Vim �ホームページを�覧����:
+	https://www.vim.org/
+
+�題�発生��場���Vim �ドキュメント���ヒントを�覧����:
+	https://www.vim.org/docs.php
+	https://vim.fandom.com/wiki/Vim_Tips_Wiki
+
+�れ�も�題�解決���場�������他��質���る場���以下�メーリン
+グリストを�利用����。Vim ユーザーや開発者�議論����:
+	https://www.vim.org/maillist.php
+
+�れ�も解決���場���vim-dev メーリングリスト�直接�グを報告������:
+	<vim-dev@vim.org>
+
+
+主�著者
+
+Vim �大部分��Bram Moolenaar <Bram@vim.org> �よ��作��れ���。
+":help Bram-Moolenaar"
+
+��他���見�パッ����案��vim-devメーリングリスト����り����:
+<vim-dev@vim.org>
diff --git a/nsis/Make_mvc.mak b/nsis/Make_mvc.mak
deleted file mode 100644
index a1f1ae4b34..0000000000
--- a/nsis/Make_mvc.mak
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# Makefile for MS Windows for create self-installing exe of Vim.
-# 2025-10-03, Restorer, restorer@mail2k.ru
-#
-
-
-# included common tools
-!INCLUDE ..\src\auto\nmake\tools.mak
-
-.SUFFIXES :
-
-!IFDEF PROGRAMW6432
-ProgFiles=%%PROGRAMFILES(x86)%%
-!ELSE
-ProgFiles=$(PROGRAMFILES)
-!ENDIF
-
-!IFDEF VIMSRC
-MKNSISFLAGS = /D"VIMSRC=$(VIMSRC)"
-!ENDIF
-
-!IFDEF VIMRT
-MKNSISFLAGS = $(MKNSISFLAGS) /D"VIMRT=$(VIMRT)"
-!ENDIF
-
-!IFDEF VIMTOOLS
-MKNSISFLAGS = $(MKNSISFLAGS) /D"VIMTOOLS=$(VIMTOOLS)"
-!ENDIF
-
-!IFDEF GETTEXT
-MKNSISFLAGS = $(MKNSISFLAGS) /D"GETTEXT=$(GETTEXT)"
-!ENDIF
-
-!IFDEF HAVE_UPX
-MKNSISFLAGS = $(MKNSISFLAGS) /DHAVE_UPX=$(HAVE_UPX)
-!ENDIF
-
-!IFDEF HAVE_NLS
-MKNSISFLAGS = $(MKNSISFLAGS) /DHAVE_NLS=$(HAVE_NLS)
-!ENDIF
-
-!IFDEF HAVE_MULTI_LANG
-MKNSISFLAGS = $(MKNSISFLAGS) /DHAVE_MULTI_LANG=$(HAVE_MULTI_LANG)
-!ENDIF
-
-!IFDEF WIN64
-MKNSISFLAGS = $(MKNSISFLAGS) /DWIN64=$(WIN64)
-!ENDIF
-
-!IFDEF ARM64
-MKNSISFLAGS = $(MKNSISFLAGS) /DARM64=$(ARM64)
-!ENDIF
-
-!IFDEF INCLUDE_LIBGCC
-MKNSISFLAGS = $(MKNSISFLAGS) /DINCLUDE_LIBGCC=$(INCLUDE_LIBGCC)
-!ENDIF
-
-!IFDEF X
-XX = /X"$(X:;=" /X")"
-!ENDIF
-
-# If necessary, correct the full path of the NSIS compiler in the next line.
-# Please do not enclose the path in quotation marks.
-MKNSIS = $(ProgFiles)\NSIS\makensis.exe
-
-MKNSISFLAGS = /INPUTCHARSET UTF8 $(MKNSISFLAGS)
-
-
-all : makeinst
-
-makeinst : prepare
-	^"$(MKNSIS)" $(MKNSISFLAGS) gvim.nsi $(XX)
-
-prepare : unzipicons license rename
-
-unzipicons : icons.zip
-	@ if exist %|fF\nul $(RD) %|fF
-	@ $(PS) $(PSFLAGS) \
-		Add-Type -AssemblyName 'System.IO.Compression.FileSystem'; \
-		[System.IO.Compression.ZipFile]::ExtractToDirectory('$**', '.')
-
-license : ..\lang\LICENSE.*.txt ..\LICENSE
-	!@ $(PS) $(PSFLAGS) \
-		Get-Content -Path '$**' -Encoding UTF8 ^| \
-		Set-Content -Path '..\lang\$(**B).nsis.txt' -Enc Unicode -Force
-
-rename :
-	@ ..\tools\rename.bat "$(SRC)" "$(DST)" 1> nul
-
-clean :
-	@ if exist ..\lang\LICENSE*.nsis.txt $(RM) ..\lang\LICENSE*.nsis.txt
-	@ if exist .\icons\nul $(RD) .\icons
-	@ if exist .\gvim??.exe $(RM) .\gvim??.exe
-
-# vim: set noet sw=8 ts=8 sts=0 wm=0 tw=79 ft=make:
diff --git a/nsis/Makefile b/nsis/Makefile
deleted file mode 100644
index 4b51b2ac71..0000000000
--- a/nsis/Makefile
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# Makefile for UNIX-like for create self-installing exe of Vim.
-# 2025-10-03, Restorer, restorer@mail2k.ru
-#
-
-
-.SUFFIXES:
-.PHONY: all makeinst prepare rename clean 
-
-ifdef VIMSRC
-MKNSISFLAGS := -D"VIMSRC=$(VIMSRC)"
-endif
-
-ifdef VIMRT
-MKNSISFLAGS := $(MKNSISFLAGS) -D"VIMRT=$(VIMRT)"
-endif
-
-ifdef VIMTOOLS
-MKNSISFLAGS := $(MKNSISFLAGS) -D"VIMTOOLS=$(VIMTOOLS)"
-endif
-
-ifdef GETTEXT
-MKNSISFLAGS := $(MKNSISFLAGS) -D"GETTEXT=$(GETTEXT)"
-endif
-
-ifdef HAVE_UPX
-MKNSISFLAGS := $(MKNSISFLAGS) -DHAVE_UPX=$(HAVE_UPX)
-endif
-
-ifdef HAVE_NLS
-MKNSISFLAGS := $(MKNSISFLAGS) -DHAVE_NLS=$(HAVE_NLS)
-endif
-
-ifdef HAVE_MULTI_LANG
-MKNSISFLAGS := $(MKNSISFLAGS) -DHAVE_MULTI_LANG=$(HAVE_MULTI_LANG)
-endif
-
-ifdef WIN64
-MKNSISFLAGS := $(MKNSISFLAGS) -DWIN64=$(WIN64)
-endif
-
-ifdef ARM64
-MKNSISFLAGS := $(MKNSISFLAGS) -DARM64=$(ARM64)
-endif
-
-ifdef INCLUDE_LIBGCC
-MKNSISFLAGS := $(MKNSISFLAGS) -DINCLUDE_LIBGCC=$(INCLUDE_LIBGCC)
-endif
-
-ifdef X
-XX := -X"$(X:;=" -X")"
-endif
-
-MKNSISFLAGS := -INPUTCHARSET UTF8 $(MKNSISFLAGS)
-
-all: makeinst
-
-makeinst: prepare
-	makensis $(MKNSISFLAGS) gvim.nsi $(XX)
-
-prepare: unzipicons license rename
-
-unzipicons: icons.zip
-	if test -d `basename $? .zip` ; then rm -rf `basename $? .zip` ; fi
-	unzip $?
-
-license: ../lang/LICENSE.*.txt ../LICENSE
-	for lic in $? ; do \
-		bn=`basename $$lic .txt` ; \
-		awk 'sub("$$", "\r")' < $$lic | \
-		iconv -f UTF-8 -t UTF-16 > ../lang/$$bn.nsis.txt ; \
-	done
-
-rename:
-	../tools/rename.bat "$(SRC)" "$(DST)"
-
-clean:
-	rm -f ../lang/LICENSE*.nsis.txt
-	if test -d icons ; then rm -rf icons ; fi
-	if test -f gvim??.exe ; then rm -f gvim??.exe ; fi
-
-# vim: set noet sw=8 ts=8 sts=0 wm=0 tw=0 ft=make:
diff --git a/nsis/README.txt b/nsis/README.txt
index 01c6c5d3b0..f7e72a02e3 100644
--- a/nsis/README.txt
+++ b/nsis/README.txt
@@ -1,112 +1,4 @@
-This builds a one-click install for Vim for MS Windows using the Nullsoft
-Installation System (NSIS), available at http://nsis.sourceforge.net/
+The code for the one-click installer for Vim for MS Windows has been moved to
+the vim-win32-installer repository.
 
-To build the installable .exe file:
-
-Preparatory stage
-
-1.  Clone using the git tool the Vim repository or download its zip file
-    available at:
-	https://github.com/vim/vim
-
-2.  Go to the "/src" directory and build the Vim editor, making sure to use the
-    following variable values: "GUI=yes"; "OLE=yes"; "VIMDLL=yes". See
-    INSTALLpc.txt and Make_mvc.mak for details.
-
-3.  Go to the GvimExt directory and build gvimext.dll (or get it from a binary
-    archive).  Both 64- and 32-bit versions are needed and should be placed
-    as follows:
-	64-bit: src/GvimExt/gvimext64.dll
-	32-bit: src/GvimExt/gvimext.dll
-
-4.  Get a "diff.exe" program.  If you skip this the built-in diff will always
-    be used (which is fine for most users).
-    You can find one in previous Vim versions or in this archive:
-	https://www.mediafire.com/file/9edk4g3xvfgzby0/diff4Vim.zip/file
-    When will you have "diff.exe" put it in the "../.." directory (above the
-    "vim91" directory, it's the same for all Vim versions).  However, you can
-    specify a different directory by specifying the appropriate makefile value.
-    How to do this is described below.
-
-5.  For the terminal window to work in Vim, the library winpty is required.
-    You can get it at the following url:
-	https://github.com/rprichard/winpty/releases/download/0.4.3/winpty-0.4.3-msvc2015.zip
-    For the 32-bit version, rename "winpty.dll" from ia32/bin to "winpty32.dll",
-    and for the 64-bit version — "winpty.dll" from x64/bin to "winpty64.dll".
-    Put the renamed file and "winpty-agent.exe" in "../.." (above the "vim91"
-    directory).  However, you can specify a different directory by specifying
-    the appropriate makefile value. How to do this is described below.
-
-6.  To use stronger encryption, add the Sodium library.  You can get it here:
-	https://github.com/jedisct1/libsodium/releases/download/1.0.19-RELEASE/libsodium-1.0.19-msvc.zip
-    Unpack the archive.  Put the "libsodium.dll" from
-    path/to/libsodium/Win32/Release/v143/dynamic for the 32�bit version or
-    path/to/libsodium/X64/Release/v143/dynamic for the 64�bit version in the
-    "../.." directory (above the "vim91" directory, where "diff.exe" and
-    "winpty{32|64}.dll").
-
-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
-    DLLs and place them as follows:
-
-	<GETTEXT directory>
-	    |
-	    + gettext32/
-	    |	libintl-8.dll
-	    |	libiconv-2.dll
-	    |	libgcc_s_sjlj-1.dll
-	    |
-	    + gettext64/
-		libintl-8.dll
-		libiconv-2.dll
-
-    The default <GETTEXT directory> is "../..".  However, you can specify a
-    different directory by specifying the appropriate makefile value. How to do
-    this is described below.
-
-8.  Install NSIS if you didn't do that already.
-    Download Unicode version the ShellExecAsUser plug-in for NSIS from:
-	https://nsis.sourceforge.io/ShellExecAsUser_plug-in
-    and put "ShellExecAsUser.dll" to path\to\NSIS\Plugins\x86-unicode
-
-Installer assembly stage
-
-    On MS Windows, open the Developer Command Prompt for VS and go to the
-    "/nsis" directory and type the command
-	    nmake.exe -lf Make_mvc.mak [variables] all
-
-    After the installer is created and you copy it to the desired location, run
-    the following command in the "/nsis" directory
-	    nmake.exe -lf Make_mvc.mak clean
-
-    On UNIX-like systems, go to the "/nsis" directory and type the command
-	    make -f Makefile [variables] all
-
-    After the installer is created and you copy it to the desired location, run
-    the following command in the "/nsis" directory
-	    make -f Makefile clean
-
-Variables and their values available for building the installer (not mandatory):
-
-    "VIMSRC=<dir>"	— directory where location of gvim_ole.exe, vimw32.exe,
-			    GvimExt/*, etc.
-    "VIMRT=<dir>"	— directory where location of runtime files.
-    "VIMTOOLS=<dir>"    — directory where location of extra tools: diff.exe,
-			    winpty{32|64}.dll, winpty-agent.exe, libsodium.dll.
-    "GETTEXT=<dir>"     — directory where location of gettext libraries.
-    "HAVE_UPX=1"	— additional compression of the installer.  UPX program
-			    must be installed.
-    "HAVE_NLS=0"	— do not add native language support.
-    "HAVE_MULTI_LANG=0" — to create an English-only the installer.
-    "WIN64=1"		— to create a 64-bit the installer.
-    "ARM64=1"		— to create the installer for ARM64. The WIN64 variable
-			    must be set to 1.
-    "X=<scriptcmd>"	— executes scriptcmd in script.  If multiple scriptcmd
-			    are specified, they are separated by a semicolon.
-			    Example "X=OutFile MyVim.exe;XPMode on"
-    "MKNSIS=<dir>"	— the directory where the "makensis.exe" program is
-			    located.
-
-Note: for icons used in the installer, see the README.txt in the icons.zip
+    https://github.com/vim/vim-win32-installer/tree/master/nsis
diff --git a/nsis/auxiliary.nsh b/nsis/auxiliary.nsh
deleted file mode 100644
index c350f69e0b..0000000000
--- a/nsis/auxiliary.nsh
+++ /dev/null
@@ -1,148 +0,0 @@
-# -*- coding: utf-8 -*-
-# NSIS helper file for creating a self-installing exe for Vim.
-# Contains service macros and functions. 
-# Last Change:	2025-09-03
-#
-
-!ifndef __AUXILIARY__NSH__
-  !define __AUXILIARY__NSH__
-
-# See https://nsis.sourceforge.io/LogicLib
-;FileExists is already part of LogicLib, but returns true for directories
-;as well as files
-  !macro _FileExists2 _a _b _t _f
-    !insertmacro _LOGICLIB_TEMP
-    StrCpy $_LOGICLIB_TEMP "0"
-;if path is not blank, continue to next check
-    StrCmp `${_b}` `` +4 0
-;if path exists, continue to next check (IfFileExists returns true if this
-;is a directory)
-    IfFileExists `${_b}` `0` +3
-;if path is not a directory, continue to confirm exists
-    IfFileExists `${_b}\*.*` +2 0
-    StrCpy $_LOGICLIB_TEMP "1" ;file exists
-;now we have a definitive value - the file exists or it does not
-    StrCmp $_LOGICLIB_TEMP "1" `${_t}` `${_f}`
-  !macroend
-  !undef FileExists
-  !define FileExists `"" FileExists2`
-  !macro _DirExists _a _b _t _f
-    !insertmacro _LOGICLIB_TEMP
-    StrCpy $_LOGICLIB_TEMP "0"
-;if path is not blank, continue to next check
-    StrCmp `${_b}` `` +3 0
-;if directory exists, continue to confirm exists
-    IfFileExists `${_b}\*.*` 0 +2
-    StrCpy $_LOGICLIB_TEMP "1"
-    StrCmp $_LOGICLIB_TEMP "1" `${_t}` `${_f}`
-  !macroend
-  !define DirExists `"" DirExists`
-
-# Get parent directory
-# Share this function both on installer and uninstaller
-  !macro GetParent un
-    Function ${un}GetParent
-      Exch $0  ; old $0 is on top of stack
-      Push $1
-      Push $2
-      StrCpy $1 -1
-      ${Do}
-	StrCpy $2 $0 1 $1
-	${If} $2 == ""
-	${OrIf} $2 == "\"
-	  ${ExitDo}
-	${EndIf}
-	IntOp $1 $1 - 1
-      ${Loop}
-      StrCpy $0 $0 $1
-      Pop $2
-      Pop $1
-      Exch $0  ; put $0 on top of stack, restore $0 to original value
-    FunctionEnd
-  !macroend
-
-  !insertmacro GetParent ""
-  !insertmacro GetParent "un."
-
-# Get home directory
-  !macro GetHomeDir un
-    Function ${un}GetHomeDir
-      Push $0
-      Push $1
-      ReadEnvStr $0 "HOME"
-      ${If} $0 == ""
-	ReadEnvStr $0 "HOMEDRIVE"
-	ReadEnvStr $1 "HOMEPATH"
-	StrCpy $0 "$0$1"
-	${If} $0 == ""
-	  ReadEnvStr $0 "USERPROFILE"
-	${EndIf}
-      ${EndIf}
-      Pop $1
-      Exch $0  ; put $0 on top of stack, restore $0 to original value
-    FunctionEnd
-  !macroend
-
-  !insertmacro GetHomeDir ""
-  !insertmacro GetHomeDir "un."
-
-# Saving the status of sections of the current installation in the registry
-  !macro SaveSectionSelection section_id reg_value
-    ${If} ${SectionIsSelected} ${section_id}
-      WriteRegDWORD HKLM "${UNINST_REG_KEY_VIM}" ${reg_value} 1
-    ${Else}
-      WriteRegDWORD HKLM "${UNINST_REG_KEY_VIM}" ${reg_value} 0
-    ${EndIf}
-  !macroend
-
-# Reading the status of sections from the registry of the previous installation 
-  !macro LoadSectionSelection section_id reg_value
-    ClearErrors
-    ReadRegDWORD $3 HKLM "${UNINST_REG_KEY_VIM}" ${reg_value}
-    ${IfNot} ${Errors}
-      ${If} $3 = 1
-	!insertmacro SelectSection ${section_id}
-      ${Else}
-	!insertmacro UnselectSection ${section_id}
-      ${EndIf}
-    ${EndIf}
-  !macroend
-
-# Reading the settings for _vimrc from the registry of a previous installation
-  !macro LoadDefaultVimrc out_var reg_value default_value
-    ClearErrors
-    ReadRegStr ${out_var} HKLM "${UNINST_REG_KEY_VIM}" ${reg_value}
-    ${If} ${Errors}
-    ${OrIf} ${out_var} == ""
-      StrCpy ${out_var} ${default_value}
-    ${EndIf}
-  !macroend
-
-# Get user locale
-  !if ${HAVE_NLS}
-    Var lng_usr  ; variable containing the locale of the current user
-
-    !include "StrFunc.nsh"
-    ${StrRep}
-
-    Function GetUserLocale
-      ClearErrors
-      System::Call \
-	  'kernel32::GetUserDefaultLocaleName(t.r19, *i${NSIS_MAX_STRLEN})'
-      StrCmp $R9 "zh-cn" coincide 0
-      StrCmp $R9 "zh-tw" coincide 0
-      StrCmp $R9 "pt-br" 0 part
-      coincide:
-      System::Call 'User32::CharLower(t r19 r19)*i${NSIS_MAX_STRLEN}'
-      ${StrRep} $lng_usr "$R9" "-" "_"
-      Goto done
-      part:
-      StrCpy $lng_usr $R9 2
-      done:
-    FunctionEnd
-  !endif
-
-
-
-!endif # __AUXILIARY__NSH__
-# vi:set ts=8 sw=2 sts=2 tw=79 wm=0 ft=nsis:
diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
deleted file mode 100644
index 02751ce90a..0000000000
--- a/nsis/gvim.nsi
+++ /dev/null
@@ -1,1157 +0,0 @@
-# -*- coding: utf-8 -*-
-# NSIS file to create a self-installing exe for Vim.
-# It requires NSIS version 3.0 or later.
-# Last Change:	2025-09-30
-#
-
-Unicode true  ; !include defaults to UTF-8 after Unicode True since 3.0 Alpha 2
-
-# WARNING: if you make changes to this script, look out for $0 to be valid,
-# because uninstall deletes most files in $0.
-
-# Location of gvim_ole.exe, vimw32.exe, GvimExt/*, etc.
-!ifndef VIMSRC
-  !define VIMSRC "..\src"
-!endif
-
-# Location of runtime files
-!ifndef VIMRT
-  !define VIMRT "..\runtime"
-!endif
-
-# Location of extra tools: diff.exe, winpty{32|64}.dll, winpty-agent.exe, etc.
-!ifndef VIMTOOLS
-  !define VIMTOOLS "..\.."
-!endif
-
-# Location of gettext.
-# It must contain two directories: gettext32 and gettext64.
-# See README.txt for detail.
-!ifndef GETTEXT
-  !define GETTEXT ${VIMTOOLS}
-!endif
-
-# If you have UPX, use the switch /DHAVE_UPX=1 on the command line makensis.exe.
-# This property will be set to 1. Get it at https://upx.github.io/
-!ifndef HAVE_UPX
-  !define HAVE_UPX 0
-!endif
-
-# If you do not want to add Native Language Support, use the switch /DHAVE_NLS=0
-# in the command line makensis.exe. This property will be set to 0.
-!ifndef HAVE_NLS
-  !define HAVE_NLS 1
-!endif
-
-# To create an English-only the installer, use the switch /DHAVE_MULTI_LANG=0 on
-# the command line makensis.exe. This property will be set to 0.
-!ifndef HAVE_MULTI_LANG
-  !define HAVE_MULTI_LANG 1
-!endif
-
-# if you want to create a 64-bit the installer, use the switch /DWIN64=1 on
-# the command line makensis.exe. This property will be set to 1.
-!ifndef WIN64
-  !define WIN64 0
-!endif
-
-# if you want to create the installer for ARM64, use the /DARM64=1 on
-# the command line makensis.exe. This property will be set to 1.
-!ifndef ARM64
-  !define ARM64 0
-!else
-  !if ${ARM64} > 0
-    !if ${WIN64} < 1
-      !define /redef WIN64 1
-    !endif
-  !endif
-!endif
-
-# if you don't want to include libgcc_s_sjlj-1.dll in the package, use the
-# switch /DINCLUDE_LIBGCC=0 on the command line makensis.exe.
-!ifndef INCLUDE_LIBGCC
-  !define INCLUDE_LIBGCC 1
-!endif
-
-# Get version numbers
-!getdllversion "${VIMSRC}\gvim_ole.exe" VimVer_
-!echo "Vim version MAJOR=${VimVer_1} MINOR=${VimVer_2} PATCHLEVEL=${VimVer_3}"
-
-!ifndef VER_MAJOR
-  !define VER_MAJOR  ${VimVer_1}
-!endif
-!ifndef VER_MINOR
-  !define VER_MINOR  ${VimVer_2}
-!endif
-!ifndef PATCHLEVEL
-  !define PATCHLEVEL ${VimVer_3}
-!endif
-
-# ----------- No configurable settings below this line -----------
-
-##########################################################
-# Installer Attributes, Including headers, Plugins and etc.
-
-CRCCheck force
-
-SetCompressor /SOLID lzma
-SetCompressorDictSize 64
-SetDatablockOptimize on
-
-!if ${HAVE_UPX}
-  !packhdr temp.dat "upx.exe --best --compress-icons=1 temp.dat"
-!endif
-
-RequestExecutionLevel highest
-ManifestDPIAware true
-# https://github.com/NSIS-Dev/nsis/blob/691211035c2aaaebe8fbca48ee02d4de93594a52/Docs/src/attributes.but#L292
-ManifestDPIAwareness "PerMonitorV2,System"
-ManifestSupportedOS \
-    {35138b9a-5d96-4fbd-8e2d-a2440225f93a} /* WinNT 6.1 */ \
-    {4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38} /* WinNT 6.2 */ \
-    {1f676c76-80e1-4239-95bb-83d0f6d0da78} /* WinNT 6.3 */ \
-    {8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a} /* WinNT 10/11 */
-
-!define PRODUCT         "Vim ${VER_MAJOR}.${VER_MINOR}"
-!define UNINST_REG_KEY  "Software\Microsoft\Windows\CurrentVersion\Uninstall"
-!define UNINST_REG_KEY_VIM  "${UNINST_REG_KEY}\${PRODUCT}"
-
-!if ${WIN64}
-  !define BIT 64
-# This adds '\Vim' to the user choice automagically.  The actual value is
-# obtained below with CheckOldVim.
-  !define DEFAULT_INSTDIR "$PROGRAMFILES64\Vim"
-  !if ${ARM64}
-    Name "${PRODUCT} (ARM64)"
-  !else
-    Name "${PRODUCT} (x64)"
-  !endif
-!else
-  !define BIT 32
-  !define DEFAULT_INSTDIR "$PROGRAMFILES\Vim"
-  Name "${PRODUCT}"
-!endif
-
-OutFile gvim${VER_MAJOR}${VER_MINOR}.exe
-InstallDir ${DEFAULT_INSTDIR}
-BrandingText "Vim - the text editor"
-
-# Types of installs we can perform:
-InstType $(str_type_typical)
-InstType $(str_type_minimal)
-InstType $(str_type_full)
-
-SilentInstall normal
-
-##########################################################
-# Version resources
-
-VIFileVersion ${VER_MAJOR}.${VER_MINOR}.${PATCHLEVEL}.0
-VIProductVersion ${VER_MAJOR}.${VER_MINOR}.${PATCHLEVEL}.0
-VIAddVersionKey /LANG=0 "ProductName" "Vim"
-VIAddVersionKey /LANG=0 "CompanyName" "The Vim Project"
-VIAddVersionKey /LANG=0 "LegalTrademarks" "Vim"
-VIAddVersionKey /LANG=0 "LegalCopyright" "Copyright (C) 1996"
-VIAddVersionKey /LANG=0 "FileDescription" \
-    "Vi Improved - A Text Editor"
-VIAddVersionKey /LANG=0 "ProductVersion" \
-    "${VER_MAJOR}.${VER_MINOR}.${PATCHLEVEL}.0"
-VIAddVersionKey /LANG=0 "FileVersion" \
-    "${VER_MAJOR}.${VER_MINOR}.${PATCHLEVEL}.0"
-
-##########################################################
-# including headers
-
-!include "Library.nsh"		; for DLL install
-!include "LogicLib.nsh"
-!include "MUI2.nsh"		; new user interface
-!include "nsDialogs.nsh"
-!include "Sections.nsh"		; for section control
-!include "x64.nsh"
-
-!include .\auxiliary.nsh	; helper file
-
-##########################################################
-# MUI2 settings
-
-!define MUI_ABORTWARNING
-!define MUI_UNABORTWARNING
-
-!define MUI_ICON   "icons\in_vim_32bpp.ico"
-!define MUI_UNICON "icons\un_vim_32bpp.ico"
-
-# Show all languages, despite user's codepage:
-!define MUI_LANGDLL_ALLLANGUAGES
-# Always show dialog choice language
-#!define MUI_LANGDLL_ALWAYSSHOW
-!define MUI_LANGDLL_REGISTRY_ROOT	"HKCU"
-!define MUI_LANGDLL_REGISTRY_KEY	"Software\Vim"
-!define MUI_LANGDLL_REGISTRY_VALUENAME  "Installer Language"
-
-!define MUI_WELCOMEFINISHPAGE_BITMAP	"icons\in_welcome.bmp"
-!define MUI_UNWELCOMEFINISHPAGE_BITMAP	"icons\un_welcome.bmp"
-!define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP		"icons\in_header.bmp"
-!define MUI_HEADERIMAGE_UNBITMAP	"icons\un_header.bmp"
-
-!define MUI_WELCOMEFINISHPAGE_BITMAP_STRETCH	"AspectFitHeight"
-!define MUI_UNWELCOMEFINISHPAGE_BITMAP_STRETCH  "AspectFitHeight"
-!define MUI_HEADERIMAGE_BITMAP_STRETCH		"AspectFitHeight"
-!define MUI_HEADERIMAGE_UNBITMAP_STRETCH	"AspectFitHeight"
-
-!define MUI_COMPONENTSPAGE_SMALLDESC
-!define MUI_LICENSEPAGE_CHECKBOX
-!define MUI_FINISHPAGE_SHOWREADME
-!define MUI_FINISHPAGE_SHOWREADME_TEXT		$(str_show_readme)
-!define MUI_FINISHPAGE_SHOWREADME_FUNCTION	LaunchApplication
-
-# Installer pages:
-!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE $(page_lic_file)
-!insertmacro MUI_PAGE_COMPONENTS
-Page custom SetCustom ValidateCustom
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-!define MUI_FINISHPAGE_NOREBOOTSUPPORT
-!insertmacro MUI_PAGE_FINISH
-
-# Uninstaller pages:
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_COMPONENTS
-!insertmacro MUI_UNPAGE_INSTFILES
-!define MUI_FINISHPAGE_NOREBOOTSUPPORT
-!insertmacro MUI_UNPAGE_FINISH
-
-##########################################################
-# Languages Files
-
-!insertmacro MUI_RESERVEFILE_LANGDLL
-!include "lang\english.nsi"
-
-# Include support for other languages:
-!if ${HAVE_MULTI_LANG}
-  !include "lang\danish.nsi"
-  !include "lang\dutch.nsi"
-  !include "lang\german.nsi"
-  !include "lang\greek.nsi"
-  !include "lang\italian.nsi"
-  !include "lang\japanese.nsi"
-  !include "lang\portuguesebr.nsi"
-  !include "lang\russian.nsi"
-  !include "lang\serbian.nsi"
-  !include "lang\simpchinese.nsi"
-  !include "lang\swedish.nsi"
-  !include "lang\tradchinese.nsi"
-  !include "lang\turkish.nsi"
-!endif
-
-##########################################################
-# Global variables
-Var vim_dialog
-Var vim_nsd_compat
-Var vim_nsd_keymap
-Var vim_nsd_mouse
-Var vim_compat_stat
-Var vim_keymap_stat
-Var vim_mouse_stat
-
-##########################################################
-# Reserve files
-ReserveFile ${VIMSRC}\installw32.exe
-
-##########################################################
-# Functions
-
-# Check if Vim is already installed.
-# return: Installed directory. If not found, it will be empty.
-Function CheckOldVim
-  Push $0
-  Push $R0
-  Push $R1
-  Push $R2
-
-  ${If} ${RunningX64}
-    SetRegView 64
-  ${EndIf}
-
-  ClearErrors
-  StrCpy $0 ""   ; Installed directory
-  StrCpy $R0 0   ; Sub-key index
-  StrCpy $R1 ""  ; Sub-key
-  ${Do}
-    # Enumerate the sub-key:
-    EnumRegKey $R1 HKLM ${UNINST_REG_KEY} $R0
-
-    # Stop if no more sub-key:
-    ${If} ${Errors}
-    ${OrIf} $R1 == ""
-      ${ExitDo}
-    ${EndIf}
-
-    # Move to the next sub-key:
-    IntOp $R0 $R0 + 1
-
-    # Check if the key is Vim uninstall key or not:
-    StrCpy $R2 $R1 4
-    ${If} $R2 S!= "Vim "
-      ${Continue}
-    ${EndIf}
-
-    # Verifies required sub-keys:
-    ReadRegStr $R2 HKLM "${UNINST_REG_KEY}\$R1" "DisplayName"
-    ${If} ${Errors}
-    ${OrIf} $R2 == ""
-      ${Continue}
-    ${EndIf}
-
-    ReadRegStr $R2 HKLM "${UNINST_REG_KEY}\$R1" "UninstallString"
-    ${If} ${Errors}
-    ${OrIf} $R2 == ""
-      ${Continue}
-    ${EndIf}
-
-    # Found
-    Push $R2
-    call GetParent
-    call GetParent
-    Pop $0  ; Vim directory
-    ${ExitDo}
-
-  ${Loop}
-
-  ${If} ${RunningX64}
-    SetRegView lastused
-  ${EndIf}
-
-  Pop $R2
-  Pop $R1
-  Pop $R0
-  Exch $0  ; put $0 on top of stack, restore $0 to original value
-FunctionEnd
-
-Function LaunchApplication
-  SetOutPath $0
-  !if ${HAVE_NLS}
-    ShellExecAsUser::ShellExecAsUser "" "$0\gvim.exe" \
-	'-R "$0\$(vim_readme_file)"'
-  !else
-    ShellExecAsUser::ShellExecAsUser "" "$0\gvim.exe" '-R "$0\README.txt"'
-  !endif
-FunctionEnd
-
-##########################################################
-# Installer Functions and Sections
-
-Section "$(str_section_old_ver)" id_section_old_ver
-  SectionIn 1 2 3 RO
-
-  # run the install program to check for already installed versions
-  SetOutPath $TEMP
-  File /oname=install.exe ${VIMSRC}\installw32.exe
-  DetailPrint "$(str_msg_uninstalling)"
-  ${Do}
-    nsExec::Exec "$TEMP\install.exe -uninstall-check"
-    Pop $3
-
-    call CheckOldVim
-    Pop $3
-    ${If} $3 == ""
-      ${ExitDo}
-    ${Else}
-      # It seems that the old version is still remaining.
-      # TODO: Should we show a warning and run the uninstaller again?
-
-      ${ExitDo}  ; Just ignore for now.
-    ${EndIf}
-  ${Loop}
-  Delete $TEMP\install.exe
-  Delete $TEMP\vimini.ini   ; install.exe creates this, but we don't need it.
-
-  # We may have been put to the background when uninstall did something.
-  BringToFront
-SectionEnd
-
-##########################################################
-Section "$(str_section_exe)" id_section_exe
-  SectionIn 1 2 3 RO
-
-  # we need also this here if the user changes the instdir
-  StrCpy $0 "$INSTDIR\vim${VER_MAJOR}${VER_MINOR}"
-
-  SetOutPath $0
-  File /oname=gvim.exe ${VIMSRC}\gvim_ole.exe
-  !if /FileExists "${VIMSRC}\vim${BIT}.dll"
-    File ${VIMSRC}\vim${BIT}.dll
-  !endif
-  File /oname=install.exe ${VIMSRC}\installw32.exe
-  File /oname=uninstall.exe ${VIMSRC}\uninstallw32.exe
-  File ${VIMSRC}\vimrun.exe
-  File /oname=tee.exe ${VIMSRC}\teew32.exe
-  File /oname=xxd.exe ${VIMSRC}\xxdw32.exe
-  File ..\vimtutor.bat
-  File ..\README.txt
-  File /oname=LICENSE.txt ..\LICENSE
-  File ..\uninstall.txt
-  File ${VIMRT}\*.vim
-
-  !if /FileExists "${VIMTOOLS}\diff.exe"
-    File ${VIMTOOLS}\diff.exe
-  !endif
-  !if /FileExists "${VIMTOOLS}\winpty${BIT}.dll"
-    File ${VIMTOOLS}\winpty${BIT}.dll
-  !endif
-  !if /FileExists "${VIMTOOLS}\winpty-agent.exe"
-    File ${VIMTOOLS}\winpty-agent.exe
-  !endif
-  !if /FileExists "${VIMTOOLS}\libsodium.dll"
-    File ${VIMTOOLS}\libsodium.dll
-  !endif
-
-  SetOutPath $0\colors
-  File /r ${VIMRT}\colors\*.*
-
-  SetOutPath $0\compiler
-  File ${VIMRT}\compiler\*.*
-
-  SetOutPath $0\doc
-  File /x uganda.nsis.txt ${VIMRT}\doc\*.txt
-  File ${VIMRT}\doc\tags
-
-  SetOutPath $0\ftplugin
-  File ${VIMRT}\ftplugin\*.*
-
-  SetOutPath $0\indent
-  File ${VIMRT}\indent\README.txt
-  File ${VIMRT}\indent\*.vim
-
-  SetOutPath $0\keymap
-  File ${VIMRT}\keymap\README.txt
-  File ${VIMRT}\keymap\*.vim
-
-  SetOutPath $0\macros
-  File /r /x *.info ${VIMRT}\macros\*.*
-
-  SetOutPath $0\pack
-  File /r ${VIMRT}\pack\*.*
-
-  SetOutPath $0\plugin
-  File ${VIMRT}\plugin\*.*
-
-  SetOutPath $0\autoload
-  File /r ${VIMRT}\autoload\*.*
-
-  SetOutPath $0\import\dist
-  File ${VIMRT}\import\dist\*.*
-
-  SetOutPath $0\bitmaps
-  File ${VIMSRC}\vim.ico
-
-  SetOutPath $0\syntax
-  File /r /x testdir /x generator /x Makefile ${VIMRT}\syntax\*.*
-
-  SetOutPath $0\spell
-  File ${VIMRT}\spell\*.txt
-  File ${VIMRT}\spell\*.vim
-  File ${VIMRT}\spell\*.spl
-  File ${VIMRT}\spell\*.sug
-
-  SetOutPath $0\tools
-  File ${VIMRT}\tools\*.*
-
-  SetOutPath $0\tutor
-  File /r /x *.info ${VIMRT}\tutor\*.*
-SectionEnd
-
-##########################################################
-Section "$(str_section_console)" id_section_console
-  SectionIn 1 3
-
-  SetOutPath $0
-  File /oname=vim.exe ${VIMSRC}\vimw32.exe
-  StrCpy $2 "$2 vim view vimdiff"
-SectionEnd
-
-##########################################################
-Section "$(str_section_batch)" id_section_batch
-  SectionIn 3
-
-  StrCpy $1 "$1 -create-batfiles $2"
-SectionEnd
-
-##########################################################
-SectionGroup $(str_group_icons) id_group_icons
-  Section "$(str_section_desktop)" id_section_desktop
-    SectionIn 1 3
-
-    StrCpy $1 "$1 -install-icons"
-  SectionEnd
-
-  Section "$(str_section_start_menu)" id_section_startmenu
-    SectionIn 1 3
-
-    StrCpy $1 "$1 -add-start-menu"
-  SectionEnd
-SectionGroupEnd
-
-##########################################################
-Section "$(str_section_edit_with)" id_section_editwith
-  SectionIn 1 3
-
-  SetOutPath $0
-
-  ${If} ${RunningX64}
-    # Install 64-bit gvimext.dll into the GvimExt64 directory.
-    SetOutPath $0\GvimExt64
-    ClearErrors
-    !define LIBRARY_SHELL_EXTENSION
-    !define LIBRARY_X64
-    !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
-	"${VIMSRC}\GvimExt\gvimext64.dll" "$0\GvimExt64\gvimext.dll" "$0"
-    !undef LIBRARY_X64
-    !undef LIBRARY_SHELL_EXTENSION
-  ${EndIf}
-
-  # Install 32-bit gvimext.dll into the GvimExt32 directory.
-  SetOutPath $0\GvimExt32
-  ClearErrors
-  !define LIBRARY_SHELL_EXTENSION
-  !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
-      "${VIMSRC}\GvimExt\gvimext.dll" "$0\GvimExt32\gvimext.dll" "$0"
-  !undef LIBRARY_SHELL_EXTENSION
-
-  # We don't have a separate entry for the "Open With..." menu, assume
-  # the user wants either both or none.
-  StrCpy $1 "$1 -install-popup -install-openwith"
-SectionEnd
-
-##########################################################
-Section "$(str_section_vim_rc)" id_section_vimrc
-  SectionIn 1 3
-
-  StrCpy $1 "$1 -create-vimrc"
-
-  ${If} ${RunningX64}
-    SetRegView 64
-  ${EndIf}
-  WriteRegStr HKLM "${UNINST_REG_KEY_VIM}" "vim_compat"   "$vim_compat_stat"
-  WriteRegStr HKLM "${UNINST_REG_KEY_VIM}" "vim_keyremap" "$vim_keymap_stat"
-  WriteRegStr HKLM "${UNINST_REG_KEY_VIM}" "vim_mouse"    "$vim_mouse_stat"
-  ${If} ${RunningX64}
-    SetRegView lastused
-  ${EndIf}
-
-  ${If} $vim_compat_stat == "vi"
-    StrCpy $1 "$1 -vimrc-compat vi"
-  ${ElseIf} $vim_compat_stat == "vim"
-    StrCpy $1 "$1 -vimrc-compat vim"
-  ${ElseIf} $vim_compat_stat == "defaults"
-    StrCpy $1 "$1 -vimrc-compat defaults"
-  ${Else}
-    StrCpy $1 "$1 -vimrc-compat all"
-  ${EndIf}
-
-  ${If} $vim_keymap_stat == "default"
-    StrCpy $1 "$1 -vimrc-remap no"
-  ${Else}
-    StrCpy $1 "$1 -vimrc-remap win"
-  ${EndIf}
-
-  ${If} $vim_mouse_stat == "default"
-    StrCpy $1 "$1 -vimrc-behave default"
-  ${ElseIf} $vim_mouse_stat == "windows"
-    StrCpy $1 "$1 -vimrc-behave mswin"
-  ${Else}
-    StrCpy $1 "$1 -vimrc-behave unix"
-  ${EndIf}
-SectionEnd
-
-##########################################################
-SectionGroup $(str_group_plugin) id_group_plugin
-  Section "$(str_section_plugin_home)" id_section_pluginhome
-    SectionIn 1 3
-    # use ShellExecAsUser below instead
-    # StrCpy $1 "$1 -create-directories home"
-  SectionEnd
-
-  Section "$(str_section_plugin_vim)" id_section_pluginvim
-    SectionIn 3
-    StrCpy $1 "$1 -create-directories vim"
-  SectionEnd
-SectionGroupEnd
-
-##########################################################
-!if ${HAVE_NLS}
-  Section "$(str_section_nls)" id_section_nls
-    SectionIn 1 3
-
-    SetOutPath $INSTDIR
-    !if /FileExists "..\lang\README.*.txt"
-      File ..\lang\README.*.txt
-      CopyFiles /SILENT /FILESONLY $INSTDIR\README.$lng_usr.txt \
-	  $INSTDIR\vim${VER_MAJOR}${VER_MINOR}\README.$lng_usr.txt
-      Delete $INSTDIR\README.*.txt
-    !endif
-    StrCpy $R7 0
-    !if /FileExists "..\lang\LICENSE.??.txt"
-      File ..\lang\LICENSE.??.txt
-      IntOp $R7 $R7 + 1
-    !endif
-    !if /FileExists "..\lang\LICENSE.??_??.txt"
-      File ..\lang\LICENSE.??_??.txt
-      IntOp $R7 $R7 + 1
-    !endif
-    IntCmp $R7 0 notcpy notcpy cpy
-    cpy:
-    CopyFiles /SILENT /FILESONLY $INSTDIR\LICENSE.$lng_usr.txt \
-	$INSTDIR\vim${VER_MAJOR}${VER_MINOR}\LICENSE.$lng_usr.txt
-    Delete $INSTDIR\LICENSE.*.txt
-    notcpy:
-
-    SetOutPath $0\lang
-    File /r /x Makefile ${VIMRT}\lang\*.*
-    SetOutPath $0
-    !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
-	"${GETTEXT}\gettext${BIT}\libintl-8.dll" "$0\libintl-8.dll" "$0"
-    !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
-	"${GETTEXT}\gettext${BIT}\libiconv-2.dll" "$0\libiconv-2.dll" "$0"
-    # Install libgcc_s_sjlj-1.dll only if it is needed.
-    !if ${INCLUDE_LIBGCC}
-      !if /FileExists "${GETTEXT}\gettext${BIT}\libgcc_s_sjlj-1.dll"
-	!insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
-	    "${GETTEXT}\gettext${BIT}\libgcc_s_sjlj-1.dll" \
-	    "$0\libgcc_s_sjlj-1.dll" "$0"
-      !endif
-    !endif
-
-    ${If} ${SectionIsSelected} ${id_section_editwith}
-      ${If} ${RunningX64}
-	# Install DLLs for 64-bit gvimext.dll into the GvimExt64 directory.
-	SetOutPath $0\GvimExt64
-	ClearErrors
-	!define LIBRARY_X64
-	!insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
-	    "${GETTEXT}\gettext64\libintl-8.dll" \
-	    "$0\GvimExt64\libintl-8.dll" "$0\GvimExt64"
-	!insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
-	    "${GETTEXT}\gettext64\libiconv-2.dll" \
-	    "$0\GvimExt64\libiconv-2.dll" "$0\GvimExt64"
-	!undef LIBRARY_X64
-      ${EndIf}
-
-      !if ! ${ARM64}
-	# Install DLLs for 32-bit gvimext.dll into the GvimExt32 directory.
-	SetOutPath $0\GvimExt32
-	ClearErrors
-	!insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
-	    "${GETTEXT}\gettext32\libintl-8.dll" \
-	    "$0\GvimExt32\libintl-8.dll" "$0\GvimExt32"
-	!insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
-	    "${GETTEXT}\gettext32\libiconv-2.dll" \
-	    "$0\GvimExt32\libiconv-2.dll" "$0\GvimExt32"
-	# Install libgcc_s_sjlj-1.dll only if it is needed.
-	!if ${INCLUDE_LIBGCC}
-	  !if /FileExists "${GETTEXT}\gettext32\libgcc_s_sjlj-1.dll"
-	      !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
-		  "${GETTEXT}\gettext32\libgcc_s_sjlj-1.dll" \
-		  "$0\GvimExt32\libgcc_s_sjlj-1.dll" "$0\GvimExt32"
-	  !endif
-	!endif
-      !endif
-    ${EndIf}
-  SectionEnd
-!endif
-
-##########################################################
-Section -call_install_exe
-  SetOutPath $0
-  DetailPrint "$(str_msg_registering)"
-  nsExec::Exec "$0\install.exe $1"
-  Pop $3
-
-  ${If} ${SectionIsSelected} ${id_section_pluginhome}
-    ReadEnvStr $3 "COMSPEC"
-    Call GetHomeDir
-    Pop $4
-    ShellExecAsUser::ShellExecAsUser "" "$3" '/c "cd /d "$4" & mkdir vimfiles \
-	& cd vimfiles & mkdir colors compiler doc ftdetect ftplugin indent \
-	keymap plugin syntax"' SW_HIDE
-  ${EndIf}
-SectionEnd
-
-##########################################################
-Section -post
-  # Get estimated install size
-  SectionGetSize ${id_section_exe} $3
-  ${If} ${SectionIsSelected} ${id_section_console}
-    SectionGetSize ${id_section_console} $4
-    IntOp $3 $3 + $4
-  ${EndIf}
-  ${If} ${SectionIsSelected} ${id_section_editwith}
-    SectionGetSize ${id_section_editwith} $4
-    IntOp $3 $3 + $4
-  ${EndIf}
-  !if ${HAVE_NLS}
-    ${If} ${SectionIsSelected} ${id_section_nls}
-      SectionGetSize ${id_section_nls} $4
-      IntOp $3 $3 + $4
-    ${EndIf}
-  !endif
-
-  # Register EstimatedSize and AllowSilent.
-  # Other information will be set by the install.exe (dosinst.c).
-  ${If} ${RunningX64}
-    SetRegView 64
-  ${EndIf}
-  WriteRegDWORD HKLM "${UNINST_REG_KEY_VIM}" "EstimatedSize" $3
-  WriteRegDWORD HKLM "${UNINST_REG_KEY_VIM}" "AllowSilent" 1
-  ${If} ${RunningX64}
-    SetRegView lastused
-  ${EndIf}
-
-  # Store the selections to the registry.
-  ${If} ${RunningX64}
-    SetRegView 64
-  ${EndIf}
-  !insertmacro SaveSectionSelection ${id_section_console}    "select_console"
-  !insertmacro SaveSectionSelection ${id_section_batch}      "select_batch"
-  !insertmacro SaveSectionSelection ${id_section_desktop}    "select_desktop"
-  !insertmacro SaveSectionSelection ${id_section_startmenu}  "select_startmenu"
-  !insertmacro SaveSectionSelection ${id_section_editwith}   "select_editwith"
-  !insertmacro SaveSectionSelection ${id_section_vimrc}      "select_vimrc"
-  !insertmacro SaveSectionSelection ${id_section_pluginhome} \
-      "select_pluginhome"
-  !insertmacro SaveSectionSelection ${id_section_pluginvim}  "select_pluginvim"
-  !if ${HAVE_NLS}
-    !insertmacro SaveSectionSelection ${id_section_nls}      "select_nls"
-  !endif
-  ${If} ${RunningX64}
-    SetRegView lastused
-  ${EndIf}
-
-  BringToFront
-SectionEnd
-
-##########################################################
-Function .onInit
-  !if ${HAVE_MULTI_LANG}
-    # Select a language (or read from the registry).
-    !insertmacro MUI_LANGDLL_DISPLAY
-  !endif
-
-  !if ${HAVE_NLS}
-    call GetUserLocale
-  !endif
-
-  ${If} $INSTDIR == ${DEFAULT_INSTDIR}
-    # Check $VIM
-    ReadEnvStr $3 "VIM"
-    ${If} $3 != ""
-      StrCpy $INSTDIR $3
-    ${EndIf}
-  ${EndIf}
-
-  call CheckOldVim
-  Pop $3
-  ${If} $3 == ""
-    # No old versions of Vim found. Unselect and hide the section.
-    !insertmacro UnselectSection ${id_section_old_ver}
-    SectionSetInstTypes ${id_section_old_ver} 0
-    SectionSetText ${id_section_old_ver} ""
-  ${Else}
-    ${If} $INSTDIR == ${DEFAULT_INSTDIR}
-      StrCpy $INSTDIR $3
-    ${EndIf}
-  ${EndIf}
-
-  ${If} ${RunningX64}
-    SetRegView 64
-  ${EndIf}
-  # Load the selections from the registry (if any).
-  !insertmacro LoadSectionSelection ${id_section_console}    "select_console"
-  !insertmacro LoadSectionSelection ${id_section_batch}      "select_batch"
-  !insertmacro LoadSectionSelection ${id_section_desktop}    "select_desktop"
-  !insertmacro LoadSectionSelection ${id_section_startmenu}  "select_startmenu"
-  !insertmacro LoadSectionSelection ${id_section_editwith}   "select_editwith"
-  !insertmacro LoadSectionSelection ${id_section_vimrc}      "select_vimrc"
-  !insertmacro LoadSectionSelection ${id_section_pluginhome} \
-      "select_pluginhome"
-  !insertmacro LoadSectionSelection ${id_section_pluginvim}  "select_pluginvim"
-  !if ${HAVE_NLS}
-    !insertmacro LoadSectionSelection ${id_section_nls}      "select_nls"
-  !endif
-  # Load the default _vimrc settings from the registry (if any).
-  !insertmacro LoadDefaultVimrc $vim_compat_stat "vim_compat"   "all"
-  !insertmacro LoadDefaultVimrc $vim_keymap_stat "vim_keyremap" "default"
-  !insertmacro LoadDefaultVimrc $vim_mouse_stat  "vim_mouse"    "default"
-  ${If} ${RunningX64}
-    SetRegView lastused
-  ${EndIf}
-
-  # User variables:
-  # $0 - holds the directory the executables are installed to
-  # $1 - holds the parameters to be passed to install.exe.  Starts with OLE
-  #      registration (since a non-OLE gvim will not complain, and we want to
-  #      always register an OLE gvim).
-  # $2 - holds the names to create batch files for
-  StrCpy $0 "$INSTDIR\vim${VER_MAJOR}${VER_MINOR}"
-  StrCpy $1 "-register-OLE"
-  StrCpy $2 "gvim evim gview gvimdiff vimtutor"
-FunctionEnd
-
-Function .onInstSuccess
-  WriteUninstaller vim${VER_MAJOR}${VER_MINOR}\uninstall-gui.exe
-FunctionEnd
-
-Function .onInstFailed
-  MessageBox MB_OK|MB_ICONEXCLAMATION "$(str_msg_install_fail)" /SD IDOK
-FunctionEnd
-
-##########################################################
-Function SetCustom
-  # Display the _vimrc setting dialog using nsDialogs.
-
-  # Check if a _vimrc should be created
-  ${IfNot} ${SectionIsSelected} ${id_section_vimrc}
-    Abort
-  ${EndIf}
-
-  !insertmacro MUI_HEADER_TEXT \
-      $(str_vimrc_page_title) $(str_vimrc_page_subtitle)
-
-  nsDialogs::Create 1018
-  Pop $vim_dialog
-
-  ${If} $vim_dialog == error
-    Abort
-  ${EndIf}
-
-  ${If} ${RunningX64}
-    SetRegView 64
-  ${EndIf}
-
-  GetFunctionAddress $3 ValidateCustom
-  nsDialogs::OnBack $3
-
-  # 1st group - Compatibility
-  ${NSD_CreateGroupBox} 0u 0u 296u 44u $(str_msg_compat_title)
-  Pop $3
-
-  ${NSD_CreateLabel} 16u 14u 269u 10u $(str_msg_compat_desc)
-  Pop $3
-  ${NSD_CreateDropList} 42u 26u 237u 13u ""
-  Pop $vim_nsd_compat
-  ${NSD_CB_AddString} $vim_nsd_compat $(str_msg_compat_vi)
-  ${NSD_CB_AddString} $vim_nsd_compat $(str_msg_compat_vim)
-  ${NSD_CB_AddString} $vim_nsd_compat $(str_msg_compat_defaults)
-  ${NSD_CB_AddString} $vim_nsd_compat $(str_msg_compat_all)
-
-  ${If} $vim_compat_stat == "defaults"
-    StrCpy $4 2
-  ${ElseIf} $vim_compat_stat == "vim"
-    StrCpy $4 1
-  ${ElseIf} $vim_compat_stat == "vi"
-    StrCpy $4 0
-  ${Else} ; default
-    StrCpy $4 3
-  ${EndIf}
-  ${NSD_CB_SetSelectionIndex} $vim_nsd_compat $4
-
-  # 2nd group - Key remapping
-  ${NSD_CreateGroupBox} 0u 48u 296u 44u $(str_msg_keymap_title)
-  Pop $3
-
-  ${NSD_CreateLabel} 16u 62u 269u 10u $(str_msg_keymap_desc)
-  Pop $3
-  ${NSD_CreateDropList} 42u 74u 236u 13u ""
-  Pop $vim_nsd_keymap
-  ${NSD_CB_AddString} $vim_nsd_keymap $(str_msg_keymap_default)
-  ${NSD_CB_AddString} $vim_nsd_keymap $(str_msg_keymap_windows)
-
-  ${If} $vim_keymap_stat == "windows"
-    StrCpy $4 1
-  ${Else} ; default
-    StrCpy $4 0
-  ${EndIf}
-  ${NSD_CB_SetSelectionIndex} $vim_nsd_keymap $4
-
-  # 3rd group - Mouse behavior
-  ${NSD_CreateGroupBox} 0u 95u 296u 44u $(str_msg_mouse_title)
-  Pop $3
-
-  ${NSD_CreateLabel} 16u 108u 269u 10u $(str_msg_mouse_desc)
-  Pop $3
-  ${NSD_CreateDropList} 42u 121u 237u 13u ""
-  Pop $vim_nsd_mouse
-  ${NSD_CB_AddString} $vim_nsd_mouse $(str_msg_mouse_default)
-  ${NSD_CB_AddString} $vim_nsd_mouse $(str_msg_mouse_windows)
-  ${NSD_CB_AddString} $vim_nsd_mouse $(str_msg_mouse_unix)
-
-  ${If} $vim_mouse_stat == "xterm"
-    StrCpy $4 2
-  ${ElseIf} $vim_mouse_stat == "windows"
-    StrCpy $4 1
-  ${Else} ; default
-    StrCpy $4 0
-  ${EndIf}
-  ${NSD_CB_SetSelectionIndex} $vim_nsd_mouse $4
-
-  ${If} ${RunningX64}
-    SetRegView lastused
-  ${EndIf}
-
-  nsDialogs::Show
-FunctionEnd
-
-Function ValidateCustom
-  ${NSD_CB_GetSelectionIndex} $vim_nsd_compat $3
-  ${If} $3 = 0
-    StrCpy $vim_compat_stat "vi"
-  ${ElseIf} $3 = 1
-    StrCpy $vim_compat_stat "vim"
-  ${ElseIf} $3 = 2
-    StrCpy $vim_compat_stat "defaults"
-  ${Else}
-    StrCpy $vim_compat_stat "all"
-  ${EndIf}
-
-  ${NSD_CB_GetSelectionIndex} $vim_nsd_keymap $3
-  ${If} $3 = 0
-    StrCpy $vim_keymap_stat "default"
-  ${Else}
-    StrCpy $vim_keymap_stat "windows"
-  ${EndIf}
-
-  ${NSD_CB_GetSelectionIndex} $vim_nsd_mouse $3
-  ${If} $3 = 0
-    StrCpy $vim_mouse_stat "default"
-  ${ElseIf} $3 = 1
-    StrCpy $vim_mouse_stat "windows"
-  ${Else}
-    StrCpy $vim_mouse_stat "xterm"
-  ${EndIf}
-FunctionEnd
-
-##########################################################
-# Description for Installer Sections
-
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-  !insertmacro MUI_DESCRIPTION_TEXT ${id_section_old_ver}   $(str_desc_old_ver)
-  !insertmacro MUI_DESCRIPTION_TEXT ${id_section_exe}	    $(str_desc_exe)
-  !insertmacro MUI_DESCRIPTION_TEXT ${id_section_console}   $(str_desc_console)
-  !insertmacro MUI_DESCRIPTION_TEXT ${id_section_batch}	    $(str_desc_batch)
-  !insertmacro MUI_DESCRIPTION_TEXT ${id_group_icons}	    $(str_desc_icons)
-  !insertmacro MUI_DESCRIPTION_TEXT ${id_section_desktop}   $(str_desc_desktop)
-  !insertmacro MUI_DESCRIPTION_TEXT ${id_section_startmenu} \
-      $(str_desc_start_menu)
-  !insertmacro MUI_DESCRIPTION_TEXT ${id_section_editwith}  \
-      $(str_desc_edit_with)
-  !insertmacro MUI_DESCRIPTION_TEXT ${id_section_vimrc}	    $(str_desc_vim_rc)
-  !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)
-  !if ${HAVE_NLS}
-    !insertmacro MUI_DESCRIPTION_TEXT ${id_section_nls}	    $(str_desc_nls)
-  !endif
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-
-##########################################################
-# Uninstaller Functions and Sections
-
-Function un.onInit
-  !if ${HAVE_MULTI_LANG}
-    # Get the language from the registry.
-    !insertmacro MUI_UNGETLANGUAGE
-  !endif
-FunctionEnd
-
-Section "un.$(str_unsection_register)" id_unsection_register
-  SectionIn RO
-
-  # Apparently $INSTDIR is set to the directory where the uninstaller is
-  # created.  Thus the "vim91" directory is included in it.
-  StrCpy $0 "$INSTDIR"
-
-  # delete the context menu entry and batch files
-  DetailPrint "$(str_msg_unregistering)"
-  nsExec::Exec "$0\uninstall.exe -nsis"
-  Pop $3
-
-  # We may have been put to the background when uninstall did something.
-  BringToFront
-
-  # Delete the installer language setting.
-  DeleteRegKey ${MUI_LANGDLL_REGISTRY_ROOT} ${MUI_LANGDLL_REGISTRY_KEY}
-SectionEnd
-
-Section "un.$(str_unsection_exe)" id_unsection_exe
-  StrCpy $0 "$INSTDIR"
-
-  # Delete gettext and iconv DLLs
-  ${If} ${FileExists} "$0\libiconv-2.dll"
-    !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
-	"$0\libiconv-2.dll"
-  ${EndIf}
-  ${If} ${FileExists} "$0\libintl-8.dll"
-    !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
-	"$0\libintl-8.dll"
-  ${EndIf}
-  ${If} ${FileExists} "$0\libgcc_s_sjlj-1.dll"
-    !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
-	"$0\libgcc_s_sjlj-1.dll"
-  ${EndIf}
-
-  # Delete other DLLs
-  Delete /REBOOTOK $0\*.dll
-
-  # Delete 64-bit GvimExt
-  ${If} ${RunningX64}
-    !define LIBRARY_X64
-    ${If} ${FileExists} "$0\GvimExt64\gvimext.dll"
-      !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
-	  "$0\GvimExt64\gvimext.dll"
-    ${EndIf}
-    ${If} ${FileExists} "$0\GvimExt64\libiconv-2.dll"
-      !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
-	  "$0\GvimExt64\libiconv-2.dll"
-    ${EndIf}
-    ${If} ${FileExists} "$0\GvimExt64\libintl-8.dll"
-      !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
-	  "$0\GvimExt64\libintl-8.dll"
-    ${EndIf}
-    ${If} ${FileExists} "$0\GvimExt64\libwinpthread-1.dll"
-      !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
-	  "$0\GvimExt64\libwinpthread-1.dll"
-    ${EndIf}
-    !undef LIBRARY_X64
-    RMDir /r $0\GvimExt64
-  ${EndIf}
-
-  # Delete 32-bit GvimExt
-  ${If} ${FileExists} "$0\GvimExt32\gvimext.dll"
-    !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
-	"$0\GvimExt32\gvimext.dll"
-  ${EndIf}
-  ${If} ${FileExists} "$0\GvimExt32\libiconv-2.dll"
-    !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
-	"$0\GvimExt32\libiconv-2.dll"
-  ${EndIf}
-  ${If} ${FileExists} "$0\GvimExt32\libintl-8.dll"
-    !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
-	"$0\GvimExt32\libintl-8.dll"
-  ${EndIf}
-  ${If} ${FileExists} "$0\GvimExt32\libgcc_s_sjlj-1.dll"
-    !insertmacro UninstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
-	"$0\GvimExt32\libgcc_s_sjlj-1.dll"
-  ${EndIf}
-  RMDir /r $0\GvimExt32
-
-  ClearErrors
-  # Remove everything but *.dll files.  Avoids that
-  # a lot remains when gvimext.dll cannot be deleted.
-  RMDir /r $0\autoload
-  RMDir /r $0\colors
-  RMDir /r $0\compiler
-  RMDir /r $0\doc
-  RMDir /r $0\ftplugin
-  RMDir /r $0\import
-  RMDir /r $0\indent
-  RMDir /r $0\macros
-  RMDir /r $0\pack
-  RMDir /r $0\plugin
-  RMDir /r $0\spell
-  RMDir /r $0\syntax
-  RMDir /r $0\tools
-  RMDir /r $0\tutor
-  RMDir /r $0\lang
-  RMDir /r $0\keymap
-  RMDir /r $0\bitmaps
-  Delete $0\*.exe
-  Delete $0\*.bat
-  Delete $0\*.vim
-  Delete $0\*.txt
-
-  ${If} ${Errors}
-    MessageBox MB_OK|MB_ICONEXCLAMATION $(str_msg_rm_exe_fail) /SD IDOK
-  ${EndIf}
-
-  # No error message if the "vim91" directory can't be removed, the
-  # gvimext.dll may still be there.
-  RMDir $0
-SectionEnd
-
-# Remove "vimfiles" directory under the specified directory.
-!macro RemoveVimfiles dir
-  ${If} ${FileExists} ${dir}\_viminfo
-    Delete ${dir}\_viminfo
-  ${EndIf}
-  ${If} ${DirExists} ${dir}\vimfiles
-    RMDir ${dir}\vimfiles\colors
-    RMDir ${dir}\vimfiles\compiler
-    RMDir ${dir}\vimfiles\doc
-    RMDir ${dir}\vimfiles\ftdetect
-    RMDir ${dir}\vimfiles\ftplugin
-    RMDir ${dir}\vimfiles\indent
-    RMDir ${dir}\vimfiles\keymap
-    RMDir ${dir}\vimfiles\plugin
-    RMDir ${dir}\vimfiles\syntax
-    ${If} ${FileExists} ${dir}\vimfiles\.netrwhist*
-      Delete ${dir}\vimfiles\.netrwhist*
-    ${EndIf}
-    RMDir ${dir}\vimfiles
-  ${EndIf}
-!macroend
-
-SectionGroup "un.$(str_ungroup_plugin)" id_ungroup_plugin
-  Section /o "un.$(str_unsection_plugin_home)" id_unsection_plugin_home
-  # get the home dir
-    Call un.GetHomeDir
-    Pop $0
-
-    ${If} $0 != ""
-      !insertmacro RemoveVimfiles $0
-    ${EndIf}
-  SectionEnd
-
-  Section "un.$(str_unsection_plugin_vim)" id_unsection_plugin_vim
-    # get the parent dir of the installation
-    Push $INSTDIR
-    Call un.GetParent
-    Pop $0
-
-    # if a plugin dir was created at installation remove it
-    !insertmacro RemoveVimfiles $0
-  SectionEnd
-SectionGroupEnd
-
-Section "un.$(str_unsection_rootdir)" id_unsection_rootdir
-# get the parent dir of the installation
-  Push $INSTDIR
-  Call un.GetParent
-  Pop $0
-
-  ${IfNot} ${Silent}
-    Delete $0\_vimrc
-  ${Endif}
-  RMDir $0
-SectionEnd
-
-##########################################################
-# Description for Uninstaller Sections
-
-!insertmacro MUI_UNFUNCTION_DESCRIPTION_BEGIN
-  !insertmacro MUI_DESCRIPTION_TEXT ${id_unsection_register}	\
-      $(str_desc_unregister)
-  !insertmacro MUI_DESCRIPTION_TEXT ${id_unsection_exe}  $(str_desc_rm_exe)
-  !insertmacro MUI_DESCRIPTION_TEXT ${id_ungroup_plugin} $(str_desc_rm_plugin)
-  !insertmacro MUI_DESCRIPTION_TEXT ${id_unsection_plugin_home} \
-      $(str_desc_rm_plugin_home)
-  !insertmacro MUI_DESCRIPTION_TEXT ${id_unsection_plugin_vim}	\
-      $(str_desc_rm_plugin_vim)
-  !insertmacro MUI_DESCRIPTION_TEXT ${id_unsection_rootdir}	\
-      $(str_desc_rm_rootdir)
-!insertmacro MUI_UNFUNCTION_DESCRIPTION_END
-
-# vi:set ts=8 sw=2 sts=2 tw=79 wm=0 ft=nsis:
diff --git a/nsis/icons.zip b/nsis/icons.zip
deleted file mode 100644
index c480bcc89e..0000000000
Binary files a/nsis/icons.zip and /dev/null differ
diff --git a/nsis/lang/README.txt b/nsis/lang/README.txt
deleted file mode 100644
index 0340c308b1..0000000000
--- a/nsis/lang/README.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-This directory contains a file with text strings for gVim installer.
-It also contains files with translations of the text strings for gVim installer
-into different languages.
-
-For translators.
-
-If you want to prepare a translation for the gVim installer, use the file
-"english.nsi" as a master file.  See the other translation files in this
-directory.
-Note that in the definition of the MUI_LANGUAGE macro, the name of the language
-to be translated must be the English name of the language.
-The name of the file with the translation must match the name of the target
-language.
-Also, when translating strings, pay attention to some restrictions on the
-allowable length of strings.  For example:
- component description field - 117 characters;
- description above the drop-down lists on the .vimrc page - 53 characters;
- drop-down lists on the .vimrc page - 55 characters.
-Characters in this case mean characters of the English alphabet.
-
-Once the message translation file is ready, it must be included in the
-"gvim.nsi" file.
-Find the line "# Include support for other languages:" in the file "gvim.nsi"
-and specify the name of the file with your translation below the line
-!if ${HAVE_MULTI_LANG}, similar to the entries already there. File names are
-specified in alphabetical order.
-
-If you do not yet have a translated "LICENSE" file and/or a main "README.txt"
-file, set the following values:
-
-for the license file
-LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
-
-for the readme.txt file
-LangString vim_readme_file 0 "README.txt"
-
-Once you have the translations of these files, then set the values for these
-variables similarly to what is done in the other translation files.
-Translation files should be located in the "lang" subdirectory of the root
-directory. The name of the files is as follows: "README.xx.txt", where xx is the
-language code according to ISO639.
-
-
-There are two ways to test the installer in different languages:
-
-1. Find and uncomment the "!define MUI_LANGDLL_ALWAYSSHOW" line in the
-   "gvim.nsi" file and rebuild the installer.
-   Now every time you run it, you will see a dialog box with the possibility to
-   select the language of the installer.
-
-2. If the Vim editor is already installed in your system, delete the
-   "Installer Language" parameter in the Windows registry under
-   "HKEY_CURRENT_USER\Software\Vim".
-   Or you can create a file "NoLangInstallerVim.reg" with the following content:
-
-	Windows Registry Editor Version 5.00
-
-	[HKEY_CURRENT_USER\Software\Vim]
-	"Installer Language"=-
-
-   and apply it by double-clicking on it.
-   After these steps, when you start the installer, a window with the installer
-   language selection will also be displayed. 
diff --git a/nsis/lang/danish.nsi b/nsis/lang/danish.nsi
deleted file mode 100644
index c4000312f2..0000000000
--- a/nsis/lang/danish.nsi
+++ /dev/null
@@ -1,187 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# danish.nsi: Danish language strings for gvim NSIS installer.
-#
-# Locale ID    : 1030
-# Locale Name  : da
-# fileencoding : UTF-8
-# Author       : scootergrisen
-
-!insertmacro MUI_LANGUAGE "Danish"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_DANISH}         "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_DANISH}         "$(^Name) Uninstall"
-
-##############################################################################
-# Translated license file for the license page                            {{{1
-##############################################################################
-
-LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_DANISH} "..\lang\LICENSE.da.nsis.txt"
-
-##############################################################################
-# Translated README.txt file, which is opened after installation          {{{1
-##############################################################################
-
-LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_DANISH} "README.da.txt"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_DANISH}     "Destinationsmappe (skal slutte med $\"vim$\")"
-
-LangString str_show_readme          ${LANG_DANISH}     "Vis README efter installationen er gennemført"
-
-# Install types:
-LangString str_type_typical         ${LANG_DANISH}     "Typisk"
-
-LangString str_type_minimal         ${LANG_DANISH}     "Minimal"
-
-LangString str_type_full            ${LANG_DANISH}     "Fuld"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_DANISH}     "Afinstaller eksisterende version(er)"
-LangString str_desc_old_ver         ${LANG_DANISH}     "Afinstaller eksisterende Vim-version(er) fra dit system."
-
-LangString str_section_exe          ${LANG_DANISH}     "Vim GUI og afviklingsfiler"
-LangString str_desc_exe             ${LANG_DANISH}     "Vim GUI-eksekverbare- og afviklingsfiler. Komponenten kræves."
-
-LangString str_section_console      ${LANG_DANISH}     "Vim-konsolprogram"
-LangString str_desc_console         ${LANG_DANISH}     "Konsolversion af Vim (vim.exe)."
-
-LangString str_section_batch        ${LANG_DANISH}     "Opret .bat-filer"
-LangString str_desc_batch           ${LANG_DANISH}     "Opret .bat-filer til Vim-varianter i Windows-mappen til brug fra kommandolinjen."
-
-LangString str_group_icons          ${LANG_DANISH}     "Opret ikoner til Vim"
-LangString str_desc_icons           ${LANG_DANISH}     "Opret ikoner til Vim diverse steder for at hjælpe med at gøre adgangen let."
-
-LangString str_section_desktop      ${LANG_DANISH}     "PÃ¥ skrivebordet"
-LangString str_desc_desktop         ${LANG_DANISH}     "Opret ikoner til gVim-eksekverbare på skrivebordet."
-
-LangString str_section_start_menu   ${LANG_DANISH}     "I Programmer-mappen i menuen Start"
-LangString str_desc_start_menu      ${LANG_DANISH}     "Tilføj Vim i Programmer-mappen i menuen Start."
-
-#LangString str_section_quick_launch ${LANG_DANISH}     "I værktøjslinjen Hurtig start"
-#LangString str_desc_quick_launch    ${LANG_DANISH}     "Tilføj Vim-genvej i værktøjslinjen Hurtig start."
-
-LangString str_section_edit_with    ${LANG_DANISH}     "Tilføj Vim-genvejsmenu"
-LangString str_desc_edit_with       ${LANG_DANISH}     "Tilføj Vim til listen i $\"Åbn med...$\"-genvejsmenuen."
-
-#LangString str_section_edit_with32  ${LANG_DANISH}     "32-bit-version"
-#LangString str_desc_edit_with32     ${LANG_DANISH}     "Tilføj Vim til listen i $\"Åbn med...$\"-genvejsmenuen for 32-bit-programmer."
-
-#LangString str_section_edit_with64  ${LANG_DANISH}     "64-bit-version"
-#LangString str_desc_edit_with64     ${LANG_DANISH}     "Tilføj Vim til listen i $\"Åbn med...$\"-genvejsmenuen for 64-bit-programmer."
-
-LangString str_section_vim_rc       ${LANG_DANISH}     "Opret standardkonfiguration"
-LangString str_desc_vim_rc          ${LANG_DANISH}     "Opret en standardkonfigurationsfil (_vimrc) hvis der ikke allerede findes en."
-
-LangString str_group_plugin         ${LANG_DANISH}     "Opret plugin-mapper"
-LangString str_desc_plugin          ${LANG_DANISH}     "Opret plugin-mapper. Plugin-mapper giver mulighed for at udvide Vim ved at slippe en fil i en mappen."
-
-LangString str_section_plugin_home  ${LANG_DANISH}     "Private"
-LangString str_desc_plugin_home     ${LANG_DANISH}     "Opret plugin-mapper i HOME (hvis du har defineret et) eller Vim-installationsmappe."
-
-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_nls          ${LANG_DANISH}     "Understøttelse af modersmål"
-LangString str_desc_nls             ${LANG_DANISH}     "Installer filer til understøttelse af modersmål."
-
-LangString str_unsection_register   ${LANG_DANISH}     "Afregistrer Vim"
-LangString str_desc_unregister      ${LANG_DANISH}     "Afregistrer Vim fra systemet."
-
-LangString str_unsection_exe        ${LANG_DANISH}     "Fjern Vim-eksekverbare-/afviklingsfiler"
-LangString str_desc_rm_exe          ${LANG_DANISH}     "Fjern alle Vim-eksekverbare- og afviklingsfiler."
-
-LangString str_ungroup_plugin       ${LANG_DANISH}     "Fjern plugin-mapper"
-LangString str_desc_rm_plugin       ${LANG_DANISH}     "Fjern plugin-mapperne, hvis de er tomme."
-
-LangString str_unsection_plugin_home ${LANG_DANISH}     "Private"
-LangString str_desc_rm_plugin_home  ${LANG_DANISH}     "Fjern plugin-mapperne fra HOME-mappen."
-
-LangString str_unsection_plugin_vim ${LANG_DANISH}     "Delte"
-LangString str_desc_rm_plugin_vim   ${LANG_DANISH}     "Fjern plugin-mapperne fra Vim-installationsmappen."
-
-LangString str_unsection_rootdir    ${LANG_DANISH}     "Fjern Vim-rodmappen"
-LangString str_desc_rm_rootdir      ${LANG_DANISH}     "Fjern Vim-rodmappen. Den indeholder dine Vim-konfigurationsfiler!"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_DANISH}     "Fandt $vim_old_ver_count Vim-versioner på dit system.$\r$\nInstallationsguiden kan højst håndtere ${VIM_MAX_OLD_VER}-versioner.$\r$\nFjern venligst nogle versioner og start igen."
-
-#LangString str_msg_invalid_root  ${LANG_DANISH}     "Ugyldig installationssti: $vim_install_root!$\r$\nDen skal slutte med $\"vim$\"."
-
-#LangString str_msg_bin_mismatch  ${LANG_DANISH}     "Uoverensstemmelse i binære sti!$\r$\n$\r$\nForventede at den binære sti var $\"$vim_bin_path$\",$\r$\nmen systemet indikerer at den binære sti er $\"$INSTDIR$\"."
-
-#LangString str_msg_vim_running   ${LANG_DANISH}     "Vim kører stadig på dit system.$\r$\nLuk venligst alle instanser af Vim inden du fortsætter."
-
-#LangString str_msg_register_ole  ${LANG_DANISH}     "Forsøger at registrere Vim med OLE. Der er ingen meddelelse til at indikere om det virker eller ej."
-
-#LangString str_msg_unreg_ole     ${LANG_DANISH}     "Forsøger at afregistrere Vim med OLE. Der er ingen meddelelse til at indikere om det virker eller ej."
-
-#LangString str_msg_rm_start      ${LANG_DANISH}     "Afinstallerer følgende version:"
-
-#LangString str_msg_rm_fail       ${LANG_DANISH}     "Kunne ikke afinstallere følgende version:"
-
-#LangString str_msg_no_rm_key     ${LANG_DANISH}     "Kan ikke finde registreringsdatabasenøgle for afinstallationsguiden."
-
-#LangString str_msg_no_rm_reg     ${LANG_DANISH}     "Kan ikke finde afinstallationsguiden fra registreringsdatabasen."
-
-#LangString str_msg_no_rm_exe     ${LANG_DANISH}     "Kan ikke tilgå afinstallationsguide."
-
-#LangString str_msg_rm_copy_fail  ${LANG_DANISH}     "Kunne ikke kopiere afinstallationsguide til midlertidig mappe."
-
-#LangString str_msg_rm_run_fail   ${LANG_DANISH}     "Kunne ikke køre afinstallationsguide."
-
-#LangString str_msg_abort_install ${LANG_DANISH}     "Installationsguiden vil afbryde."
-
-LangString str_msg_install_fail  ${LANG_DANISH}     "Installationen mislykkedes. Bedre held næste gang."
-
-LangString str_msg_rm_exe_fail   ${LANG_DANISH}     "Nogle filer i $0 er ikke blevet slettet!$\r$\nDu skal gøre det manuelt."
-
-#LangString str_msg_rm_root_fail  ${LANG_DANISH}     "ADVARSEL: Kan ikke fjerne $\"$vim_install_root$\", den er ikke tom!"
-
-LangString str_msg_uninstalling  ${LANG_DANISH}     "Afinstallerer den gamle version..."
-
-LangString str_msg_registering   ${LANG_DANISH}     "Registrerer..."
-
-LangString str_msg_unregistering ${LANG_DANISH}     "Afregistrerer..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_DANISH}     "Vælg _vimrc-indstillinger"
-LangString str_vimrc_page_subtitle ${LANG_DANISH}     "Vælg indstillingerne til forbedring, tastatur og mus."
-
-LangString str_msg_compat_title    ${LANG_DANISH}     " Vi- / Vim-opførsel "
-LangString str_msg_compat_desc     ${LANG_DANISH}     "&Kompatibilitet og forbedringer"
-LangString str_msg_compat_vi       ${LANG_DANISH}     "Vi-kompatibel"
-LangString str_msg_compat_vim      ${LANG_DANISH}     "Vim original"
-LangString str_msg_compat_defaults ${LANG_DANISH}     "Vim med nogle forbedringer (indlæs defaults.vim)"
-LangString str_msg_compat_all      ${LANG_DANISH}     "Vim med alle forbedringer (indlæs vimrc_example.vim) (standard)"
-
-LangString str_msg_keymap_title   ${LANG_DANISH}     " Tilknytninger "
-LangString str_msg_keymap_desc    ${LANG_DANISH}     "&Gentilknyt nogle få taster for Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F osv.)"
-LangString str_msg_keymap_default ${LANG_DANISH}     "Gentilknyt ikke taster (standard)"
-LangString str_msg_keymap_windows ${LANG_DANISH}     "Gentilknyt nogle få taster"
-
-LangString str_msg_mouse_title   ${LANG_DANISH}     " Mus "
-LangString str_msg_mouse_desc    ${LANG_DANISH}     "&Opførsel af højre og venstre knapper"
-LangString str_msg_mouse_default ${LANG_DANISH}     "Højre: genvejsmenu, venstre: visuel tilstand (standard)"
-LangString str_msg_mouse_windows ${LANG_DANISH}     "Højre: genvejsmenu, venstre: vælg-tilstand (Windows)"
-LangString str_msg_mouse_unix    ${LANG_DANISH}     "Højre: udvider markering, venstre: visuel tilstand (Unix)"
diff --git a/nsis/lang/dutch.nsi b/nsis/lang/dutch.nsi
deleted file mode 100644
index 5a2ba14ce5..0000000000
--- a/nsis/lang/dutch.nsi
+++ /dev/null
@@ -1,290 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# dutch.nsi : Dutch language strings for gvim NSIS installer.
-#
-# Locale ID    : 1043
-# Locale Name  : nl
-# fileencoding : UTF-8
-# Author       : Peter Odding <peter@peterodding.com>
-
-!insertmacro MUI_LANGUAGE "Dutch"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_DUTCH} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_DUTCH} \
-        "$(^Name) Uninstall"
-
-##############################################################################
-# Translated license file for the license page                            {{{1
-##############################################################################
-
-LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_DUTCH} "..\lang\LICENSE.nl.nsis.txt"
-
-##############################################################################
-# Translated README.txt file, which is opened after installation          {{{1
-##############################################################################
-
-LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_DUTCH} "README.nl.txt"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_DUTCH} \
-#    "Doelmap (moet eindigen op $\"vim$\")"
-
-LangString str_show_readme          ${LANG_DUTCH} \
-    "README weergeven na installatie"
-
-# Install types:
-LangString str_type_typical         ${LANG_DUTCH} \
-    "Gebruikelijk"
-
-LangString str_type_minimal         ${LANG_DUTCH} \
-    "Minimaal"
-
-LangString str_type_full            ${LANG_DUTCH} \
-    "Volledig"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_DUTCH} \
-    "Bestaande versie(s) de-installeren"
-LangString str_desc_old_ver         ${LANG_DUTCH} \
-    "Bestaande Vim versie(s) van je systeem verwijderen."
-
-LangString str_section_exe          ${LANG_DUTCH} \
-    "Vim GUI"
-LangString str_desc_exe             ${LANG_DUTCH} \
-    "Vim GUI uitvoerbare bestanden en runtime bestanden.  Dit component is vereist."
-
-LangString str_section_console      ${LANG_DUTCH} \
-    "Vim console programma"
-LangString str_desc_console         ${LANG_DUTCH} \
-    "Console versie van Vim (vim.exe)."
-
-LangString str_section_batch        ${LANG_DUTCH} \
-    "Creëer .bat bestanden"
-LangString str_desc_batch           ${LANG_DUTCH} \
-    "Creëer .bat bestanden voor Vim varianten in de Windows map voor \
-     commando regel gebruik."
-
-LangString str_group_icons          ${LANG_DUTCH} \
-    "Creëer pictogrammen for Vim"
-LangString str_desc_icons           ${LANG_DUTCH} \
-    "Creëer pictogrammen voor Vim op verschillende locaties voor gemakkelijke toegang."
-
-LangString str_section_desktop      ${LANG_DUTCH} \
-    "Op het bureaublad"
-LangString str_desc_desktop         ${LANG_DUTCH} \
-    "Creëer pictogrammen voor Vim uitvoerbare bestanden op het bureaublad."
-
-LangString str_section_start_menu   ${LANG_DUTCH} \
-    "In de Programma's map in het start menu"
-LangString str_desc_start_menu      ${LANG_DUTCH} \
-    "Voeg Vim toe aan de programma's map in het start menu.  \
-     Van toepassing op Windows 95 en later."
-
-#LangString str_section_quick_launch ${LANG_DUTCH} \
-#    "In de snel starten balk"
-#LangString str_desc_quick_launch    ${LANG_DUTCH} \
-#    "Voeg Vim snelkoppeling toe aan de snel starten balk."
-
-LangString str_section_edit_with    ${LANG_DUTCH} \
-    "Voeg Vim contextmenu toe"
-LangString str_desc_edit_with       ${LANG_DUTCH} \
-    "Voeg Vim toe aan de $\"Openen met...$\" contextmenu lijst."
-
-#LangString str_section_edit_with32  ${LANG_DUTCH} \
-#    "32-bit versie"
-#LangString str_desc_edit_with32     ${LANG_DUTCH} \
-#    "Voeg Vim toe aan de $\"Openen met...$\" contextmenu lijst \
-#     voor 32-bit toepassingen."
-
-#LangString str_section_edit_with64  ${LANG_DUTCH} \
-#    "64-bit versie"
-#LangString str_desc_edit_with64     ${LANG_DUTCH} \
-#    "Voeg Vim toe aan de $\"Openen met...$\" contextmenu lijst \
-#     voor 64-bit toepassingen."
-
-LangString str_section_vim_rc       ${LANG_DUTCH} \
-    "Creëer standaard configuratie"
-LangString str_desc_vim_rc          ${LANG_DUTCH} \
-    "Creëer een standaard configuratie bestand (_vimrc) als er nog geen bestaat."
-
-LangString str_group_plugin         ${LANG_DUTCH} \
-    "Creëer Plugin mappen"
-LangString str_desc_plugin          ${LANG_DUTCH} \
-    "Creëer plugin mappen.  Plugin mappen maken het mogelijk om \
-     Vim uit te breiden door een bestand in een map te plaatsen."
-
-LangString str_section_plugin_home  ${LANG_DUTCH} \
-    "Privé"
-LangString str_desc_plugin_home     ${LANG_DUTCH} \
-    "Create plugin directories in HOME directory."
-
-LangString str_section_plugin_vim   ${LANG_DUTCH} \
-    "Gedeeld"
-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_nls          ${LANG_DUTCH} \
-    "Ondersteuning voor andere talen"
-LangString str_desc_nls             ${LANG_DUTCH} \
-    "Bestanden voor ondersteuning van andere talen dan Engels installeren."
-
-LangString str_unsection_register   ${LANG_DUTCH} \
-    "Vim afmelden"
-LangString str_desc_unregister      ${LANG_DUTCH} \
-    "Registratie van Vim in het systeem ongedaan maken."
-
-LangString str_unsection_exe        ${LANG_DUTCH} \
-    "Vim uitvoerbare/runtime bestanden verwijderen"
-LangString str_desc_rm_exe          ${LANG_DUTCH} \
-    "Verwijder alle Vim uitvoerbare bestanden en runtime bestanden."
-
-LangString str_ungroup_plugin       ${LANG_DUTCH} \
-    "Remove plugin directories"
-LangString str_desc_rm_plugin       ${LANG_DUTCH} \
-    "Remove the plugin directories if they are empty."
-
-LangString str_unsection_plugin_home ${LANG_DUTCH} \
-    "Privé"
-LangString str_desc_rm_plugin_home  ${LANG_DUTCH} \
-    "Remove the plugin directories from HOME directory."
-
-LangString str_unsection_plugin_vim ${LANG_DUTCH} \
-    "Gedeeld"
-LangString str_desc_rm_plugin_vim   ${LANG_DUTCH} \
-    "Remove the plugin directories from Vim install directory."
-
-LangString str_unsection_rootdir    ${LANG_DUTCH} \
-    "Remove the Vim root directory"
-LangString str_desc_rm_rootdir      ${LANG_DUTCH} \
-    "Remove the Vim root directory. It contains your Vim configuration files!"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_DUTCH} \
-#    "Er zijn $vim_old_ver_count Vim versies op je systeem gevonden.$\r$\n\
-#     Deze installatie kan omgaan met maximaal ${VIM_MAX_OLD_VER} versies.$\r$\n\
-#     Verwijder a.u.b. wat versies en probeer het dan opnieuw."
-
-#LangString str_msg_invalid_root  ${LANG_DUTCH} \
-#    "Ongeldig installatiepad: $vim_install_root!$\r$\n\
-#     Het moet eindelijk op $\"vim$\"."
-
-#LangString str_msg_bin_mismatch  ${LANG_DUTCH} \
-#    "Binair pad onjuist!$\r$\n$\r$\n\
-#     Het binaire pad zou $\"$vim_bin_path$\" moeten zijn,$\r$\n\
-#     maar het systeem geeft aan dat het binaire pad $\"$INSTDIR$\" is."
-
-#LangString str_msg_vim_running   ${LANG_DUTCH} \
-#    "Vim is nog actief op je systeem.$\r$\n\
-#     Sluit a.u.b. alle instanties van Vim voordat je verder gaat."
-
-#LangString str_msg_register_ole  ${LANG_DUTCH} \
-#    "Bezig met proberen om Vim te registreren met OLE. \
-#     Er is geen bericht dat aangeeft of deze operatie slaagt."
-
-#LangString str_msg_unreg_ole     ${LANG_DUTCH} \
-#    "Bezig met proberen om Vim te de-registreren met OLE. \
-#     Er is geen bericht dat aangeeft of deze operatie slaagt."
-
-#LangString str_msg_rm_start      ${LANG_DUTCH} \
-#    "De volgende versies worden verwijderd:"
-
-#LangString str_msg_rm_fail       ${LANG_DUTCH} \
-#    "De volgende versies konden niet worden verwijderd:"
-
-#LangString str_msg_no_rm_key     ${LANG_DUTCH} \
-#    "Kan de uninstaller register sleutel niet vinden."
-
-#LangString str_msg_no_rm_reg     ${LANG_DUTCH} \
-#    "Kan de uninstaller niet vinden via het register."
-
-#LangString str_msg_no_rm_exe     ${LANG_DUTCH} \
-#    "Kan geen toegang krijgen tot de uninstaller."
-
-#LangString str_msg_rm_copy_fail  ${LANG_DUTCH} \
-#    "Kon de uninstaller niet naar een tijdelijke map kopiëren."
-
-#LangString str_msg_rm_run_fail   ${LANG_DUTCH} \
-#    "Kon de uninstaller niet uitvoeren."
-
-#LangString str_msg_abort_install ${LANG_DUTCH} \
-#    "Installatie wordt gestopt."
-
-LangString str_msg_install_fail  ${LANG_DUTCH} \
-    "Installatie is mislukt."
-
-LangString str_msg_rm_exe_fail   ${LANG_DUTCH} \
-    "Sommige bestanden in $0 zijn niet verwijderd!$\r$\n\
-     Dit moet je handmatig doen."
-
-#LangString str_msg_rm_root_fail  ${LANG_DUTCH} \
-#    "WAARSCHUWING: Kan $\"$vim_install_root$\" niet verwijderen omdat het niet leeg is!"
-
-LangString str_msg_uninstalling  ${LANG_DUTCH} \
-    "Uninstalling the old version..."
-
-LangString str_msg_registering   ${LANG_DUTCH} \
-    "Registering..."
-
-LangString str_msg_unregistering ${LANG_DUTCH} \
-    "Unregistering..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_DUTCH} \
-    "Choose _vimrc settings"
-LangString str_vimrc_page_subtitle ${LANG_DUTCH} \
-    "Choose the settings for enhancement, keyboard and mouse."
-
-LangString str_msg_compat_title    ${LANG_DUTCH} \
-    " Vi / Vim behavior "
-LangString str_msg_compat_desc     ${LANG_DUTCH} \
-    "&Compatibility and enhancements"
-LangString str_msg_compat_vi       ${LANG_DUTCH} \
-    "Vi compatible"
-LangString str_msg_compat_vim      ${LANG_DUTCH} \
-    "Vim original"
-LangString str_msg_compat_defaults ${LANG_DUTCH} \
-    "Vim with some enhancements (load defaults.vim)"
-LangString str_msg_compat_all      ${LANG_DUTCH} \
-    "Vim with all enhancements (load vimrc_example.vim) (Default)"
-
-LangString str_msg_keymap_title   ${LANG_DUTCH} \
-    " Mappings "
-LangString str_msg_keymap_desc    ${LANG_DUTCH} \
-    "&Remap a few keys for Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc)"
-LangString str_msg_keymap_default ${LANG_DUTCH} \
-    "Do not remap keys (Default)"
-LangString str_msg_keymap_windows ${LANG_DUTCH} \
-    "Remap a few keys"
-
-LangString str_msg_mouse_title   ${LANG_DUTCH} \
-    " Mouse "
-LangString str_msg_mouse_desc    ${LANG_DUTCH} \
-    "&Behavior of right and left buttons"
-LangString str_msg_mouse_default ${LANG_DUTCH} \
-    "Right: popup menu, Left: visual mode (Default)"
-LangString str_msg_mouse_windows ${LANG_DUTCH} \
-    "Right: popup menu, Left: select mode (Windows)"
-LangString str_msg_mouse_unix    ${LANG_DUTCH} \
-    "Right: extends selection, Left: visual mode (Unix)"
diff --git a/nsis/lang/english.nsi b/nsis/lang/english.nsi
deleted file mode 100644
index d80f6f3686..0000000000
--- a/nsis/lang/english.nsi
+++ /dev/null
@@ -1,288 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# english.nsi: English language strings for gvim NSIS installer.
-#
-# Locale ID    : 1033
-# Locale Name  : en
-# fileencoding : UTF-8
-# Author       : Guopeng Wen, Ken Takata
-
-!insertmacro MUI_LANGUAGE "English"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_ENGLISH} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_ENGLISH} \
-        "$(^Name) Uninstall"
-
-##############################################################################
-# License file for the license page                                       {{{1
-##############################################################################
-
-LicenseLangString page_lic_file ${LANG_ENGLISH} "..\lang\LICENSE.nsis.txt"
-
-##############################################################################
-# README.txt file, which is opened after installation                     {{{1
-##############################################################################
-
-LangString vim_readme_file ${LANG_ENGLISH} "README.txt"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_ENGLISH} \
-#    "Destination Folder (Must end with $\"vim$\")"
-
-LangString str_show_readme          ${LANG_ENGLISH} \
-    "Show README after installation finished"
-
-# Install types:
-LangString str_type_typical         ${LANG_ENGLISH} \
-    "Typical"
-
-LangString str_type_minimal         ${LANG_ENGLISH} \
-    "Minimal"
-
-LangString str_type_full            ${LANG_ENGLISH} \
-    "Full"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_ENGLISH} \
-    "Uninstall Existing Version(s)"
-LangString str_desc_old_ver         ${LANG_ENGLISH} \
-    "Uninstall existing Vim version(s) from your system."
-
-LangString str_section_exe          ${LANG_ENGLISH} \
-    "Vim GUI and runtime files"
-LangString str_desc_exe             ${LANG_ENGLISH} \
-    "Vim GUI executables and runtime files.  This component is required."
-
-LangString str_section_console      ${LANG_ENGLISH} \
-    "Vim console program"
-LangString str_desc_console         ${LANG_ENGLISH} \
-    "Console version of Vim (vim.exe)."
-
-LangString str_section_batch        ${LANG_ENGLISH} \
-    "Create .bat files"
-LangString str_desc_batch           ${LANG_ENGLISH} \
-    "Create .bat files for Vim variants in the Windows directory for \
-     command line use."
-
-LangString str_group_icons          ${LANG_ENGLISH} \
-    "Create icons for Vim"
-LangString str_desc_icons           ${LANG_ENGLISH} \
-    "Create icons for Vim at various locations to facilitate easy access."
-
-LangString str_section_desktop      ${LANG_ENGLISH} \
-    "On the Desktop"
-LangString str_desc_desktop         ${LANG_ENGLISH} \
-    "Create icons for gVim executables on the desktop."
-
-LangString str_section_start_menu   ${LANG_ENGLISH} \
-    "In the Start Menu Programs Folder"
-LangString str_desc_start_menu      ${LANG_ENGLISH} \
-    "Add Vim in the programs folder of the start menu."
-
-#LangString str_section_quick_launch ${LANG_ENGLISH} \
-#    "In the Quick Launch Bar"
-#LangString str_desc_quick_launch    ${LANG_ENGLISH} \
-#    "Add Vim shortcut in the quick launch bar."
-
-LangString str_section_edit_with    ${LANG_ENGLISH} \
-    "Add Vim Context Menu"
-LangString str_desc_edit_with       ${LANG_ENGLISH} \
-    "Add Vim to the $\"Open With...$\" context menu list."
-
-#LangString str_section_edit_with32  ${LANG_ENGLISH} \
-#    "32-bit Version"
-#LangString str_desc_edit_with32     ${LANG_ENGLISH} \
-#    "Add Vim to the $\"Open With...$\" context menu list \
-#     for 32-bit applications."
-
-#LangString str_section_edit_with64  ${LANG_ENGLISH} \
-#    "64-bit Version"
-#LangString str_desc_edit_with64     ${LANG_ENGLISH} \
-#    "Add Vim to the $\"Open With...$\" context menu list \
-#     for 64-bit applications."
-
-LangString str_section_vim_rc       ${LANG_ENGLISH} \
-    "Create Default Config"
-LangString str_desc_vim_rc          ${LANG_ENGLISH} \
-    "Create a default config file (_vimrc) if one does not already exist."
-
-LangString str_group_plugin         ${LANG_ENGLISH} \
-    "Create Plugin Directories"
-LangString str_desc_plugin          ${LANG_ENGLISH} \
-    "Create plugin directories.  Plugin directories allow extending Vim \
-     by dropping a file into a directory."
-
-LangString str_section_plugin_home  ${LANG_ENGLISH} \
-    "Private"
-LangString str_desc_plugin_home     ${LANG_ENGLISH} \
-    "Create plugin directories in HOME directory."
-
-LangString str_section_plugin_vim   ${LANG_ENGLISH} \
-    "Shared"
-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_nls          ${LANG_ENGLISH} \
-    "Native Language Support"
-LangString str_desc_nls             ${LANG_ENGLISH} \
-    "Install files for native language support."
-
-LangString str_unsection_register   ${LANG_ENGLISH} \
-    "Unregister Vim"
-LangString str_desc_unregister      ${LANG_ENGLISH} \
-    "Unregister Vim from the system."
-
-LangString str_unsection_exe        ${LANG_ENGLISH} \
-    "Remove Vim Executables/Runtime Files"
-LangString str_desc_rm_exe          ${LANG_ENGLISH} \
-    "Remove all Vim executables and runtime files."
-
-LangString str_ungroup_plugin       ${LANG_ENGLISH} \
-    "Remove plugin directories"
-LangString str_desc_rm_plugin       ${LANG_ENGLISH} \
-    "Remove the plugin directories if they are empty."
-
-LangString str_unsection_plugin_home ${LANG_ENGLISH} \
-    "Private"
-LangString str_desc_rm_plugin_home  ${LANG_ENGLISH} \
-    "Remove the plugin directories from HOME directory."
-
-LangString str_unsection_plugin_vim ${LANG_ENGLISH} \
-    "Shared"
-LangString str_desc_rm_plugin_vim   ${LANG_ENGLISH} \
-    "Remove the plugin directories from Vim install directory."
-
-LangString str_unsection_rootdir    ${LANG_ENGLISH} \
-    "Remove the Vim root directory"
-LangString str_desc_rm_rootdir      ${LANG_ENGLISH} \
-    "Remove the Vim root directory. It contains your Vim configuration files!"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_ENGLISH} \
-#    "Found $vim_old_ver_count Vim versions on your system.$\r$\n\
-#     This installer can only handle ${VIM_MAX_OLD_VER} versions \
-#     at most.$\r$\n\
-#     Please remove some versions and start again."
-
-#LangString str_msg_invalid_root  ${LANG_ENGLISH} \
-#    "Invalid install path: $vim_install_root!$\r$\n\
-#     It should end with $\"vim$\"."
-
-#LangString str_msg_bin_mismatch  ${LANG_ENGLISH} \
-#    "Binary path mismatch!$\r$\n$\r$\n\
-#     Expect the binary path to be $\"$vim_bin_path$\",$\r$\n\
-#     but system indicates the binary path is $\"$INSTDIR$\"."
-
-#LangString str_msg_vim_running   ${LANG_ENGLISH} \
-#    "Vim is still running on your system.$\r$\n\
-#     Please close all instances of Vim before you continue."
-
-#LangString str_msg_register_ole  ${LANG_ENGLISH} \
-#    "Attempting to register Vim with OLE. \
-#     There is no message indicates whether this works or not."
-
-#LangString str_msg_unreg_ole     ${LANG_ENGLISH} \
-#    "Attempting to unregister Vim with OLE. \
-#     There is no message indicates whether this works or not."
-
-#LangString str_msg_rm_start      ${LANG_ENGLISH} \
-#    "Uninstalling the following version:"
-
-#LangString str_msg_rm_fail       ${LANG_ENGLISH} \
-#    "Fail to uninstall the following version:"
-
-#LangString str_msg_no_rm_key     ${LANG_ENGLISH} \
-#    "Cannot find uninstaller registry key."
-
-#LangString str_msg_no_rm_reg     ${LANG_ENGLISH} \
-#    "Cannot find uninstaller from registry."
-
-#LangString str_msg_no_rm_exe     ${LANG_ENGLISH} \
-#    "Cannot access uninstaller."
-
-#LangString str_msg_rm_copy_fail  ${LANG_ENGLISH} \
-#    "Fail to copy uninstaller to temporary directory."
-
-#LangString str_msg_rm_run_fail   ${LANG_ENGLISH} \
-#    "Fail to run uninstaller."
-
-#LangString str_msg_abort_install ${LANG_ENGLISH} \
-#    "Installer will abort."
-
-LangString str_msg_install_fail  ${LANG_ENGLISH} \
-    "Installation failed. Better luck next time."
-
-LangString str_msg_rm_exe_fail   ${LANG_ENGLISH} \
-    "Some files in $0 have not been deleted!$\r$\n\
-     You must do it manually."
-
-#LangString str_msg_rm_root_fail  ${LANG_ENGLISH} \
-#    "WARNING: Cannot remove $\"$vim_install_root$\", it is not empty!"
-
-LangString str_msg_uninstalling  ${LANG_ENGLISH} \
-    "Uninstalling the old version..."
-
-LangString str_msg_registering   ${LANG_ENGLISH} \
-    "Registering..."
-
-LangString str_msg_unregistering ${LANG_ENGLISH} \
-    "Unregistering..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_ENGLISH} \
-    "Choose _vimrc settings"
-LangString str_vimrc_page_subtitle ${LANG_ENGLISH} \
-    "Choose the settings for enhancement, keyboard and mouse."
-
-LangString str_msg_compat_title    ${LANG_ENGLISH} \
-    " Vi / Vim behavior "
-LangString str_msg_compat_desc     ${LANG_ENGLISH} \
-    "&Compatibility and enhancements"
-LangString str_msg_compat_vi       ${LANG_ENGLISH} \
-    "Vi compatible"
-LangString str_msg_compat_vim      ${LANG_ENGLISH} \
-    "Vim original"
-LangString str_msg_compat_defaults ${LANG_ENGLISH} \
-    "Vim with some enhancements (load defaults.vim)"
-LangString str_msg_compat_all      ${LANG_ENGLISH} \
-    "Vim with all enhancements (load vimrc_example.vim) (Default)"
-
-LangString str_msg_keymap_title   ${LANG_ENGLISH} \
-    " Mappings "
-LangString str_msg_keymap_desc    ${LANG_ENGLISH} \
-    "&Remap a few keys for Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc)"
-LangString str_msg_keymap_default ${LANG_ENGLISH} \
-    "Do not remap keys (Default)"
-LangString str_msg_keymap_windows ${LANG_ENGLISH} \
-    "Remap a few keys"
-
-LangString str_msg_mouse_title   ${LANG_ENGLISH} \
-    " Mouse "
-LangString str_msg_mouse_desc    ${LANG_ENGLISH} \
-    "&Behavior of right and left buttons"
-LangString str_msg_mouse_default ${LANG_ENGLISH} \
-    "Right: popup menu, Left: visual mode (Default)"
-LangString str_msg_mouse_windows ${LANG_ENGLISH} \
-    "Right: popup menu, Left: select mode (Windows)"
-LangString str_msg_mouse_unix    ${LANG_ENGLISH} \
-    "Right: extends selection, Left: visual mode (Unix)"
diff --git a/nsis/lang/german.nsi b/nsis/lang/german.nsi
deleted file mode 100644
index 59d65a3425..0000000000
--- a/nsis/lang/german.nsi
+++ /dev/null
@@ -1,290 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# german.nsi : German language strings for gvim NSIS installer.
-#
-# Locale ID    : 1031
-# Locale Name  : de
-# fileencoding : UTF-8
-# Author       : Christian Brabandt, tux
-
-!insertmacro MUI_LANGUAGE "German"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_GERMAN} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_GERMAN} \
-        "$(^Name) Uninstall"
-
-##############################################################################
-# Translated license file for the license page                            {{{1
-##############################################################################
-
-LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_GERMAN} "..\lang\LICENSE.de.nsis.txt"
-
-##############################################################################
-# Translated README.txt file, which is opened after installation          {{{1
-##############################################################################
-
-LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_GERMAN} "README.de.txt"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_GERMAN} \
-#    "Zielverzeichnis auswählen (muss auf $\"vim$\" enden)"
-
-LangString str_show_readme          ${LANG_GERMAN} \
-    "README-Datei nach der Installation anzeigen"
-
-# Install types:
-LangString str_type_typical         ${LANG_GERMAN} \
-    "Typisch"
-
-LangString str_type_minimal         ${LANG_GERMAN} \
-    "Minimal"
-
-LangString str_type_full            ${LANG_GERMAN} \
-    "Vollständig"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_GERMAN} \
-    "Vorherige Version deinstallieren"
-LangString str_desc_old_ver         ${LANG_GERMAN} \
-    "Vorherige installierte Versionen auf diesem System deinstallieren."
-
-LangString str_section_exe          ${LANG_GERMAN} \
-    "Vim GUI"
-LangString str_desc_exe             ${LANG_GERMAN} \
-    "Vim (Anwendung) und Laufzeitdateien (Dieser Teil ist zwingend \
-     erforderlich)."
-
-LangString str_section_console      ${LANG_GERMAN} \
-    "Vim Konsolenanwendung"
-LangString str_desc_console         ${LANG_GERMAN} \
-    "Konsolenversion von Vim."
-
-LangString str_section_batch        ${LANG_GERMAN} \
-    ".bat-Dateien erstellen"
-LangString str_desc_batch           ${LANG_GERMAN} \
-    ".bat-Dateien erstellen, um Vim in der Konsole auszuführen."
-
-LangString str_group_icons          ${LANG_GERMAN} \
-    "Vim-Verknüpfungen erstellen"
-LangString str_desc_icons           ${LANG_GERMAN} \
-    "Verknüpfungen mit Vim für einfachen Aufruf erstellen."
-
-LangString str_section_desktop      ${LANG_GERMAN} \
-    "Auf dem Desktop"
-LangString str_desc_desktop         ${LANG_GERMAN} \
-    "Icons für GVim auf dem Desktop erstellen."
-
-LangString str_section_start_menu   ${LANG_GERMAN} \
-    "Im Startmenü"
-LangString str_desc_start_menu      ${LANG_GERMAN} \
-    "Vim im Programmverzeichnis des Startmenüs hinzufügen."
-
-#LangString str_section_quick_launch ${LANG_GERMAN} \
-#    "In der Schnellstartleiste"
-#LangString str_desc_quick_launch    ${LANG_GERMAN} \
-#    "Verknüpfung zu Vim in der Schnellstartleiste ablegen."
-
-LangString str_section_edit_with    ${LANG_GERMAN} \
-    "Vim zum Kontextmenü hinzufügen"
-LangString str_desc_edit_with       ${LANG_GERMAN} \
-    "Vim in das $\"Öffnen mit...$\"-Kontextmenü einfügen."
-
-#LangString str_section_edit_with32  ${LANG_GERMAN} \
-#    "32-Bit-Version"
-#LangString str_desc_edit_with32     ${LANG_GERMAN} \
-#    "Vim in das $\"Öffnen mit...$\"-Kontextmenü \
-#     für 32-Bit-Anwendungen integrieren."
-
-#LangString str_section_edit_with64  ${LANG_GERMAN} \
-#    "64-Bit-Version"
-#LangString str_desc_edit_with64     ${LANG_GERMAN} \
-#    "Vim in das $\"Öffnen mit...$\"-Kontextmenü \
-#     für 64-Bit-Anwendungen integrieren."
-
-LangString str_section_vim_rc       ${LANG_GERMAN} \
-    "Standard-Konfigurationsdatei erstellen"
-LangString str_desc_vim_rc          ${LANG_GERMAN} \
-    "Eine Standard-Konfigurationsdatei (_vimrc) erstellen, \
-     falls noch keine existiert."
-
-LangString str_group_plugin         ${LANG_GERMAN} \
-    "Plugin-Verzeichnisse anlegen"
-LangString str_desc_plugin          ${LANG_GERMAN} \
-    "Plugin-Verzeichnisse anlegen. Plugins erlauben es, Vim \
-     um zusätzliche Funktionen zu erweitern."
-
-LangString str_section_plugin_home  ${LANG_GERMAN} \
-    "Privat"
-LangString str_desc_plugin_home     ${LANG_GERMAN} \
-    "Erstelle Plugin-Verzeichnis im HOME Benutzerverzeichnis."
-
-LangString str_section_plugin_vim   ${LANG_GERMAN} \
-    "Freigegeben"
-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_nls          ${LANG_GERMAN} \
-    "Unterstützung für andere Sprachen"
-LangString str_desc_nls             ${LANG_GERMAN} \
-    "Dateien zur Unterstützung anderer Sprachen als Englisch installieren."
-
-LangString str_unsection_register   ${LANG_GERMAN} \
-    "Vim deinstallieren"
-LangString str_desc_unregister      ${LANG_GERMAN} \
-    "Vim vom System entfernen."
-
-LangString str_unsection_exe        ${LANG_GERMAN} \
-    "Vim-Anwendung und Laufzeitdateien entfernen"
-LangString str_desc_rm_exe          ${LANG_GERMAN} \
-    "Alle Vim-Anwendungen und Laufzeitdateien von diesem System entfernen."
-
-LangString str_ungroup_plugin       ${LANG_GERMAN} \
-    "Entferne Plugin-Verzeichnisse"
-LangString str_desc_rm_plugin       ${LANG_GERMAN} \
-    "Entferne Plugin-Verzeichnisse, falls sie leer sind."
-
-LangString str_unsection_plugin_home ${LANG_GERMAN} \
-    "Privat"
-LangString str_desc_rm_plugin_home  ${LANG_GERMAN} \
-    "Entfernt die Plugin-Verzeichnisse aus dem HOME Benutzerverzeichnis."
-
-LangString str_unsection_plugin_vim ${LANG_GERMAN} \
-    "Freigegeben"
-LangString str_desc_rm_plugin_vim   ${LANG_GERMAN} \
-    "Entfernt das Plugin-Verzeichnis aus dem Vim-Installationsverzeichnis."
-
-LangString str_unsection_rootdir    ${LANG_GERMAN} \
-    "Entferne Vim Installationsverzeichnis"
-LangString str_desc_rm_rootdir      ${LANG_GERMAN} \
-    "Entfernt das Vim Installationsverzeichnis. Es enthält die Vim Konfigurationsdateien!"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_GERMAN} \
-#    "$vim_old_ver_count Vim-Versionen auf diesem System gefunden..$\r$\n\
-#     Dieser Installer kann maximal ${VIM_MAX_OLD_VER} Versionen \
-#     handhaben.$\r$\n\
-#     Bitte alte Versionen entfernen und noch einmal probieren."
-
-#LangString str_msg_invalid_root  ${LANG_GERMAN} \
-#    "Nicht gültiges Installationsverzeichnis: $vim_install_root!$\r$\n\
-#     Der Pfad muss auf $\"vim$\" enden."
-
-#LangString str_msg_bin_mismatch  ${LANG_GERMAN} \
-#    "Pfaddiskrepanz!$\r$\n$\r$\n\
-#     Erwarte Anwendungsverzeichnis $\"$vim_bin_path$\",$\r$\n\
-#     aber fand Anwendungspfad $\"$INSTDIR$\" vor."
-
-#LangString str_msg_vim_running   ${LANG_GERMAN} \
-#    "Laufender Vim-Prozess erkannt.$\r$\n\
-#     Bitte alle laufenden Vim-Prozesse vor dem Fortfahren beenden."
-
-#LangString str_msg_register_ole  ${LANG_GERMAN} \
-#    "Versuche OLE-Registrierung durchzuführen."
-
-#LangString str_msg_unreg_ole     ${LANG_GERMAN} \
-#    "Versuche OLE-Registrierung zu löschen."
-
-#LangString str_msg_rm_start      ${LANG_GERMAN} \
-#    "Deinstalliere die folgende Version:"
-
-#LangString str_msg_rm_fail       ${LANG_GERMAN} \
-#    "Deinstallation der Version fehlgeschlagen:"
-
-#LangString str_msg_no_rm_key     ${LANG_GERMAN} \
-#    "Deinstallationsschlüssel in der Registrierungsdatenbank nicht gefunden."
-
-#LangString str_msg_no_rm_reg     ${LANG_GERMAN} \
-#    "Kein Uninstaller in der Registrierungsdatenbank gefunden."
-
-#LangString str_msg_no_rm_exe     ${LANG_GERMAN} \
-#    "Kein Zugriff auf den Uninstaller."
-
-#LangString str_msg_rm_copy_fail  ${LANG_GERMAN} \
-#    "Fehler beim Kopieren des Uninstallers in ein temporäres Verzeichnis."
-
-#LangString str_msg_rm_run_fail   ${LANG_GERMAN} \
-#    "Fehler beim Aufruf des Uninstallers."
-
-#LangString str_msg_abort_install ${LANG_GERMAN} \
-#    "Installation wird abgebrochen."
-
-LangString str_msg_install_fail  ${LANG_GERMAN} \
-    "Installation fehlerhaft beendet."
-
-LangString str_msg_rm_exe_fail   ${LANG_GERMAN} \
-    "Einige Dateien im Pfad $0 konnten nicht gelöscht werden!$\r$\n\
-     Diese Dateien müssen manuell gelöscht werden."
-
-#LangString str_msg_rm_root_fail  ${LANG_GERMAN} \
-#    "Achtung: Kann Verzeichnis $\"$vim_install_root$\" nicht entfernen, \
-#     weil es nicht leer ist!"
-
-LangString str_msg_uninstalling  ${LANG_GERMAN} \
-    "Deinstalliere alte Version..."
-
-LangString str_msg_registering   ${LANG_GERMAN} \
-    "Registriere..."
-
-LangString str_msg_unregistering ${LANG_GERMAN} \
-    "Entferne Registrierung..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_GERMAN} \
-    "Wähle _vimrc Konfigurationsoptionen"
-LangString str_vimrc_page_subtitle ${LANG_GERMAN} \
-    "Wähle Einstellungen zur Kompatibilität, Tastatur und Maus."
-
-LangString str_msg_compat_title    ${LANG_GERMAN} \
-    " Vi / Vim Verhalten "
-LangString str_msg_compat_desc     ${LANG_GERMAN} \
-    "&Kompatibilität und Erweiterungen"
-LangString str_msg_compat_vi       ${LANG_GERMAN} \
-    "Vi-kompatibel"
-LangString str_msg_compat_vim      ${LANG_GERMAN} \
-    "Vim Original"
-LangString str_msg_compat_defaults ${LANG_GERMAN} \
-    "Vim mit einigen Erweiterungen (Lädt defaults.vim)"
-LangString str_msg_compat_all      ${LANG_GERMAN} \
-    "Vim mit allen Erweiterungen (Lädt vimrc_example.vim) (Standard)"
-
-LangString str_msg_keymap_title   ${LANG_GERMAN} \
-    " Mappings für Windows Standard Tastenkombinationen "
-LangString str_msg_keymap_desc    ${LANG_GERMAN} \
-    "&Einige Tasten umkonfigurieren (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc)"
-LangString str_msg_keymap_default ${LANG_GERMAN} \
-    "Keine Tasten umkonfigurieren (Standard)"
-LangString str_msg_keymap_windows ${LANG_GERMAN} \
-    "Einige Tasten umkonfigurieren"
-
-LangString str_msg_mouse_title   ${LANG_GERMAN} \
-    " Maus "
-LangString str_msg_mouse_desc    ${LANG_GERMAN} \
-    "&Verhalten der linken und rechten Buttons"
-LangString str_msg_mouse_default ${LANG_GERMAN} \
-    "Rechts: Popup Menü, Links: Visueller Modus (Standard)"
-LangString str_msg_mouse_windows ${LANG_GERMAN} \
-    "Rechts: Popup Menü, Links: Auswahl Modus (Windows)"
-LangString str_msg_mouse_unix    ${LANG_GERMAN} \
-    "Rechts: Auswahl erweitern, Links: Visueller Modus (Unix)"
diff --git a/nsis/lang/greek.nsi b/nsis/lang/greek.nsi
deleted file mode 100644
index d746cb3a2c..0000000000
--- a/nsis/lang/greek.nsi
+++ /dev/null
@@ -1,291 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# greek.nsi: Greek language strings for gvim NSIS installer.
-#
-# Locale ID    : 1032
-# Locale Name  : el
-# fileencoding : UTF-8
-# Author       : Christos Longros
-
-!insertmacro MUI_LANGUAGE "Greek"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_GREEK} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_GREEK} \
-        "$(^Name) Uninstall"
-
-##############################################################################
-# Translated license file for the license page                            {{{1
-##############################################################################
-
-LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_GREEK} "..\lang\LICENSE.el.nsis.txt"
-
-##############################################################################
-# Translated README.txt file, which is opened after installation          {{{1
-##############################################################################
-
-LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_GREEK} "README.el.txt"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_GREEK} \
-#    "Φάκελος π�οο�ισμός (Π�έπει να τελειώνει σε $\"vim$\")"
-
-LangString str_show_readme          ${LANG_GREEK} \
-    "Εμφάνιση README μετά την ολοκλή�ωση της εγκατάστασης"
-
-# Install types:
-LangString str_type_typical         ${LANG_GREEK} \
-    "Typical"
-
-LangString str_type_minimal         ${LANG_GREEK} \
-    "Minimal"
-
-LangString str_type_full            ${LANG_GREEK} \
-    "Full"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_GREEK} \
-    "Απεγκατάσταση υπά�χουσων εκδόσεων"
-LangString str_desc_old_ver         ${LANG_GREEK} \
-    "Απεγκατάσταση υπά�χουσων εκδόσεων Vim από το σ�στημά σας."
-
-LangString str_section_exe          ${LANG_GREEK} \
-    "Vim GUI and runtime files"
-LangString str_desc_exe             ${LANG_GREEK} \
-    "Vim GUI executables and runtime files.  This component is required."
-
-LangString str_section_console      ${LANG_GREEK} \
-    "Vim console program"
-LangString str_desc_console         ${LANG_GREEK} \
-    "Console version of Vim (vim.exe)."
-
-LangString str_section_batch        ${LANG_GREEK} \
-    "Δημιου�γία α�χείων .bat"
-LangString str_desc_batch           ${LANG_GREEK} \
-    "Δημιου�γία α�χείων .bat από πα�άγωγα Vim στον κατάλογο των Windows για \
-     χ�ήση γ�αμμής εντολών."
-
-LangString str_group_icons          ${LANG_GREEK} \
-    "Δημιου�γία  εικονιδίων Vim"
-LangString str_desc_icons           ${LANG_GREEK} \
-    "Δημιου�γία εικονιδίων για τον Vim σε διάφο�ες τοποθεσίες για την διευκόλυνση της π�οσβασιμότητας."
-
-LangString str_section_desktop      ${LANG_GREEK} \
-    "Στην επιφάνεια ε�γασίας"
-LangString str_desc_desktop         ${LANG_GREEK} \
-    "Δημιου�γία εικονιδίων για gVim εκτελέσιμα στην επιφάνεια ε�γασίας."
-
-LangString str_section_start_menu   ${LANG_GREEK} \
-    "In the Start Menu Programs Folder"
-LangString str_desc_start_menu      ${LANG_GREEK} \
-    "Π�οσθήκη του Vim στον φάκελο π�ογ�αμμάτων του μενο� εκκίνησης."
-
-#LangString str_section_quick_launch ${LANG_GREEK} \
-#    "In the Quick Launch Bar"
-#LangString str_desc_quick_launch    ${LANG_GREEK} \
-#    "Add Vim shortcut in the quick launch bar."
-
-LangString str_section_edit_with    ${LANG_GREEK} \
-    "Add Vim Context Menu"
-LangString str_desc_edit_with       ${LANG_GREEK} \
-    "Add Vim to the $\"Open With...$\" context menu list."
-
-#LangString str_section_edit_with32  ${LANG_GREEK} \
-#    "32-bit Version"
-#LangString str_desc_edit_with32     ${LANG_GREEK} \
-#    "Add Vim to the $\"Open With...$\" context menu list \
-#     for 32-bit applications."
-
-#LangString str_section_edit_with64  ${LANG_GREEK} \
-#    "64-bit Version"
-#LangString str_desc_edit_with64     ${LANG_GREEK} \
-#    "Add Vim to the $\"Open With...$\" context menu list \
-#     for 64-bit applications."
-
-LangString str_section_vim_rc       ${LANG_GREEK} \
-    "Δημιου�γία π�οεπιλεγμένων �υθμίσεων"
-LangString str_desc_vim_rc          ${LANG_GREEK} \
-    "Δημιου�γία π�οεπιλεγμένου α�χείου �υθμίσεων (_vimrc) αν δεν υπά�χει ήδη."
-
-LangString str_group_plugin         ${LANG_GREEK} \
-    "Δημιου�γία καταλόγων Plugin"
-LangString str_desc_plugin          ${LANG_GREEK} \
-    "Δημιου�γία καταλόγων plugin.  Οι κατάλογοι Plugin επιτ�έπουν την επέκταση του Vim \
-     με την μεταφο�ά ενός α�χείου σε έναν κατάλογο."
-
-LangString str_section_plugin_home  ${LANG_GREEK} \
-    "Private"
-LangString str_desc_plugin_home     ${LANG_GREEK} \
-    "Δημιου�γία καταλόγων plugin στον κατάλογο HOME."
-
-LangString str_section_plugin_vim   ${LANG_GREEK} \
-    "Shared"
-LangString str_desc_plugin_vim      ${LANG_GREEK} \
-    "Δημιου�γία καταλόγων plugin στον κατάλογο εγκατάστασης του Vim, χ�ησιμοποιείται από \
-     όλους στο σ�στημα."
-
-LangString str_section_nls          ${LANG_GREEK} \
-    "Native Language Support"
-LangString str_desc_nls             ${LANG_GREEK} \
-    "Install files for native language support."
-
-LangString str_unsection_register   ${LANG_GREEK} \
-    "Unregister Vim"
-LangString str_desc_unregister      ${LANG_GREEK} \
-    "Unregister Vim from the system."
-
-LangString str_unsection_exe        ${LANG_GREEK} \
-    "Remove Vim Executables/Runtime Files"
-LangString str_desc_rm_exe          ${LANG_GREEK} \
-    "Remove all Vim executables and runtime files."
-
-LangString str_ungroup_plugin       ${LANG_GREEK} \
-    "Remove plugin directories"
-LangString str_desc_rm_plugin       ${LANG_GREEK} \
-    "Remove the plugin directories if they are empty."
-
-LangString str_unsection_plugin_home ${LANG_GREEK} \
-    "Private"
-LangString str_desc_rm_plugin_home  ${LANG_GREEK} \
-    "Remove the plugin directories from HOME directory."
-
-LangString str_unsection_plugin_vim ${LANG_GREEK} \
-    "Shared"
-LangString str_desc_rm_plugin_vim   ${LANG_GREEK} \
-    "Remove the plugin directories from Vim install directory."
-
-LangString str_unsection_rootdir    ${LANG_GREEK} \
-    "Remove the Vim root directory"
-LangString str_desc_rm_rootdir      ${LANG_GREEK} \
-    "Remove the Vim root directory. It contains your Vim configuration files!"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_GREEK} \
-#    "Found $vim_old_ver_count Vim versions on your system.$\r$\n\
-#     This installer can only handle ${VIM_MAX_OLD_VER} versions \
-#     at most.$\r$\n\
-#     Please remove some versions and start again."
-
-#LangString str_msg_invalid_root  ${LANG_GREEK} \
-#    "Invalid install path: $vim_install_root!$\r$\n\
-#     It should end with $\"vim$\"."
-
-#LangString str_msg_bin_mismatch  ${LANG_GREEK} \
-#    "Binary path mismatch!$\r$\n$\r$\n\
-#     Expect the binary path to be $\"$vim_bin_path$\",$\r$\n\
-#     but system indicates the binary path is $\"$INSTDIR$\"."
-
-#LangString str_msg_vim_running   ${LANG_GREEK} \
-#    "Vim is still running on your system.$\r$\n\
-#     Please close all instances of Vim before you continue."
-
-#LangString str_msg_register_ole  ${LANG_GREEK} \
-#    "Attempting to register Vim with OLE. \
-#     There is no message indicates whether this works or not."
-
-#LangString str_msg_unreg_ole     ${LANG_GREEK} \
-#    "Attempting to unregister Vim with OLE. \
-#     There is no message indicates whether this works or not."
-
-#LangString str_msg_rm_start      ${LANG_GREEK} \
-#    "Uninstalling the following version:"
-
-#LangString str_msg_rm_fail       ${LANG_GREEK} \
-#    "Fail to uninstall the following version:"
-
-#LangString str_msg_no_rm_key     ${LANG_GREEK} \
-#    "Cannot find uninstaller registry key."
-
-#LangString str_msg_no_rm_reg     ${LANG_GREEK} \
-#    "Cannot find uninstaller from registry."
-
-#LangString str_msg_no_rm_exe     ${LANG_GREEK} \
-#    "Cannot access uninstaller."
-
-#LangString str_msg_rm_copy_fail  ${LANG_GREEK} \
-#    "Fail to copy uninstaller to temporary directory."
-
-#LangString str_msg_rm_run_fail   ${LANG_GREEK} \
-#    "Αποτυχία εκτέλεσης της λειτου�γίας απεγκατάστασης."
-
-#LangString str_msg_abort_install ${LANG_GREEK} \
-#    "Installer will abort."
-
-LangString str_msg_install_fail  ${LANG_GREEK} \
-    "Η εγκατάσταση απέτυχε. Better luck next time."
-
-LangString str_msg_rm_exe_fail   ${LANG_GREEK} \
-    "Με�ικά α�χεία στο $0 δεν έχουν διαγ�αφεί!$\r$\n\
-     Π�έπει να το κάνετε χει�οκίνητα."
-
-#LangString str_msg_rm_root_fail  ${LANG_GREEK} \
-#    "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αδ�νατη η αφαί�εση $\"$vim_install_root$\", δεν είναι κενό!"
-
-LangString str_msg_uninstalling  ${LANG_GREEK} \
-    "Απεγκατάσταση παλιάς έκδοσης the old version..."
-
-LangString str_msg_registering   ${LANG_GREEK} \
-    "Καταχώ�ηση..."
-
-LangString str_msg_unregistering ${LANG_GREEK} \
-    "Unregistering..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_GREEK} \
-    "Επιλογή �υθμίσεων _vimrc"
-LangString str_vimrc_page_subtitle ${LANG_GREEK} \
-    "Choose the settings for enhancement, keyboard and mouse."
-
-LangString str_msg_compat_title    ${LANG_GREEK} \
-    " Συμπε�ιφο�ά Vi / Vim  "
-LangString str_msg_compat_desc     ${LANG_GREEK} \
-    "&Compatibility and enhancements"
-LangString str_msg_compat_vi       ${LANG_GREEK} \
-    "Vi compatible"
-LangString str_msg_compat_vim      ${LANG_GREEK} \
-    "Vim original"
-LangString str_msg_compat_defaults ${LANG_GREEK} \
-    "Vim with some enhancements (load defaults.vim)"
-LangString str_msg_compat_all      ${LANG_GREEK} \
-    "Vim with all enhancements (load vimrc_example.vim) (Default)"
-
-LangString str_msg_keymap_title   ${LANG_GREEK} \
-    " Mappings "
-LangString str_msg_keymap_desc    ${LANG_GREEK} \
-    "&Remap a few keys for Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc)"
-LangString str_msg_keymap_default ${LANG_GREEK} \
-    "Do not remap keys (Default)"
-LangString str_msg_keymap_windows ${LANG_GREEK} \
-    "Remap a few keys"
-
-LangString str_msg_mouse_title   ${LANG_GREEK} \
-    " Ποντίκι "
-LangString str_msg_mouse_desc    ${LANG_GREEK} \
-    "&Behavior of right and left buttons"
-LangString str_msg_mouse_default ${LANG_GREEK} \
-    "Right: popup menu, Left: visual mode (Default)"
-LangString str_msg_mouse_windows ${LANG_GREEK} \
-    "Right: popup menu, Left: select mode (Windows)"
-LangString str_msg_mouse_unix    ${LANG_GREEK} \
-    "Right: extends selection, Left: visual mode (Unix)"
-
diff --git a/nsis/lang/italian.nsi b/nsis/lang/italian.nsi
deleted file mode 100644
index 629d476589..0000000000
--- a/nsis/lang/italian.nsi
+++ /dev/null
@@ -1,288 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# italian.nsi : Italian language strings for gvim NSIS installer.
-#
-# Locale ID    : 1040
-# Locale Name  : it
-# fileencoding : UTF-8
-# Author       : Antonio Colombo, bovirus - revision: 12.05.2023
-
-!insertmacro MUI_LANGUAGE "Italian"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_ITALIAN} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_ITALIAN} \
-        "$(^Name) Uninstall"
-
-##############################################################################
-# Translated license file for the license page                            {{{1
-##############################################################################
-
-LicenseLangString page_lic_file ${LANG_ITALIAN} "..\lang\LICENSE.it.nsis.txt"
-
-##############################################################################
-# Translated README.txt file, which is opened after installation          {{{1
-##############################################################################
-
-LangString vim_readme_file ${LANG_ITALIAN} "README.it.txt"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_ITALIAN} \
-#    "Cartella installazione (il percorso deve finire con $\"vim$\")"
-
-LangString str_show_readme          ${LANG_ITALIAN} \
-    "Visualizza file README a fine installazione"
-
-# Install types:
-LangString str_type_typical         ${LANG_ITALIAN} \
-    "Tipica"
-
-LangString str_type_minimal         ${LANG_ITALIAN} \
-    "Minima"
-
-LangString str_type_full            ${LANG_ITALIAN} \
-    "Completa"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_ITALIAN} \
-    "Disinstalla versioni esistenti"
-LangString str_desc_old_ver         ${LANG_ITALIAN} \
-    "Disinstalla versioni esistenti di Vim."
-
-LangString str_section_exe          ${LANG_ITALIAN} \
-    "GUI e file supporto Vim"
-LangString str_desc_exe             ${LANG_ITALIAN} \
-    "GUI programmi e file di supporto Vim.  Questa componente è indispensabile."
-
-LangString str_section_console      ${LANG_ITALIAN} \
-    "Console Vim (vim.exe per MS-DOS)"
-LangString str_desc_console         ${LANG_ITALIAN} \
-    "Versione console di Vim (vim.exe)."
-
-LangString str_section_batch        ${LANG_ITALIAN} \
-    "Crea file .bat"
-LangString str_desc_batch           ${LANG_ITALIAN} \
-    "Crea file .bat per varianti di Vim nella cartella \
-     di Windows, per utilizzo da riga di comando."
-
-LangString str_group_icons          ${LANG_ITALIAN} \
-    "Crea icone Vim"
-LangString str_desc_icons           ${LANG_ITALIAN} \
-    "Crea icone Vim per rendere facile l'accesso."
-
-LangString str_section_desktop      ${LANG_ITALIAN} \
-    "Icone sul Desktop"
-LangString str_desc_desktop         ${LANG_ITALIAN} \
-    "Crea icone programma gVim sul desktop."
-
-LangString str_section_start_menu   ${LANG_ITALIAN} \
-    "Gruppo programmi menù START"
-LangString str_desc_start_menu      ${LANG_ITALIAN} \
-    "Aggiunge gruppo programmi al menù START."
-
-#LangString str_section_quick_launch ${LANG_ITALIAN} \
-#    "Barra avvio veloce"
-#LangString str_desc_quick_launch    ${LANG_ITALIAN} \
-#    "Aggiunge un collegamento a Vim nella barra di avvio veloce."
-
-LangString str_section_edit_with    ${LANG_ITALIAN} \
-    "Aggiungi Vim al menù contestuale"
-LangString str_desc_edit_with       ${LANG_ITALIAN} \
-    "Aggiunge Vim al menu contestuale $\"Apri con...$\"."
-
-#LangString str_section_edit_with32  ${LANG_ITALIAN} \
-#    "Versione a 32 bit"
-#LangString str_desc_edit_with32     ${LANG_ITALIAN} \
-#    "Aggiungi Vim al menu contestuale $\"Apri con...$\" \
-#     per applicazioni a 32 bit."
-
-#LangString str_section_edit_with64  ${LANG_ITALIAN} \
-#    "Versione a 64 bit"
-#LangString str_desc_edit_with64     ${LANG_ITALIAN} \
-#    "Aggiunge Vim al menu contestuale $\"Apri con...$\" \
-#     per applicazioni a 64 bit."
-
-LangString str_section_vim_rc       ${LANG_ITALIAN} \
-    "Crea configurazione predefinita"
-LangString str_desc_vim_rc          ${LANG_ITALIAN} \
-    "Crea, se non ne esiste già uno, un file configurazione predefinito (_vimrc) ."
-
-LangString str_group_plugin         ${LANG_ITALIAN} \
-    "Crea cartella plugin"
-LangString str_desc_plugin          ${LANG_ITALIAN} \
-    "Crea cartella plugin.  I plugin consentono di aggiungere funzionalità \
-     a Vim copiando i relativi file in una di queste cartelle."
-
-LangString str_section_plugin_home  ${LANG_ITALIAN} \
-    "Privata"
-LangString str_desc_plugin_home     ${LANG_ITALIAN} \
-    "Crea cartella plugin nella cartella HOME."
-
-LangString str_section_plugin_vim   ${LANG_ITALIAN} \
-    "Condivisa"
-LangString str_desc_plugin_vim      ${LANG_ITALIAN} \
-    "Crea cartella plugin nella cartella di installazione di Vim \
-     per uso da parte di tutti gli utenti di questo sistema."
-
-LangString str_section_nls          ${LANG_ITALIAN} \
-    "Supporto nativo lingua (NLS)"
-LangString str_desc_nls             ${LANG_ITALIAN} \
-    "Installa i file per il supporto nativo multilingua."
-
-LangString str_unsection_register   ${LANG_ITALIAN} \
-    "Rimuovi Vim dal registro"
-LangString str_desc_unregister      ${LANG_ITALIAN} \
-    "Rimuove Vim dal registro di configurazione sistema."
-
-LangString str_unsection_exe        ${LANG_ITALIAN} \
-    "Elimina programmi/file di supporto Vim"
-LangString str_desc_rm_exe          ${LANG_ITALIAN} \
-    "Elimina tutti i programmi/file di supporto di Vim."
-
-LangString str_ungroup_plugin       ${LANG_ITALIAN} \
-    "Elimina cartelle plugin"
-LangString str_desc_rm_plugin       ${LANG_ITALIAN} \
-    "Elimina le cartelle plugin se sono vuote."
-
-LangString str_unsection_plugin_home ${LANG_ITALIAN} \
-    "Private"
-LangString str_desc_rm_plugin_home  ${LANG_ITALIAN} \
-    "Elimina cartelle plugin nella cartella HOME."
-
-LangString str_unsection_plugin_vim ${LANG_ITALIAN} \
-    "Condivise"
-LangString str_desc_rm_plugin_vim   ${LANG_ITALIAN} \
-    "Elimina cartelle plugin nella cartella di installazione di Vim."
-
-LangString str_unsection_rootdir    ${LANG_ITALIAN} \
-    "Elimina la cartella di installazione di Vim"
-LangString str_desc_rm_rootdir      ${LANG_ITALIAN} \
-    "Elimina la cartella di installazione di Vim. Contiene i file di configurazione!"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_ITALIAN} \
-#    "Rilevate nel sistema $vim_old_ver_count versioni di Vim.$\r$\n\
-#     Questo programma di installazione può gestire solo \
-#     ${VIM_MAX_OLD_VER} versioni.$\r$\n\
-#     Disinstalla qualche versione precedente e ricomincia."
-
-#LangString str_msg_invalid_root  ${LANG_ITALIAN} \
-#    "Nome cartella di installazione non valida: $vim_install_root!$\r$\n\
-#     Dovrebbe terminare con $\"vim$\"."
-
-#LangString str_msg_bin_mismatch  ${LANG_ITALIAN} \
-#    "Conflitto nella cartella di installazione!$\r$\n$\r$\n\
-#     La cartella di installazione dev'essere $\"$vim_bin_path$\",$\r$\n\
-#     ma il sistema indica che il percorso è $\"$INSTDIR$\"."
-
-#LangString str_msg_vim_running   ${LANG_ITALIAN} \
-#    "Vim è ancora in esecuzione nel sistema.$\r$\n\
-#     Per continuare chiudi tutte le sessioni attive di Vim."
-
-#LangString str_msg_register_ole  ${LANG_ITALIAN} \
-#    "Tentativo di registrazione di Vim con OLE. \
-#     Non ci sono messaggi che indicano se l'operazione è riuscita."
-
-#LangString str_msg_unreg_ole     ${LANG_ITALIAN} \
-#    "Tentativo di rimozione di VIM dal registro via OLE. \
-#     Non ci sono messaggi che indicano se l'operazione è riuscita."
-
-#LangString str_msg_rm_start      ${LANG_ITALIAN} \
-#    "Disinstallazione della versione:"
-
-#LangString str_msg_rm_fail       ${LANG_ITALIAN} \
-#    "Disinstallazione non riuscita per la versione:"
-
-#LangString str_msg_no_rm_key     ${LANG_ITALIAN} \
-#    "Impossibile trovare chiave disinstallazione nel registro."
-
-#LangString str_msg_no_rm_reg     ${LANG_ITALIAN} \
-#    "Impossibile trovare programma disinstallazione nel registro."
-
-#LangString str_msg_no_rm_exe     ${LANG_ITALIAN} \
-#    "Impossibile trovare programma disinstallazione."
-
-#LangString str_msg_rm_copy_fail  ${LANG_ITALIAN} \
-#    "Impossibile copiare il programma disinstallazione in una cartella temporanea."
-
-#LangString str_msg_rm_run_fail   ${LANG_ITALIAN} \
-#    "Impossibile eseguire programma disinstallazione."
-
-#LangString str_msg_abort_install ${LANG_ITALIAN} \
-#    "Il programma di disinstallazione verrà chiuso senza aver eseguito nessuna modifica."
-
-LangString str_msg_install_fail  ${LANG_ITALIAN} \
-    "Installazione non riuscita."
-
-LangString str_msg_rm_exe_fail   ${LANG_ITALIAN} \
-    "Alcuni file in $0 non sono stati eliminati!$\r$\n\
-     I file vanno rimossi manualmente."
-
-#LangString str_msg_rm_root_fail  ${LANG_ITALIAN} \
-#    "AVVISO: impossibile eliminare $\"$vim_install_root$\", non è vuota!"
-
-LangString str_msg_uninstalling  ${LANG_ITALIAN} \
-    "Disinstallazione vecchia versione Vim..."
-
-LangString str_msg_registering   ${LANG_ITALIAN} \
-    "Aggiunta di Vim al registro..."
-
-LangString str_msg_unregistering ${LANG_ITALIAN} \
-    "Rimozione di Vim dal registro..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_ITALIAN} \
-    "Scelta impostazioni _vimrc"
-LangString str_vimrc_page_subtitle ${LANG_ITALIAN} \
-    "Scelta impostazioni funzionalità aggiuntive, tastiera e mouse."
-
-LangString str_msg_compat_title    ${LANG_ITALIAN} \
-    " Comportamento come Vi / Vim "
-LangString str_msg_compat_desc     ${LANG_ITALIAN} \
-    "&Compatibilità e funzionalità"
-LangString str_msg_compat_vi       ${LANG_ITALIAN} \
-    "Compatibile Vi"
-LangString str_msg_compat_vim      ${LANG_ITALIAN} \
-    "Vim originale"
-LangString str_msg_compat_defaults ${LANG_ITALIAN} \
-    "Vim con alcune funzionalità aggiuntive (defaults.vim)"
-LangString str_msg_compat_all      ${LANG_ITALIAN} \
-    "Vim con tutte le funzionalità aggiuntive (vimrc_example.vim) (predefinito)"
-
-LangString str_msg_keymap_title   ${LANG_ITALIAN} \
-    " Mappature tastiera "
-LangString str_msg_keymap_desc    ${LANG_ITALIAN} \
-    "&Rimappa alcuni tasti Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc.)"
-LangString str_msg_keymap_default ${LANG_ITALIAN} \
-    "Non rimappare i tasti (predefinito)"
-LangString str_msg_keymap_windows ${LANG_ITALIAN} \
-    "Rimappa solo alcuni tasti"
-
-LangString str_msg_mouse_title   ${LANG_ITALIAN} \
-    " Mouse "
-LangString str_msg_mouse_desc    ${LANG_ITALIAN} \
-    "&Comportamento pulsanti destro/sinistro"
-LangString str_msg_mouse_default ${LANG_ITALIAN} \
-    "Destro: menu popup, Sinistro: modalità visuale (predefinito)"
-LangString str_msg_mouse_windows ${LANG_ITALIAN} \
-    "Destro: menu popup, Sinistro: selezione modalità (Windows)"
-LangString str_msg_mouse_unix    ${LANG_ITALIAN} \
-    "Destro: estensione selezione, Sinistro: modalità visuale (Unix)"
diff --git a/nsis/lang/japanese.nsi b/nsis/lang/japanese.nsi
deleted file mode 100644
index 6bacf4930f..0000000000
--- a/nsis/lang/japanese.nsi
+++ /dev/null
@@ -1,297 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# japanese.nsi: Japanese language strings for gvim NSIS installer.
-#
-# Locale ID    : 1041
-# Locale Name  : ja
-# fileencoding : UTF-8
-# Author       : Ken Takata
-
-!insertmacro MUI_LANGUAGE "Japanese"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_JAPANESE} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_JAPANESE} \
-        "$(^Name) Uninstall"
-
-# Workarounds for NSIS Japanese translation. The messages are too long.
-# These should be better to be fixed by the NSIS upstream.
-LangString ^SpaceAvailable   ${LANG_JAPANESE} \
-        "利用�能�ディスク容�："
-LangString ^SpaceRequired    ${LANG_JAPANESE} \
-        "必��ディスク容�："
-# Fix another NSIS Japanese translation. The access key was missing.
-LangString ^InstallBtn       ${LANG_JAPANESE} \
-        "インストール(&I)"
-
-##############################################################################
-# Translated license file for the license page                            {{{1
-##############################################################################
-
-LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_JAPANESE} "..\lang\LICENSE.ja.txt"
-
-##############################################################################
-# Translated README.txt file, which is opened after installation          {{{1
-##############################################################################
-
-LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_JAPANESE} "README.jax.txt"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_JAPANESE} \
-#    "Destination Folder (Must end with $\"vim$\")"
-
-LangString str_show_readme          ${LANG_JAPANESE} \
-    "インストール完了後� README を表示�る"
-
-# Install types:
-LangString str_type_typical         ${LANG_JAPANESE} \
-    "通常"
-
-LangString str_type_minimal         ${LANG_JAPANESE} \
-    "最�"
-
-LangString str_type_full            ${LANG_JAPANESE} \
-    "全�"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_JAPANESE} \
-    "既存��ージョンをアンインストール"
-LangString str_desc_old_ver         ${LANG_JAPANESE} \
-    "���インストール�れ��る Vim をシステム�ら削除���。"
-
-LangString str_section_exe          ${LANG_JAPANESE} \
-    "Vim GUI �ランタイムファイル"
-LangString str_desc_exe             ${LANG_JAPANESE} \
-    "Vim GUI 実行ファイル�ラインタイムファイル。��コン�ー�ント�必須��。"
-
-LangString str_section_console      ${LANG_JAPANESE} \
-    "Vim コンソールプログラム"
-LangString str_desc_console         ${LANG_JAPANESE} \
-    "コンソール版� Vim (vim.exe)。"
-
-LangString str_section_batch        ${LANG_JAPANESE} \
-    ".bat ファイルを作�"
-LangString str_desc_batch           ${LANG_JAPANESE} \
-    "コマンドライン�ら Vim �関連コマンドを実行��るよ���.bat ファイルを Windows ディレクトリ�作����。"
-
-LangString str_group_icons          ${LANG_JAPANESE} \
-    "Vim �アイコンを作�"
-LangString str_desc_icons           ${LANG_JAPANESE} \
-    "Vim を簡��実行��るよ��������場所�アイコンを作����。"
-
-LangString str_section_desktop      ${LANG_JAPANESE} \
-    "デスクトップ上"
-LangString str_desc_desktop         ${LANG_JAPANESE} \
-    "gVim 実行ファイル�アイコンをデスクトップ上�作����。"
-
-LangString str_section_start_menu   ${LANG_JAPANESE} \
-    "スタートメニュー�プログラムフォルダー上"
-LangString str_desc_start_menu      ${LANG_JAPANESE} \
-    "Vim �アイコンをスタートメニュー�プログラムフォルダー上�作����。"
-
-#LangString str_section_quick_launch ${LANG_JAPANESE} \
-#    "In the Quick Launch Bar"
-#LangString str_desc_quick_launch    ${LANG_JAPANESE} \
-#    "Add Vim shortcut in the quick launch bar."
-
-LangString str_section_edit_with    ${LANG_JAPANESE} \
-    "Vim �コンテキストメニューを追加"
-LangString str_desc_edit_with       ${LANG_JAPANESE} \
-    "$\"Vim�編集�る$\" をコンテキストメニュー�追加���。"
-
-#LangString str_section_edit_with32  ${LANG_JAPANESE} \
-#    "32-bit Version"
-#LangString str_desc_edit_with32     ${LANG_JAPANESE} \
-#    "Add Vim to the $\"Open With...$\" context menu list \
-#     for 32-bit applications."
-
-#LangString str_section_edit_with64  ${LANG_JAPANESE} \
-#    "64-bit Version"
-#LangString str_desc_edit_with64     ${LANG_JAPANESE} \
-#    "Add Vim to the $\"Open With...$\" context menu list \
-#     for 64-bit applications."
-
-LangString str_section_vim_rc       ${LANG_JAPANESE} \
-    "既定�コンフィグを作�"
-LangString str_desc_vim_rc          ${LANG_JAPANESE} \
-    "も�無�れ��既定�コンフィグファイル (_vimrc) を作����。"
-
-LangString str_group_plugin         ${LANG_JAPANESE} \
-    "プラグインディレクトリを作�"
-LangString str_desc_plugin          ${LANG_JAPANESE} \
-    "プラグインディレクトリを作����。���プラグインファイルを置���� Vim を拡張�る�������。"
-
-LangString str_section_plugin_home  ${LANG_JAPANESE} \
-    "個人用"
-LangString str_desc_plugin_home     ${LANG_JAPANESE} \
-    "プラグインディレクトリをホームディレクトリ�作����。"
-
-LangString str_section_plugin_vim   ${LANG_JAPANESE} \
-    "共用"
-LangString str_desc_plugin_vim      ${LANG_JAPANESE} \
-    "プラグインディレクトリを Vim �インストールディレクトリ�作����。システム�全員�共有�れ��。"
-
-LangString str_section_nls          ${LANG_JAPANESE} \
-    "多言語サ�ート"
-LangString str_desc_nls             ${LANG_JAPANESE} \
-    "多言語サ�ート用�ファイルをインストール���。"
-
-LangString str_unsection_register   ${LANG_JAPANESE} \
-    "Vim を登録解除"
-LangString str_desc_unregister      ${LANG_JAPANESE} \
-    "Vim をシステム�ら登録解除���。"
-
-LangString str_unsection_exe        ${LANG_JAPANESE} \
-    "Vim �実行ファイル/ランタイムファイルを削除"
-LangString str_desc_rm_exe          ${LANG_JAPANESE} \
-    "全�� Vim �実行ファイル�ランタイムファイルを削除���。"
-
-LangString str_ungroup_plugin       ${LANG_JAPANESE} \
-    "プラグインディレクトリを削除"
-LangString str_desc_rm_plugin       ${LANG_JAPANESE} \
-    "プラグインディレクトリ�空��れ��れを削除���。"
-
-LangString str_unsection_plugin_home ${LANG_JAPANESE} \
-    "個人用"
-LangString str_desc_rm_plugin_home  ${LANG_JAPANESE} \
-    "プラグインディレクトリをホームディレクトリ�ら削除���。"
-
-LangString str_unsection_plugin_vim ${LANG_JAPANESE} \
-    "共用"
-LangString str_desc_rm_plugin_vim   ${LANG_JAPANESE} \
-    "プラグインディレクトリを Vim �インストールディレクトリ�ら削除���。"
-
-LangString str_unsection_rootdir    ${LANG_JAPANESE} \
-    "Vim �トップディレクトリを削除"
-LangString str_desc_rm_rootdir      ${LANG_JAPANESE} \
-    "Vim �トップディレクトリを削除���。���� Vim �設定ファイルも��れ��る���注��������"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_JAPANESE} \
-#    "Found $vim_old_ver_count Vim versions on your system.$\r$\n\
-#     This installer can only handle ${VIM_MAX_OLD_VER} versions \
-#     at most.$\r$\n\
-#     Please remove some versions and start again."
-
-#LangString str_msg_invalid_root  ${LANG_JAPANESE} \
-#    "Invalid install path: $vim_install_root!$\r$\n\
-#     It should end with $\"vim$\"."
-
-#LangString str_msg_bin_mismatch  ${LANG_JAPANESE} \
-#    "Binary path mismatch!$\r$\n$\r$\n\
-#     Expect the binary path to be $\"$vim_bin_path$\",$\r$\n\
-#     but system indicates the binary path is $\"$INSTDIR$\"."
-
-#LangString str_msg_vim_running   ${LANG_JAPANESE} \
-#    "Vim is still running on your system.$\r$\n\
-#     Please close all instances of Vim before you continue."
-
-#LangString str_msg_register_ole  ${LANG_JAPANESE} \
-#    "Attempting to register Vim with OLE. \
-#     There is no message indicates whether this works or not."
-
-#LangString str_msg_unreg_ole     ${LANG_JAPANESE} \
-#    "Attempting to unregister Vim with OLE. \
-#     There is no message indicates whether this works or not."
-
-#LangString str_msg_rm_start      ${LANG_JAPANESE} \
-#    "Uninstalling the following version:"
-
-#LangString str_msg_rm_fail       ${LANG_JAPANESE} \
-#    "Fail to uninstall the following version:"
-
-#LangString str_msg_no_rm_key     ${LANG_JAPANESE} \
-#    "Cannot find uninstaller registry key."
-
-#LangString str_msg_no_rm_reg     ${LANG_JAPANESE} \
-#    "Cannot find uninstaller from registry."
-
-#LangString str_msg_no_rm_exe     ${LANG_JAPANESE} \
-#    "Cannot access uninstaller."
-
-#LangString str_msg_rm_copy_fail  ${LANG_JAPANESE} \
-#    "Fail to copy uninstaller to temporary directory."
-
-#LangString str_msg_rm_run_fail   ${LANG_JAPANESE} \
-#    "Fail to run uninstaller."
-
-#LangString str_msg_abort_install ${LANG_JAPANESE} \
-#    "Installer will abort."
-
-LangString str_msg_install_fail  ${LANG_JAPANESE} \
-    "インストール�失敗����。次��������を祈り��。"
-
-LangString str_msg_rm_exe_fail   ${LANG_JAPANESE} \
-    "$0 内�一部�ファイル�削除����ん���!$\r$\n\
-     手動�削除�る必���り��。"
-
-#LangString str_msg_rm_root_fail  ${LANG_JAPANESE} \
-#    "WARNING: Cannot remove $\"$vim_install_root$\", it is not empty!"
-
-LangString str_msg_uninstalling  ${LANG_JAPANESE} \
-    "���ージョンをアンインストール�����..."
-
-LangString str_msg_registering   ${LANG_JAPANESE} \
-    "登録中..."
-
-LangString str_msg_unregistering ${LANG_JAPANESE} \
-    "登録解除中..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_JAPANESE} \
-    "_vimrc �設定を�ん�����"
-LangString str_vimrc_page_subtitle ${LANG_JAPANESE} \
-    "拡張やキーボード�マウス�設定を�ん�����。"
-
-LangString str_msg_compat_title    ${LANG_JAPANESE} \
-    " Vi / Vim �動作 "
-LangString str_msg_compat_desc     ${LANG_JAPANESE} \
-    "互�性�拡張(&C)"
-LangString str_msg_compat_vi       ${LANG_JAPANESE} \
-    "Vi 互�"
-LangString str_msg_compat_vim      ${LANG_JAPANESE} \
-    "Vim 独自"
-LangString str_msg_compat_defaults ${LANG_JAPANESE} \
-    "Vim 独自�多少�拡張 (defaults.vim を読�込�)"
-LangString str_msg_compat_all      ${LANG_JAPANESE} \
-    "Vim 独自�全��拡張 (vimrc_example.vim を読�込�) (既定)"
-
-LangString str_msg_keymap_title   ${LANG_JAPANESE} \
-    " マッピング "
-LangString str_msg_keymap_desc    ${LANG_JAPANESE} \
-    "Windows用�一部�キーをリマップ�る(&R) (例: Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F ��)"
-LangString str_msg_keymap_default ${LANG_JAPANESE} \
-    "リマップ��� (既定)"
-LangString str_msg_keymap_windows ${LANG_JAPANESE} \
-    "リマップ�る"
-
-LangString str_msg_mouse_title   ${LANG_JAPANESE} \
-    " マウス "
-LangString str_msg_mouse_desc    ${LANG_JAPANESE} \
-    "�ボタン�左ボタン�動作(&B)"
-LangString str_msg_mouse_default ${LANG_JAPANESE} \
-    "�：�ップアップメニュー�左：ビジュアルモード (既定)"
-LangString str_msg_mouse_windows ${LANG_JAPANESE} \
-    "�：�ップアップメニュー�左：�択モード (Windows)"
-LangString str_msg_mouse_unix    ${LANG_JAPANESE} \
-    "�：�択を拡張�左：ビジュアルモード (Unix)"
diff --git a/nsis/lang/portuguesebr.nsi b/nsis/lang/portuguesebr.nsi
deleted file mode 100644
index ea92f54e80..0000000000
--- a/nsis/lang/portuguesebr.nsi
+++ /dev/null
@@ -1,291 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# portuguesebr.nsi: Brazilian Portuguese strings for gvim NSIS installer.
-#
-# Locale ID    : 1046 
-# Locale Name  : pt-BR
-# fileencoding : UTF-8
-# Author       : Rafael Fontenelle
-
-!insertmacro MUI_LANGUAGE "PortugueseBR"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_PORTUGUESEBR} \
-        "Configuração do $(^Name)"
-LangString ^UninstallCaption ${LANG_PORTUGUESEBR} \
-        "Desinstalação do $(^Name)"
-
-##############################################################################
-# License file for the license page                                       {{{1
-##############################################################################
-
-LicenseLangString page_lic_file ${LANG_PORTUGUESEBR} "..\lang\LICENSE.pt_br.nsis.txt"
-
-##############################################################################
-# README.txt file, which is opened after installation                     {{{1
-##############################################################################
-
-LangString vim_readme_file ${LANG_PORTUGUESEBR} "README.pt_br.txt"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_PORTUGUESEBR} \
-#    "Pasta de destino (Deve terminar com $\"vim$\")"
-
-LangString str_show_readme          ${LANG_PORTUGUESEBR} \
-    "Mostrar o README ao concluir a instalação"
-
-# Install types:
-LangString str_type_typical         ${LANG_PORTUGUESEBR} \
-    "Típica"
-
-LangString str_type_minimal         ${LANG_PORTUGUESEBR} \
-    "Mínima"
-
-LangString str_type_full            ${LANG_PORTUGUESEBR} \
-    "Completa"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_PORTUGUESEBR} \
-    "Desinstalar versões existentes"
-LangString str_desc_old_ver         ${LANG_PORTUGUESEBR} \
-    "Desinstala versões do Vim existentes no seu sistema."
-
-LangString str_section_exe          ${LANG_PORTUGUESEBR} \
-    "Vim GUI e arquivos de runtime"
-LangString str_desc_exe             ${LANG_PORTUGUESEBR} \
-    "Executáveis ​​e arquivos de runtime do Vim GUI. Este componente \
-     é obrigatório."
-
-LangString str_section_console      ${LANG_PORTUGUESEBR} \
-    "Programa de console do Vim"
-LangString str_desc_console         ${LANG_PORTUGUESEBR} \
-    "Versão de console do Vim (vim.exe)."
-
-LangString str_section_batch        ${LANG_PORTUGUESEBR} \
-    "Criar arquivos .bat"
-LangString str_desc_batch           ${LANG_PORTUGUESEBR} \
-    "Cria arquivos .bat para variantes do Vim no diretório Windows para \
-     usar na linha de comando."
-
-LangString str_group_icons          ${LANG_PORTUGUESEBR} \
-    "Criar ícones para o Vim"
-LangString str_desc_icons           ${LANG_PORTUGUESEBR} \
-    "Cria ícones para Vim em vários locais para facilitar o acesso rápido."
-
-LangString str_section_desktop      ${LANG_PORTUGUESEBR} \
-    "Na área de trabalho"
-LangString str_desc_desktop         ${LANG_PORTUGUESEBR} \
-    "Cria ícones para executáveis do gVim na área de trabalho."
-
-LangString str_section_start_menu   ${LANG_PORTUGUESEBR} \
-    "Na pasta Programas do Menu Iniciar"
-LangString str_desc_start_menu      ${LANG_PORTUGUESEBR} \
-    "Adiciona Vim na pasta de programas do menu iniciar."
-
-#LangString str_section_quick_launch ${LANG_PORTUGUESEBR} \
-#    "Na barra de Inicialização Rápida"
-#LangString str_desc_quick_launch    ${LANG_PORTUGUESEBR} \
-#    "Adiciona um atalho para o Vim na barra de inicialização rápida."
-
-LangString str_section_edit_with    ${LANG_PORTUGUESEBR} \
-    "Adicionar menu de contexto do Vim"
-LangString str_desc_edit_with       ${LANG_PORTUGUESEBR} \
-    "Adiciona o Vim à lista $\"Abrir com...$\" do menu de contexto."
-
-#LangString str_section_edit_with32  ${LANG_PORTUGUESEBR} \
-#    "Versão 32 bits"
-#LangString str_desc_edit_with32     ${LANG_PORTUGUESEBR} \
-#    "Adiciona o Vim à lista $\"Abrir com...$\" do menu de contexto \
-#     para aplicativos 32 bits."
-
-#LangString str_section_edit_with64  ${LANG_PORTUGUESEBR} \
-#    "Versão 64 bits"
-#LangString str_desc_edit_with64     ${LANG_PORTUGUESEBR} \
-#    "Adiciona o Vim à lista $\"Abrir com...$\" do menu de contexto \
-#     para aplicativos 64 bits."
-
-LangString str_section_vim_rc       ${LANG_PORTUGUESEBR} \
-    "Criar configuração padrão"
-LangString str_desc_vim_rc          ${LANG_PORTUGUESEBR} \
-    "Cria um arquivo de configuração padrão (_vimrc) se não já existir."
-
-LangString str_group_plugin         ${LANG_PORTUGUESEBR} \
-    "Criar diretórios de plugins"
-LangString str_desc_plugin          ${LANG_PORTUGUESEBR} \
-    "Cria diretórios de plugins. Diretórios de plugins permitem estender \
-     o Vim adicionando um arquivo a um direótrio."
-
-LangString str_section_plugin_home  ${LANG_PORTUGUESEBR} \
-    "Privados"
-LangString str_desc_plugin_home     ${LANG_PORTUGUESEBR} \
-    "Cria diretórios de plugins no diretório HOME."
-
-LangString str_section_plugin_vim   ${LANG_PORTUGUESEBR} \
-    "Compartilhados"
-LangString str_desc_plugin_vim      ${LANG_PORTUGUESEBR} \
-    "Cria diretórios de plugins no diretório de instalação do Vim, \
-     o qual é usado por todos os usuários do sistema."
-
-LangString str_section_nls          ${LANG_PORTUGUESEBR} \
-    "Suporte ao idioma nativo"
-LangString str_desc_nls             ${LANG_PORTUGUESEBR} \
-    "Instala arquivos para suporte ao idioma nativo."
-
-LangString str_unsection_register   ${LANG_PORTUGUESEBR} \
-    "Desregistrar Vim"
-LangString str_desc_unregister      ${LANG_PORTUGUESEBR} \
-    "Remove os registras do Vim do sistema."
-
-LangString str_unsection_exe        ${LANG_PORTUGUESEBR} \
-    "Remover arquivos executáveis/runtime do Vim"
-LangString str_desc_rm_exe          ${LANG_PORTUGUESEBR} \
-    "Remove todos os arquivos executáveis e de runtime do Vim."
-
-LangString str_ungroup_plugin       ${LANG_PORTUGUESEBR} \
-    "Remover diretórios de plugins"
-LangString str_desc_rm_plugin       ${LANG_PORTUGUESEBR} \
-    "Remove os diretórios de plugins se eles estiverem vazios."
-
-LangString str_unsection_plugin_home ${LANG_PORTUGUESEBR} \
-    "Privados"
-LangString str_desc_rm_plugin_home  ${LANG_PORTUGUESEBR} \
-    "Remove os diretórios de plugins do diretório HOME."
-
-LangString str_unsection_plugin_vim ${LANG_PORTUGUESEBR} \
-    "Compartilhados"
-LangString str_desc_rm_plugin_vim   ${LANG_PORTUGUESEBR} \
-    "Remove os diretórios de plugins do diretório de instalação do Vim."
-
-LangString str_unsection_rootdir    ${LANG_PORTUGUESEBR} \
-    "Remover diretório raiz do Vim"
-LangString str_desc_rm_rootdir      ${LANG_PORTUGUESEBR} \
-    "Remove o diretório raiz do Vim. Ele contém seus \
-     arquivos de configuração do Vim!"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_PORTUGUESEBR} \
-#    "Encontradas $vim_old_ver_count versões do Vim em seu sistema.$\r$\n\
-#     Este instalador só consegue lidar com ${VIM_MAX_OLD_VER} versões\
-#     no máximo.$\r$\n\
-#     Por favor, remova algumas versões e comece novamente."
-
-#LangString str_msg_invalid_root  ${LANG_PORTUGUESEBR} \
-#    "Caminho de instalação inválido: $vim_install_root!$\r$\n\
-#     Ele deve terminar com $\"vim$\"."
-
-#LangString str_msg_bin_mismatch  ${LANG_PORTUGUESEBR} \
-#    "Incompatibilidade de caminho de binários!$\r$\n$\r$\n\
-#     Esperava que o caminho de binários fosse $\"$vim_bin_path$\",$\r$\n\
-#     mas o sistema indica que o caminho de binários é $\"$INSTDIR$\"."
-
-#LangString str_msg_vim_running   ${LANG_PORTUGUESEBR} \
-#    "Vim ainda está em execução em seu sistema.$\r$\n\
-#     Por favor, feche todas as instâncias do Vim para poder continuar."
-
-#LangString str_msg_register_ole  ${LANG_PORTUGUESEBR} \
-#    "Tentativa de registrar o Vim com OLE. \
-#     Não há mensagem que indique se isso funciona ou não."
-
-#LangString str_msg_unreg_ole     ${LANG_PORTUGUESEBR} \
-#    "Tentando desregistrar o Vim com OLE. \
-#     Não há mensagem que indique se isso funciona ou não."
-
-#LangString str_msg_rm_start      ${LANG_PORTUGUESEBR} \
-#    "Desinstalando a seguinte versão:"
-
-#LangString str_msg_rm_fail       ${LANG_PORTUGUESEBR} \
-#    "Falha ao desinstalar a seguinte versão:"
-
-#LangString str_msg_no_rm_key     ${LANG_PORTUGUESEBR} \
-#    "Não foi possível encontrar a chave de registro do desinstalador."
-
-#LangString str_msg_no_rm_reg     ${LANG_PORTUGUESEBR} \
-#    "Não foi possível encontrar o desinstalador a partir do registro."
-
-#LangString str_msg_no_rm_exe     ${LANG_PORTUGUESEBR} \
-#    "Não foi possível acessar o desinstalador."
-
-#LangString str_msg_rm_copy_fail  ${LANG_PORTUGUESEBR} \
-#    "Falha ao copiar o desinstalador para um diretório temporário."
-
-#LangString str_msg_rm_run_fail   ${LANG_PORTUGUESEBR} \
-#    "Falha ao executar o desinstalador."
-
-#LangString str_msg_abort_install ${LANG_PORTUGUESEBR} \
-#    "Instalador será interrompido."
-
-LangString str_msg_install_fail  ${LANG_PORTUGUESEBR} \
-    "A instalação falhou. Mais sorte na próxima vez."
-
-LangString str_msg_rm_exe_fail   ${LANG_PORTUGUESEBR} \
-    "Alguns arquivos em $0 não foram excluídos!$\r$\n\
-     Você deve fazê-lo manualmente."
-
-#LangString str_msg_rm_root_fail  ${LANG_PORTUGUESEBR} \
-#    "AVISO: Não foi possível remover $\"$vim_install_root$\", \
-#    pois não está vazio!"
-
-LangString str_msg_uninstalling  ${LANG_PORTUGUESEBR} \
-    "Desinstalando a versão antiga..."
-
-LangString str_msg_registering   ${LANG_PORTUGUESEBR} \
-    "Registrando..."
-
-LangString str_msg_unregistering ${LANG_PORTUGUESEBR} \
-    "Desregistrando..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_PORTUGUESEBR} \
-    "Escolher configurações do _vimrc"
-LangString str_vimrc_page_subtitle ${LANG_PORTUGUESEBR} \
-    "Escolha as configurações para melhorias, teclado e mouse."
-
-LangString str_msg_compat_title    ${LANG_PORTUGUESEBR} \
-    " Comportamento Vi / Vim "
-LangString str_msg_compat_desc     ${LANG_PORTUGUESEBR} \
-    "&Compatibilidade e melhorias"
-LangString str_msg_compat_vi       ${LANG_PORTUGUESEBR} \
-    "Compatível com Vi"
-LangString str_msg_compat_vim      ${LANG_PORTUGUESEBR} \
-    "Vim original"
-LangString str_msg_compat_defaults ${LANG_PORTUGUESEBR} \
-    "Vim com algumas melhorias (carrega defaults.vim)"
-LangString str_msg_compat_all      ${LANG_PORTUGUESEBR} \
-    "Vim com todas as melhorias (carrega vimrc_example.vim) (Padrão)"
-
-LangString str_msg_keymap_title   ${LANG_PORTUGUESEBR} \
-    " Mapeamentos "
-LangString str_msg_keymap_desc    ${LANG_PORTUGUESEBR} \
-    "&Remapear algumas teclas para o Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc)"
-LangString str_msg_keymap_default ${LANG_PORTUGUESEBR} \
-    "Não remapear teclas (Padrão)"
-LangString str_msg_keymap_windows ${LANG_PORTUGUESEBR} \
-    "Remapear algumas teclas"
-
-LangString str_msg_mouse_title   ${LANG_PORTUGUESEBR} \
-    " Mouse "
-LangString str_msg_mouse_desc    ${LANG_PORTUGUESEBR} \
-    "&Comportamento de botões direito e esquerdo"
-LangString str_msg_mouse_default ${LANG_PORTUGUESEBR} \
-    "Direito: menu popup, Esquerdo: modo visual (Padrão)"
-LangString str_msg_mouse_windows ${LANG_PORTUGUESEBR} \
-    "Direito: menu popup, Esquerdo: modo de seleção (Windows)"
-LangString str_msg_mouse_unix    ${LANG_PORTUGUESEBR} \
-    "Direito: estende seleção, Esquerdo: modo visual (Unix)"
diff --git a/nsis/lang/russian.nsi b/nsis/lang/russian.nsi
deleted file mode 100644
index bcb54672fd..0000000000
--- a/nsis/lang/russian.nsi
+++ /dev/null
@@ -1,304 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# russian.nsi: Russian language strings for gvim NSIS installer.
-#
-# Locale ID    : 1049
-# Locale name  : ru
-# fileencoding : UTF-8
-# Author       : Restorer
-
-!insertmacro MUI_LANGUAGE "Russian"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_RUSSIAN} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_RUSSIAN} \
-        "$(^Name) Uninstall"
-
-##############################################################################
-# Translated license file for the license page                            {{{1
-##############################################################################
-
-LicenseLangString page_lic_file ${LANG_RUSSIAN} "..\lang\LICENSE.ru.nsis.txt"
-
-##############################################################################
-# Translated README.txt file, which is opened after installation          {{{1
-##############################################################################
-
-LangString vim_readme_file ${LANG_RUSSIAN} "README.ru.txt"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_RUSSIAN} \
-#    "Маршрут у�тановки программы (должен завершать�� каталогом $\"vim$\")"
-
-LangString str_show_readme          ${LANG_RUSSIAN} \
-    " Ознакомить�� � кратким опи�анием программы"
-
-# Install types:
-LangString str_type_typical         ${LANG_RUSSIAN} \
-    "Стандартный"
-
-LangString str_type_minimal         ${LANG_RUSSIAN} \
-    "Минимальный"
-
-LangString str_type_full            ${LANG_RUSSIAN} \
-    "Полный"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_RUSSIAN} \
-    "Удаление предыдущих вер�ий"
-LangString str_desc_old_ver         ${LANG_RUSSIAN} \
-    "Будут удалены предыдущие у�тановленные вер�ии программы"
-
-LangString str_section_exe          ${LANG_RUSSIAN} \
-    "Графиче�кий интерфей� и в�помогательные файлы"
-LangString str_desc_exe             ${LANG_RUSSIAN} \
-    "И�полн�емые файлы и в�е необходимые дл� работы программы файлы. \
-    Это об�зательный компонент"
-
-LangString str_section_console      ${LANG_RUSSIAN} \
-    "Кон�ольна� программа Vim"
-LangString str_desc_console         ${LANG_RUSSIAN} \
-    "Вариант редактора Vim (vim.exe), и�пользуемый дл� работы в командной \
-    оболочке"
-
-LangString str_section_batch        ${LANG_RUSSIAN} \
-    "Создать командные файлы"
-LangString str_desc_batch           ${LANG_RUSSIAN} \
-    "Создание командных bat-файлов в каталоге Windows дл� работы � редактором \
-    Vim из командной �троки"
-
-LangString str_group_icons          ${LANG_RUSSIAN} \
-    "Создать �рлыки дл� редактора Vim"
-LangString str_desc_icons           ${LANG_RUSSIAN} \
-    "Создание �рлыков программы дл� удобного и бы�трого запу�ка редактора Vim"
-
-LangString str_section_desktop      ${LANG_RUSSIAN} \
-    "�а Рабочем �толе"
-LangString str_desc_desktop         ${LANG_RUSSIAN} \
-    "Создание �рлыков редактора Vim на Рабочем �толе"
-
-LangString str_section_start_menu   ${LANG_RUSSIAN} \
-    "В меню кнопки Пу�к"
-LangString str_desc_start_menu      ${LANG_RUSSIAN} \
-    "Создание �рлыков редактора Vim в меню кнопки Пу�к"
-
-#LangString str_section_quick_launch ${LANG_RUSSIAN} \
-#    "�а панели бы�трого запу�ка"
-#LangString str_desc_quick_launch    ${LANG_RUSSIAN} \
-#    "Создание �рлыков редактора Vim на панели бы�трого запу�ка"
-
-LangString str_section_edit_with    ${LANG_RUSSIAN} \
-    "Запу�к редактора Vim из контек�тного меню"
-LangString str_desc_edit_with       ${LANG_RUSSIAN} \
-    "Добавление необходимой �троки в пункт контек�тного меню \
-    «Открыть � помощью...»"
-
-#LangString str_section_edit_with32  ${LANG_RUSSIAN} \
-#    "Дл� 32-разр�дной вер�ии программы"
-#LangString str_desc_edit_with32     ${LANG_RUSSIAN} \
-#    "Добавление в пункт контек�тного меню \
-#    «Открыть � помощью...» 32-разр�дных приложений"
-
-#LangString str_section_edit_with64  ${LANG_RUSSIAN} \
-#    "Дл� 64-разр�дной вер�ии программы"
-#LangString str_desc_edit_with64     ${LANG_RUSSIAN} \
-#    "Добавление в пункт контек�тного меню \
-#    «Открыть � помощью...» 64-разр�дных приложений"
-
-LangString str_section_vim_rc       ${LANG_RUSSIAN} \
-    "�ачальна� на�тройка программы"
-LangString str_desc_vim_rc          ${LANG_RUSSIAN} \
-    "Создание файла _vimrc � преду�тановленными на�тройками, е�ли нет других \
-    файлов на�троек"
-
-LangString str_group_plugin         ${LANG_RUSSIAN} \
-    "Создать каталог дл� подключаемых модулей"
-LangString str_desc_plugin          ${LANG_RUSSIAN} \
-    "Создание каталога дл� подключаемых модулей, которые ра�шир�ют возможно�ти \
-    редактора Vim"
-
-LangString str_section_plugin_home  ${LANG_RUSSIAN} \
-    "Личный каталог"
-LangString str_desc_plugin_home     ${LANG_RUSSIAN} \
-    "В домашнем каталоге пользовател�. Модули в �том каталоге до�тупны только \
-    �тому пользователю"
-
-LangString str_section_plugin_vim   ${LANG_RUSSIAN} \
-    "Общий каталог"
-LangString str_desc_plugin_vim      ${LANG_RUSSIAN} \
-    "В каталоге у�тановки редактора Vim. Модули в �том каталоге до�тупны дл� \
-    в�ех пользователей"
-
-#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} \
-    "У�тановка файлов дл� работы программе на различных региональных �зыках"
-
-LangString str_unsection_register   ${LANG_RUSSIAN} \
-    "Отменить реги�трацию компонентов программы Vim"
-LangString str_desc_unregister      ${LANG_RUSSIAN} \
-    "Отмена реги�трации компонентов программы Vim в операционной �и�теме"
-
-LangString str_unsection_exe        ${LANG_RUSSIAN} \
-    "Удалить файлы редактора Vim"
-LangString str_desc_rm_exe          ${LANG_RUSSIAN} \
-    "Удаление в�ех и�полн�емых и в�помогательных файлов редактора Vim"
-
-LangString str_ungroup_plugin       ${LANG_RUSSIAN} \
-    "Удалить каталог подключаемых модулей"
-LangString str_desc_rm_plugin       ${LANG_RUSSIAN} \
-    "Удаление каталога подключаемых модулей, е�ли в нём нет файлов"
-
-LangString str_unsection_plugin_home ${LANG_RUSSIAN} \
-    "Личный каталог"
-LangString str_desc_rm_plugin_home  ${LANG_RUSSIAN} \
-    "Удаление каталога подключаемых модулей из домашнего каталога пользовател�"
-
-LangString str_unsection_plugin_vim ${LANG_RUSSIAN} \
-    "Общий каталог"
-LangString str_desc_rm_plugin_vim   ${LANG_RUSSIAN} \
-    "Удаление каталога подключаемых модулей из каталога у�тановки редактора Vim"
-
-LangString str_unsection_rootdir    ${LANG_RUSSIAN} \
-    "Удалить о�новной каталог программы Vim"
-LangString str_desc_rm_rootdir      ${LANG_RUSSIAN} \
-    "Удаление о�новного каталога программы Vim. В �том каталоге наход�т�� \
-    файлы на�троек!"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_RUSSIAN} \
-#    "Обнаружено предыдущих вер�ий программы Vim: $vim_old_ver_count.$\r$\n\
-#     Данна� программа у�тановки может удалить не более ${VIM_MAX_OLD_VER}.$\r$\n\
-#     Удалить лишние вер�ии программы Vim и повторите у�тановку"
-
-#LangString str_msg_invalid_root  ${LANG_RUSSIAN} \
-#    "�едопу�тимый каталог у�тановки программы Vim $vim_install_root!$\r$\n\
-#     Маршрут у�тановки должен оканчивать�� каталогом $\"vim$\""
-
-#LangString str_msg_bin_mismatch  ${LANG_RUSSIAN} \
-#    "�едопу�тимый маршрут к каталогу � и�полн�емыми файлами!$\r$\n$\r$\n\
-#     Маршрут к каталогу � и�полн�емыми файлами должен быть $\"$vim_bin_path$\",$\r$\n\
-#     но от операционной �и�темы получен как $\"$INSTDIR$\"."
-
-#LangString str_msg_vim_running   ${LANG_RUSSIAN} \
-#    "Программа Vim �ейча� работает.$\r$\n\
-#     Прежде чем продолжить, закройте в�е работающие редакторы Vim"
-
-#LangString str_msg_register_ole  ${LANG_RUSSIAN} \
-#    "Попытка зареги�трировать компоненты программы Vim в про�тран�тве OLE. \
-#     �о не получено уведомление об у�пешно�ти данной операции"
-
-#LangString str_msg_unreg_ole     ${LANG_RUSSIAN} \
-#    "Попытка отменить реги�трацию компонентов программы Vim в про�тран�тве OLE. \
-#     �о не получено уведомление об у�пешно�ти данной операции"
-
-#LangString str_msg_rm_start      ${LANG_RUSSIAN} \
-#    "Выполн�ет�� удаление �ледующих вер�ий программы:"
-
-#LangString str_msg_rm_fail       ${LANG_RUSSIAN} \
-#    "Произошёл �бой при выполнении удалени� �ледующих вер�ий программы:"
-
-#LangString str_msg_no_rm_key     ${LANG_RUSSIAN} \
-#    "�е удало�ь найти раздел рее�тра, �одержащий информацию об удалении \
-#    программы"
-
-#LangString str_msg_no_rm_reg     ${LANG_RUSSIAN} \
-#    "�е удало�ь найти указанную в рее�тре программу, котора� выполн�ет удаление"
-
-#LangString str_msg_no_rm_exe     ${LANG_RUSSIAN} \
-#    "От�ут�твуют права на до�туп к программе, выполн�ющей удаление"
-
-#LangString str_msg_rm_copy_fail  ${LANG_RUSSIAN} \
-#    "Произошла ошибка при копировании программы удалени� во временный каталог"
-
-#LangString str_msg_rm_run_fail   ${LANG_RUSSIAN} \
-#    "Произошёл �бой при запу�ке программы, выполн�ющей удаление"
-
-#LangString str_msg_abort_install ${LANG_RUSSIAN} \
-#    "У�тановка программы была отменена"
-
-LangString str_msg_install_fail  ${LANG_RUSSIAN} \
-    "Произошла ошибка при у�тановке программы. Попробуйте повторить у�тановку \
-    немного попозже"
-# когда Луна будет в другой фазе и ветер должен дуть � юго�запада
-
-LangString str_msg_rm_exe_fail   ${LANG_RUSSIAN} \
-    "�екоторые файлы не были удалены из каталога $0 $\r$\n\
-     �еобходимо выполнить их удаление �амо�то�тельно"
-
-#LangString str_msg_rm_root_fail  ${LANG_RUSSIAN} \
-#    "Внимание! В каталоге $\"$vim_install_root$\" �одержат�� файлы. Удаление \
-#    каталога не выполнено"
-
-LangString str_msg_uninstalling  ${LANG_RUSSIAN} \
-    "Удаление предыдущих вер�ий программ..."
-
-LangString str_msg_registering   ${LANG_RUSSIAN} \
-    "Реги�траци� компонентов программы в �и�теме..."
-
-LangString str_msg_unregistering ${LANG_RUSSIAN} \
-    "Отмена реги�трации компонентов программы в �и�теме..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_RUSSIAN} \
-    "У�тановка параметров программы"
-LangString str_vimrc_page_subtitle ${LANG_RUSSIAN} \
-    "Параметры, и�пользуемые дл� клавиатуры, манипул�тора «мышь» и \
-    функционально�ти программы"
-
-LangString str_msg_compat_title    ${LANG_RUSSIAN} \
-    " Варианты и�пользовани� программы "
-LangString str_msg_compat_desc     ${LANG_RUSSIAN} \
-    "Совме�тимо�ть и функционально�ть программы"
-LangString str_msg_compat_vi       ${LANG_RUSSIAN} \
-    "Работа в варианте �овме�тимо�ти � редактором Vi"
-LangString str_msg_compat_vim      ${LANG_RUSSIAN} \
-    "Работа в варианте функционально�ти редактора Vim"
-LangString str_msg_compat_defaults ${LANG_RUSSIAN} \
-    "Включить некоторые улучшени� (из файла defaults.vim)"
-LangString str_msg_compat_all      ${LANG_RUSSIAN} \
-    "Включить в�е улучшени� (из файла vimrc_example.vim). Стандартно"
-
-LangString str_msg_keymap_title   ${LANG_RUSSIAN} \
-    " Клавиатурные команды "
-LangString str_msg_keymap_desc    ${LANG_RUSSIAN} \
-    "Изменение клавиатурных команд CTRL+V, CTRL+C, CTRL+S, CTRL+F и т. п."
-LangString str_msg_keymap_default ${LANG_RUSSIAN} \
-    "Без изменени�, и�пользовать как прин�то в редакторе Vim"
-LangString str_msg_keymap_windows ${LANG_RUSSIAN} \
-    "Изменить и и�пользовать как прин�то в ОС Windows"
-
-LangString str_msg_mouse_title   ${LANG_RUSSIAN} \
-    " Манипул�тор «мышь» "
-LangString str_msg_mouse_desc    ${LANG_RUSSIAN} \
-    "Дей�тви� правой и левой кнопки манипул�тора «мышь»"
-LangString str_msg_mouse_default ${LANG_RUSSIAN} \
-    "Права� — в�плывающее меню, лева� — режим визуальный (Vim)"
-LangString str_msg_mouse_windows ${LANG_RUSSIAN} \
-    "Права� — в�плывающее меню, лева� — режим выборки (Windows)"
-LangString str_msg_mouse_unix    ${LANG_RUSSIAN} \
-    "Права� — ра�ширение выборки, лева� — режим визуальный (UNIX)"
diff --git a/nsis/lang/serbian.nsi b/nsis/lang/serbian.nsi
deleted file mode 100644
index 9b829ef961..0000000000
--- a/nsis/lang/serbian.nsi
+++ /dev/null
@@ -1,290 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# serbian.nsi: Serbian language strings for gvim NSIS installer.
-#
-# Locale ID    : 3098
-# Locale Name  : sr
-# fileencoding : UTF-8
-# Author       : Ivan Pešić
-
-!insertmacro MUI_LANGUAGE "Serbian"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_SERBIAN} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_SERBIAN} \
-        "$(^Name) Uninstall"
-
-##############################################################################
-# Translated license file for the license page                            {{{1
-##############################################################################
-
-LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_SERBIAN} "..\lang\LICENSE.sr.nsis.txt"
-
-##############################################################################
-# Translated README.txt file, which is opened after installation          {{{1
-##############################################################################
-
-LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_SERBIAN} "README.sr.txt"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_SERBIAN} \
-#    "Destination Folder (Must end with $\"vim$\")"
-
-LangString str_show_readme          ${LANG_SERBIAN} \
-    "Прикажи ПРОЧИТ�ЈМЕ када �е заврши ин�талација"
-
-# Install types:
-LangString str_type_typical         ${LANG_SERBIAN} \
-    "Типична"
-
-LangString str_type_minimal         ${LANG_SERBIAN} \
-    "Минимална"
-
-LangString str_type_full            ${LANG_SERBIAN} \
-    "Пуна"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_SERBIAN} \
-    "Уклањање по�тојећ(е/их) верзиј(е/а)"
-LangString str_desc_old_ver         ${LANG_SERBIAN} \
-    "Уклања по�тојећ(у/е) Vim верзииј(у/е) из вашег �и�тема."
-
-LangString str_section_exe          ${LANG_SERBIAN} \
-    "Vim ГКИ и фајлови потребни за извршавање"
-LangString str_desc_exe             ${LANG_SERBIAN} \
-    "Vim ГКИ извршни фајлови и фајлови потребни током извршавања. Ова компонента је неопходна."
-
-LangString str_section_console      ${LANG_SERBIAN} \
-    "Vim конзолни програм"
-LangString str_desc_console         ${LANG_SERBIAN} \
-    "Конзолна верзија програма Vim (vim.exe)."
-
-LangString str_section_batch        ${LANG_SERBIAN} \
-    "Креирај .bat фајлове"
-LangString str_desc_batch           ${LANG_SERBIAN} \
-    "Креира у Windows директоријуму .bat фајлове за Vim варијанте \
-     у циљу коришћења из командне линије."
-
-LangString str_group_icons          ${LANG_SERBIAN} \
-    "Креирај иконе за Vim"
-LangString str_desc_icons           ${LANG_SERBIAN} \
-    "Креира иконе за Vim на различитим ме�тима, како би �е олакшао при�туп."
-
-LangString str_section_desktop      ${LANG_SERBIAN} \
-    "�а радној површини"
-LangString str_desc_desktop         ${LANG_SERBIAN} \
-    "Креира иконе за gVim извршне фајлове на радној површини."
-
-LangString str_section_start_menu   ${LANG_SERBIAN} \
-    "У фа�цикли Програми унутар Старт менија"
-LangString str_desc_start_menu      ${LANG_SERBIAN} \
-    "Додаје Vim у фолдер Програми Старт менија."
-
-#LangString str_section_quick_launch ${LANG_SERBIAN} \
-#    "In the Quick Launch Bar"
-#LangString str_desc_quick_launch    ${LANG_SERBIAN} \
-#    "Add Vim shortcut in the quick launch bar."
-
-LangString str_section_edit_with    ${LANG_SERBIAN} \
-    "Додај Vim контек�тни мени"
-LangString str_desc_edit_with       ${LANG_SERBIAN} \
-    "Додаје Vim у $\"Отвори помоћу...$\" ли�ту контек�тног менија."
-
-#LangString str_section_edit_with32  ${LANG_SERBIAN} \
-#    "32-bit Version"
-#LangString str_desc_edit_with32     ${LANG_SERBIAN} \
-#    "Add Vim to the $\"Open With...$\" context menu list \
-#     for 32-bit applications."
-
-#LangString str_section_edit_with64  ${LANG_SERBIAN} \
-#    "64-bit Version"
-#LangString str_desc_edit_with64     ${LANG_SERBIAN} \
-#    "Add Vim to the $\"Open With...$\" context menu list \
-#     for 64-bit applications."
-
-LangString str_section_vim_rc       ${LANG_SERBIAN} \
-    "Креирај Подразумевану конфигурацију"
-LangString str_desc_vim_rc          ${LANG_SERBIAN} \
-    "Креира подразумевани конфиг фајл (_vimrc) ако неки већ не по�тоји."
-
-LangString str_group_plugin         ${LANG_SERBIAN} \
-    "Креира директоријуме додатака"
-LangString str_desc_plugin          ${LANG_SERBIAN} \
-    "Креира директоријуме додатака. Ови директоријуми омогућавају проширење програма Vim \
-     убацивањем фајла у директоријум."
-
-LangString str_section_plugin_home  ${LANG_SERBIAN} \
-    "Приватне"
-LangString str_desc_plugin_home     ${LANG_SERBIAN} \
-    "Креира директоријуме додатака у HOME директоријуму."
-
-LangString str_section_plugin_vim   ${LANG_SERBIAN} \
-    "Дељене"
-LangString str_desc_plugin_vim      ${LANG_SERBIAN} \
-    "Креира директоријуме додатака у Vim ин�талационом директоријуму, кори�те их �ви \
-     на �и�тему."
-
-LangString str_section_nls          ${LANG_SERBIAN} \
-    "Подршка за домаћи језик"
-LangString str_desc_nls             ${LANG_SERBIAN} \
-    "Ин�талира фајлове за домаћу језичку подршку."
-
-LangString str_unsection_register   ${LANG_SERBIAN} \
-    "Поништи реги�трацију Vim"
-LangString str_desc_unregister      ${LANG_SERBIAN} \
-    "Поништава реги�трацију програма Vim на �и�тему."
-
-LangString str_unsection_exe        ${LANG_SERBIAN} \
-    "Уклони Vim извршне фајлове/фајлове потребне у време извршавања"
-LangString str_desc_rm_exe          ${LANG_SERBIAN} \
-    "Уклања �ве Vim извршне фајлове и оне потребне у време извршавања."
-
-LangString str_ungroup_plugin       ${LANG_SERBIAN} \
-    "Укони директоријуме додатака"
-LangString str_desc_rm_plugin       ${LANG_SERBIAN} \
-    "Уклања директоријуме додатака ако �у празни."
-
-LangString str_unsection_plugin_home ${LANG_SERBIAN} \
-    "Приватне"
-LangString str_desc_rm_plugin_home  ${LANG_SERBIAN} \
-    "Уклања директоријуме додатака из HOME директоријума."
-
-LangString str_unsection_plugin_vim ${LANG_SERBIAN} \
-    "Дељене"
-LangString str_desc_rm_plugin_vim   ${LANG_SERBIAN} \
-    "Уклања директоријуме додатака из Vim ин�талациониг директоријума."
-
-LangString str_unsection_rootdir    ${LANG_SERBIAN} \
-    "Уклони Vim корени директоријум"
-LangString str_desc_rm_rootdir      ${LANG_SERBIAN} \
-    "Уклања Vim корени директоријум. Он �адржи ваше Vim конфигурационе фајлове!"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_SERBIAN} \
-#    "Found $vim_old_ver_count Vim versions on your system.$\r$\n\
-#     This installer can only handle ${VIM_MAX_OLD_VER} versions \
-#     at most.$\r$\n\
-#     Please remove some versions and start again."
-
-#LangString str_msg_invalid_root  ${LANG_SERBIAN} \
-#    "Invalid install path: $vim_install_root!$\r$\n\
-#     It should end with $\"vim$\"."
-
-#LangString str_msg_bin_mismatch  ${LANG_SERBIAN} \
-#    "Binary path mismatch!$\r$\n$\r$\n\
-#     Expect the binary path to be $\"$vim_bin_path$\",$\r$\n\
-#     but system indicates the binary path is $\"$INSTDIR$\"."
-
-#LangString str_msg_vim_running   ${LANG_SERBIAN} \
-#    "Vim is still running on your system.$\r$\n\
-#     Please close all instances of Vim before you continue."
-
-#LangString str_msg_register_ole  ${LANG_SERBIAN} \
-#    "Attempting to register Vim with OLE. \
-#     There is no message indicates whether this works or not."
-
-#LangString str_msg_unreg_ole     ${LANG_SERBIAN} \
-#    "Attempting to unregister Vim with OLE. \
-#     There is no message indicates whether this works or not."
-
-#LangString str_msg_rm_start      ${LANG_SERBIAN} \
-#    "Uninstalling the following version:"
-
-#LangString str_msg_rm_fail       ${LANG_SERBIAN} \
-#    "Fail to uninstall the following version:"
-
-#LangString str_msg_no_rm_key     ${LANG_SERBIAN} \
-#    "Cannot find uninstaller registry key."
-
-#LangString str_msg_no_rm_reg     ${LANG_SERBIAN} \
-#    "Cannot find uninstaller from registry."
-
-#LangString str_msg_no_rm_exe     ${LANG_SERBIAN} \
-#    "Cannot access uninstaller."
-
-#LangString str_msg_rm_copy_fail  ${LANG_SERBIAN} \
-#    "Fail to copy uninstaller to temporary directory."
-
-#LangString str_msg_rm_run_fail   ${LANG_SERBIAN} \
-#    "Fail to run uninstaller."
-
-#LangString str_msg_abort_install ${LANG_SERBIAN} \
-#    "Installer will abort."
-
-LangString str_msg_install_fail  ${LANG_SERBIAN} \
-    "Ин�талација није у�пела. Више �реће идући пут."
-
-LangString str_msg_rm_exe_fail   ${LANG_SERBIAN} \
-    "�еки фајлови у $0 ни�у обри�ани!$\r$\n\
-     Морате то ручно да обавите."
-
-#LangString str_msg_rm_root_fail  ${LANG_SERBIAN} \
-#    "WARNING: Cannot remove $\"$vim_install_root$\", it is not empty!"
-
-LangString str_msg_uninstalling  ${LANG_SERBIAN} \
-    "Уклањање �таре верзије..."
-
-LangString str_msg_registering   ${LANG_SERBIAN} \
-    "Реги�тровање..."
-
-LangString str_msg_unregistering ${LANG_SERBIAN} \
-    "Поништавање реги�трације..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_SERBIAN} \
-    "Изаберите _vimrc подешавања"
-LangString str_vimrc_page_subtitle ${LANG_SERBIAN} \
-    "Изаберите подешавања за побољшања, та�татуру и миша."
-
-LangString str_msg_compat_title    ${LANG_SERBIAN} \
-    " Vi / Vim понашање "
-LangString str_msg_compat_desc     ${LANG_SERBIAN} \
-    "&Компатибилно�т и побољшања"
-LangString str_msg_compat_vi       ${LANG_SERBIAN} \
-    "Vi компатибилно"
-LangString str_msg_compat_vim      ${LANG_SERBIAN} \
-    "Vim оригинално"
-LangString str_msg_compat_defaults ${LANG_SERBIAN} \
-    "Vim �а неким побољшањима (учитава defaults.vim)"
-LangString str_msg_compat_all      ${LANG_SERBIAN} \
-    "Vim �а �вим побољшањима (учитава vimrc_example.vim) (Подразумевано)"
-
-LangString str_msg_keymap_title   ${LANG_SERBIAN} \
-    " Мапирања "
-LangString str_msg_keymap_desc    ${LANG_SERBIAN} \
-    "&Ремапира неколико та�тера за Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, итд.)"
-LangString str_msg_keymap_default ${LANG_SERBIAN} \
-    "�емој да ремапираш та�тере (Подразумевано)"
-LangString str_msg_keymap_windows ${LANG_SERBIAN} \
-    "Ремапира неколико та�тера"
-
-LangString str_msg_mouse_title   ${LANG_SERBIAN} \
-    " Миш "
-LangString str_msg_mouse_desc    ${LANG_SERBIAN} \
-    "&Понашање левог и де�ног та�тера"
-LangString str_msg_mouse_default ${LANG_SERBIAN} \
-    "Де�ни: и�качући мени, Леви: визуелни режим (Подразумевано)"
-LangString str_msg_mouse_windows ${LANG_SERBIAN} \
-    "Де�ни: и�качући мени, Леви: режим избора (Windows)"
-LangString str_msg_mouse_unix    ${LANG_SERBIAN} \
-    "Де�ни: проширује избор, Леви: визуелни режим (Unix)"
diff --git a/nsis/lang/simpchinese.nsi b/nsis/lang/simpchinese.nsi
deleted file mode 100644
index fb4d5087f7..0000000000
--- a/nsis/lang/simpchinese.nsi
+++ /dev/null
@@ -1,286 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# simpchinese.nsi: Simplified Chinese language strings for gvim NSIS
-# installer.
-#
-# Locale ID    : 2052
-# Locale Name  : cn
-# fileencoding : UTF-8
-# Author       : Guopeng Wen, David Liu
-
-!insertmacro MUI_LANGUAGE "SimpChinese"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_SIMPCHINESE} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_SIMPCHINESE} \
-        "$(^Name) Uninstall"
-
-##############################################################################
-# Translated license file for the license page                            {{{1
-##############################################################################
-
-LicenseLangString page_lic_file ${LANG_SIMPCHINESE} \
-        "..\lang\LICENSE.zh_cn.nsis.txt"
-
-##############################################################################
-# Translated README.txt file, which is opened after installation          {{{1
-##############################################################################
-
-LangString vim_readme_file ${LANG_SIMPCHINESE} "README.zh_cn.txt"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_SIMPCHINESE} \
-#    "安装路径 (必须以 vim 结尾)"
-
-LangString str_show_readme          ${LANG_SIMPCHINESE} \
-    "安装完��显示 README 文件"
-
-# Install types:
-LangString str_type_typical         ${LANG_SIMPCHINESE} \
-    "典型安装"
-
-LangString str_type_minimal         ${LANG_SIMPCHINESE} \
-    "最�安装"
-
-LangString str_type_full            ${LANG_SIMPCHINESE} \
-    "完全安装"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_SIMPCHINESE} \
-    "�载旧版本"
-LangString str_desc_old_ver         ${LANG_SIMPCHINESE} \
-    "�载系统上已存在的 Vim 版本"
-
-LangString str_section_exe          ${LANG_SIMPCHINESE} \
-    "安装 Vim 图形界�"
-LangString str_desc_exe             ${LANG_SIMPCHINESE} \
-    "安装 Vim 图形界���行时文件。此项为必选。"
-
-LangString str_section_console      ${LANG_SIMPCHINESE} \
-    "安装 Vim 控制�版本"
-LangString str_desc_console         ${LANG_SIMPCHINESE} \
-    "安装 Vim 的控制�版本（vim.exe）。"
-
-LangString str_section_batch        ${LANG_SIMPCHINESE} \
-    "安装批处�文件"
-LangString str_desc_batch           ${LANG_SIMPCHINESE} \
-    "为 Vim 的���体创建批处�文件，以便在命令行下�行 Vim。"
-
-LangString str_group_icons          ${LANG_SIMPCHINESE} \
-    "创建图标"
-LangString str_desc_icons           ${LANG_SIMPCHINESE} \
-    "为 Vim 创建若干图标，以方便使用 Vim。"
-
-LangString str_section_desktop      ${LANG_SIMPCHINESE} \
-    "桌�图标"
-LangString str_desc_desktop         ${LANG_SIMPCHINESE} \
-    "创建 Vim 的桌�快�方�图标。"
-
-LangString str_section_start_menu   ${LANG_SIMPCHINESE} \
-    "「开始���程�组"
-LangString str_desc_start_menu      ${LANG_SIMPCHINESE} \
-    "在开始��中添加 Vim 程�组（适用于 Windows 95 �以上版本）"
-
-#LangString str_section_quick_launch ${LANG_SIMPCHINESE} \
-#    "在快速�动�动�中"
-#LangString str_desc_quick_launch    ${LANG_SIMPCHINESE} \
-#    "在快速�动�中添加 Vim 图标。"
-
-LangString str_section_edit_with    ${LANG_SIMPCHINESE} \
-    "添加到快���"
-LangString str_desc_edit_with       ${LANG_SIMPCHINESE} \
-    "将“用 Vim 编辑�添加到快���中。"
-
-#LangString str_section_edit_with32  ${LANG_SIMPCHINESE} \
-#    "32 �版本"
-#LangString str_desc_edit_with32     ${LANG_SIMPCHINESE} \
-#    "将 Vim 添加到 32 �程�的“打开方��快���中。"
-
-#LangString str_section_edit_with64  ${LANG_SIMPCHINESE} \
-#    "64 �版本"
-#LangString str_desc_edit_with64     ${LANG_SIMPCHINESE} \
-#    "将 Vim 添加到 64 �程�的“打开方��快���中。"
-
-LangString str_section_vim_rc       ${LANG_SIMPCHINESE} \
-    "创建默认�置文件"
-LangString str_desc_vim_rc          ${LANG_SIMPCHINESE} \
-    "在安装目录下生�默认的 Vim �置文件(_vimrc)。\
-     如果该文件已�存在，则跳过该项。"
-
-LangString str_group_plugin         ${LANG_SIMPCHINESE} \
-    "创建�件目录"
-LangString str_desc_plugin          ${LANG_SIMPCHINESE} \
-    "创建(空的)�件目录结构。�件目录用于安装 Vim 扩展�件，\
-     ��将文件�制到相关的�目录中��。"
-
-LangString str_section_plugin_home  ${LANG_SIMPCHINESE} \
-    "�有�件目录"
-LangString str_desc_plugin_home     ${LANG_SIMPCHINESE} \
-    "在主目录创建�有�件目录。"
-
-LangString str_section_plugin_vim   ${LANG_SIMPCHINESE} \
-    "公共�件目录"
-LangString str_desc_plugin_vim      ${LANG_SIMPCHINESE} \
-    "在 Vim 安装目录下创建(空的)�件目录结构，系统上所有用户都能使用安装在\
-     该目录下的扩展�件。"
-
-LangString str_section_nls          ${LANG_SIMPCHINESE} \
-    "安装多语言支�"
-LangString str_desc_nls             ${LANG_SIMPCHINESE} \
-    "安装用于多语言支�的文件。"
-
-LangString str_unsection_register   ${LANG_SIMPCHINESE} \
-    "删除 Vim 系统�置"
-LangString str_desc_unregister      ${LANG_SIMPCHINESE} \
-    "删除和 Vim 相关的系统�置。"
-
-LangString str_unsection_exe        ${LANG_SIMPCHINESE} \
-    "删除 Vim 执行文件以�脚本"
-LangString str_desc_rm_exe          ${LANG_SIMPCHINESE} \
-    "删除 Vim 的所有执行文件�脚本。"
-
-LangString str_ungroup_plugin       ${LANG_SIMPCHINESE} \
-    "移除�件目录"
-LangString str_desc_rm_plugin       ${LANG_SIMPCHINESE} \
-    "移除�件目录（如果目录为空）。"
-
-LangString str_unsection_plugin_home ${LANG_SIMPCHINESE} \
-    "�有�件目录"
-LangString str_desc_rm_plugin_home  ${LANG_SIMPCHINESE} \
-    "从主目录中移除�有�件目录。"
-
-LangString str_unsection_plugin_vim ${LANG_SIMPCHINESE} \
-    "公共�件目录"
-LangString str_desc_rm_plugin_vim   ${LANG_SIMPCHINESE} \
-    "从 Vim 安装目录下移除�件目录。"
-
-LangString str_unsection_rootdir    ${LANG_SIMPCHINESE} \
-    "移除 Vim 主目录"
-LangString str_desc_rm_rootdir      ${LANG_SIMPCHINESE} \
-    "移除 Vim 的主目录，该目录包�您的�置文件�"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_SIMPCHINESE} \
-#    "您的系统上安装了 $vim_old_ver_count 个��版本的 Vim，$\r$\n\
-#     但本安装程�最多�能处� ${VIM_MAX_OLD_VER} 个版本。$\r$\n\
-#     请您手工删除一些旧版本以���行本安装程�。"
-
-#LangString str_msg_invalid_root  ${LANG_SIMPCHINESE} \
-#    "安装路径“$vim_install_root�无效�$\r$\n\
-#     该路径必须以 vim 结尾。"
-
-#LangString str_msg_bin_mismatch  ${LANG_SIMPCHINESE} \
-#    "Vim 执行程�安装路径异常�$\r$\n$\r$\n\
-#     该版本 Vim 的执行程�安装路径应该是“$vim_bin_path�,$\r$\n\
-#     而系统�指示该路径为“$INSTDIR�。"
-
-#LangString str_msg_vim_running   ${LANG_SIMPCHINESE} \
-#    "您的系统上�有 Vim 在�行，$\r$\n\
-#     请您在执行�续步骤�退出这些 Vim。"
-
-#LangString str_msg_register_ole  ${LANG_SIMPCHINESE} \
-#    "试图注册 Vim OLE �务器。请注�无论�功与�都��显示进一步的信�。"
-
-#LangString str_msg_unreg_ole     ${LANG_SIMPCHINESE} \
-#    "试图注销 Vim OLE �务器。请注�无论�功与�都��显示进一步的信�。"
-
-#LangString str_msg_rm_start      ${LANG_SIMPCHINESE} \
-#    "开始�载以下版本："
-
-#LangString str_msg_rm_fail       ${LANG_SIMPCHINESE} \
-#    "以下版本�载失败："
-
-#LangString str_msg_no_rm_key     ${LANG_SIMPCHINESE} \
-#    "找�到�载程�的注册表键。"
-
-#LangString str_msg_no_rm_reg     ${LANG_SIMPCHINESE} \
-#    "在注册表中未找到�载程�路径。"
-
-#LangString str_msg_no_rm_exe     ${LANG_SIMPCHINESE} \
-#    "找�到�载程�。"
-
-#LangString str_msg_rm_copy_fail  ${LANG_SIMPCHINESE} \
-#    "无法将�载程��制到临时目录。"
-
-#LangString str_msg_rm_run_fail   ${LANG_SIMPCHINESE} \
-#    "执行�载程�失败。"
-
-#LangString str_msg_abort_install ${LANG_SIMPCHINESE} \
-#    "安装程�将退出。"
-
-LangString str_msg_install_fail  ${LANG_SIMPCHINESE} \
-    "安装失败。�您下次好�。"
-
-LangString str_msg_rm_exe_fail   ${LANG_SIMPCHINESE} \
-    "目录“$0�下有部分文件删除失败�$\r$\n\
-     您�能手工删除该目录。"
-
-#LangString str_msg_rm_root_fail  ${LANG_SIMPCHINESE} \
-#    "警告：无法删除 Vim 安装目录“$vim_install_root�，\
-#     该目录下�有其他文件。"
-
-LangString str_msg_uninstalling  ${LANG_SIMPCHINESE} \
-    "正在�载旧版本..."
-
-LangString str_msg_registering   ${LANG_SIMPCHINESE} \
-    "正在注册..."
-
-LangString str_msg_unregistering ${LANG_SIMPCHINESE} \
-    "正在�消注册..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_SIMPCHINESE} \
-    "设置 _vimrc"
-LangString str_vimrc_page_subtitle ${LANG_SIMPCHINESE} \
-    "选择键盘�鼠标和扩展设置。"
-
-LangString str_msg_compat_title    ${LANG_SIMPCHINESE} \
-    "Vi / Vim 行为"
-LangString str_msg_compat_desc     ${LANG_SIMPCHINESE} \
-    "兼容性与扩展(&B)"
-LangString str_msg_compat_vi       ${LANG_SIMPCHINESE} \
-    "原始 Vi"
-LangString str_msg_compat_vim      ${LANG_SIMPCHINESE} \
-    "原始 Vim"
-LangString str_msg_compat_defaults ${LANG_SIMPCHINESE} \
-    "Vim 原始版本和部分扩展 (加载 defaults.vim)"
-LangString str_msg_compat_all      ${LANG_SIMPCHINESE} \
-    "Vim 原始版本和所有扩展 (加载 vimrc_example.vim) (缺�)"
-
-LangString str_msg_keymap_title   ${LANG_SIMPCHINESE} \
-    "键盘映射"
-LangString str_msg_keymap_desc    ${LANG_SIMPCHINESE} \
-    "为 Windows 映射按键(&R) (例如:Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F 等)"
-LangString str_msg_keymap_default ${LANG_SIMPCHINESE} \
-    "�映射按键 (缺�)"
-LangString str_msg_keymap_windows ${LANG_SIMPCHINESE} \
-    "映射一些按键"
-
-LangString str_msg_mouse_title   ${LANG_SIMPCHINESE} \
-    "é¼ æ ‡"
-LangString str_msg_mouse_desc    ${LANG_SIMPCHINESE} \
-    "左键和�键行为(&B)"
-LangString str_msg_mouse_default ${LANG_SIMPCHINESE} \
-    "�键：弹出��, 左键：�视化模� (缺�)"
-LangString str_msg_mouse_windows ${LANG_SIMPCHINESE} \
-    "�键：弹出��, 左键:选择模� (Windows)"
-LangString str_msg_mouse_unix    ${LANG_SIMPCHINESE} \
-    "�键： 扩展选择, 左键：�视化模� (Unix)"
diff --git a/nsis/lang/swedish.nsi b/nsis/lang/swedish.nsi
deleted file mode 100644
index b512175a91..0000000000
--- a/nsis/lang/swedish.nsi
+++ /dev/null
@@ -1,288 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# swedish.nsi: Svenska strängar för gvim NSIS-installationsprogram.
-#
-# Lokalisering-ID    : 1053
-# Lokalt namn  : sv
-# filkodning : UTF-8
-# Översättare       : Daniel Nylander
-
-!insertmacro MUI_LANGUAGE "Swedish"
-
-
-# Skriv över standardöversättningen.
-# Dessa strängar ska alltid vara på engelska.  Annars misslyckas dosinst.c.
-LangString ^SetupCaption     ${LANG_SWEDISH} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_SWEDISH} \
-        "$(^Name) Uninstall"
-
-##############################################################################
-# Licensfil för licenssidan                                       {{{1
-##############################################################################
-
-LicenseLangString page_lic_file ${LANG_SWEDISH} "..\lang\LICENSE.sv.nsis.txt"
-
-##############################################################################
-# README.txt-fil, som öppnas efter installationen                     {{{1
-##############################################################################
-
-LangString vim_readme_file ${LANG_SWEDISH} "README.sv.txt"
-
-##############################################################################
-# MUI-konfigurationssträngar                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_SWEDISH} \
-#    "Målmapp (måste sluta med $\"vim$\")"
-
-LangString str_show_readme          ${LANG_SWEDISH} \
-    "Visa README efter avslutad installation"
-
-# Installationstyper:
-LangString str_type_typical         ${LANG_SWEDISH} \
-    "Typisk"
-
-LangString str_type_minimal         ${LANG_SWEDISH} \
-    "Minimal"
-
-LangString str_type_full            ${LANG_SWEDISH} \
-    "Fullständig"
-
-
-##############################################################################
-# Avsnittstitlar och beskrivning                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_SWEDISH} \
-    "Avinstallera befintliga versioner"
-LangString str_desc_old_ver         ${LANG_SWEDISH} \
-    "Avinstallera befintliga Vim-versioner från ditt system."
-
-LangString str_section_exe          ${LANG_SWEDISH} \
-    "Vim GUI och runtime-filer"
-LangString str_desc_exe             ${LANG_SWEDISH} \
-    "Vim GUI-körbara filer och runtime-filer.  Denna komponent krävs."
-
-LangString str_section_console      ${LANG_SWEDISH} \
-    "Vim-konsolprogram"
-LangString str_desc_console         ${LANG_SWEDISH} \
-    "Konsolversion av Vim (vim.exe)."
-
-LangString str_section_batch        ${LANG_SWEDISH} \
-    "Skapa .bat-filer"
-LangString str_desc_batch           ${LANG_SWEDISH} \
-    "Skapa .bat-filer för Vim-varianter i Windows-katalogen för \
-     kommandoradsanvändning."
-
-LangString str_group_icons          ${LANG_SWEDISH} \
-    "Skapa ikoner för Vim"
-LangString str_desc_icons           ${LANG_SWEDISH} \
-    "Skapa ikoner för Vim på olika platser för att underlätta åtkomsten."
-
-LangString str_section_desktop      ${LANG_SWEDISH} \
-    "PÃ¥ skrivbordet"
-LangString str_desc_desktop         ${LANG_SWEDISH} \
-    "Skapa ikoner för gVim-körbara filer på skrivbordet."
-
-LangString str_section_start_menu   ${LANG_SWEDISH} \
-    "I startmenyns programmapp"
-LangString str_desc_start_menu      ${LANG_SWEDISH} \
-    "Lägg till Vim i programmappen i startmenyn."
-
-#LangString str_section_quick_launch ${LANG_SWEDISH} \
-#    "I snabbstartfältet"
-#LangString str_desc_quick_launch    ${LANG_SWEDISH} \
-#    "Lägg till Vim-genväg i snabbstartfältet."
-
-LangString str_section_edit_with    ${LANG_SWEDISH} \
-    "Lägg till Vim-kontextmeny"
-LangString str_desc_edit_with       ${LANG_SWEDISH} \
-    "Lägg till Vim i listan över snabbmenyn $\"Öppna med...$\"."
-
-#LangString str_section_edit_with32  ${LANG_SWEDISH} \
-#    "32-bitarsversion"
-#LangString str_desc_edit_with32     ${LANG_SWEDISH} \
-#    "Lägg till Vim i listan över snabbmenyn $\"Öppna med...$\" \
-#     för 32-bitarsprogram."
-
-#LangString str_section_edit_with64  ${LANG_SWEDISH} \
-#    "64-bitarsversion"
-#LangString str_desc_edit_with64     ${LANG_SWEDISH} \
-#    "Lägg till Vim i listan över kontextmenyn $\"Öppna med...$\" \
-#     för 64-bitarsprogram."
-
-LangString str_section_vim_rc       ${LANG_SWEDISH} \
-    "Skapa standardkonfiguration"
-LangString str_desc_vim_rc          ${LANG_SWEDISH} \
-    "Skapa en standardkonfigurationsfil (_vimrc) om det inte redan finns en."
-
-LangString str_group_plugin         ${LANG_SWEDISH} \
-    "Skapa plugin-kataloger"
-LangString str_desc_plugin          ${LANG_SWEDISH} \
-    "Skapa plugin-kataloger.  Plugin-kataloger gör det möjligt att utöka Vim \
-     genom att släppa en fil i en katalog."
-
-LangString str_section_plugin_home  ${LANG_SWEDISH} \
-    "Privat"
-LangString str_desc_plugin_home     ${LANG_SWEDISH} \
-    "Skapa plugin-kataloger i HOME-katalogen."
-
-LangString str_section_plugin_vim   ${LANG_SWEDISH} \
-    "Delad"
-LangString str_desc_plugin_vim      ${LANG_SWEDISH} \
-    "Skapa plugin-kataloger i Vim-installationskatalogen, den används för \
-     alla på systemet."
-
-LangString str_section_nls          ${LANG_SWEDISH} \
-    "Stöd för modersmål"
-LangString str_desc_nls             ${LANG_SWEDISH} \
-    "Installera filer för stöd för modersmål."
-
-LangString str_unsection_register   ${LANG_SWEDISH} \
-    "Avregistrera Vim"
-LangString str_desc_unregister      ${LANG_SWEDISH} \
-    "Avregistrera Vim från systemet."
-
-LangString str_unsection_exe        ${LANG_SWEDISH} \
-    "Ta bort Vim-körbara filer/körningsfiler"
-LangString str_desc_rm_exe          ${LANG_SWEDISH} \
-    "Ta bort alla Vim-körbara filer och runtime-filer."
-
-LangString str_ungroup_plugin       ${LANG_SWEDISH} \
-    "Ta bort plugin-kataloger"
-LangString str_desc_rm_plugin       ${LANG_SWEDISH} \
-    "Ta bort plugin-katalogerna om de är tomma."
-
-LangString str_unsection_plugin_home ${LANG_SWEDISH} \
-    "Privat"
-LangString str_desc_rm_plugin_home  ${LANG_SWEDISH} \
-    "Ta bort plugin-katalogerna från HOME-katalogen."
-
-LangString str_unsection_plugin_vim ${LANG_SWEDISH} \
-    "Delad"
-LangString str_desc_rm_plugin_vim   ${LANG_SWEDISH} \
-    "Ta bort plugin-katalogerna från Vim-installationskatalogen."
-
-LangString str_unsection_rootdir    ${LANG_SWEDISH} \
-    "Ta bort Vim-rotkatalogen"
-LangString str_desc_rm_rootdir      ${LANG_SWEDISH} \
-    "Ta bort Vim-rotkatalogen. Den innehåller dina Vim-konfigurationsfiler!"
-
-
-##############################################################################
-# Meddelanden                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_SWEDISH} \
-#    "Hittade $vim_old_ver_count Vim-versioner på ditt system.$\r$\n\
-#     Denna installationsprogram kan endast hantera ${VIM_MAX_OLD_VER} versioner \
-#    .$\r$\n\
-#     Ta bort några versioner och börja om."
-
-#LangString str_msg_invalid_root  ${LANG_SWEDISH} \
-#    "Ogiltig installationsväg: $vim_install_root!$\r$\n\
-#     Den ska sluta med $\"vim$\"."
-
-#LangString str_msg_bin_mismatch  ${LANG_SWEDISH} \
-#    "Binär sökväg stämmer inte!$\r$\n$\r$\n\
-#     Förväntar mig att binärvägen är $\"$vim_bin_path$\",$\r$\n\
-#     men systemet anger att binärvägen är $\"$INSTDIR$\"."
-
-#LangString str_msg_vim_running   ${LANG_SWEDISH} \
-#    "Vim körs fortfarande på ditt system.$\r$\n\
-#     Stäng alla instanser av Vim innan du fortsätter."
-
-#LangString str_msg_register_ole  ${LANG_SWEDISH} \
-#    "Försöker registrera Vim med OLE. \
-#     Det finns inget meddelande som anger om detta fungerar eller inte."
-
-#LangString str_msg_unreg_ole     ${LANG_SWEDISH} \
-#    "Försöker avregistrera Vim från OLE. \
-#     Det finns inget meddelande som anger om detta fungerar eller inte."
-
-#LangString str_msg_rm_start      ${LANG_SWEDISH} \
-#    "Avinstallera följande version:"
-
-#LangString str_msg_rm_fail       ${LANG_SWEDISH} \
-#    "Det gick inte att avinstallera följande version:"
-
-#LangString str_msg_no_rm_key     ${LANG_SWEDISH} \
-#    "Kan inte hitta avinstallationsnyckeln i registret."
-
-#LangString str_msg_no_rm_reg     ${LANG_SWEDISH} \
-#    "Kan inte hitta avinstallationsprogrammet i registret."
-
-#LangString str_msg_no_rm_exe     ${LANG_SWEDISH} \
-#    "Kan inte komma åt avinstallationsprogrammet."
-
-#LangString str_msg_rm_copy_fail  ${LANG_SWEDISH} \
-#    "Det gick inte att kopiera avinstallationsprogrammet till den tillfälliga katalogen."
-
-#LangString str_msg_rm_run_fail   ${LANG_SWEDISH} \
-#    "Det gick inte att köra avinstallationsprogrammet."
-
-#LangString str_msg_abort_install ${LANG_SWEDISH} \
-#    "Installationsprogrammet avbryts."
-
-LangString str_msg_install_fail  ${LANG_SWEDISH} \
-    "Installationen misslyckades. Bättre lycka nästa gång."
-
-LangString str_msg_rm_exe_fail   ${LANG_SWEDISH} \
-    "Vissa filer i $0 har inte raderats!$\r$\n\
-     Du måste göra det manuellt."
-
-#LangString str_msg_rm_root_fail  ${LANG_SWEDISH} \
-#    "VARNING: Kan inte ta bort $\"$vim_install_root$\", den är inte tom!"
-
-LangString str_msg_uninstalling  ${LANG_SWEDISH} \
-    "Avinstallerar den gamla versionen..."
-
-LangString str_msg_registering   ${LANG_SWEDISH} \
-    "Registrerar..."
-
-LangString str_msg_unregistering ${LANG_SWEDISH} \
-    "Avregistrerar..."
-
-
-##############################################################################
-# Dialogruta                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_SWEDISH} \
-    "Välj _vimrc-inställningar"
-LangString str_vimrc_page_subtitle ${LANG_SWEDISH} \
-    "Välj inställningar för förbättringar, tangentbord och mus."
-
-LangString str_msg_compat_title    ${LANG_SWEDISH} \
-    " Vi / Vim-beteende "
-LangString str_msg_compat_desc     ${LANG_SWEDISH} \
-    "&Kompatibilitet och förbättringar"
-LangString str_msg_compat_vi       ${LANG_SWEDISH} \
-    "Vi-kompatibel"
-LangString str_msg_compat_vim      ${LANG_SWEDISH} \
-    "Vim original"
-LangString str_msg_compat_defaults ${LANG_SWEDISH} \
-    "Vim med vissa förbättringar (ladda defaults.vim)"
-LangString str_msg_compat_all      ${LANG_SWEDISH} \
-    "Vim med alla förbättringar (ladda vimrc_example.vim) (Standard)"
-
-LangString str_msg_keymap_title   ${LANG_SWEDISH} \
-    " Mappningar "
-LangString str_msg_keymap_desc    ${LANG_SWEDISH} \
-    "&Omkonfigurera några tangenter för Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc)"
-LangString str_msg_keymap_default ${LANG_SWEDISH} \
-    "Omkonfigurera inte tangenter (standard)"
-LangString str_msg_keymap_windows ${LANG_SWEDISH} \
-    "Omkonfigurera några tangenter"
-
-LangString str_msg_mouse_title   ${LANG_SWEDISH} \
-    " Mus "
-LangString str_msg_mouse_desc    ${LANG_SWEDISH} \
-    "&Funktion för höger- och vänsterknapp"
-LangString str_msg_mouse_default ${LANG_SWEDISH} \
-    "Höger: popup-meny, Vänster: visuellt läge (Standard)"
-LangString str_msg_mouse_windows ${LANG_SWEDISH} \
-    "Höger: popup-meny, Vänster: välj läge (Windows)"
-LangString str_msg_mouse_unix    ${LANG_SWEDISH} \
-    "Höger: utökar valet, Vänster: visuellt läge (Unix)"
diff --git a/nsis/lang/tradchinese.nsi b/nsis/lang/tradchinese.nsi
deleted file mode 100644
index 5d9a5d3a56..0000000000
--- a/nsis/lang/tradchinese.nsi
+++ /dev/null
@@ -1,289 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# tradchinese.nsi: Traditional Chinese language strings for gvim NSIS
-# installer.
-#
-# Locale ID    : 1028
-# Locale Name  : tw
-# fileencoding : UTF-8
-# Author       : Guopeng Wen
-
-!insertmacro MUI_LANGUAGE "TradChinese"
-
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_TRADCHINESE} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_TRADCHINESE} \
-        "$(^Name) Uninstall"
-
-##############################################################################
-# Translated license file for the license page                            {{{1
-##############################################################################
-
-LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_TRADCHINESE} \
-#        "..\lang\LICENSE.zh_tw.nsis.txt"
-
-##############################################################################
-# Translated README.txt file, which is opened after installation          {{{1
-##############################################################################
-
-LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_TRADCHINESE} "README.zh_tw.txt"
-
-##############################################################################
-# MUI Configuration Strings                                               {{{1
-##############################################################################
-
-#LangString str_dest_folder          ${LANG_TRADCHINESE} \
-#    "安�資料夾 (必須以 vim �尾)"
-
-LangString str_show_readme          ${LANG_TRADCHINESE} \
-    "安�完�後顯示 README 檔案"
-
-# Install types:
-LangString str_type_typical         ${LANG_TRADCHINESE} \
-    "典型安�"
-
-LangString str_type_minimal         ${LANG_TRADCHINESE} \
-    "最�安�"
-
-LangString str_type_full            ${LANG_TRADCHINESE} \
-    "完全安�"
-
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_TRADCHINESE} \
-    "移除舊版本"
-LangString str_desc_old_ver         ${LANG_TRADCHINESE} \
-    "移除閣下電腦上舊版本的 Vim。"
-
-LangString str_section_exe          ${LANG_TRADCHINESE} \
-    "安� Vim 圖形界�程�"
-LangString str_desc_exe             ${LANG_TRADCHINESE} \
-    "安� Vim 圖形界�程��腳本。此為必�安�。"
-
-LangString str_section_console      ${LANG_TRADCHINESE} \
-    "安� Vim 命令行程�"
-LangString str_desc_console         ${LANG_TRADCHINESE} \
-    "安� Vim 命令行程� (vim.exe)。該程�在控制臺窗�中�行。"
-
-LangString str_section_batch        ${LANG_TRADCHINESE} \
-    "安�批次檔案"
-LangString str_desc_batch           ${LANG_TRADCHINESE} \
-    "為 Vim 的�種變體創建批次檔，以便在命令行下啟動 Vim。"
-
-LangString str_group_icons          ${LANG_TRADCHINESE} \
-    "建立 Vim 圖示"
-LangString str_desc_icons           ${LANG_TRADCHINESE} \
-    "建立若干 Vim 圖示，以便于使用 Vim。"
-
-LangString str_section_desktop      ${LANG_TRADCHINESE} \
-    "於桌�"
-LangString str_desc_desktop         ${LANG_TRADCHINESE} \
-    "建立若干 Vim 圖示於桌�上，以方便啟動 Vim。"
-
-LangString str_section_start_menu   ${LANG_TRADCHINESE} \
-    "於「開始�功能表的「程��集"
-LangString str_desc_start_menu      ${LANG_TRADCHINESE} \
-    "在「開始�功能表的「程��集中建立 Vim 啟動組。\
-     �用于 Windows 95 �以上版本。"
-
-#LangString str_section_quick_launch ${LANG_TRADCHINESE} \
-#    "於快速啟動列"
-#LangString str_desc_quick_launch    ${LANG_TRADCHINESE} \
-#    "在快速啟動列中建立 Vim 圖示。"
-
-LangString str_section_edit_with    ${LANG_TRADCHINESE} \
-    "安�快��單"
-LangString str_desc_edit_with       ${LANG_TRADCHINESE} \
-    "在「打開方��快��單中添加 Vim 項。"
-
-#LangString str_section_edit_with32  ${LANG_TRADCHINESE} \
-#    "32 �元版本"
-#LangString str_desc_edit_with32     ${LANG_TRADCHINESE} \
-#    "在 32 �元程�的「打開方��快��單中添加 Vim 項。"
-
-#LangString str_section_edit_with64  ${LANG_TRADCHINESE} \
-#    "64 �元版本"
-#LangString str_desc_edit_with64     ${LANG_TRADCHINESE} \
-#    "在 64 �元程�的「打開方��快��單中添加 Vim 項。"
-
-LangString str_section_vim_rc       ${LANG_TRADCHINESE} \
-    "建立默�設定檔"
-LangString str_desc_vim_rc          ${LANG_TRADCHINESE} \
-    "在安�資料夾下建立默�的 Vim 設定檔(_vimrc)。\
-     若該設定檔已經存在，則略�此項。"
-
-LangString str_group_plugin         ${LANG_TRADCHINESE} \
-    "建立�件資料夾"
-LangString str_desc_plugin          ${LANG_TRADCHINESE} \
-    "建立(空的)�件資料夾�構。�件資料夾用于安� Vim 的擴展�件，\
-     ��將檔案復制到相關的�資料夾中��。"
-
-LangString str_section_plugin_home  ${LANG_TRADCHINESE} \
-    "建立�件資料夾"
-LangString str_desc_plugin_home     ${LANG_TRADCHINESE} \
-    "Create plugin directories in HOME directory."
-
-LangString str_section_plugin_vim   ${LANG_TRADCHINESE} \
-    "建立共享�件資料夾"
-LangString str_desc_plugin_vim      ${LANG_TRADCHINESE} \
-    "在 Vim 安�資料夾下建立(空的)�件資料夾�構，電腦上所有用戶都能使用安�\
-     在該資料夾里的擴展�件。"
-
-LangString str_section_nls          ${LANG_TRADCHINESE} \
-    "安�本地語言支�"
-LangString str_desc_nls             ${LANG_TRADCHINESE} \
-    "安�用于支�本地語言的檔案。"
-
-LangString str_unsection_register   ${LANG_TRADCHINESE} \
-    "移除 Vim 系統設定"
-LangString str_desc_unregister      ${LANG_TRADCHINESE} \
-    "移除與 Vim 相關的系統設定。"
-
-LangString str_unsection_exe        ${LANG_TRADCHINESE} \
-    "移除 Vim 程��腳本"
-LangString str_desc_rm_exe          ${LANG_TRADCHINESE} \
-    "移除所有的 Vim 程��腳本。"
-
-LangString str_ungroup_plugin       ${LANG_TRADCHINESE} \
-    "Remove plugin directories"
-LangString str_desc_rm_plugin       ${LANG_TRADCHINESE} \
-    "Remove the plugin directories if they are empty."
-
-LangString str_unsection_plugin_home ${LANG_TRADCHINESE} \
-    "Private"
-LangString str_desc_rm_plugin_home  ${LANG_TRADCHINESE} \
-    "Remove the vimfiles directory in HOME directory."
-
-LangString str_unsection_plugin_vim ${LANG_TRADCHINESE} \
-    "Shared"
-LangString str_desc_rm_plugin_vim   ${LANG_TRADCHINESE} \
-    "Remove the vimfiles directory in Vim install directory."
-
-LangString str_unsection_rootdir    ${LANG_TRADCHINESE} \
-    "Remove the Vim root directory"
-LangString str_desc_rm_rootdir      ${LANG_TRADCHINESE} \
-    "Remove the Vim root directory. It contains your Vim configuration files!"
-
-
-##############################################################################
-# Messages                                                                {{{1
-##############################################################################
-
-#LangString str_msg_too_many_ver  ${LANG_TRADCHINESE} \
-#    "閣下的電腦上安�了 $vim_old_ver_count 個��版本的 Vim，$\r$\n\
-#     但是本安�程�最多�能處� ${VIM_MAX_OLD_VER} 個版本。$\r$\n\
-#     煩請閣下手工移除一些版本以���行本安�程�。"
-
-#LangString str_msg_invalid_root  ${LANG_TRADCHINESE} \
-#    "安�資料夾「$vim_install_root�無效�$\r$\n\
-#     該資料夾必須以「vim��尾。"
-
-#LangString str_msg_bin_mismatch  ${LANG_TRADCHINESE} \
-#    "Vim 執行程�安�路徑異常�$\r$\n$\r$\n\
-#     該版本 Vim 的執行程�安�路徑應該是「$vim_bin_path�,$\r$\n\
-#     而系統�指示該路徑為「$INSTDIR�。"
-
-#LangString str_msg_vim_running   ${LANG_TRADCHINESE} \
-#    "閣下的電腦上尚有正在�行之 Vim，$\r$\n\
-#     煩請閣下在執行�續步驟�將其全部退出。"
-
-#LangString str_msg_register_ole  ${LANG_TRADCHINESE} \
-#    "試圖注冊 Vim OLE 伺�程�。請注��論�功與�都��顯示進一步的信�。"
-
-#LangString str_msg_unreg_ole     ${LANG_TRADCHINESE} \
-#    "試圖注銷 Vim OLE 伺�程�。請注��論�功與�都��顯示進一步的信�。"
-
-#LangString str_msg_rm_start      ${LANG_TRADCHINESE} \
-#    "正移除如下版本："
-
-#LangString str_msg_rm_fail       ${LANG_TRADCHINESE} \
-#    "以下版本移除失敗："
-
-#LangString str_msg_no_rm_key     ${LANG_TRADCHINESE} \
-#    "找�到�安�程�的登錄檔入�。"
-
-#LangString str_msg_no_rm_reg     ${LANG_TRADCHINESE} \
-#    "在登錄檔中未找到�安�程�路徑。"
-
-#LangString str_msg_no_rm_exe     ${LANG_TRADCHINESE} \
-#    "找�到�安�程�。"
-
-#LangString str_msg_rm_copy_fail  ${LANG_TRADCHINESE} \
-#    "無法將法將�安�程��制到臨時目錄。"
-
-#LangString str_msg_rm_run_fail   ${LANG_TRADCHINESE} \
-#    "執行�安�程�失敗。"
-
-#LangString str_msg_abort_install ${LANG_TRADCHINESE} \
-#    "安�程�將退出。"
-
-LangString str_msg_install_fail  ${LANG_TRADCHINESE} \
-    "安�失敗。��下次好�。"
-
-LangString str_msg_rm_exe_fail   ${LANG_TRADCHINESE} \
-    "資料夾「$0�下有部分檔案未能移除�$\r$\n\
-     閣下�能手工移除該資料夾。"
-
-#LangString str_msg_rm_root_fail  ${LANG_TRADCHINESE} \
-#    "警告：無法刪除 Vim 安�資料夾「$vim_install_root�，\
-#     該資料夾下�有其他檔案。"
-
-LangString str_msg_uninstalling  ${LANG_TRADCHINESE} \
-    "Uninstalling the old version..."
-
-LangString str_msg_registering   ${LANG_TRADCHINESE} \
-    "Registering..."
-
-LangString str_msg_unregistering ${LANG_TRADCHINESE} \
-    "Unregistering..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_TRADCHINESE} \
-    "Choose _vimrc settings"
-LangString str_vimrc_page_subtitle ${LANG_TRADCHINESE} \
-    "Choose the settings for enhancement, keyboard and mouse."
-
-LangString str_msg_compat_title    ${LANG_TRADCHINESE} \
-    " Vi / Vim behavior "
-LangString str_msg_compat_desc     ${LANG_TRADCHINESE} \
-    "&Compatibility and enhancements"
-LangString str_msg_compat_vi       ${LANG_TRADCHINESE} \
-    "Vi compatible"
-LangString str_msg_compat_vim      ${LANG_TRADCHINESE} \
-    "Vim original"
-LangString str_msg_compat_defaults ${LANG_TRADCHINESE} \
-    "Vim with some enhancements (load defaults.vim)"
-LangString str_msg_compat_all      ${LANG_TRADCHINESE} \
-    "Vim with all enhancements (load vimrc_example.vim) (Default)"
-
-LangString str_msg_keymap_title   ${LANG_TRADCHINESE} \
-    " Mappings "
-LangString str_msg_keymap_desc    ${LANG_TRADCHINESE} \
-    "&Remap a few keys for Windows (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc)"
-LangString str_msg_keymap_default ${LANG_TRADCHINESE} \
-    "Do not remap keys (Default)"
-LangString str_msg_keymap_windows ${LANG_TRADCHINESE} \
-    "Remap a few keys"
-
-LangString str_msg_mouse_title   ${LANG_TRADCHINESE} \
-    " Mouse "
-LangString str_msg_mouse_desc    ${LANG_TRADCHINESE} \
-    "&Behavior of right and left buttons"
-LangString str_msg_mouse_default ${LANG_TRADCHINESE} \
-    "Right: popup menu, Left: visual mode (Default)"
-LangString str_msg_mouse_windows ${LANG_TRADCHINESE} \
-    "Right: popup menu, Left: select mode (Windows)"
-LangString str_msg_mouse_unix    ${LANG_TRADCHINESE} \
-    "Right: extends selection, Left: visual mode (Unix)"
diff --git a/nsis/lang/turkish.nsi b/nsis/lang/turkish.nsi
deleted file mode 100644
index 3522faa7f4..0000000000
--- a/nsis/lang/turkish.nsi
+++ /dev/null
@@ -1,206 +0,0 @@
-# vi:set ts=8 sts=4 sw=4 et fdm=marker:
-#
-# turkish.nsi: Turkish language strings for gvim NSIS installer.
-#
-# Locale ID    : 1055
-# Locale Name  : tr
-# fileencoding : UTF-8
-# Author       : Emir SARI
-
-!insertmacro MUI_LANGUAGE "Turkish"
-
-# Overwrite the default translation.
-# These strings should be always English.  Otherwise dosinst.c fails.
-LangString ^SetupCaption     ${LANG_TURKISH} \
-        "$(^Name) Setup"
-LangString ^UninstallCaption ${LANG_TURKISH} \
-        "$(^Name) Uninstall"
-
-##############################################################################
-# Translated license file for the license page                            {{{1
-##############################################################################
-
-LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_TURKISH} "..\lang\LICENSE.tr.nsis.txt"
-
-##############################################################################
-# Translated README.txt file, which is opened after installation          {{{1
-##############################################################################
-
-LangString vim_readme_file 0 "README.txt"
-#LangString vim_readme_file ${LANG_TURKISH} "README.tr.txt"
-
-##############################################################################
-
-LangString str_show_readme          ${LANG_TURKISH} \
-    "Kurulum bittikten sonra README dosyasını aç"
-
-# Install types:
-LangString str_type_typical         ${LANG_TURKISH} \
-    "Normal"
-
-LangString str_type_minimal         ${LANG_TURKISH} \
-    "Küçük"
-
-LangString str_type_full            ${LANG_TURKISH} \
-    "Tam"
-
-##############################################################################
-# Section Titles & Description                                            {{{1
-##############################################################################
-
-LangString str_section_old_ver      ${LANG_TURKISH} \
-    "Eski sürümü kaldır"
-LangString str_desc_old_ver         ${LANG_TURKISH} \
-    "Vim'in eski sürümünü sisteminizden kaldırır."
-
-LangString str_section_exe          ${LANG_TURKISH} \
-    "Vim grafik arabirimi ve çalışma dosyaları"
-LangString str_desc_exe             ${LANG_TURKISH} \
-    "Vim program başlatıcı ve çalışma dosyaları. Bu bileşen zorunludur."
-
-LangString str_section_console      ${LANG_TURKISH} \
-    "Vim konsol sürümü"
-LangString str_desc_console         ${LANG_TURKISH} \
-    "Vim'in konsol sürümü (vim.exe)."
-
-LangString str_section_batch        ${LANG_TURKISH} \
-    ".bat dosyaları oluştur"
-LangString str_desc_batch           ${LANG_TURKISH} \
-    "Vim için komut satırında kullanmak üzere .bat dosyaları oluşturur"
-
-LangString str_group_icons          ${LANG_TURKISH} \
-    "Vim için kısayollar oluştur"
-LangString str_desc_icons           ${LANG_TURKISH} \
-    "Kolay erişim için Vim kısayolları oluşturur."
-
-LangString str_section_desktop      ${LANG_TURKISH} \
-    "Masaüstünde"
-LangString str_desc_desktop         ${LANG_TURKISH} \
-    "gVim programı için Masaüstünde kısayol oluşturur."
-
-LangString str_section_start_menu   ${LANG_TURKISH} \
-    "Başlat Menüsü - Programlar klasöründe"
-LangString str_desc_start_menu      ${LANG_TURKISH} \
-    "Vim kısayolunu Başlat Menüsüne ekler."
-
-LangString str_section_edit_with    ${LANG_TURKISH} \
-    "Vim ile Aç"
-LangString str_desc_edit_with       ${LANG_TURKISH} \
-    "Vim'i $\"Birlikte aç$\" sağ tık menüsüne ekler."
-
- LangString str_section_vim_rc       ${LANG_TURKISH} \
-    "Bir yapılandırma dosyası oluştur"
-LangString str_desc_vim_rc          ${LANG_TURKISH} \
-    "Eğer yoksa bir yapılandırma dosyası (_vimrc) oluşturur."
-
-LangString str_group_plugin         ${LANG_TURKISH} \
-    "Eklenti dizinleri oluÅŸtur"
-LangString str_desc_plugin          ${LANG_TURKISH} \
-    "Bu dizinlere Vim eklentilerini yerleÅŸtirerek Vim'e yeni \
-     özellikler kazandırabilirsiniz."
-
-LangString str_section_plugin_home  ${LANG_TURKISH} \
-    "Gizli"
-LangString str_desc_plugin_home     ${LANG_TURKISH} \
-    "Eklenti dizinlerini EV dizininde oluÅŸturur."
-
-LangString str_section_plugin_vim   ${LANG_TURKISH} \
-    "Paylaşılan"
-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_nls          ${LANG_TURKISH} \
-    "Ek dil desteÄŸi"
-LangString str_desc_nls             ${LANG_TURKISH} \
-    "Mevcut olan Vim yerelleştirmelerini yükler."
-
-LangString str_unsection_register   ${LANG_TURKISH} \
-    "Vim kaydını kaldır"
-LangString str_desc_unregister      ${LANG_TURKISH} \
-    "Vim'in bu bilgisayardaki kaydını kaldırır."
-
-LangString str_unsection_exe        ${LANG_TURKISH} \
-    "Vim programını ve çalıştırma dosyalarını kaldır"
-LangString str_desc_rm_exe          ${LANG_TURKISH} \
-    "Vim çalıştırılabilir dosyalarını ve diğer dosyaları kaldırır."
-
-LangString str_ungroup_plugin       ${LANG_TURKISH} \
-    "Eklenti dizinlerini kaldır"
-LangString str_desc_rm_plugin       ${LANG_TURKISH} \
-    "Eklenti dizinlerini eğer boş ise kaldırır."
-
-LangString str_unsection_plugin_home ${LANG_TURKISH} \
-    "Gizli"
-LangString str_desc_rm_plugin_home  ${LANG_TURKISH} \
-    "Eklenti dizinlerini EV dizininden kaldırır."
-
-LangString str_unsection_plugin_vim ${LANG_TURKISH} \
-    "Paylaşılan"
-LangString str_desc_rm_plugin_vim   ${LANG_TURKISH} \
-    "Eklenti dizinlerini Vim yükleme dizininden kaldırır."
-
-LangString str_unsection_rootdir    ${LANG_TURKISH} \
-    "Vim kök dizinini kaldır"
-LangString str_desc_rm_rootdir      ${LANG_TURKISH} \
-    "Vim kök dizinini kaldırır. Bu dizin Vim yapılandırma dosyalarını içerir!"
-
- LangString str_msg_install_fail  ${LANG_TURKISH} \
-    "Yükleme başarısız oldu. Yeniden deneyin."
-
-LangString str_msg_rm_exe_fail   ${LANG_TURKISH} \
-    "$0 içindeki bazı dosyalar silinemedi!$\r$\n\
-     Bu dosyaları el ile kaldırmalısınız."
-
- LangString str_msg_uninstalling  ${LANG_TURKISH} \
-    "Eski sürüm kaldırılıyor..."
-
-LangString str_msg_registering   ${LANG_TURKISH} \
-    "Kaydediliyor..."
-
-LangString str_msg_unregistering ${LANG_TURKISH} \
-    "Kayıt siliniyor..."
-
-
-##############################################################################
-# Dialog Box                                                              {{{1
-##############################################################################
-
-LangString str_vimrc_page_title    ${LANG_TURKISH} \
-    "_vimrc ayarlarını seçin"
-LangString str_vimrc_page_subtitle ${LANG_TURKISH} \
-    "Yüklenecek ek özellikler, klavye ve fare için ayarları seçin."
-
-LangString str_msg_compat_title    ${LANG_TURKISH} \
-    " Vi / Vim davranışı "
-LangString str_msg_compat_desc     ${LANG_TURKISH} \
-    "&Uyumluluk ve ek özellikler"
-LangString str_msg_compat_vi       ${LANG_TURKISH} \
-    "Vi uyumlu"
-LangString str_msg_compat_vim      ${LANG_TURKISH} \
-    "Vim orijinal"
-LangString str_msg_compat_defaults ${LANG_TURKISH} \
-    "Vim ve ek olarak bazı ek özellikler (load defaults.vim)"
-LangString str_msg_compat_all      ${LANG_TURKISH} \
-    "Vim ve ek olarak tüm ek özellikler (load vimrc_example.vim) (Default)"
-
-LangString str_msg_keymap_title   ${LANG_TURKISH} \
-    " Klavye Ä°ÅŸlevleri "
-LangString str_msg_keymap_desc    ${LANG_TURKISH} \
-    "&Windows için bazı düğmeleri yeniden ayarla (Ctrl-V, Ctrl-C, Ctrl-A, Ctrl-S, Ctrl-F, etc)"
-LangString str_msg_keymap_default ${LANG_TURKISH} \
-    "Düğme işlevlerini değiştirme (varsayılan)"
-LangString str_msg_keymap_windows ${LANG_TURKISH} \
-    "Bazı düğmeleri yeniden ayarla"
-
-LangString str_msg_mouse_title   ${LANG_TURKISH} \
-    " Fare Ä°ÅŸlevleri "
-LangString str_msg_mouse_desc    ${LANG_TURKISH} \
-    "&Sağ ve sol düğme davranışı"
-LangString str_msg_mouse_default ${LANG_TURKISH} \
-    "Sağ: açılır menü, Sol: Görsel Kip (varsayılan)"
-LangString str_msg_mouse_windows ${LANG_TURKISH} \
-    "Sağ: açılır menü, Sol: seçim kipi (Windows)"
-LangString str_msg_mouse_unix    ${LANG_TURKISH} \
-    "Sağ: seçimi genişlet, Sol: Görsel Kip (Unix)"
diff --git a/runtime/autoload/README.txt b/runtime/autoload/README.txt
index 2180a744bf..acc1bbf370 100644
--- a/runtime/autoload/README.txt
+++ b/runtime/autoload/README.txt
@@ -11,6 +11,8 @@ paste.vim	common code for mswin.vim, menu.vim and macmap.vim
 spellfile.vim	downloading of a missing spell file
 
 Omni completion files:
+adacomplete.vim		Ada
+beancount.vim		Beancount
 ccomplete.vim		C
 csscomplete.vim		HTML / CSS
 htmlcomplete.vim	HTML
diff --git a/runtime/autoload/beancount.vim b/runtime/autoload/beancount.vim
new file mode 100644
index 0000000000..ca1aaf09d1
--- /dev/null
+++ b/runtime/autoload/beancount.vim
@@ -0,0 +1,59 @@
+" Beancount specific formatting
+" Language: beancount
+" Maintainer: Nathan Grigg
+" Latest Revision: 2021-03-06
+
+" Align currency on decimal point.
+function! beancount#align_commodity(line1, line2) abort
+    " Save cursor position to adjust it if necessary.
+    let l:cursor_col = col('.')
+    let l:cursor_line = line('.')
+
+    " Increment at start of loop, because of continue statements.
+    let l:current_line = a:line1 - 1
+    while l:current_line < a:line2
+        let l:current_line += 1
+        let l:line = getline(l:current_line)
+        " This matches an account name followed by a space in one of the two
+        " following cases:
+        "  - A posting line, i.e., the line starts with indentation followed
+        "    by an optional flag and the account.
+        "  - A balance directive, i.e., the line starts with a date followed
+        "    by the 'balance' keyword and the account.
+        "  - A price directive, i.e., the line starts with a date followed by
+        "    the 'price' keyword and a currency.
+        let l:end_account = matchend(l:line, '\v' .
+            \ '^[\-/[:digit:]]+\s+balance\s+([A-Z][A-Za-z0-9\-]+)(:[A-Z0-9][A-Za-z0-9\-]*)+ ' .
+            \ '|^[\-/[:digit:]]+\s+price\s+\S+ ' .
+            \ '|^\s+([!&#?%PSTCURM]\s+)?([A-Z][A-Za-z0-9\-]+)(:[A-Z0-9][A-Za-z0-9\-]*)+ '
+            \ )
+        if l:end_account < 0
+            continue
+        endif
+
+        " Where does the number begin?
+        let l:begin_number = matchend(l:line, '^ *', l:end_account)
+
+        " Look for a minus sign and a number (possibly containing commas) and
+        " align on the next column.
+        let l:separator = matchend(l:line, '^\v([-+])?[,[:digit:]]+', l:begin_number) + 1
+        if l:separator < 0 | continue | endif
+        let l:has_spaces = l:begin_number - l:end_account
+        let l:need_spaces = g:beancount_separator_col - l:separator + l:has_spaces
+        if l:need_spaces < 0 | continue | endif
+        call setline(l:current_line, l:line[0 : l:end_account - 1] . repeat(' ', l:need_spaces) . l:line[ l:begin_number : -1])
+        if l:current_line == l:cursor_line && l:cursor_col >= l:end_account
+            " Adjust cursor position for continuity.
+            call cursor(0, l:cursor_col + l:need_spaces - l:has_spaces)
+        endif
+    endwhile
+endfunction
+
+" Call bean-doctor on the current line and dump output into a scratch buffer
+function! beancount#get_context() abort
+    let l:context = system('bean-doctor context ' . shellescape(expand('%')) . ' ' . line('.'))
+    botright new
+    setlocal buftype=nofile bufhidden=hide noswapfile
+    call append(0, split(l:context, '\v\n'))
+    normal! gg
+endfunction
diff --git a/runtime/autoload/beancountcomplete.vim b/runtime/autoload/beancountcomplete.vim
new file mode 100644
index 0000000000..4b778d30e0
--- /dev/null
+++ b/runtime/autoload/beancountcomplete.vim
@@ -0,0 +1,215 @@
+" Vim completion script
+" Language: beancount
+" Maintainer: Nathan Grigg
+" Latest Revision: 2021-03-06
+
+let s:using_python3 = has('python3') || has('python3/dyn')
+
+" Equivalent to python's startswith
+" Matches based on user's ignorecase preference
+function! s:startswith(string, prefix) abort
+    return strpart(a:string, 0, strlen(a:prefix)) == a:prefix
+endfunction
+
+function! s:count_expression(text, expression) abort
+    return len(split(a:text, a:expression, 1)) - 1
+endfunction
+
+function! s:sort_accounts_by_depth(name1, name2) abort
+    let l:depth1 = s:count_expression(a:name1, ':')
+    let l:depth2 = s:count_expression(a:name2, ':')
+    return l:depth1 == l:depth2 ? 0 : l:depth1 > l:depth2 ? 1 : -1
+endfunction
+
+let s:directives = ['open', 'close', 'commodity', 'txn', 'balance', 'pad', 'note', 'document', 'price', 'event', 'query', 'custom']
+
+" ------------------------------
+" Completion functions
+" ------------------------------
+function! beancountcomplete#complete(findstart, base) abort
+    if a:findstart
+        let l:col = searchpos('\s', 'bn', line('.'))[1]
+        if l:col == 0
+            return -1
+        else
+            return l:col
+        endif
+    endif
+
+    let l:partial_line = strpart(getline('.'), 0, getpos('.')[2]-1)
+    " Match directive types
+    if l:partial_line =~# '^\d\d\d\d\(-\|/\)\d\d\1\d\d $'
+        return beancountcomplete#complete_basic(s:directives, a:base, '')
+    endif
+
+    " If we are using python3, now is a good time to load everything
+    call beancountcomplete#load_everything()
+
+    " Split out the first character (for cases where we don't want to match the
+    " leading character: ", #, etc)
+    let l:first = strpart(a:base, 0, 1)
+    let l:rest = strpart(a:base, 1)
+
+    if l:partial_line =~# '^\d\d\d\d\(-\|/\)\d\d\1\d\d event $' && l:first ==# '"'
+        return beancountcomplete#complete_basic(b:beancount_events, l:rest, '"')
+    endif
+
+    let l:two_tokens = searchpos('\S\+\s', 'bn', line('.'))[1]
+    let l:prev_token = strpart(getline('.'), l:two_tokens, getpos('.')[2] - l:two_tokens)
+    " Match curriences if previous token is number
+    if l:prev_token =~# '^\d\+\([\.,]\d\+\)*'
+        call beancountcomplete#load_currencies()
+        return beancountcomplete#complete_basic(b:beancount_currencies, a:base, '')
+    endif
+
+    if l:first ==# '#'
+        call beancountcomplete#load_tags()
+        return beancountcomplete#complete_basic(b:beancount_tags, l:rest, '#')
+    elseif l:first ==# '^'
+        call beancountcomplete#load_links()
+        return beancountcomplete#complete_basic(b:beancount_links, l:rest, '^')
+    elseif l:first ==# '"'
+        call beancountcomplete#load_payees()
+        return beancountcomplete#complete_basic(b:beancount_payees, l:rest, '"')
+    else
+        call beancountcomplete#load_accounts()
+        return beancountcomplete#complete_account(a:base)
+    endif
+endfunction
+
+function! beancountcomplete#get_root() abort
+    if exists('b:beancount_root')
+        return b:beancount_root
+    endif
+    return expand('%')
+endfunction
+
+function! beancountcomplete#load_everything() abort
+    if s:using_python3 && !exists('b:beancount_loaded')
+        let l:root = beancountcomplete#get_root()
+python3 << EOF
+import vim
+from beancount import loader
+from beancount.core import data
+
+accounts = set()
+currencies = set()
+events = set()
+links = set()
+payees = set()
+tags = set()
+
+entries, errors, options_map = loader.load_file(vim.eval('l:root'))
+for index, entry in enumerate(entries):
+    if isinstance(entry, data.Open):
+        accounts.add(entry.account)
+        if entry.currencies:
+            currencies.update(entry.currencies)
+    elif isinstance(entry, data.Commodity):
+        currencies.add(entry.currency)
+    elif isinstance(entry, data.Event):
+        events.add(entry.type)
+    elif isinstance(entry, data.Transaction):
+        if entry.tags:
+            tags.update(entry.tags)
+        if entry.links:
+            links.update(entry.links)
+        if entry.payee:
+            payees.add(entry.payee)
+
+vim.bindeval('b:')['beancount_accounts'] = sorted(accounts)
+vim.bindeval('b:')['beancount_currencies'] = sorted(currencies)
+vim.bindeval('b:')['beancount_events'] = sorted(events)
+vim.bindeval('b:')['beancount_links'] = sorted(links)
+vim.bindeval('b:')['beancount_payees'] = sorted(payees)
+vim.bindeval('b:')['beancount_tags'] = sorted(tags)
+vim.bindeval('b:')['beancount_loaded'] = 1
+EOF
+    endif
+endfunction
+
+function! beancountcomplete#load_accounts() abort
+    if !s:using_python3 && !exists('b:beancount_accounts')
+        let l:root = beancountcomplete#get_root()
+        let b:beancount_accounts = beancountcomplete#query_single(l:root, 'select distinct account;')
+    endif
+endfunction
+
+function! beancountcomplete#load_tags() abort
+    if !s:using_python3 && !exists('b:beancount_tags')
+        let l:root = beancountcomplete#get_root()
+        let b:beancount_tags = beancountcomplete#query_single(l:root, 'select distinct tags;')
+    endif
+endfunction
+
+function! beancountcomplete#load_links() abort
+    if !s:using_python3 && !exists('b:beancount_links')
+        let l:root = beancountcomplete#get_root()
+        let b:beancount_links = beancountcomplete#query_single(l:root, 'select distinct links;')
+    endif
+endfunction
+
+function! beancountcomplete#load_currencies() abort
+    if !s:using_python3 && !exists('b:beancount_currencies')
+        let l:root = beancountcomplete#get_root()
+        let b:beancount_currencies = beancountcomplete#query_single(l:root, 'select distinct currency;')
+    endif
+endfunction
+
+function! beancountcomplete#load_payees() abort
+    if !s:using_python3 && !exists('b:beancount_payees')
+        let l:root = beancountcomplete#get_root()
+        let b:beancount_payees = beancountcomplete#query_single(l:root, 'select distinct payee;')
+    endif
+endfunction
+
+" General completion function
+function! beancountcomplete#complete_basic(input, base, prefix) abort
+    let l:matches = filter(copy(a:input), 's:startswith(v:val, a:base)')
+
+    return map(l:matches, 'a:prefix . v:val')
+endfunction
+
+" Complete account name.
+function! beancountcomplete#complete_account(base) abort
+    if g:beancount_account_completion ==? 'chunks'
+        let l:pattern = '^\V' . substitute(a:base, ':', '\\[^:]\\*:', 'g') . '\[^:]\*'
+    else
+        let l:pattern = '^\V\.\*' . substitute(a:base, ':', '\\.\\*:\\.\\*', 'g') . '\.\*'
+    endif
+
+    let l:matches = []
+    let l:index = -1
+    while 1
+        let l:index = match(b:beancount_accounts, l:pattern, l:index + 1)
+        if l:index == -1 | break | endif
+        call add(l:matches, matchstr(b:beancount_accounts[l:index], l:pattern))
+    endwhile
+
+    if g:beancount_detailed_first
+        let l:matches = reverse(sort(l:matches, 's:sort_accounts_by_depth'))
+    endif
+
+    return l:matches
+endfunction
+
+function! beancountcomplete#query_single(root_file, query) abort
+    if s:using_python3
+python3 << EOF
+import vim
+import subprocess
+
+# We intentionally want to ignore stderr so it doesn't mess up our query processing
+output = subprocess.check_output(
+    ['bean-query', vim.eval('a:root_file'), vim.eval('a:query')],
+    stderr=subprocess.DEVNULL,
+    text=True,
+).splitlines()
+output = output[2:]
+result_list = sorted(y for y in (x.strip() for x in output) if y)
+EOF
+        return py3eval('result_list')
+    else
+        return []
+    endif
+endfunction
diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
index f59d95af49..8de0176216 100644
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -3,7 +3,7 @@ vim9script
 # Vim functions for file type detection
 #
 # Maintainer:		The Vim Project <https://github.com/vim/vim>
-# Last Change:		2026 May 29
+# Last Change:		2026 Jun 14
 # Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 # These functions are moved here from runtime/filetype.vim to make startup
@@ -1498,14 +1498,25 @@ enddef
 
 # Determine if a *.tf file is TF mud client or terraform
 export def FTtf()
-  var numberOfLines = line('$')
-  for i in range(1, numberOfLines)
-    var currentLine = trim(getline(i))
-    var firstCharacter = currentLine[0]
-    if firstCharacter !=? ";" && firstCharacter !=? "/" && firstCharacter !=? ""
-      setf terraform
-      return
+  if exists("g:filetype_tf")
+    exe "setf " .. g:filetype_tf
+    return
+  endif
+
+  var continuation: bool = false
+  for lnum in range(1, min([line("$"), 100]))
+    var line = getline(lnum)
+    # TF supports backslash line continuation, so a continued line may begin
+    # with any character.  Only test the first character of a line that does
+    # not continue a previous one.
+    if !continuation
+      var firstchar = trim(line)[0]
+      if firstchar !=? ";" && firstchar !=? "/" && firstchar !=? ""
+        setf terraform
+        return
+      endif
     endif
+    continuation = line =~ '\\$'
   endfor
   setf tf
 enddef
diff --git a/runtime/autoload/python3complete.vim b/runtime/autoload/python3complete.vim
index 0cbfc02ab9..88e3466515 100644
--- a/runtime/autoload/python3complete.vim
+++ b/runtime/autoload/python3complete.vim
@@ -1,8 +1,8 @@
 "python3complete.vim - Omni Completion for python
 " Maintainer: <vacancy>
 " Previous Maintainer: Aaron Griffin <aaronmgriffin@gmail.com>
-" Version: 0.9
-" Last Updated: 2022 Mar 30
+" Version: 0.10
+" Last Updated: 2026 Jun 21
 "
 " Roland Puntaier: this file contains adaptations for python3 and is parallel to pythoncomplete.vim
 "
@@ -17,6 +17,12 @@
 " v 0.10 by Vim project
 "   * disables importing local modules, unless the global Vim variable
 "     g:pythoncomplete_allow_import is set to non-zero
+"   * strip default values and annotations from function parameter lists
+"     before exec(), and whitelist class base lists to dotted names: the
+"     previous code passed buffer-supplied expressions to exec() which
+"     Python evaluates at definition time, allowing arbitrary code
+"     execution via crafted def/class headers
+"   * use repr() on doc strings to prevent code execution
 "
 " v 0.9
 "   * Fixed docstring parsing for classes and functions
@@ -100,6 +106,24 @@ warnings.simplefilter(action='ignore', category=FutureWarning)
 
 import sys, tokenize, io, types
 from token import NAME, DEDENT, NEWLINE, STRING
+import re
+
+# Used by Class.get_code(): a base class expression is only included in the
+# code passed to exec() if it is a pure dotted name (e.g. "Base", "mod.Base",
+# "pkg.sub.Cls").  Anything containing calls, subscripts, "=", ":" or other
+# operators is dropped, since exec()-ing it would evaluate buffer-supplied
+# expressions.  See the security note in the file header.
+_DOTTED_NAME_RE = re.compile(r'^[A-Za-z_]\w*(\s*\.\s*[A-Za-z_]\w*)*$')
+
+def _strip_param(p):
+    # Return the bare parameter name from a parameter spec harvested by
+    # _parenparse(), discarding any default value or annotation.  Default
+    # values and annotations would otherwise be evaluated by exec() at
+    # function-definition time.  Star prefixes ("*args", "**kw") and bare
+    # "*" / "/" are preserved as written.
+    p = p.split('=', 1)[0]
+    p = p.split(':', 1)[0]
+    return p.strip()
 
 debugstmts=[]
 def dbg(s): debugstmts.append(s)
@@ -315,7 +339,7 @@ class Scope(object):
 
     def get_code(self):
         str = ""
-        if len(self.docstr) > 0: str += '"""'+self.docstr+'"""\n'
+        if len(self.docstr) > 0: str += repr(self.docstr)+'\n'
         str += 'class _PyCmplNoType:\n    def __getattr__(self,name):\n        return None\n'
         for sub in self.subscopes:
             str += sub.get_code()
@@ -350,9 +374,15 @@ class Class(Scope):
         return c
     def get_code(self):
         str = '%sclass %s' % (self.currentindent(),self.name)
-        if len(self.supers) > 0: str += '(%s)' % ','.join(self.supers)
+        # Only include base class expressions that are pure dotted names.
+        # Anything else (calls, subscripts, conditionals, ...) is dropped
+        # because exec() would evaluate it at class-definition time.  See
+        # the security note in the file header.
+        safe_supers = [s.strip() for s in self.supers
+                       if _DOTTED_NAME_RE.match(s.strip())]
+        if len(safe_supers) > 0: str += '(%s)' % ','.join(safe_supers)
         str += ':\n'
-        if len(self.docstr) > 0: str += self.childindent()+'"""'+self.docstr+'"""\n'
+        if len(self.docstr) > 0: str += self.childindent()+repr(self.docstr)+'\n'
         if len(self.subscopes) > 0:
             for s in self.subscopes: str += s.get_code()
         else:
@@ -367,9 +397,15 @@ class Function(Scope):
     def copy_decl(self,indent=0):
         return Function(self.name,self.params,indent, self.docstr)
     def get_code(self):
+        # Strip default values and annotations from each parameter before
+        # joining: exec() evaluates these at definition time and a hostile
+        # buffer could otherwise execute arbitrary code via crafted def
+        # headers.  See file header for details.
+        safe_params = [_strip_param(p) for p in self.params]
+        safe_params = [p for p in safe_params if p]
         str = "%sdef %s(%s):\n" % \
-            (self.currentindent(),self.name,','.join(self.params))
-        if len(self.docstr) > 0: str += self.childindent()+'"""'+self.docstr+'"""\n'
+            (self.currentindent(),self.name,','.join(safe_params))
+        if len(self.docstr) > 0: str += self.childindent()+repr(self.docstr)+'\n'
         str += "%spass\n" % self.childindent()
         return str
 
diff --git a/runtime/autoload/pythoncomplete.vim b/runtime/autoload/pythoncomplete.vim
index b4340f7ae2..5dd6c9462d 100644
--- a/runtime/autoload/pythoncomplete.vim
+++ b/runtime/autoload/pythoncomplete.vim
@@ -1,8 +1,8 @@
 "pythoncomplete.vim - Omni Completion for python
 " Maintainer: <vacancy>
 " Previous Maintainer: Aaron Griffin <aaronmgriffin@gmail.com>
-" Version: 0.9
-" Last Updated: 2020 Oct 9
+" Version: 0.10
+" Last Updated: 2026 Jun 21
 "
 " Changes
 " TODO:
@@ -15,6 +15,12 @@
 " v 0.10 by Vim project
 "   * disables importing local modules, unless the global Vim variable
 "     g:pythoncomplete_allow_import is set to non-zero
+"   * strip default values and annotations from function parameter lists
+"     before exec(), and whitelist class base lists to dotted names: the
+"     previous code passed buffer-supplied expressions to exec() which
+"     Python evaluates at definition time, allowing arbitrary code
+"     execution via crafted def/class headers
+"   * use repr() on doc strings to prevent code execution
 "
 " v 0.9
 "   * Fixed docstring parsing for classes and functions
@@ -95,6 +101,24 @@ function! s:DefPython()
 python << PYTHONEOF
 import sys, tokenize, cStringIO, types
 from token import NAME, DEDENT, NEWLINE, STRING
+import re
+
+# Used by Class.get_code(): a base class expression is only included in the
+# code passed to exec() if it is a pure dotted name (e.g. "Base", "mod.Base",
+# "pkg.sub.Cls").  Anything containing calls, subscripts, "=", ":" or other
+# operators is dropped, since exec()-ing it would evaluate buffer-supplied
+# expressions.  See the security note in the file header.
+_DOTTED_NAME_RE = re.compile(r'^[A-Za-z_]\w*(\s*\.\s*[A-Za-z_]\w*)*$')
+
+def _strip_param(p):
+    # Return the bare parameter name from a parameter spec harvested by
+    # _parenparse(), discarding any default value or annotation.  Default
+    # values and annotations would otherwise be evaluated by exec() at
+    # function-definition time.  Star prefixes ("*args", "**kw") and bare
+    # "*" / "/" are preserved as written.
+    p = p.split('=', 1)[0]
+    p = p.split(':', 1)[0]
+    return p.strip()
 
 debugstmts=[]
 def dbg(s): debugstmts.append(s)
@@ -330,7 +354,7 @@ class Scope(object):
 
     def get_code(self):
         str = ""
-        if len(self.docstr) > 0: str += '"""'+self.docstr+'"""\n'
+        if len(self.docstr) > 0: str += repr(self.docstr)+'\n'
         str += 'class _PyCmplNoType:\n    def __getattr__(self,name):\n        return None\n'
         for sub in self.subscopes:
             str += sub.get_code()
@@ -365,9 +389,15 @@ class Class(Scope):
         return c
     def get_code(self):
         str = '%sclass %s' % (self.currentindent(),self.name)
-        if len(self.supers) > 0: str += '(%s)' % ','.join(self.supers)
+        # Only include base class expressions that are pure dotted names.
+        # Anything else (calls, subscripts, conditionals, ...) is dropped
+        # because exec() would evaluate it at class-definition time.  See
+        # the security note in the file header.
+        safe_supers = [s.strip() for s in self.supers
+                       if _DOTTED_NAME_RE.match(s.strip())]
+        if len(safe_supers) > 0: str += '(%s)' % ','.join(safe_supers)
         str += ':\n'
-        if len(self.docstr) > 0: str += self.childindent()+'"""'+self.docstr+'"""\n'
+        if len(self.docstr) > 0: str += self.childindent()+repr(self.docstr)+'\n'
         if len(self.subscopes) > 0:
             for s in self.subscopes: str += s.get_code()
         else:
@@ -382,9 +412,15 @@ class Function(Scope):
     def copy_decl(self,indent=0):
         return Function(self.name,self.params,indent, self.docstr)
     def get_code(self):
+        # Strip default values and annotations from each parameter before
+        # joining: exec() evaluates these at definition time and a hostile
+        # buffer could otherwise execute arbitrary code via crafted def
+        # headers.  See file header for details.
+        safe_params = [_strip_param(p) for p in self.params]
+        safe_params = [p for p in safe_params if p]
         str = "%sdef %s(%s):\n" % \
-            (self.currentindent(),self.name,','.join(self.params))
-        if len(self.docstr) > 0: str += self.childindent()+'"""'+self.docstr+'"""\n'
+            (self.currentindent(),self.name,','.join(safe_params))
+        if len(self.docstr) > 0: str += self.childindent()+repr(self.docstr)+'\n'
         str += "%spass\n" % self.childindent()
         return str
 
diff --git a/runtime/autoload/tar.vim b/runtime/autoload/tar.vim
index 3c899f85f6..7f8e24ac0f 100644
--- a/runtime/autoload/tar.vim
+++ b/runtime/autoload/tar.vim
@@ -26,6 +26,7 @@
 "   2026 Apr 15 by Vim Project: fix more path traversal issues (#19981)
 "   2026 Apr 16 by Vim Project: use g:tar_secure in tar#Extract()
 "   2026 May 14 by Vim Project: use correct shellescape() call in Vimuntar()
+"   2026 Jun 16 by Vim Project: fix lz4 extraction on non-linux systemd (#20555)
 "
 "	Contains many ideas from Michael Toren's <tar.vim>
 "
@@ -129,7 +130,7 @@ let g:tar_leading_pat='\m^\%([.]\{,2\}/\)\+'
 fun! s:Msg(func, severity, msg)
   redraw!
   if a:severity =~? 'error'
-    echohl Error 
+    echohl Error
   else
     echohl WarningMsg
   endif
@@ -733,8 +734,10 @@ fun! tar#Extract()
   elseif tarball =~# "\.tlz4$"
    if has("linux")
     let extractcmd= substitute(extractcmd,"-","-I lz4 -","")
+    call system(extractcmd." ".shellescape(tarball)." ".g:tar_secure.shellescape(fname))
+   else
+    call system("lz4 --decompress --stdout -- ".shellescape(tarball)." | ".extractcmd." - ".g:tar_secure.shellescape(fname))
    endif
-   call system(extractcmd." ".shellescape(tarball)." ".g:tar_secure.shellescape(fname))
    if v:shell_error != 0
     call s:Msg('tar#Extract', 'error', $"{extractcmd} {tarball} {fname}: failed!")
    else
@@ -744,8 +747,10 @@ fun! tar#Extract()
   elseif tarball =~# "\.tar\.lz4$"
    if has("linux")
     let extractcmd= substitute(extractcmd,"-","-I lz4 -","")
+    call system(extractcmd." ".shellescape(tarball)." ".g:tar_secure.shellescape(fname))
+   else
+    call system("lz4 --decompress --stdout -- ".shellescape(tarball)." | ".extractcmd." - ".g:tar_secure.shellescape(fname))
    endif
-   call system(extractcmd." ".shellescape(tarball)." ".g:tar_secure.shellescape(fname))
    if v:shell_error != 0
     call s:Msg('tar#Extract', 'error', $"{extractcmd} {tarball} {fname}: failed!")
    else
diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim
index aad548239a..44bdfc6820 100644
--- a/runtime/autoload/zip.vim
+++ b/runtime/autoload/zip.vim
@@ -24,6 +24,7 @@
 " 2026 Apr 05 by Vim Project: Detect more path traversal attacks
 " 2026 Apr 14 by Vim Project: Detect more path traversal attacks on Windows
 " 2026 Apr 15 by Vim Project: Detect more path traversal attacks on Windows
+" 2026 Jun 20 by Vim Project: Fix wrong escaping for the powershell calls
 " License:	Vim License  (see vim's :help license)
 " Copyright:	Copyright (C) 2005-2019 Charles E. Campbell {{{1
 "		Permission is hereby granted to use and distribute this code,
@@ -51,15 +52,6 @@ let s:NOTE           = 0
 
 " ---------------------------------------------------------------------
 "  Global Values: {{{1
-if !exists("g:zip_shq")
- if &shq != ""
-  let g:zip_shq= &shq
- elseif has("unix")
-  let g:zip_shq= "'"
- else
-  let g:zip_shq= '"'
- endif
-endif
 if !exists("g:zip_zipcmd")
  let g:zip_zipcmd= "zip"
 endif
@@ -135,7 +127,7 @@ function! s:ZipBrowsePS(zipfile)
   " Browse the contents of a zip file using PowerShell's
   " Equivalent `unzip -Z1 -- zipfile`
   let cmds = [
-        \ '$zip = [System.IO.Compression.ZipFile]::OpenRead(' . s:Escape(a:zipfile, 1) . ');',
+        \ '$zip = [System.IO.Compression.ZipFile]::OpenRead(' . s:PSEscape(a:zipfile) . ');',
         \ '$zip.Entries | ForEach-Object { $_.FullName };',
         \ '$zip.Dispose()'
         \ ]
@@ -149,16 +141,16 @@ function! s:ZipReadPS(zipfile, fname, tempfile)
     call s:Mess('WarningMsg', "***warning*** PowerShell can display, but cannot update, files in archive subfolders")
   endif
   let cmds = [
-        \ '$zip = [System.IO.Compression.ZipFile]::OpenRead(' . s:Escape(a:zipfile, 1) . ');',
-        \ '$fileEntry = $zip.Entries | Where-Object { $_.FullName -eq ' . s:Escape(a:fname, 1) . ' };',
+        \ '$zip = [System.IO.Compression.ZipFile]::OpenRead(' . s:PSEscape(a:zipfile) . ');',
+        \ '$fileEntry = $zip.Entries | Where-Object { $_.FullName -eq ' . s:PSEscape(a:fname) . ' };',
         \ '$stream = $fileEntry.Open();',
-        \ '$fileStream = [System.IO.File]::Create(' . s:Escape(a:tempfile, 1) . ');',
+        \ '$fileStream = [System.IO.File]::Create(' . s:PSEscape(a:tempfile) . ');',
         \ '$stream.CopyTo($fileStream);',
         \ '$fileStream.Close();',
         \ '$stream.Close();',
         \ '$zip.Dispose()'
         \ ]
-  return 'pwsh -NoProfile -Command ' . s:Escape(join(cmds, ' '), 1)
+  return 'pwsh -NoProfile -Command ' . s:Escape(join(cmds, ' '))
 endfunction
 
 function! s:ZipUpdatePS(zipfile, fname)
@@ -168,7 +160,7 @@ function! s:ZipUpdatePS(zipfile, fname)
     call s:Mess('Error', "***error*** PowerShell cannot update files in archive subfolders")
     return ':'
   endif
-  return 'Compress-Archive -Path ' . a:fname . ' -Update -DestinationPath ' . a:zipfile
+  return 'Compress-Archive -Path ' . s:PSEscape(a:fname) . ' -Update -DestinationPath ' . s:PSEscape(a:zipfile)
 endfunction
 
 function! s:ZipExtractFilePS(zipfile, fname)
@@ -179,16 +171,16 @@ function! s:ZipExtractFilePS(zipfile, fname)
     return ':'
   endif
   let cmds = [
-        \ '$zip = [System.IO.Compression.ZipFile]::OpenRead(' . s:Escape(a:zipfile, 1) . ');',
-        \ '$fileEntry = $zip.Entries | Where-Object { $_.FullName -eq ' . a:fname . ' };',
+        \ '$zip = [System.IO.Compression.ZipFile]::OpenRead(' . s:PSEscape(a:zipfile) . ');',
+        \ '$fileEntry = $zip.Entries | Where-Object { $_.FullName -eq ' . s:PSEscape(a:fname) . ' };',
         \ '$stream = $fileEntry.Open();',
-        \ '$fileStream = [System.IO.File]::Create(' . a:fname . ');',
+        \ '$fileStream = [System.IO.File]::Create(' . s:PSEscape(a:fname) . ');',
         \ '$stream.CopyTo($fileStream);',
         \ '$fileStream.Close();',
         \ '$stream.Close();',
         \ '$zip.Dispose()'
         \ ]
-  return 'pwsh -NoProfile -Command ' . s:Escape(join(cmds, ' '), 1)
+  return 'pwsh -NoProfile -Command ' . s:Escape(join(cmds, ' '))
 endfunction
 
 function! s:ZipDeleteFilePS(zipfile, fname)
@@ -196,12 +188,12 @@ function! s:ZipDeleteFilePS(zipfile, fname)
   " Equivalent to `zip -d zipfile fname`
   let cmds = [
         \ 'Add-Type -AssemblyName System.IO.Compression.FileSystem;',
-        \ '$zip = [System.IO.Compression.ZipFile]::Open(' . s:Escape(a:zipfile, 1) . ', ''Update'');',
-        \ '$entry = $zip.Entries | Where-Object { $_.Name -eq ' . s:Escape(a:fname, 1) . ' };',
+        \ '$zip = [System.IO.Compression.ZipFile]::Open(' . s:PSEscape(a:zipfile) . ', ''Update'');',
+        \ '$entry = $zip.Entries | Where-Object { $_.Name -eq ' . s:PSEscape(a:fname) . ' };',
         \ 'if ($entry) { $entry.Delete(); $zip.Dispose() }',
         \ 'else { $zip.Dispose() }'
         \ ]
-  return 'pwsh -NoProfile -Command ' . s:Escape(join(cmds, ' '), 1)
+  return 'pwsh -NoProfile -Command ' . s:Escape(join(cmds, ' '))
 endfunction
 
 " ----------------
@@ -341,9 +333,9 @@ fun! zip#Read(fname,mode)
   let temp = tempname()
   let fn   = expand('%:p')
 
-  let gnu_cmd = g:zip_unzipcmd . ' -p -- ' . s:Escape(zipfile, 0) . ' ' . s:Escape(fname, 0) . ' > ' . s:Escape(temp, 0)
-  let gnu_cmd = 'call system(''' . substitute(gnu_cmd, "'", "''", 'g') . ''')'
-  let ps_cmd = 'sil !' . s:ZipReadPS(zipfile, fname, temp)
+  let gnu_cmd = g:zip_unzipcmd . ' -p -- ' . s:Escape(zipfile) . ' ' . s:Escape(fname) . ' > ' . s:Escape(temp)
+  let gnu_cmd = 'call system(' . string(gnu_cmd) . ')'
+  let ps_cmd = 'call system(' . string(s:ZipReadPS(zipfile, fname, temp)) . ')'
   call s:TryExecGnuFallBackToPs(g:zip_unzipcmd, gnu_cmd, ps_cmd)
 
   sil exe 'keepalt file '.temp
@@ -415,9 +407,9 @@ fun! zip#Write(fname)
     endif
   endif
   if fname =~ '^[.]\{1,2}/'
-    let gnu_cmd = g:zip_zipcmd . ' -d ' . s:Escape(fnamemodify(zipfile,":p"),0) . ' ' . s:Escape(fname,0)
-    let gnu_cmd = 'call system(''' . substitute(gnu_cmd, "'", "''", 'g') . ''')'
-    let ps_cmd = $"call system({s:Escape(s:ZipDeleteFilePS(zipfile, fname), 1)})"
+    let gnu_cmd = g:zip_zipcmd . ' -d ' . s:Escape(fnamemodify(zipfile,":p")) . ' ' . s:Escape(fname)
+    let gnu_cmd = 'call system(' . string(gnu_cmd) . ')'
+    let ps_cmd = $"call system({string(s:ZipDeleteFilePS(zipfile, fname))})"
     call s:TryExecGnuFallBackToPs(g:zip_zipcmd, gnu_cmd, ps_cmd)
     let fname = fname->substitute('^\([.]\{1,2}/\)\+', '', 'g')
     let need_rename = 1
@@ -426,7 +418,7 @@ fun! zip#Write(fname)
   if fname =~ '/'
     let dirpath = substitute(fname,'/[^/]\+$','','e')
     if has("win32unix") && executable("cygpath")
-    let dirpath = substitute(system("cygpath ".s:Escape(dirpath,0)),'\n','','e')
+    let dirpath = substitute(system("cygpath ".s:Escape(dirpath)),'\n','','e')
     endif
     call mkdir(dirpath,"p")
   endif
@@ -437,16 +429,17 @@ fun! zip#Write(fname)
   " don't overwrite files forcefully
   exe "w ".fnameescape(fname)
   if has("win32unix") && executable("cygpath")
-    let zipfile = substitute(system("cygpath ".s:Escape(zipfile,0)),'\n','','e')
+    let zipfile = substitute(system("cygpath ".s:Escape(zipfile)),'\n','','e')
   endif
 
   if (has("win32") || has("win95") || has("win64") || has("win16")) && &shell !~? 'sh$'
     let fname = substitute(fname, '[', '[[]', 'g')
   endif
 
-  let gnu_cmd = g:zip_zipcmd . ' -u '. s:Escape(fnamemodify(zipfile,":p"),0) . ' ' . s:Escape(fname,0)
+  let gnu_cmd = g:zip_zipcmd . ' -u '. s:Escape(fnamemodify(zipfile,":p")) . ' ' . s:Escape(fname)
   let gnu_cmd = 'call system(''' . substitute(gnu_cmd, "'", "''", 'g') . ''')'
-  let ps_cmd = s:ZipUpdatePS(s:Escape(fnamemodify(zipfile, ':p'), 0), s:Escape(fname, 0))
+  let zip = fnamemodify(zipfile, ':p')
+  let ps_cmd = s:ZipUpdatePS(zip, fname)
   let ps_cmd = 'call system(''' . substitute(ps_cmd, "'", "''", 'g') . ''')'
   call s:TryExecGnuFallBackToPs(g:zip_zipcmd, gnu_cmd, ps_cmd)
   if &shell =~ 'pwsh'
@@ -541,8 +534,8 @@ fun! zip#Extract()
 
   " extract the file mentioned under the cursor
   let gnu_cmd = g:zip_extractcmd . ' -o '. shellescape(b:zipfile) . ' ' . target
-  let gnu_cmd = 'call system(''' . substitute(gnu_cmd, "'", "''", 'g') . ''')'
-  let ps_cmd = $"call system({s:Escape(s:ZipExtractFilePS(b:zipfile, target), 1)})"
+  let gnu_cmd = 'call system(' . string(gnu_cmd) . ')'
+  let ps_cmd = 'call system(' . string(s:ZipExtractFilePS(b:zipfile, fname)) . ')'
   call s:TryExecGnuFallBackToPs(g:zip_extractcmd, gnu_cmd, ps_cmd)
 
   if v:shell_error != 0
@@ -556,19 +549,20 @@ endfun
 
 " ---------------------------------------------------------------------
 " s:Escape: {{{2
-fun! s:Escape(fname,isfilt)
-  if exists("*shellescape")
-   if a:isfilt
-    let qnameq= shellescape(a:fname,1)
-   else
-    let qnameq= shellescape(a:fname)
-   endif
+fun! s:Escape(fname, isfilt = 0)
+  if a:isfilt
+   let qnameq = shellescape(a:fname, 1)
   else
-   let qnameq= g:zip_shq.escape(a:fname,g:zip_shq).g:zip_shq
+   let qnameq = shellescape(a:fname)
   endif
   return qnameq
 endfun
 
+" s:PSEscape: Escape a string for Powershell, shellescape() does not work here {{{2
+fun! s:PSEscape(str)
+  return "'" .. substitute(a:str, "'", "''", 'g') .. "'"
+endfun
+
 " ---------------------------------------------------------------------
 " s:ChgDir: {{{2
 fun! s:ChgDir(newdir,errlvl,errmsg)
diff --git a/runtime/compiler/bean_check.vim b/runtime/compiler/bean_check.vim
new file mode 100644
index 0000000000..45f6b0b4d2
--- /dev/null
+++ b/runtime/compiler/bean_check.vim
@@ -0,0 +1,22 @@
+" Vim compiler file
+" Compiler: bean-check
+" Maintainer: Nathan Grigg
+" Latest Revision: 2017-03-20
+
+if exists('g:current_compiler')
+    finish
+endif
+let g:current_compiler = 'bean_check'
+
+let s:cpo_save = &cpoptions
+set cpoptions-=C
+
+CompilerSet makeprg=bean-check\ %
+" File:line: message
+" Skip blank lines and indented lines.
+CompilerSet errorformat=%-G
+CompilerSet errorformat+=%f:%l:\ %m
+CompilerSet errorformat+=%-G\ %.%#
+
+let &cpoptions = s:cpo_save
+unlet s:cpo_save
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 9662e8928a..af88740762 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -1,4 +1,4 @@
-*builtin.txt*	For Vim version 9.2.  Last change: 2026 May 31
+*builtin.txt*	For Vim version 9.2.  Last change: 2026 Jun 17
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -231,6 +231,7 @@ garbagecollect([{atexit}])	none	free memory, breaking cyclic
 get({list}, {idx} [, {def}])	any	get item {idx} from {list} or {def}
 get({dict}, {key} [, {def}])	any	get item {key} from {dict} or {def}
 get({func}, {what})		any	get property of funcref/partial {func}
+getbgcolor()			List	get background colour as [r, g, b]
 getbufinfo([{buf}])		List	information about buffers
 getbufline({buf}, {lnum} [, {end}])
 				List	lines {lnum} to {end} of buffer {buf}
@@ -1987,6 +1988,14 @@ complete({startcol}, {matches})				*complete()* *E785*
 		The match can be selected with CTRL-N and CTRL-P as usual with
 		Insert mode completion.  The popup menu will appear if
 		specified, see |ins-completion-menu|.
+		Unlike with other |ins-completion| modes, the CTRL-N and
+		CTRL-P keys can be mapped while this completion is active.
+		For example, to make CTRL-N move the selection without
+		inserting the match: >
+
+		inoremap <expr> <C-N> complete_info().mode ==# 'eval'
+			\ ? '<Down>' : '<C-N>'
+<
 
 		Example (using legacy Vim script): >
 
@@ -4036,6 +4045,25 @@ getbufvar({buf}, {varname} [, {def}])			*getbufvar()*
 		Return type: any, depending on {varname}
 
 
+getbgcolor()						*getbgcolor()*
+		Returns a |List| describing the current background colour as
+		[red, green, blue], each component in the range 0..255.
+
+		In the GUI (or with 'termguicolors' set) the value comes from
+		the |hl-Normal| highlight group's background.  In a terminal
+		it comes from the OSC 11 response (also available as
+		|v:termrbgresp|).
+		Returns [] when no value is available, e.g. before the
+		terminal has answered the OSC 11 query, or when |hl-Normal|
+		has no background colour set.
+
+		Useful when manually crafting RGB image data and you want to
+		flatten alpha onto the same colour the terminal will actually
+		display behind the image.
+
+		Return type: list<any>
+
+
 getcellpixels()						*getcellpixels()*
 		Returns a |List| of terminal cell pixel size.
 		List format is [xpixel, ypixel].
@@ -7553,15 +7581,15 @@ matchfuzzy({list}, {str} [, {dict}])			*matchfuzzy()*
 				use for fuzzy matching.
 
 		{str} is treated as a literal string and regular expression
-		matching is NOT supported.  The maximum supported {str} length
-		is 256.
+		matching is NOT supported.  Only the first 1024 characters of
+		{str} and of each item in {list} are used for matching;
+		characters beyond that are ignored.
 
 		When {str} has multiple words each separated by white space,
 		then the list of strings that have all the words is returned.
 
 		If there are no matching strings or there is an error, then an
-		empty list is returned.  If length of {str} is greater than
-		256, then returns an empty list.
+		empty list is returned.
 
 		When {limit} is given, matchfuzzy() will find up to this
 		number of matches in {list} and return them in sorted order.
@@ -13306,6 +13334,14 @@ hangul_input		Compiled with Hangul input support. |hangul|
 hpux			HP-UX version of Vim.
 hurd			GNU/Hurd version of Vim
 iconv			Can use iconv() for conversion.
+image			Compiled with the popup window "image" attribute.
+			See |popup-image|.
+image_cairo		Compiled with the Cairo image backend (GTK2 and GTK3 GUI).
+image_gdi		Compiled with the GDI image backend (Windows GUI).
+image_gdk		Compiled with the GDK image backend (GTK4 GUI).
+image_kitty		Compiled with the kitty graphics protocol image backend
+			(terminal).
+image_sixel		Compiled with the DEC sixel image backend (terminal).
 insert_expand		Compiled with support for CTRL-X expansion commands in
 			Insert mode. (always true)
 job			Compiled with support for |channel| and |job|
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index ead590a5da..32cbc06248 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -1,4 +1,4 @@
-*change.txt*	For Vim version 9.2.  Last change: 2026 May 31
+*change.txt*	For Vim version 9.2.  Last change: 2026 Jun 18
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1334,19 +1334,19 @@ and ":put" commands and with CTRL-R.
 		feature}
 							*quote_#* *quote#*
 6. Alternate file register "#
-Contains the name of the alternate file for the current window.  It will
-change how the |CTRL-^| command works.
-This register is writable, mainly to allow for restoring it after a plugin has
-changed it.  It accepts buffer number: >
-    let altbuf = bufnr(@#)
-    ...
-    let @# = altbuf
-It will give error |E86| if you pass buffer number and this buffer does not
-exist.
-It can also accept a match with an existing buffer name: >
+Contains the |alternate-file| name for current window
+This register is writeable and changes which buffer CTRL-^ enters.
+A String is matched against existing buffer names, like |:buffer|: >
     let @# = 'buffer_name'
-Error |E93| if there is more than one buffer matching the given name or |E94|
-if none of buffers matches the given name.
+Also supports using buffer number and |file-pattern|.
+
+Throws
+  |E86| when the buffer number does not exist
+  |E93| when more than one buffer matches
+  |E94| when none match
+
+Clear the register with empty String: >
+    let @# = ''
 
 7. Expression register "=			*quote_=* *quote=* *@=*
 This is not really a register that stores text, but is a way to use an
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index a9a0e92203..73ce826c19 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -1,4 +1,4 @@
-*filetype.txt*	For Vim version 9.2.  Last change: 2026 May 29
+*filetype.txt*	For Vim version 9.2.  Last change: 2026 Jun 18
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -183,6 +183,7 @@ variables can be used to overrule the filetype used for certain extensions:
 	*.sys		g:filetype_sys
 	*.sh		g:bash_is_sh		|ft-sh-syntax|
 	*.tex		g:tex_flavor		|ft-tex-plugin|
+	*.tf		g:filetype_tf
 	*.typ		g:filetype_typ
 	*.v		g:filetype_v
 	*.w		g:filetype_w		|ft-cweb-syntax|
@@ -482,6 +483,61 @@ Support for features specific to GNU Awk, like @include, can be enabled by
 setting: >
 	:let g:awk_is_gawk = 1
 
+BEANCOUNT						*ft-beancount-plugin*
+
+Beancount omni-completion |compl-omni| is provided by beancountcomplete.vim,
+if enabled with g:beancount_completion_enable.
+
+To enable completion of account names, set: >
+	let g:beancount_completion_enable = 1
+<
+Note: Enabling this may cause beancount to load additional plugin files.  Only
+enable for code you trust.
+
+Variables:
+g:beancount_account_completion
+			Specify the completion pattern format for the account
+			name.  Can be either "default" or "chunks".
+			Default value: "default"
+
+g:beancount_completion_enable
+			Enable omni-completion |compl-omni| for accounts.
+			Default value: 0
+
+g:beancount_detailed_first
+			If non-zero, accounts higher down the hierarchy will
+			be listed first as completions.
+			Default value: 0
+
+g:beancount_separator_col
+			The column that the decimal separator is aligned to.
+			Default value: 50
+
+b:beancount_root
+			Set the root Beancount file.  This is used to gather
+			values for the completion.
+			If not set (default), the current file will be used.
+
+
+Commands:
+:AlignCommodity		Adds spaces between an account and commodity so that
+			the decimal points of the commodities all occur in the
+			column given by g:beancount_separator_col.  If an
+			amount has no decimal point, the imaginary decimal
+			point to the right of the least significant digit will
+			align.
+
+			The command acts on a range, with the default being
+			the current line.  If the cursor happens to be inside
+			that range and to the right of the account name, the
+			cursor will be pushed to the right the appropriate
+			amount, so that it remains on the same character.
+
+			The script assumes the use of spaces for alignment.
+			It does not understand tabs.
+
+:GetContext		Uses bean-doctor context to display the context of the
+			current line.
 
 CHANGELOG						*ft-changelog-plugin*
 
@@ -834,6 +890,12 @@ For example, to use Lua 5.1, set the variables like this: >
 	let g:lua_version = 5
 	let g:lua_subversion = 1
 <
+LUAU					*ft-luau-plugin* *g:luau_folding*
+
+You can enable folding of Luau block constructs using |fold-expr| by: >
+
+	let g:luau_folding = 1
+<
 MAIL							*ft-mail-plugin*
 
 Options:
diff --git a/runtime/doc/gui_x11.txt b/runtime/doc/gui_x11.txt
index c0a0794bd6..c35cf50ecc 100644
--- a/runtime/doc/gui_x11.txt
+++ b/runtime/doc/gui_x11.txt
@@ -1,4 +1,4 @@
-*gui_x11.txt*	For Vim version 9.2.  Last change: 2026 Feb 14
+*gui_x11.txt*	For Vim version 9.2.  Last change: 2026 Jun 13
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -365,6 +365,24 @@ for more information.
 If you are using GTK3 and Vim appears to be slow, try setting the environment
 variable $GDK_RENDERING to "image".
 
+							*gtk4-slow*
+If the GTK4 GUI is slow, freezes, or does not accept keyboard input right
+after startup, it may be caused by the OpenGL renderer or GPU driver.  Try
+starting gvim with one of the following environment variables.  Setting
+$GSK_RENDERER to "cairo" disables the GSK OpenGL renderer.  Setting
+$LIBGL_ALWAYS_SOFTWARE to "true" retains the OpenGL renderer but forces Mesa
+to use software rendering: >
+
+    $ GSK_RENDERER=cairo gvim
+    $ LIBGL_ALWAYS_SOFTWARE=true gvim
+<
+							*gtk4-hwaccel*
+If Vim is compiled with the configure option "--enable-gtk4-hwaccel" set, then
+the GTK4 GUI will use GtkSnapshot instead of Cairo, allowing for hardware
+accelerated rendering, which is much faster.  Enabling this configure option
+also makes the GTK4 GUI use |+image_gdk| instead of |+image_cairo| for
+rendering popup window images.  Note that this feature is currently
+experimental.
 
 Tooltip Colors ~
 							*gtk-tooltip-colors*
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index 13f2d89a2d..688d65fb3f 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt*	For Vim version 9.2.  Last change: 2026 Jun 02
+*insert.txt*	For Vim version 9.2.  Last change: 2026 Jun 13
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -690,7 +690,8 @@ When the popup menu is displayed there are a few more special keys, see
 Note: The keys that are valid in CTRL-X mode are not mapped.  This allows for
 `: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.
+Also, when doing completion with 'complete' or when completion was started
+with |complete()| mappings apply as usual.
 
 								*E565*
 Note: While completion is active Insert mode can't be used recursively and
@@ -1449,6 +1450,22 @@ CTRL-E		  End completion, go back to what was there before selecting a
 		  insert it.
 <Down>		  Select the next match, as if CTRL-N was used, but don't
 		  insert it.
+CTRL-SHIFT-<Up>
+		  Scroll the info popup up one line, when it is shown, see
+		  |complete-popup|.
+		  Note: these CTRL-SHIFT keys need the GUI or a terminal that
+		  reports key modifiers; the Linux console does not.
+CTRL-SHIFT-<Down>
+		  Scroll the info popup down one line.
+CTRL-SHIFT-<PageUp>
+		  Scroll the info popup up one page.
+CTRL-SHIFT-<PageDown>
+		  Scroll the info popup down one page.
+CTRL-SHIFT-P	  Like CTRL-SHIFT-<Up>, scroll the info popup up one line.
+CTRL-SHIFT-N	  Like CTRL-SHIFT-<Down>, scroll the info popup down one line.
+		  Note: CTRL-SHIFT-N and CTRL-SHIFT-P additionally need the
+		  terminal to report modifiers for letter keys, see
+		  |modifyOtherKeys|.
 <Space> or <Tab>  Stop completion without changing the match and insert the
 		  typed character.
 
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 38de46c657..98b3819908 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1,4 +1,4 @@
-*map.txt*	For Vim version 9.2.  Last change: 2026 May 23
+*map.txt*	For Vim version 9.2.  Last change: 2026 Jun 13
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1620,6 +1620,11 @@ Completing ":MyCmd2 two va<tab>" will complete with: >
 
 	:MyCmd2 two values
 
+Use -nargs=_ when the whole argument area should be taken as a single value
+as-is.  When you need several arguments and an individual argument may itself
+contain spaces (so the splitter must keep running), use -nargs=+/* together
+with |:command-completeopt| (-completeopt=escape) instead.
+
 
 Note that arguments are used as text, not as expressions.  Specifically,
 "s:var" will use the script-local variable in the script where the command was
@@ -1758,6 +1763,50 @@ the 'path' option: >
 <
 This example does not work for file names with spaces!
 
+							*:command-completeopt*
+For the "custom" and "customlist" types you can further opt into specific
+behaviors with the -completeopt= attribute.  It takes a comma-separated list
+of option names; currently only "escape" is recognized:
+
+	-completeopt=escape
+		The completion function may return matches containing spaces,
+		tabs or backslashes.  When such a match is inserted into the
+		command line each space, tab and backslash is preceded by a
+		backslash so the value is preserved as a single argument.  The
+		unescaped form is used for display (popup menu / wildmenu /
+		|getcompletion()|).  The ArgLead passed to the completion
+		function is also unescaped: when the user types
+		`:Cmd foo\ b<Tab>` the function is called with `foo b`, not
+		`foo\ b` .  In the command's replacement text |<q-args>| and
+		|<f-args>| likewise yield the unescaped value.
+
+Example: >
+    :func MyComplete(ArgLead, CmdLine, CursorPos)
+    :    return filter(['hello world', 'good morning'],
+    :    \              {_, v -> stridx(v, a:ArgLead) ==# 0})
+    :endfunc
+    :com! -nargs=1 -complete=customlist,MyComplete -completeopt=escape MyCmd
+		\ echo <q-args>
+<
+After `:MyCmd <Tab>` the popup shows `hello world` and `good morning`.  Typing
+`:MyCmd hello\ w<Tab>` calls MyComplete with ArgLead set to `hello w` (the
+backslash before the space is removed), the filter finds `hello world`, and
+`<Tab>` inserts it as `:MyCmd hello\ world`.  `<q-args>` then evaluates to the
+logical `hello world`.
+
+Without -completeopt=escape the literal string `hello world` would be inserted
+into the command line, so Vim's argument splitter would treat it as two
+arguments.
+
+-completeopt=escape and -nargs=_ (see |:command-nargs|) target different
+shapes; they are not competing solutions for the same one:
+	"whole line as one argument, no escaping"
+			use -nargs=_
+	"multiple arguments, each may contain spaces"
+			use -nargs=+ or -nargs=* with -completeopt=escape
+Because -nargs=_ disables the argument splitter, escaping has no effect there,
+so combining -nargs=_ with -completeopt=escape is an error (E1579).
+
 
 Range handling ~
 				*E177* *E178* *:command-range* *:command-count*
diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index 600ce647c5..a78ee204e5 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -1,4 +1,4 @@
-*motion.txt*	For Vim version 9.2.  Last change: 2026 Feb 14
+*motion.txt*	For Vim version 9.2.  Last change: 2026 Jun 13
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1294,9 +1294,13 @@ remembered.
 			quotes).  Note that this works fine for C, but not for
 			Perl, where single quotes are used for strings.
 
-			Nothing special is done for matches in comments.  You
-			can either use the matchit plugin |matchit-install| or
-			put quotes around matches.
+			When in addition 'comments' defines C-style "//" or
+			"/*" comments, parens and braces inside such comments
+			are skipped, like the |=| operator does.  This does
+			not happen when the cursor is inside a comment, so a
+			match inside that comment can still be found.
+			Otherwise you can use the matchit plugin
+			|matchit-install| or put quotes around matches.
 
 			No count is allowed, {count}% jumps to a line {count}
 			percentage down the file |N%|.  Using '%' on
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index cca9ab13b4..97d8a409ac 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 9.2.  Last change: 2026 May 25
+*options.txt*	For Vim version 9.2.  Last change: 2026 Jun 17
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -9835,7 +9835,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 		icons		Toolbar buttons are shown with icons.
 		text		Toolbar buttons shown with text.
 		horiz		Icon and text of a toolbar button are
-				horizontally arranged.  {only in GTK+ 2 GUI}
+				horizontally arranged.
+				{only in GTK+ 2 and GTK 4 GUI}
 		tooltips	Tooltips are active for toolbar buttons.
 	Tooltips refer to the popup help text which appears after the mouse
 	cursor is placed over a toolbar button for a brief moment.
@@ -10672,7 +10673,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 			is not supported for file and directory names and
 			instead wildcard expansion is used.
 	  pum		Display the completion matches using the popup menu in
-			the same style as the |ins-completion-menu|.
+			the same style as the |ins-completion-menu|.  When an
+			info popup is shown next to the menu, it can be
+			scrolled by moving the mouse pointer on top of it and
+			using the scroll wheel, or with the keyboard like in
+			Insert mode completion, see |popupmenu-keys|.
 	  tagfile	When using CTRL-D to list matching tags, the kind of
 			tag and the file of the tag is listed.	Only one match
 			is displayed per line.  Often used tag kinds are:
diff --git a/runtime/doc/pi_zip.txt b/runtime/doc/pi_zip.txt
index 81275b24ec..dc462cfefc 100644
--- a/runtime/doc/pi_zip.txt
+++ b/runtime/doc/pi_zip.txt
@@ -1,4 +1,4 @@
-*pi_zip.txt*	For Vim version 9.2.  Last change: 2026 May 16
+*pi_zip.txt*	For Vim version 9.2.  Last change: 2026 Jun 20
 
 				+====================+
 				| Zip File Interface |
@@ -48,16 +48,6 @@ Copyright: Copyright (C) 2005-2015 Charles E Campbell	 *zip-copyright*
    If this variable exists and is true, the file window will not be
    automatically maximized when opened.
 
-							*g:zip_shq*
-   Different operating systems may use one or more shells to execute
-   commands.  Zip will try to guess the correct quoting mechanism to
-   allow spaces and whatnot in filenames; however, if it is incorrectly
-   guessing the quote to use for your setup, you may use >
-	g:zip_shq
-<   which by default is a single quote under Unix (') and a double quote
-   under Windows (").  If you'd rather have no quotes, simply set
-   g:zip_shq to the empty string (let g:zip_shq= "") in your <.vimrc>.
-
 							*g:zip_unzipcmd*
    Use this option to specify the program which does the duty of "unzip".
    It's used during browsing. By default: >
diff --git a/runtime/doc/popup.txt b/runtime/doc/popup.txt
index 2e91244778..ef3310638c 100644
--- a/runtime/doc/popup.txt
+++ b/runtime/doc/popup.txt
@@ -1,4 +1,4 @@
-*popup.txt*	For Vim version 9.2.  Last change: 2026 May 17
+*popup.txt*	For Vim version 9.2.  Last change: 2026 Jun 17
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -23,6 +23,7 @@ Displaying text in a popup window.	*popup* *popup-window* *popupwin*
    Popup scrollbar		|popup-scrollbar|
    Popup opacity		|popup-opacity|
    Popup mask			|popup-mask|
+   Popup image			|popup-image|
 4. Examples			|popup-examples|
 
 
@@ -798,6 +799,18 @@ The second argument of |popup_create()| is a dictionary with options:
 			underlying text, making it partially transparent.
 			Requires 'termguicolors' to be set.
 			Also see |popup-opacity|.
+	image		Dictionary describing a raw RGB or RGBA pixel buffer
+			to render inside the popup.  When set the popup
+			auto-sizes its cell box from the image's pixel
+			dimensions, so "minwidth" / "minheight" / "maxwidth" /
+			"maxheight" do not need to be set by hand.  Keys:
+			    data    |Blob| of bytes; length must equal
+				    width*height*3 (RGB) or width*height*4
+				    (RGBA).
+			    width   image width in pixels.
+			    height  image height in pixels.
+			Use an empty dictionary to remove a previously set
+			image.  See |popup-image|.
 	padding		List with numbers, defining the padding
 			above/right/below/left of the popup (similar to CSS).
 			An empty list uses a padding of 1 all around.  The
@@ -1155,6 +1168,77 @@ For example, to make the last 10 columns of the last line transparent:
 To make the four corners transparent:
 	[[1, 1, 1, 1], [-1, -1, 1, 1], [1, 1, -1, -1], [-1, -1, -1, -1]]
 
+POPUP IMAGE						*popup-image*
+
+A popup window can render an image instead of (or on top of) text by passing
+an "image" dictionary to |popup_create()| or |popup_setoptions()|.  The caller
+supplies an already-decoded raw pixel buffer and Vim emits it through
+whichever backend is available at runtime:
+
+    sixel   DEC sixel DCS sequence on a sixel-capable terminal.
+	    |+image_sixel|.  Detected automatically; the buffer is also
+	    cropped one cell above the screen edge to avoid sixel-induced
+	    terminal scrolling.
+    kitty   kitty graphics protocol APC sequence on terminals that support it
+	    (kitty, ghostty, WezTerm, Konsole, ...).  |+image_kitty|.
+	    Detected by actively querying the terminal.
+    GDI     StretchDIBits onto the GUI canvas on the MS-Windows GUI.
+	    |+image_gdi|.
+    Cairo   composite onto a cairo_image_surface_t on the GTK GUI
+	    (covers GTK 2 and GTK 3).  |+image_cairo|.
+    GDK	    Use GdkTexture, which uploads the image onto the GPU for faster
+	    rendering (only for GTK 4).	|+image_gdk|
+
+Vim itself does NOT link against libpng, libjpeg, libwebp or any image
+decoder.  Format decoding is left to the caller, who can pipe the file through
+any external tool (GraphicsMagick, ImageMagick, ffmpeg, a custom converter,
+...) and pass the resulting bytes via a |Blob|.
+
+The "image" dictionary accepts:
+    data	|Blob| of bytes.  Length must equal width*height*3 for RGB,
+		or width*height*4 for RGBA.  RGBA buffers are alpha-composited
+		over the popup's background.
+    width	image width in pixels.
+    height	image height in pixels.
+
+The popup's cell box is derived from the pixel dimensions and the terminal /
+GUI cell metrics, so the caller does not normally have to set "minwidth" /
+"minheight" / "maxwidth" / "maxheight".
+
+For RGBA buffers that need to blend cleanly into the editor's actual backdrop
+the script can call |getbgcolor()| to obtain the current background colour as
+[r, g, b] and pre-composite anti-aliased edges against it.
+
+Minimal RGB example - a 4x4 red square popped at the cursor: >
+	let pixels = repeat([0xff, 0x00, 0x00], 4 * 4)->list2blob()
+	call popup_create('', #{
+	      \ image: #{ data: pixels, width: 4, height: 4 },
+	      \ line: 'cursor+1', col: 'cursor',
+	      \ })
+
+Real-world example - pipe a PNG through GraphicsMagick and pop the resulting
+raw RGB bytes: >
+	let png = 'cat.png'
+	let dim = split(system('gm identify -format "%w %h" '
+		\ .. shellescape(png)))
+	let [w, h] = [str2nr(dim[0]), str2nr(dim[1])]
+	call system('gm convert ' .. shellescape(png)
+		\ .. ' -depth 8 rgb:/tmp/cat.rgb')
+	let blob = readblob('/tmp/cat.rgb')
+	call popup_create('', #{
+	      \ image: #{ data: blob, width: w, height: h },
+	      \ line: 1, col: 1, border: [], padding: [0, 0, 0, 0],
+	      \ })
+
+The image can be replaced at runtime via |popup_setoptions()|.  When the new
+buffer has the same width and height as the current one the pixels are swapped
+in place, which is fast enough to drive frame-by-frame animation from a
+|timer|.  |popup_getoptions()| returns the same dictionary back; the "data"
+entry is a fresh blob copy independent of the popup's internal buffer.
+
+To remove a previously set image pass an empty dictionary: >
+	call popup_setoptions(winid, #{image: {}})
+
 ==============================================================================
 4. Examples						*popup-examples*
 
diff --git a/runtime/doc/remote.txt b/runtime/doc/remote.txt
index 24f3ee9ca2..dff85b7e40 100644
--- a/runtime/doc/remote.txt
+++ b/runtime/doc/remote.txt
@@ -1,4 +1,4 @@
-*remote.txt*	For Vim version 9.2.  Last change: 2026 Feb 14
+*remote.txt*	For Vim version 9.2.  Last change: 2026 Jun 05
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -81,11 +81,17 @@ The following command line arguments are available:
    --clientserver {method}	Use the specified method {method} as the
 				backend for clientserver functionality.  Can
 				either be "socket", "x11", or "mswin".
+							    *$VIM_CLIENTSERVER*
+				If the "$VIM_CLIENTSERVER" environment
+				variable is set, then Vim will interpret the
+				value just like the --clientserver argument.
+				If it is set and --clientserver is provided in
+				the command line, then --clientserver takes
+				priority.
 				{only available when compiled with both |+X11|
 				and |+socketserver| features, or
 				|+socketserver| on MS-Windows}
 
-
 Examples ~
 
 Edit "file.txt" in an already running GVIM server: >
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 55d51270c1..f56a833de8 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 9.2.  Last change: 2026 Jun 01
+*syntax.txt*	For Vim version 9.2.  Last change: 2026 Jun 21
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1261,6 +1261,7 @@ cpp_no_cpp14		don't highlight C++14 standard items
 cpp_no_cpp17		don't highlight C++17 standard items
 cpp_no_cpp20		don't highlight C++20 standard items
 cpp_no_cpp23		don't highlight C++23 standard items
+cpp_no_cpp26		don't highlight C++26 standard items
 
 
 CSH						*csh.vim* *ft-csh-syntax*
diff --git a/runtime/doc/tags b/runtime/doc/tags
index fd1d18024d..edeb9941ff 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -13,6 +13,7 @@ $NoDefaultCurrentDirectoryInExePath	builtin.txt	/*$NoDefaultCurrentDirectoryInEx
 $VIM	starting.txt	/*$VIM*
 $VIM-use	version5.txt	/*$VIM-use*
 $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
+$VIM_CLIENTSERVER	remote.txt	/*$VIM_CLIENTSERVER*
 $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 $XDG_CONFIG_HOME	starting.txt	/*$XDG_CONFIG_HOME*
 $quote	eval.txt	/*$quote*
@@ -1490,6 +1491,12 @@ $quote	eval.txt	/*$quote*
 +hangul_input	various.txt	/*+hangul_input*
 +iconv	various.txt	/*+iconv*
 +iconv/dyn	various.txt	/*+iconv\/dyn*
++image	various.txt	/*+image*
++image_cairo	various.txt	/*+image_cairo*
++image_gdi	various.txt	/*+image_gdi*
++image_gdk	various.txt	/*+image_gdk*
++image_kitty	various.txt	/*+image_kitty*
++image_sixel	various.txt	/*+image_sixel*
 +insert_expand	various.txt	/*+insert_expand*
 +ipv6	various.txt	/*+ipv6*
 +job	various.txt	/*+job*
@@ -2541,6 +2548,7 @@ $quote	eval.txt	/*$quote*
 :command-bar	map.txt	/*:command-bar*
 :command-buffer	map.txt	/*:command-buffer*
 :command-complete	map.txt	/*:command-complete*
+:command-completeopt	map.txt	/*:command-completeopt*
 :command-completion	map.txt	/*:command-completion*
 :command-completion-custom	map.txt	/*:command-completion-custom*
 :command-completion-customlist	map.txt	/*:command-completion-customlist*
@@ -7642,6 +7650,7 @@ ft-asy-syntax	syntax.txt	/*ft-asy-syntax*
 ft-awk-plugin	filetype.txt	/*ft-awk-plugin*
 ft-bash-syntax	syntax.txt	/*ft-bash-syntax*
 ft-basic-syntax	syntax.txt	/*ft-basic-syntax*
+ft-beancount-plugin	filetype.txt	/*ft-beancount-plugin*
 ft-c-omni	insert.txt	/*ft-c-omni*
 ft-c-syntax	syntax.txt	/*ft-c-syntax*
 ft-cangjie-syntax	syntax.txt	/*ft-cangjie-syntax*
@@ -7730,6 +7739,7 @@ ft-log-syntax	syntax.txt	/*ft-log-syntax*
 ft-lpc-syntax	syntax.txt	/*ft-lpc-syntax*
 ft-lua-plugin	filetype.txt	/*ft-lua-plugin*
 ft-lua-syntax	syntax.txt	/*ft-lua-syntax*
+ft-luau-plugin	filetype.txt	/*ft-luau-plugin*
 ft-mail-plugin	filetype.txt	/*ft-mail-plugin*
 ft-mail.vim	syntax.txt	/*ft-mail.vim*
 ft-make-syntax	syntax.txt	/*ft-make-syntax*
@@ -7994,6 +8004,7 @@ g:lf_shell_syntax	syntax.txt	/*g:lf_shell_syntax*
 g:lua_folding	filetype.txt	/*g:lua_folding*
 g:lua_subversion	filetype.txt	/*g:lua_subversion*
 g:lua_version	filetype.txt	/*g:lua_version*
+g:luau_folding	filetype.txt	/*g:luau_folding*
 g:macvim_default_touchbar_characterpicker	gui_mac.txt	/*g:macvim_default_touchbar_characterpicker*
 g:macvim_default_touchbar_fullscreen	gui_mac.txt	/*g:macvim_default_touchbar_fullscreen*
 g:markdown_fenced_languages	syntax.txt	/*g:markdown_fenced_languages*
@@ -8169,7 +8180,6 @@ g:zipPlugin_ext	pi_zip.txt	/*g:zipPlugin_ext*
 g:zip_exec	pi_zip.txt	/*g:zip_exec*
 g:zip_extractcmd	pi_zip.txt	/*g:zip_extractcmd*
 g:zip_nomax	pi_zip.txt	/*g:zip_nomax*
-g:zip_shq	pi_zip.txt	/*g:zip_shq*
 g:zip_unzipcmd	pi_zip.txt	/*g:zip_unzipcmd*
 g:zip_zipcmd	pi_zip.txt	/*g:zip_zipcmd*
 g;	motion.txt	/*g;*
@@ -8230,6 +8240,7 @@ get()-func	builtin.txt	/*get()-func*
 get()-list	builtin.txt	/*get()-list*
 get()-tuple	builtin.txt	/*get()-tuple*
 get-ms-debuggers	debug.txt	/*get-ms-debuggers*
+getbgcolor()	builtin.txt	/*getbgcolor()*
 getbufinfo()	builtin.txt	/*getbufinfo()*
 getbufline()	builtin.txt	/*getbufline()*
 getbufoneline()	builtin.txt	/*getbufoneline()*
@@ -8354,6 +8365,8 @@ gt	tabpage.txt	/*gt*
 gtk-css	gui_x11.txt	/*gtk-css*
 gtk-tooltip-colors	gui_x11.txt	/*gtk-tooltip-colors*
 gtk3-slow	gui_x11.txt	/*gtk3-slow*
+gtk4-hwaccel	gui_x11.txt	/*gtk4-hwaccel*
+gtk4-slow	gui_x11.txt	/*gtk4-slow*
 gu	change.txt	/*gu*
 gugu	change.txt	/*gugu*
 gui	gui.txt	/*gui*
@@ -9972,6 +9985,7 @@ popup-filter-errors	popup.txt	/*popup-filter-errors*
 popup-filter-mode	popup.txt	/*popup-filter-mode*
 popup-function-details	popup.txt	/*popup-function-details*
 popup-functions	popup.txt	/*popup-functions*
+popup-image	popup.txt	/*popup-image*
 popup-intro	popup.txt	/*popup-intro*
 popup-mapping	popup.txt	/*popup-mapping*
 popup-mask	popup.txt	/*popup-mask*
diff --git a/runtime/doc/testing.txt b/runtime/doc/testing.txt
index 24e3a4aa25..8e8831b422 100644
--- a/runtime/doc/testing.txt
+++ b/runtime/doc/testing.txt
@@ -409,6 +409,8 @@ test_override({name}, {val})				*test_override()*
 		redraw       disable the redrawing() function.
 		redraw_flag  ignore the RedrawingDisabled flag.
 		starting     reset the "starting" variable, see below.
+		syn_idlist_cache	disable the cache for resolving
+					syntax "contains"/cluster lists.
 		term_props   reset all terminal properties when the version
 			     string is detected.
 		ui_delay     time in msec to use in ui_delay(); overrules a
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 40a961f328..66b8f96ed5 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*	For Vim version 9.2.  Last change: 2026 Apr 29
+*todo.txt*	For Vim version 9.2.  Last change: 2026 Jun 12
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1999,9 +1999,6 @@ Dominique can't reproduce it.
 ":function f(x) keepjumps" creates a function where every command is executed
 like it has ":keepjumps" before it.
 
-Coverity: Check if there are new reported defects:
-https://scan.coverity.com/projects/241
-
 Problem with editing file in binary mode. (Ingo Krabbe, 2009 Oct 8)
 
 Display error when 'tabline' that includes a file name with double-width
diff --git a/runtime/doc/uganda.txt b/runtime/doc/uganda.txt
index db0cd3660d..0e803bc338 100644
--- a/runtime/doc/uganda.txt
+++ b/runtime/doc/uganda.txt
@@ -1,4 +1,4 @@
-*uganda.txt*	For Vim version 9.2.  Last change: 2026 Feb 14
+*uganda.txt*	For Vim version 9.2.  Last change: 2026 Jun 07
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -234,7 +234,7 @@ Check the Kuwasha web site for the latest information!
 Credit Card:	You can use PayPal to send money with a Credit card.  This is
 		the most widely used Internet based payment system.  It's
 		really simple to use.  Use this link to find more info:
-		    https://www.paypal.com/en_US/mrb/pal=XAC62PML3GF8Q
+		    https://www.paypal.com/ncp/payment/ZZPJ7XEYD3CZ2
 		The e-mail address for sending the money to is:
 		    info@kuwasha.net
 
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 446e2fd43e..380f7e140a 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 9.2.  Last change: 2026 Apr 28
+*usr_41.txt*	For Vim version 9.2.  Last change: 2026 Jun 09
 
 
 		     VIM USER MANUAL	by Bram Moolenaar
@@ -1203,6 +1203,7 @@ Interactive:					*interactive-functions*
 	inputrestore()		restore typeahead
 
 GUI:						*gui-functions*
+	getbgcolor()		get current background colour as [r, g, b]
 	getfontname()		get name of current font being used
 	getwinpos()		position of the Vim window
 	getwinposx()		X position of the Vim window
diff --git a/runtime/doc/usr_51.txt b/runtime/doc/usr_51.txt
index 82bb0faf22..e8fb68bced 100644
--- a/runtime/doc/usr_51.txt
+++ b/runtime/doc/usr_51.txt
@@ -1,4 +1,4 @@
-*usr_51.txt*	For Vim version 9.2.  Last change: 2026 Jun 02
+*usr_51.txt*	For Vim version 9.2.  Last change: 2026 Jun 03
 
 
 		     VIM USER MANUAL	by Bram Moolenaar
@@ -250,6 +250,9 @@ difference between using <SID> and <Plug>:
 	only conventions to keep the name readable and unlikely to clash with
 	other plugins.  None of them are required: all that matters is that
 	the sequence starts with "<Plug>" and is unique.
+	A mapping whose {lhs} starts with <Plug> is always applied to the
+	{rhs} of another mapping, even if remapping is explicitly disallowed.
+	|:nore|
 
 <SID>	is the script ID, a unique identifier for a script.
 	Internally Vim translates <SID> to "<SNR>123_", where "123" can be any
@@ -258,6 +261,8 @@ difference between using <SID> and <Plug>:
 	you use the ":function" command to get a list of functions.  The
 	translation of <SID> in mappings is exactly the same, that's how you
 	can call a script-local function from a mapping.
+	Note: when <SID> appears in the {rhs} of a mapping, you might consider
+	using <script>. |:map-<script>|
 
 
 USER COMMAND
@@ -416,8 +421,8 @@ hasmapto()		Function to test if the user already defined a mapping
 
 map <unique>		Give a warning if a mapping already exists.
 
-noremap <script>	Use only mappings local to the script, not global
-			mappings.
+noremap <script>	Only remap mappings defined in this script that start
+			with <SID>.
 
 exists(":Cmd")		Check if a user command already exists.
 
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index f53a0c5d91..56a9207d25 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -1,4 +1,4 @@
-*various.txt*	For Vim version 9.2.  Last change: 2026 May 21
+*various.txt*	For Vim version 9.2.  Last change: 2026 Jun 13
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -424,6 +424,12 @@ N  *+gettext*		message translations |multi-lang|
 m  *+hangul_input*	Hangul input support |hangul|
    *+iconv*		Compiled with the |iconv()| function
    *+iconv/dyn*		Likewise |iconv-dynamic| |/dyn|
+H  *+image*		popup window image attribute, see |popup-image|
+H  *+image_cairo*	|+image| Cairo backend (GTK2 and GTK3 GUI)
+H  *+image_gdi*		|+image| GDI backend (Windows GUI)
+H  *+image_gdk*		|+image| GDK backend (GTK4 GUI)
+H  *+image_kitty*	|+image| kitty graphics protocol backend (terminal)
+H  *+image_sixel*	|+image| DEC sixel backend (terminal)
 T  *+insert_expand*	|insert_expand| Insert mode completion
 m  *+ipv6*		Support for IPv6 networking |channel|
 m  *+job*		starting and stopping jobs |job|
@@ -455,7 +461,8 @@ N  *+mouse_sysmouse*	Unix only: *BSD console mouse handling |sysmouse|
 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|
+T  *+multi_byte*	Unicode support, 16 and 32 bit characters |multibyte|.
+			Always enabled since 8.1.0811
    *+multi_byte_ime*	Win32 input method for multibyte chars |multibyte-ime|
 N  *+multi_lang*	non-English language support |multi-lang|
 m  *+mzscheme*		Mzscheme interface |mzscheme|
diff --git a/runtime/doc/version9.txt b/runtime/doc/version9.txt
index 2496d1b695..a515589de5 100644
--- a/runtime/doc/version9.txt
+++ b/runtime/doc/version9.txt
@@ -1,4 +1,4 @@
-*version9.txt*	For Vim version 9.2.  Last change: 2026 May 31
+*version9.txt*	For Vim version 9.2.  Last change: 2026 Jun 18
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -52598,6 +52598,10 @@ Popups ~
   "align").
 - Support "opacity" setting for 'completepopup' option.
 - Support for clipping textproperty popups |popup-clipwindow|.
+- Completion popup menu can be scrolled with the mouse or using keys
+  |popupmenu-keys|.
+- Support for loading images in popups using the cairo, GDI, kitty, or sixel
+  backend |popup-image|.
 
 Diff mode ~
 ---------
@@ -52613,6 +52617,15 @@ when Vim is running in |restricted-mode|.
 
 Using |:cscope| is no longer allowed.
 
+Commands ~
+--------
+- |:command-completion-customlist| can return a list of dictionaries with
+  kind/menu/info/abbr for the popup menu.
+- New argument handling for user commands |:command-nargs| using the "-nars=_"
+  attribute to handle completion of single arguments with spaces as expected.
+- New :command attribute |:command-completeopt| escapes spaces in
+  custom completion matches so they survive as a single argument.
+
 Other ~
 -----
 - The new |xdg.vim| script for full XDG compatibility is included.
@@ -52635,13 +52648,11 @@ Other ~
   'completeopt' option
 - Channel can handle |Blob| messages |channel-open-options|.
 - Added the "u" flag to 'shortmess' to silence undo/redo messages: |shm-u|
-- |:command-completion-customlist| can return a list of dictionaries with
-  kind/menu/info/abbr for the popup menu.
 - |C-indenting| detects comments better.
+- The |%| command skips parens inside comments when 'comments' defines
+  C-style "//" or "/*" comments.
 - The |package-hlyank| can now optionally highlight the last put region as
   well.
-- New argument handling for user commands |:command-nargs| using the "-nars=_"
-  attribute to handle completion of single arguments with spaces as expected.
 - Support %0{} in 'statusline' to insert the expression result verbatim and
   not drop leading spaces |stl-%0{|.
 - Generated Session and View files are written in Vim9 script, see |:mksession|,
@@ -52651,6 +52662,7 @@ Platform specific ~
 -----------------
 - support OpenType font features in 'guifont' for DirectWrite (Win32)
 - Include strptime() fallback for MS-Windows
+- Hardware-accelerated rendering for the GTK4 GUI via |gtk4-hwaccel|.
 
 xxd ~
 ---
@@ -52673,6 +52685,9 @@ Changed ~
 - On Unix, filename completion for single-file Ex commands now treats embedded
   whitespace as part of the filename, like on other platforms.
 - Rewrite the clientserver socketserver backend to use channels and JSON.
+- During |complete()|-triggered completion, CTRL-N and CTRL-P are now subject
+  to insert-mode mappings.
+- It is possible to clear the alternate file register |quote#|.
 
 
 							*added-9.3*
@@ -52683,6 +52698,7 @@ Various syntax, indent and other plugins were added.
 Functions: ~
 
 |ch_listen()|		listen on {address}
+|getbgcolor()|		return background color as RGB value
 |tabpanel_getinfo()|	get current state of the |tabpanel|
 |tabpanel_scroll()|	scroll the |tabpanel|
 
diff --git a/runtime/doc/vim-it.1 b/runtime/doc/vim-it.1
index f8fa761c8b..0d471fdbc9 100644
--- a/runtime/doc/vim-it.1
+++ b/runtime/doc/vim-it.1
@@ -1,4 +1,4 @@
-.TH VIM 1 "22 maggio 2026"
+.TH VIM 1 "05 giugno 2026"
 .SH NOME
 vim \- VI Migliorato, un editor di testi per programmatori
 .SH SINTASSI
@@ -533,8 +533,11 @@ relativo per arrivare al socket.
 \-\-clientserver {metodo}
 Usare {metodo} come interfaccia per la funzionalità client/server. Può valere
 "socket" o "x11" o "mswin".  Disponibile solo se Vim è stato compilato sia con
-la funzionalità socketserver che con quella X11, o se compilato con la
-funzionalità socketserver in ambiente MS-Windows.
+la funzionalità socketserver che con quella X11, o se, in ambiente MS-Windows,
+è stato compilato con la funzionalità socketserver.
+Si può anche impostare la variabile d'ambiente $VIM_CLIENTSERVER, che sarà
+interpretata allo stesso modo, ma specificare l'argomento --clientserver
+prevarrà sempre su di essa.
 .TP
 \-\-socketid {id}
 Solo per GUI GTK: Usare meccanismo GtkPlug per eseguire gVim in un'altra
diff --git a/runtime/doc/vim-it.UTF-8.1 b/runtime/doc/vim-it.UTF-8.1
index 7d799df773..8eb61707d0 100644
--- a/runtime/doc/vim-it.UTF-8.1
+++ b/runtime/doc/vim-it.UTF-8.1
@@ -1,4 +1,4 @@
-.TH VIM 1 "22 maggio 2026"
+.TH VIM 1 "05 giugno 2026"
 .SH NOME
 vim \- VI Migliorato, un editor di testi per programmatori
 .SH SINTASSI
@@ -533,8 +533,11 @@ relativo per arrivare al socket.
 \-\-clientserver {metodo}
 Usare {metodo} come interfaccia per la funzionalità client/server. Può valere
 "socket" o "x11" o "mswin".  Disponibile solo se Vim è stato compilato sia con
-la funzionalità socketserver che con quella X11, o se compilato con la
-funzionalità socketserver in ambiente MS-Windows.
+la funzionalità socketserver che con quella X11, o se, in ambiente MS-Windows,
+è stato compilato con la funzionalità socketserver.
+Si può anche impostare la variabile d'ambiente $VIM_CLIENTSERVER, che sarà
+interpretata allo stesso modo, ma specificare l'argomento --clientserver
+prevarrà sempre su di essa.
 .TP
 \-\-socketid {id}
 Solo per GUI GTK: Usare meccanismo GtkPlug per eseguire gVim in un'altra
diff --git a/runtime/doc/vim.1 b/runtime/doc/vim.1
index 66171d723f..c74fa9f155 100644
--- a/runtime/doc/vim.1
+++ b/runtime/doc/vim.1
@@ -1,4 +1,4 @@
-.TH VIM 1 "2026 May 22"
+.TH VIM 1 "2026 Jun 05"
 .SH NAME
 vim \- Vi IMproved, a programmer's text editor
 .SH SYNOPSIS
@@ -519,7 +519,9 @@ it is taken as either an absolute, relative or relative path to the socket.
 Use {backend} as the backend for clientserver functionality, either "socket",
 "x11", or "mswin" respectively.  Only available when compiled with both
 socketserver and X11 features present, or if compiled with socketserver on
-MS-Windows.
+MS-Windows. The $VIM_CLIENTSERVER environment variable may also be set which
+will be interpreted in the same way, but the --clientserver argument will always
+take priority.
 .TP
 \-\-socketid {id}
 GTK GUI only: Use the GtkPlug mechanism to run gVim in another window.
diff --git a/runtime/doc/vim.man b/runtime/doc/vim.man
index fea142d75e..06f51b5bb3 100644
--- a/runtime/doc/vim.man
+++ b/runtime/doc/vim.man
@@ -390,11 +390,13 @@ OPTIONS
                    to the socket.
 
        --clientserver {backend}
-                   Use {backend} as the backend for  clientserver  functional�
+                   Use  {backend}  as the backend for clientserver functional�
                    ity, either "socket", "x11", or "mswin" respectively.  Only
                    available when compiled with both socketserver and X11 fea�
-                   tures  present, or if compiled with socketserver on MS-Win�
-                   dows.
+                   tures present, or if compiled with socketserver on  MS-Win�
+                   dows.  The  $VIM_CLIENTSERVER environment variable may also
+                   be set which will be interpreted in the same way,  but  the
+                   --clientserver argument will always take priority.
 
        --socketid {id}
                    GTK  GUI only: Use the GtkPlug mechanism to run gVim in an�
@@ -493,4 +495,4 @@ BUGS
        vi_diff.txt when in Vim).  Also have a look  at  the  'compatible'  and
        'cpoptions' options.
 
-                                  2026 May 22                           VIM(1)
+                                  2026 Jun 05                           VIM(1)
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 3590ebe97c..680b62b37a 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:		The Vim Project <https://github.com/vim/vim>
-" Last Change:		2026 May 29
+" Last Change:		2026 Jun 03
 " Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " If the filetype can be detected from extension or file name(the final path component),
@@ -1038,6 +1038,7 @@ au BufNewFile,BufRead *.decl,*.dcl,*.dec
 " Gentoo ebuilds and Arch Linux PKGBUILDs are actually bash scripts.
 " NOTE: Patterns ending in a star are further down, these have lower priority.
 au BufNewFile,BufRead .bashrc,bashrc,bash.bashrc,.bash[_-]profile,.bash[_-]logout,.bash[_-]aliases,.bash[_-]history,bash-fc[-.],*.ebuild,*.bash,*.eclass,PKGBUILD,*.bats,*.cygport call dist#ft#SetFileTypeSH("bash")
+au BufNewFile,BufRead ~/.x{init,server}rc,/etc/X11/xinit/x{initrc{,.d/*},serverrc} setf sh
 au BufNewFile,BufRead .kshrc,*.ksh call dist#ft#SetFileTypeSH("ksh")
 au BufNewFile,BufRead */etc/profile,.profile,*.sh,*.envrc,.envrc.* call dist#ft#SetFileTypeSH(getline(1))
 " Shell script (Arch Linux) or PHP file (Drupal)
diff --git a/runtime/ftplugin/beancount.vim b/runtime/ftplugin/beancount.vim
new file mode 100644
index 0000000000..d8bcecde94
--- /dev/null
+++ b/runtime/ftplugin/beancount.vim
@@ -0,0 +1,35 @@
+if exists('b:did_ftplugin')
+    finish
+endif
+
+let b:did_ftplugin = 1
+let b:undo_ftplugin = 'setlocal foldmethod< comments< commentstring< omnifunc<'
+let b:undo_ftplugin .= '| delc -buffer AlignCommodity'
+let b:undo_ftplugin .= '| delc -buffer GetContext'
+
+setl foldmethod=syntax
+setl comments=b:;
+setl commentstring=;\ %s
+compiler bean_check
+
+" This variable customizes the behavior of the AlignCommodity command.
+if !exists('g:beancount_separator_col')
+    let g:beancount_separator_col = 50
+endif
+if !exists('g:beancount_account_completion')
+    let g:beancount_account_completion = 'default'
+endif
+if !exists('g:beancount_detailed_first')
+    let g:beancount_detailed_first = 0
+endif
+
+command! -buffer -range AlignCommodity
+            \ :call beancount#align_commodity(<line1>, <line2>)
+
+command! -buffer -range GetContext
+            \ :call beancount#get_context()
+
+" Omnifunc for account completion.
+if get(g:, 'beancount_completion_enable', 0)
+    setl omnifunc=beancountcomplete#complete
+endif
diff --git a/runtime/ftplugin/lua.vim b/runtime/ftplugin/lua.vim
index e3bb3a5ddf..cb73a24fa8 100644
--- a/runtime/ftplugin/lua.vim
+++ b/runtime/ftplugin/lua.vim
@@ -8,8 +8,7 @@
 "			Tyler Miller <tmillr@proton.me>
 "			Phạm Bình An <phambinhanctb2004@gmail.com>
 "			@konfekt
-" Last Change:		2025 Apr 04
-" 2025 May 06 by Vim Project update 'path' setting #17267
+" Last Change:		2026 Jun 20
 
 if exists("b:did_ftplugin")
   finish
@@ -49,7 +48,7 @@ if exists("loaded_matchit") && !exists("b:match_words")
 	\ '\<\%(return\|else\|elseif\)\>:' ..
 	\ '\<end\>,' ..
 	\ '\<repeat\>:\<until\>,' ..
-	\ '\%(--\)\=\[\(=*\)\[:]\1]'
+	\ '--\[\(=*\)\[:\%(--\)\=]\1]'
   let b:undo_ftplugin ..= " | unlet! b:match_words b:match_ignorecase"
 endif
 
diff --git a/runtime/ftplugin/luau.vim b/runtime/ftplugin/luau.vim
index 458d0b05a9..9b413e6778 100644
--- a/runtime/ftplugin/luau.vim
+++ b/runtime/ftplugin/luau.vim
@@ -1,14 +1,193 @@
 " Vim filetype plugin file
-" Language:	Luau
-" Maintainer:	None yet
-" Last Change:	2023 Apr 30
+" Language:     Luau
+" Maintainer:   Lopy (@lopi-py)
+" Last Change:  2026 Jun 16
 
 if exists("b:did_ftplugin")
   finish
 endif
+let b:did_ftplugin = 1
 
-" Luau is a superset of Lua
-runtime! ftplugin/lua.vim
+let s:cpo_save = &cpo
+set cpo&vim
 
+setlocal comments=:---,:--
+setlocal commentstring=--\ %s
+setlocal formatoptions-=t formatoptions+=croql
 
-" vim: nowrap sw=2 sts=2 ts=8
+let &l:define = '\<\%(function\|local\%(\s\+function\)\=\|const\%(\s\+function\)\=\|type\%(\s\+function\)\=\|export\s\+type\%(\s\+function\)\=\|class\|declare\s\+\%(function\|class\|extern\s\+type\)\)\>'
+let &l:include = '\<require\s*('
+setlocal includeexpr=s:LuauInclude(v:fname)
+setlocal suffixesadd=.luau,.lua
+
+let b:undo_ftplugin = "setl cms< com< def< fo< inc< inex< sua<"
+
+let s:attr = '@\%(\h\w*\|\[[^]]*\]\)\s*'
+let s:line_end = '\s*\%(--.*\)\=$'
+let s:end_pat = '^\s*end\>' .. s:line_end
+let s:end_block = '^\s*\%(' .. s:attr .. '\)*if\>.\{-}\<then\>' ..
+      \ '\|^\s*\%(' .. s:attr .. '\)*class\>\s\+\h' ..
+      \ '\|^\s*\%(' .. s:attr .. '\)*declare\s\+class\>\s\+\h' ..
+      \ '\|^\s*\%(' .. s:attr .. '\)*declare\s\+extern\s\+type\>.\{-}\<with\>' .. s:line_end
+
+if exists("loaded_matchit") && !exists("b:match_words")
+  let b:match_ignorecase = 0
+  let s:match_tail = ':\<return\>\|^\s*\%(else\|elseif\)\>:' .. s:end_pat ..
+        \ ',^\s*repeat\>:\<until\>,' ..
+        \ '\%(--\)\=\[\(=*\)\[:\]\1\]'
+  let s:match_words = '\<\%(do\|function\)\>\|' .. s:end_block .. s:match_tail
+  let s:match_words_no_function = '\<do\>\|' .. s:end_block .. s:match_tail
+  let b:match_words = "LuauMatchWords()"
+  let b:match_skip = 'LuauMatchSkip()'
+  let b:undo_ftplugin ..= " | unlet! b:match_words b:match_ignorecase b:match_skip"
+endif
+
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+  let b:browsefilter = "Luau Source Files (*.luau)\t*.luau\n"
+  if has("win32")
+    let b:browsefilter ..= "All Files (*.*)\t*\n"
+  else
+    let b:browsefilter ..= "All Files (*)\t*\n"
+  endif
+  let b:undo_ftplugin ..= " | unlet! b:browsefilter"
+endif
+
+if has("folding") && get(g:, "luau_folding", 0)
+  setlocal foldmethod=expr
+  setlocal foldexpr=s:LuauFold()
+  let b:luau_lasttick = -1
+  let b:undo_ftplugin ..= " | setl foldexpr< foldmethod< | unlet! b:luau_lasttick b:luau_foldlists"
+endif
+
+" the rest of the file needs to be sourced only once per Vim session
+if exists("s:loaded_luau") || &cp
+  let &cpo = s:cpo_save
+  unlet s:cpo_save
+  finish
+endif
+let s:loaded_luau = 1
+
+function s:LuauInclude(fname) abort
+  let fname = a:fname
+  if fname =~# '^@'
+    return fname
+  endif
+  for path in [fname, fname .. ".luau", fname .. ".lua", fname .. "/init.luau", fname .. "/init.lua"]
+    if filereadable(path)
+      return path
+    endif
+  endfor
+  return fname
+endfunction
+
+function s:IsStringOrComment(lnum, col) abort
+  let name = synIDattr(synID(a:lnum, a:col, 1), "name")
+  return name =~# '^luau\%(Comment\|.*String\)'
+endfunction
+
+function s:LineCommentStart(lnum) abort
+  let line = getline(a:lnum)
+  let midx = stridx(line, '--')
+  while midx != -1
+    if !s:IsStringOrComment(a:lnum, midx + 1)
+      return midx
+    endif
+    let midx = stridx(line, '--', midx + 2)
+  endwhile
+  return -1
+endfunction
+
+function s:InDeclareClass(lnum) abort
+  let save_cursor = getcurpos()
+  call cursor(a:lnum - 1, 1)
+  let lnum = search('^\s*\%(end\>\|declare\s\+class\>\)', 'bcnW')
+  call setpos('.', save_cursor)
+  return lnum > 0 && getline(lnum) =~# '^\s*declare\s\+class\>'
+endfunction
+
+function LuauMatchSkip() abort
+  let lnum = line(".")
+  let col = col(".")
+  let comment = s:LineCommentStart(lnum)
+  return s:IsStringOrComment(lnum, col)
+        \ || (comment != -1 && col > comment)
+        \ || (expand("<cword>") ==# "function" && s:InDeclareClass(lnum))
+endfunction
+
+function LuauMatchWords() abort
+  if exists("s:match_words_no_function")
+        \ && expand("<cword>") ==# "function" && s:InDeclareClass(line("."))
+    return s:match_words_no_function
+  endif
+  return get(s:, "match_words", "")
+endfunction
+
+let s:fold_guard = '^\s*\%(@\|\%(do\|if\|repeat\|for\|while\|public' ..
+      \ '\|function\|return\|local\|const\|type\|export\|class' ..
+      \ '\|declare\|end\|until\)\>\)'
+
+let s:patterns = [
+      \ ['^\s*do\>' .. s:line_end, s:end_pat, 'block'],
+      \ ['^\s*if\>.\{-}\<then\>' .. s:line_end, s:end_pat, 'block'],
+      \ ['^\s*repeat\>' .. s:line_end, '^\s*until\>.*', 'block'],
+      \ ['^\s*for\>.\{-}\<do\>' .. s:line_end, s:end_pat, 'block'],
+      \ ['^\s*while\>.\{-}\<do\>' .. s:line_end, s:end_pat, 'block'],
+      \ ['^\s*\%(' .. s:attr .. '\)*\%(public\s\+\)\=function\>.*', s:end_pat, 'function'],
+      \ ['^\s*return\s\+function\>.*', s:end_pat, 'function'],
+      \ ['^\s*\%(' .. s:attr .. '\)*local\s\+function\>.*', s:end_pat, 'function'],
+      \ ['^\s*\%(' .. s:attr .. '\)*const\s\+function\>.*', s:end_pat, 'function'],
+      \ ['^\s*\%(' .. s:attr .. '\)*\%(export\s\+\)\=type\s\+function\>.*', s:end_pat, 'function'],
+      \ ['^\s*class\>\s\+\h.*', s:end_pat, 'class'],
+      \ ['^\s*declare\s\+class\>\s\+\h.*', s:end_pat, 'declare_class'],
+      \ ['^\s*declare\s\+extern\s\+type\>.\{-}\<with\>' .. s:line_end, s:end_pat, 'block'],
+      \ ]
+
+function s:LuauFold() abort
+  if b:luau_lasttick == b:changedtick
+    return b:luau_foldlists[v:lnum - 1]
+  endif
+  let b:luau_lasttick = b:changedtick
+
+  let b:luau_foldlists = []
+  let foldlist = []
+  let buf = getline(1, "$")
+  for line in buf
+    let open = 0
+    let end = 0
+    if line !~# s:fold_guard
+      call add(b:luau_foldlists, "" .. len(foldlist))
+      continue
+    endif
+    for t in s:patterns
+      let tagopen = t[0]
+      let tagend = t[1]
+      if line =~# tagopen
+        if t[2] ==# 'function' && len(foldlist) > 0 && foldlist[-1][2] ==# 'declare_class'
+          continue
+        endif
+        call add(foldlist, t)
+        let open = 1
+        break
+      elseif line =~# tagend
+        if len(foldlist) > 0 && line =~# foldlist[-1][1]
+          call remove(foldlist, -1)
+          let end = 1
+        else
+          let foldlist = []
+        endif
+        break
+      endif
+    endfor
+    let prefix = ""
+    if open == 1 | let prefix = ">" | endif
+    if end == 1 | let prefix = "<" | endif
+    call add(b:luau_foldlists, prefix .. (len(foldlist) + end))
+  endfor
+
+  return b:luau_foldlists[v:lnum - 1]
+endfunction
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: nowrap sw=2 sts=2 ts=8 noet:
diff --git a/runtime/indent/beancount.vim b/runtime/indent/beancount.vim
new file mode 100644
index 0000000000..594ae71086
--- /dev/null
+++ b/runtime/indent/beancount.vim
@@ -0,0 +1,51 @@
+" Vim indent file
+" Language: beancount
+" Maintainer: Nathan Grigg
+" Latest Revision: 2017-03-20
+
+if exists('b:did_indent')
+    finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetBeancountIndent(v:lnum)
+
+let b:undo_indent = "setl inde<"
+
+if exists('*GetBeancountIndent')
+    finish
+endif
+
+function! s:IsDirective(str)
+    return a:str =~# '\v^\s*(\d{4}-\d{2}-\d{2}|pushtag|poptag|option|plugin|include)'
+endfunction
+
+function! s:IsPosting(str)
+    return a:str =~# '\v^\s*[A-Z]\w+:'
+endfunction
+
+function! s:IsMetadata(str)
+    return a:str =~# '\v^\s*[a-z][a-zA-Z0-9\-_]+:'
+endfunction
+
+function! s:IsTransaction(str)
+    " The final \S represents the flag (e.g. * or !).
+    return a:str =~# '\v^\s*\d{4}-\d{2}-\d{2}\s+(txn\s+)?\S(\s|$)'
+endfunction
+
+function GetBeancountIndent(line_num)
+    let l:this_line = getline(a:line_num)
+    let l:prev_line = getline(a:line_num - 1)
+    " Don't touch comments
+    if l:this_line =~# '\v^\s*;' | return -1 | endif
+    " This is a new directive or previous line is blank.
+    if l:prev_line =~# '^\s*$' || s:IsDirective(l:this_line) | return 0 | endif
+    " Previous line is transaction or this is a posting.
+    if s:IsTransaction(l:prev_line) || s:IsPosting(l:this_line) | return &shiftwidth | endif
+    if s:IsMetadata(l:this_line)
+        let l:this_indent = indent(a:line_num - 1)
+        if ! s:IsMetadata(l:prev_line) | let l:this_indent += &shiftwidth | endif
+        return l:this_indent
+    endif
+    return -1
+endfunction
diff --git a/runtime/indent/luau.vim b/runtime/indent/luau.vim
index 69893f7399..a7422acf36 100644
--- a/runtime/indent/luau.vim
+++ b/runtime/indent/luau.vim
@@ -1,14 +1,153 @@
-" Vim filetype indent file
-" Language:    Luau
-" Maintainer:  None yet
-" Last Change: 2023 Apr 30
+" Vim indent file
+" Language:     Luau
+" Maintainer:   Lopy (@lopi-py)
+" Last Change:  2026 Jun 17
 
-" Only load this indent file when no other was loaded.
+" only load this indent file when no other was loaded
 if exists("b:did_indent")
-    finish
+  finish
 endif
+let b:did_indent = 1
 
-" Luau is a superset of Lua
-runtime! indent/lua.vim
+let s:cpo_save = &cpo
+set cpo&vim
 
+setlocal indentexpr=GetLuauIndent()
 
+" make Vim call GetLuauIndent() when it finds a closing keyword or delimiter
+setlocal indentkeys+=0=end,0=until,0=else,0=elseif,0=},0=),0=]
+
+setlocal autoindent
+
+let b:undo_indent = "setlocal autoindent< indentexpr< indentkeys<"
+
+" only define the function once
+if exists("*GetLuauIndent")
+  let &cpo = s:cpo_save
+  unlet s:cpo_save
+  finish
+endif
+
+function GetLuauIndent() abort
+  let ignorecase_save = &ignorecase
+  try
+    let &ignorecase = 0
+    return s:GetLuauIndentIntern()
+  finally
+    let &ignorecase = ignorecase_save
+  endtry
+endfunction
+
+function s:InDeclareClass(lnum) abort
+  let save_cursor = getcurpos()
+  call cursor(a:lnum - 1, 1)
+  let lnum = search('^\s*\%(end\>\|declare\s\+class\>\)', 'bcnW')
+  call setpos('.', save_cursor)
+  return lnum > 0 && getline(lnum) =~# '^\s*declare\s\+class\>'
+endfunction
+
+function s:IsStringOrComment(lnum, col) abort
+  let name = synIDattr(synID(a:lnum, a:col, 1), "name")
+  return name =~# '^luau\%(Comment\|.*String\)'
+endfunction
+
+function s:LineCommentStart(lnum) abort
+  let line = getline(a:lnum)
+  let midx = stridx(line, '--')
+  while midx != -1
+    if !s:IsStringOrComment(a:lnum, midx + 1)
+      return midx
+    endif
+    let midx = stridx(line, '--', midx + 2)
+  endwhile
+  return -1
+endfunction
+
+function s:IsCode(lnum, col) abort
+  let comment = s:LineCommentStart(a:lnum)
+  return (comment == -1 || a:col <= comment) && !s:IsStringOrComment(a:lnum, a:col)
+endfunction
+
+function s:HasBlockCloser(lnum) abort
+  let line = getline(a:lnum)
+  let midx = match(line, '\<\%(end\|until\)\>')
+  while midx != -1
+    if s:IsCode(a:lnum, midx + 1)
+      return 1
+    endif
+    let midx = match(line, '\<\%(end\|until\)\>', midx + 1)
+  endwhile
+  return 0
+endfunction
+
+function s:GetLuauIndentIntern() abort
+  " find a non-blank line above the current line
+  let prevlnum = prevnonblank(v:lnum - 1)
+
+  " hit the start of the file, use zero indent
+  if prevlnum == 0
+    return 0
+  endif
+
+  " add a 'shiftwidth' after lines that start a block
+  let ind = indent(prevlnum)
+  let prevline = getline(prevlnum)
+  let attr = '@\%(\h\w*\|\[[^]]*\]\)\s*'
+  let stmt = 'if\>\|for\>\|while\>\|repeat\>\|else\>\|elseif\>\|do\>\|then\>'
+  let class = 'class\>\s\+\h\|declare\s\+class\>\s\+\h'
+  let func = '\%(\%(public\s\+\)\=function\|local\s\+function\|const\s\+function\|type\s\+function\|return\s\+function\)'
+  let declare_func = '^\s*\%(' .. attr .. '\)*declare\s\+function\>'
+  let midx = -1
+  if prevline =~# '^\s*\%(@\|\%(if\|for\|while\|repeat\|else\|elseif\|do\|then\|class\)\>\|declare\s\+class\>\)'
+    let midx = match(prevline, '^\s*\%(' .. attr .. '\)*\%(' .. stmt .. '\|' .. class .. '\)')
+  endif
+  if midx == -1
+    if prevline =~# '^\s*\%(' .. attr .. '\)*declare\s\+extern\s\+type\>'
+      let midx = match(prevline, '\<with\>\s*\%(--.*\)\=$')
+    endif
+    if midx == -1
+      let midx = match(prevline, '\%({\|(\|\[\)\s*\%(--\%([^[].*\)\?\)\?$')
+      if midx == -1 && stridx(prevline, 'function') != -1 && prevline !~# declare_func
+        let midx = match(prevline, '\<' .. func .. '\>\s*\%(\k\|[.:]\)\{-}\s*\%(<[^>]*>\s*\)\=(')
+      endif
+    endif
+  endif
+
+  if midx == -1 && prevline =~ '^\s*)\s*\%(:.\+\)\=\s*\%(--.*\)\=$'
+    let save_cursor = getcurpos()
+    call cursor(prevlnum, match(prevline, ')') + 1)
+    let [par_lnum, par_col] = searchpairpos('(', '', ')', 'bnW')
+    call setpos('.', save_cursor)
+    if par_lnum > 0
+      let funline = getline(par_lnum)
+      let funidx = match(funline, '\<' .. func .. '\>')
+      if funidx != -1 && funidx < par_col && funline !~# declare_func
+        let midx = match(prevline, ')')
+      endif
+    endif
+  endif
+
+  if midx != -1
+    " add 'shiftwidth' if this is not in a comment or string and the block
+    " does not close on the same line
+    if s:IsCode(prevlnum, midx + 1) && !s:HasBlockCloser(prevlnum)
+          \ && !(prevline =~# '^\s*\%(public\s\+\)\=function\>' && s:InDeclareClass(prevlnum))
+      let ind = ind + shiftwidth()
+    endif
+  endif
+
+  " subtract a 'shiftwidth' on end, else, elseif, until, '}', ')' and ']'
+  let midx = match(getline(v:lnum), '^\s*\%(end\>\|else\>\|elseif\>\|until\>\|}\|)\|\]\)')
+  if midx != -1
+    if s:IsCode(v:lnum, midx + 1)
+      let ind = ind - shiftwidth()
+    endif
+  endif
+
+  return ind
+endfunction
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: nowrap sw=2 sts=2 ts=8 noet:
diff --git a/runtime/indent/odin.vim b/runtime/indent/odin.vim
index f8e0d3609e..cba45e9ddf 100644
--- a/runtime/indent/odin.vim
+++ b/runtime/indent/odin.vim
@@ -4,7 +4,7 @@ vim9script
 # Language: Odin
 # Maintainer: Maxim Kim <habamax@gmail.com>
 # Website: https://github.com/habamax/vim-odin
-# Last Change: 2026-02-02
+# Last Change: 2026-06-01
 
 if exists("b:did_indent")
     finish
@@ -105,6 +105,8 @@ def GetOdinIndent(lnum: number): number
         endfor
     elseif pline =~ '{[^{]*}\s*$' && line !~ '^\s*[})]\s*$' # https://github.com/habamax/vim-odin/issues/2
         indent = pindent
+    elseif line !~ '^\s*}' && pline =~ '^\s*\%(if\|for\).*\s\+do\%(\s\+\|$\)' # https://github.com/habamax/vim-odin/issues/15
+        indent = pindent
     elseif pline =~ '^\s*}\s*$' # https://github.com/habamax/vim-odin/issues/3
         # Find line with opening { and check if there is a label:
         # If there is, return indent of the closing }
diff --git a/runtime/indent/testdir/luau.in b/runtime/indent/testdir/luau.in
new file mode 100644
index 0000000000..0d3a4afaaa
--- /dev/null
+++ b/runtime/indent/testdir/luau.in
@@ -0,0 +1,101 @@
+-- vim: set ft=luau sw=2 noet:
+
+-- START_INDENT
+@native
+function compute<T>(values: {T}): number
+local total: number = 0
+for _, value: T in values do
+if value then
+continue
+else
+total += 1
+end
+end
+return total
+end
+
+local function typed(
+name: string,
+count: number
+): boolean
+return count > 0
+end
+
+function singletonReturn(): "end"
+print("string singleton return")
+end
+
+if ready then -- end in a comment
+print("comment closer ignored")
+end
+
+local oneline = function() end
+local afterOneline = oneline
+
+declare function PluginManager(): PluginManager
+local afterDeclareFunction = true
+
+declare function WithArgs(
+arg: string
+): boolean
+local afterDeclareFunctionArgs = true
+
+local text = `function(`
+local afterText = text
+
+-- function(
+local afterLineComment = text
+
+class = makeClass()
+local afterClassIdentifier = class
+
+export type Box<T> = {
+read value: T,
+write name: string,
+callback: (T) -> (),
+}
+
+const function makeBox<T>(value: T): Box<T>
+return {
+value = value,
+name = `box {tostring(value)}`,
+callback = function(item: T)
+print(item)
+end,
+}
+end
+
+declare extern type Vector with
+x: number
+y: number
+z: number
+end
+
+declare class EnumItem extends Enum
+@deprecated
+function IsA(self, enumName: string): boolean
+Name: string
+end
+
+type function Optionalize(t)
+return types.optional(t)
+end
+
+local choice = if 2 == 3 then 4 else 5
+local raw = [=[
+if true then
+]=]
+local afterRaw = choice
+
+--[=[
+function ignored()
+]=]
+local afterComment = raw
+
+class Widget
+public Name: string
+public function Describe(self): string
+return `Widget {self.Name}`
+end
+end
+-- END_INDENT
diff --git a/runtime/indent/testdir/luau.ok b/runtime/indent/testdir/luau.ok
new file mode 100644
index 0000000000..d38b79525b
--- /dev/null
+++ b/runtime/indent/testdir/luau.ok
@@ -0,0 +1,101 @@
+-- vim: set ft=luau sw=2 noet:
+
+-- START_INDENT
+@native
+function compute<T>(values: {T}): number
+  local total: number = 0
+  for _, value: T in values do
+    if value then
+      continue
+    else
+      total += 1
+    end
+  end
+  return total
+end
+
+local function typed(
+  name: string,
+  count: number
+): boolean
+  return count > 0
+end
+
+function singletonReturn(): "end"
+  print("string singleton return")
+end
+
+if ready then -- end in a comment
+  print("comment closer ignored")
+end
+
+local oneline = function() end
+local afterOneline = oneline
+
+declare function PluginManager(): PluginManager
+local afterDeclareFunction = true
+
+declare function WithArgs(
+  arg: string
+): boolean
+local afterDeclareFunctionArgs = true
+
+local text = `function(`
+local afterText = text
+
+-- function(
+local afterLineComment = text
+
+class = makeClass()
+local afterClassIdentifier = class
+
+export type Box<T> = {
+  read value: T,
+  write name: string,
+  callback: (T) -> (),
+}
+
+const function makeBox<T>(value: T): Box<T>
+  return {
+    value = value,
+    name = `box {tostring(value)}`,
+    callback = function(item: T)
+      print(item)
+    end,
+  }
+end
+
+declare extern type Vector with
+  x: number
+  y: number
+  z: number
+end
+
+declare class EnumItem extends Enum
+  @deprecated
+  function IsA(self, enumName: string): boolean
+  Name: string
+end
+
+type function Optionalize(t)
+  return types.optional(t)
+end
+
+local choice = if 2 == 3 then 4 else 5
+local raw = [=[
+if true then
+]=]
+local afterRaw = choice
+
+--[=[
+function ignored()
+]=]
+local afterComment = raw
+
+class Widget
+  public Name: string
+  public function Describe(self): string
+    return `Widget {self.Name}`
+  end
+end
+-- END_INDENT
diff --git a/runtime/pack/dist/opt/netrw/autoload/netrw.vim b/runtime/pack/dist/opt/netrw/autoload/netrw.vim
index f555d66317..8006837cf0 100644
--- a/runtime/pack/dist/opt/netrw/autoload/netrw.vim
+++ b/runtime/pack/dist/opt/netrw/autoload/netrw.vim
@@ -1,7 +1,7 @@
 " Creator:    Charles E Campbell
 " Previous Maintainer: Luca Saccarola <github.e41mv@aleeas.com>
 " Maintainer: This runtime file is looking for a new maintainer.
-" Last Change: 2026 May 28
+" Last Change: 2026 Jun 16
 " Copyright:  Copyright (C) 2016 Charles E. Campbell {{{1
 "             Permission is hereby granted to use and distribute this code,
 "             with or without modifications, provided that this copyright
@@ -3083,7 +3083,7 @@ function s:NetrwBrowse(islocal,dirname)
     elseif !a:islocal && dirname !~ '[\/]$' && dirname !~ '^"'
         " s:NetrwBrowse :  remote regular file handler {{{3
         if bufname(dirname) != ""
-            exe "NetrwKeepj b ".bufname(dirname)
+            exe "NetrwKeepj b ".fnameescape(bufname(dirname))
         else
             " attempt transfer of remote regular file
 
@@ -5172,7 +5172,7 @@ endfunction
 "    s:netrwmarkfilelist_#  -- holds list of marked files in current-buffer's directory (#==bufnr())
 "
 "  Creates a marked file match string
-"    s:netrwmarfilemtch_#   -- used with 2match to display marked files
+"    s:netrwmarkfilemtch_#   -- used with 2match to display marked files
 "
 "  Creates a buffer version of islocal
 "    b:netrw_islocal
@@ -5184,23 +5184,21 @@ function s:NetrwMarkFile(islocal,fname)
     endif
     let curdir = s:NetrwGetCurdir(a:islocal)
 
-    let ykeep   = @@
-    let curbufnr= bufnr("%")
-    let leader= '\%(^\|\s\)\zs'
-    if a:fname =~ '\a$'
-        let trailer = '\>[@=|\/\*]\=\ze\%(  \|\t\|$\)'
-    else
-        let trailer = '[@=|\/\*]\=\ze\%(  \|\t\|$\)'
-    endif
+    let ykeep    = @@
+    let curbufnr = bufnr("%")
+    let leader   = '\%(^\|\s\)\zs'
+    let word_boundary_trailer = '\>[@=|\/\*]\=\ze\%(  \|\t\|$\)'
+    let fallback_trailer      = '[@=|\/\*]\=\ze\%(  \|\t\|$\)'
+    let trailer = (a:fname =~ '\a$') ? word_boundary_trailer : fallback_trailer
 
     if exists("s:netrwmarkfilelist_".curbufnr)
         " markfile list pre-exists
-        let b:netrw_islocal= a:islocal
+        let b:netrw_islocal = a:islocal
 
         if index(s:netrwmarkfilelist_{curbufnr},a:fname) == -1
             " append filename to buffer's markfilelist
-            call add(s:netrwmarkfilelist_{curbufnr},a:fname)
-            let s:netrwmarkfilemtch_{curbufnr}= s:netrwmarkfilemtch_{curbufnr}.'\|'.leader.escape(a:fname,g:netrw_markfileesc).trailer
+            call add(s:netrwmarkfilelist_{curbufnr},substitute(a:fname,'[|@]$','',''))
+            let s:netrwmarkfilemtch_{curbufnr} = s:netrwmarkfilemtch_{curbufnr}.'\|'.leader.escape(a:fname,g:netrw_markfileesc).trailer
 
         else
             " remove filename from buffer's markfilelist
@@ -5210,35 +5208,34 @@ function s:NetrwMarkFile(islocal,fname)
                 call s:NetrwUnmarkList(curbufnr,curdir)
             else
                 " rebuild match list to display markings correctly
-                let s:netrwmarkfilemtch_{curbufnr}= ""
-                let first                         = 1
+                let s:netrwmarkfilemtch_{curbufnr} = ""
+                let first = 1
                 for fname in s:netrwmarkfilelist_{curbufnr}
+                    let curtrailer = (fname =~ '\a$') ? word_boundary_trailer : fallback_trailer
+
+                    let match_str = leader.escape(fname, g:netrw_markfileesc).curtrailer
                     if first
-                        let s:netrwmarkfilemtch_{curbufnr}= s:netrwmarkfilemtch_{curbufnr}.leader.escape(fname,g:netrw_markfileesc).trailer
+                        let s:netrwmarkfilemtch_{curbufnr} = match_str
                     else
-                        let s:netrwmarkfilemtch_{curbufnr}= s:netrwmarkfilemtch_{curbufnr}.'\|'.leader.escape(fname,g:netrw_markfileesc).trailer
+                        let s:netrwmarkfilemtch_{curbufnr} = s:netrwmarkfilemtch_{curbufnr}.'\|'.match_str
                     endif
-                    let first= 0
+                    let first = 0
                 endfor
             endif
         endif
 
     else
         " initialize new markfilelist
-        let s:netrwmarkfilelist_{curbufnr}= []
+        let s:netrwmarkfilelist_{curbufnr} = []
         call add(s:netrwmarkfilelist_{curbufnr},substitute(a:fname,'[|@]$','',''))
 
         " build initial markfile matching pattern
-        if a:fname =~ '/$'
-            let s:netrwmarkfilemtch_{curbufnr}= leader.escape(a:fname,g:netrw_markfileesc)
-        else
-            let s:netrwmarkfilemtch_{curbufnr}= leader.escape(a:fname,g:netrw_markfileesc).trailer
-        endif
+        let s:netrwmarkfilemtch_{curbufnr} = leader.escape(a:fname,g:netrw_markfileesc).trailer
     endif
 
     " handle global markfilelist
     if exists("s:netrwmarkfilelist")
-        let dname= netrw#fs#ComposePath(b:netrw_curdir,a:fname)
+        let dname = netrw#fs#ComposePath(b:netrw_curdir,a:fname)
         if index(s:netrwmarkfilelist,dname) == -1
             " append new filename to global markfilelist
             call add(s:netrwmarkfilelist,netrw#fs#ComposePath(b:netrw_curdir,a:fname))
@@ -5251,7 +5248,7 @@ function s:NetrwMarkFile(islocal,fname)
         endif
     else
         " initialize new global-directory markfilelist
-        let s:netrwmarkfilelist= []
+        let s:netrwmarkfilelist = []
         call add(s:netrwmarkfilelist,netrw#fs#ComposePath(b:netrw_curdir,a:fname))
     endif
 
@@ -8803,7 +8800,7 @@ function s:NetrwLocalRmFile(path, fname, all)
             call netrw#msg#Notify('ERROR', printf("unable to delete <%s>!", rmfile))
         else
             " Remove file only if there are no pending changes
-            execute printf('silent! bwipeout %s', rmfile)
+            execute printf('silent! bwipeout %s', fnameescape(rmfile))
         endif
 
     elseif dir && (all || empty(ok))
diff --git a/runtime/syntax/algol68.vim b/runtime/syntax/algol68.vim
index 9f9611861d..41b9797c51 100644
--- a/runtime/syntax/algol68.vim
+++ b/runtime/syntax/algol68.vim
@@ -3,7 +3,7 @@
 " Version:		0.4
 " Maintainer:		Janis Papanagnou
 " Previous Maintainer:	NevilleD.ALGOL_68@sgr-a.net
-" Last Change:		2026 May 19
+" Last Change:		2026 Jun 13
 
 if exists("b:current_syntax")
   finish
@@ -41,7 +41,8 @@ syn keyword algol68Repeat	FOR FROM BY UPTO DOWNTO TO WHILE DO UNTIL OD
 syn keyword algol68Statement	PAR BEGIN END EXIT
 syn keyword algol68Struct	STRUCT
 syn keyword algol68PreProc	VECTOR
-syn keyword algol68Type		FLEX HEAP LOC LONG REF SHORT
+syn match   algol68Type		"\<\%(LONG\|SHORT\)\>"
+syn keyword algol68Type		FLEX HEAP LOC REF
 syn keyword algol68Type		VOID BOOL INT REAL COMPL CHAR STRING COMPLEX
 syn keyword algol68Type		BITS BYTES FILE CHANNEL PIPE SEMA SOUND
 syn keyword algol68Type		FORMAT STRUCT UNION 
@@ -120,16 +121,16 @@ syn match   algol68DefiningOperator	"\u[A-Z0-9]" contained
 syn match   algol68DefiningOperator	"[!%&+\-?^~][*/<=>]\?\%(:=\|=:\)\?" contained
 syn match   algol68DefiningOperator	"\%([!%&+\-?^~]\|[*/<=>]\)[*/<=>]\?\%(:=\|=:\)\?" contained
 
-syn match  algol68Number	"\<\d\+\%(\s\+\d\+\)*\>"
+syn match  algol68Number	"\<\%(\%(LONG\s\+\)\+\|\%(SHORT\s\+\)\+\)\=\d\+\%(\s\+\d\+\)*\>"
 
-syn match  algol68Float		"\c\.\d\+\%(\s\+\d\+\)*\%(\s*[e\\�]\s*[-+]\?\s*\d\+\%(\s\+\d\+\)*\)\?\>"
-syn match  algol68Float		"\c\<\d\+\%(\s\+\d\+\)*\%(\s*[e\\�]\s*[-+]\?\s*\d\+\%(\s\+\d\+\)*\)\>"
-syn match  algol68Float		"\c\<\d\+\%(\s\+\d\+\)*\s*\.\s*\d\+\%(\s\+\d\+\)*\%(\s*[e\\�]\s*[-+]\?\s*\d\+\%(\s\+\d\+\)*\)\?\>"
+syn match  algol68Float		"\%(\%(LONG\s\+\)*\|\%(SHORT\s\+\)*\)\=\.\d\+\%(\s\+\d\+\)*\%(\s*[eE\\�]\s*[-+]\?\s*\d\+\%(\s\+\d\+\)*\)\?\>"
+syn match  algol68Float		"\<\%(\%(LONG\s\+\)*\|\%(SHORT\s\+\)*\)\=\d\+\%(\s\+\d\+\)*\%(\s*[eE\\�]\s*[-+]\?\s*\d\+\%(\s\+\d\+\)*\)\>"
+syn match  algol68Float		"\<\%(\%(LONG\s\+\)*\|\%(SHORT\s\+\)*\)\=\d\+\%(\s\+\d\+\)*\s*\.\s*\d\+\%(\s\+\d\+\)*\%(\s*[eE\\�]\s*[-+]\?\s*\d\+\%(\s\+\d\+\)*\)\?\>"
 
-syn match  algol68HexNumber	"\c\<2r\s*[01]\+\%(\s\+[01]\+\)*\>"
-syn match  algol68HexNumber	"\c\<4r\s*[0-3]\+\%(\s\+[0-3]\+\)*\>"
-syn match  algol68HexNumber	"\c\<8r\s*[0-7]\+\%(\s\+[0-7]\+\)*\>"
-syn match  algol68HexNumber	"\c\<16r\s*[0-9a-f]\+\%(\s\+[0-9a-f]\+\)*\>"
+syn match  algol68HexNumber	"\<\%(\%(LONG\s\+\)*\|\%(SHORT\s\+\)*\)\=2[rR]\s*[01]\+\%(\s\+[01]\+\)*\>"
+syn match  algol68HexNumber	"\<\%(\%(LONG\s\+\)*\|\%(SHORT\s\+\)*\)\=4[rR]\s*[0-3]\+\%(\s\+[0-3]\+\)*\>"
+syn match  algol68HexNumber	"\<\%(\%(LONG\s\+\)*\|\%(SHORT\s\+\)*\)\=8[rR]\s*[0-7]\+\%(\s\+[0-7]\+\)*\>"
+syn match  algol68HexNumber	"\<\%(\%(LONG\s\+\)*\|\%(SHORT\s\+\)*\)\=16[rR]\s*[0-9a-f]\+\%(\s\+[0-9a-f]\+\)*\>"
 
 
 syn region algol68Special	start="\$"  end="\$" contains=algol68String
diff --git a/runtime/syntax/beancount.vim b/runtime/syntax/beancount.vim
new file mode 100644
index 0000000000..4909c4bc08
--- /dev/null
+++ b/runtime/syntax/beancount.vim
@@ -0,0 +1,94 @@
+" Vim syntax file
+" Language: beancount
+" Maintainer: Nathan Grigg
+" Latest Revision: 2024-11-25
+
+if exists("b:current_syntax")
+    finish
+endif
+
+syntax clear
+" Basics.
+syn region beanComment start="\s*;" end="$" keepend contains=beanMarker
+syn match beanMarker "\v(\{\{\{|\}\}\})\d?" contained
+syn region beanString start='"' skip='\\"' end='"' contained
+syn match beanAmount "\v[-+]?[[:digit:].,]+" nextgroup=beanCurrency contained
+            \ skipwhite
+syn match beanCurrency "\v\w+" contained
+" Account name: alphanumeric with at least one colon.
+syn match beanAccount "\v[[:alnum:]]+:[-[:alnum:]:]+" contained
+syn match beanTag "\v#[-[:alnum:]]+" contained
+syn match beanLink "\v\^\S+" contained
+" We must require a space after the flag because you can have flags per
+" transaction leg, and the letter-based flags might get confused with the
+" start of an account name.
+syn match beanFlag "\v[*!&#?%PSTCURM]\s\@=" contained
+
+" Most directives start with a date.
+syn match beanDate "^\v\d{4}[-/]\d{2}[-/]\d{2}" skipwhite
+            \ nextgroup=beanOpen,beanTxn,beanClose,beanCommodity,beanNote,beanBalance,beanEvent,beanPad,beanPrice
+" Options and events have two string arguments. The first, we are matching as
+" beanOptionTitle and the second as a regular string.
+syn region beanOption matchgroup=beanKeyword start="^option" end="$"
+            \ keepend contains=beanOptionTitle,beanComment
+syn region beanOption matchgroup=beanKeyword start="^plugin" end="$"
+            \ keepend contains=beanString,beanComment
+syn region beanInclude matchgroup=beanKeyword start="^include" end="$"
+            \ keepend contains=beanString,beanComment
+syn region beanEvent matchgroup=beanKeyword start="event" end="$" contained
+            \ keepend contains=beanOptionTitle,beanComment
+syn region beanOptionTitle start='"' skip='\\"' end='"' contained
+            \ nextgroup=beanString skipwhite
+syn region beanOpen matchgroup=beanKeyword start="open" end="$" keepend
+            \ contained contains=beanAccount,beanCurrency,beanComment
+syn region beanClose matchgroup=beanKeyword start="close" end="$" keepend
+            \ contained contains=beanAccount,beanComment
+syn region beanCommodity matchgroup=beanKeyword start="commodity" end="$" keepend
+            \ contained contains=beanCurrency,beanComment
+syn region beanNote matchgroup=beanKeyword start="\vnote|document" end="$"
+            \ keepend contains=beanAccount,beanString,beanComment contained
+syn region beanBalance matchgroup=beanKeyword start="balance" end="$" contained
+            \ keepend contains=beanAccount,beanAmount,beanComment
+syn region beanPrice matchgroup=beanKeyword start="price" end="$" contained
+            \ keepend contains=beanCurrency,beanAmount
+syn region beanPushTag matchgroup=beanKeyword start="\v^(push|pop)tag" end="$"
+            \ keepend contains=beanTag
+syn region beanPad matchgroup=beanKeyword start="pad" end="$" contained
+            \ keepend contains=beanAccount,beanComment
+
+syn region beanTxn matchgroup=beanKeyword start="\v\s+(txn|[*!&#?%PSTCURM])" skip="^\s"
+            \ end="^" keepend contained fold
+            \ contains=beanString,beanPost,beanComment,beanTag,beanLink,beanMeta
+syn region beanPost start="^\v\C\s+(([*!&#?%PSTCURM]\s+)?[A-Z])@=" end="$"
+            \ contains=beanFlag,beanAccount,beanAmount,beanComment,beanCost,beanPrice
+syn region beanMeta matchgroup=beanTag start="^\v\C\s+[a-z][-_a-zA-Z0-9]*:(\s|$)@=" end="$"
+
+syn region beanCost start="{" end="}" contains=beanAmount contained
+syn match beanPrice "\V@@\?" nextgroup=beanAmount contained
+
+syn region beanHashHeaderFold
+    \ start="^\z(#\+\)"
+    \ skip="^\s*\z1#\+"
+    \ end="^\(#\)\@="
+    \ fold contains=TOP
+
+syn region beanStarHeaderFold
+    \ start="^\z(\*\+\)"
+    \ skip="^\s*\z1\*\+"
+    \ end="^\(\*\)\@="
+    \ fold contains=TOP
+
+highlight default link beanKeyword Keyword
+highlight default link beanOptionTitle Keyword
+highlight default link beanDate Keyword
+highlight default link beanString String
+highlight default link beanComment Comment
+highlight default link beanAccount Identifier
+highlight default link beanAmount Number
+highlight default link beanCurrency Number
+highlight default link beanCost Number
+highlight default link beanPrice Number
+highlight default link beanTag Tag
+highlight default link beanLink Comment
+highlight default link beanMeta Special
+highlight default link beanFlag Keyword
diff --git a/runtime/syntax/context.vim b/runtime/syntax/context.vim
index 07b59c0fcb..891d5c6515 100644
--- a/runtime/syntax/context.vim
+++ b/runtime/syntax/context.vim
@@ -4,7 +4,7 @@ vim9script
 # Language:           ConTeXt typesetting engine
 # Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
 # Former Maintainers: Nikolai Weibull <now@bitwi.se>
-# Latest Revision:    2026 Jan 10
+# Latest Revision:    2026 Jun 13
 
 if exists("b:current_syntax")
   finish
@@ -60,7 +60,7 @@ syn match   contextSequence   '\\[a-zA-Z]*[@_!?]\+[a-zA-Z@_!?]*' contains=@NoSpe
 
 # Math
 syn match  contextMathCmd '\\m\%(ath\%(ematics\)\=\)\=\>'
-syn region contextInlineMath matchgroup=contextMathDelim start='\$' skip='\\\\\|\\\$' end='\$'
+syn region contextInlineMath matchgroup=contextMathDelim start='[\\]\@1<!\$' skip='\\\\\|\\\$' end='[\\]\@1<!\$'
 syn region contextDisplayMath matchgroup=contextMathDelim start='\$\$' skip='\\\\\|\\\$' end='\$\$' keepend
 syn region contextDisplayMath matchgroup=contextBlockDelim start='\\startformula' end='\\stopformula' contains=TOP
 
@@ -117,27 +117,28 @@ syn match   contextFont       '\\\%(Word\|WORD\|Words\|WORDS\)\>'
 syn match   contextFont       '\\\%(vi\{1,3}\|ix\|xi\{0,2}\)\>'                 contains=@NoSpell
 syn match   contextFont       '\\\%(tf\|b[si]\|s[cl]\|os\)\%(xx\|[xabcd]\)\=\>' contains=@NoSpell
 
-hi def link contextBlockDelim Keyword
-hi def link contextBuiltin    Keyword
-hi def link contextCommand    Keyword
-hi def link contextComment    Comment
-hi def link contextDelimiter  Delimiter
-hi def link contextDirectLua  Keyword
-hi def link contextEscaped    String
-hi def link contextFont       contextType
-hi def link contextKeyword    Keyword
-hi def link contextInlineMath String
-hi def link contextMagicLine  PreProc
-hi def link contextMathCmd    Identifier
-hi def link contextMathDelim  Delimiter
-hi def link contextOptions    Typedef
-hi def link contextPreProc    PreProc
-hi def link contextSectioning PreProc
-hi def link contextSequence   Identifier
-hi def link contextSpecial    Special
-hi def link contextStyle      contextType
-hi def link contextTodo       Todo
-hi def link contextType       Type
+hi def link contextBlockDelim  Keyword
+hi def link contextBuiltin     Keyword
+hi def link contextCommand     Keyword
+hi def link contextComment     Comment
+hi def link contextDelimiter   Delimiter
+hi def link contextDirectLua   Keyword
+hi def link contextDisplayMath String
+hi def link contextEscaped     String
+hi def link contextFont        contextType
+hi def link contextKeyword     Keyword
+hi def link contextInlineMath  String
+hi def link contextMagicLine   PreProc
+hi def link contextMathCmd     Identifier
+hi def link contextMathDelim   Delimiter
+hi def link contextOptions     Typedef
+hi def link contextPreProc     PreProc
+hi def link contextSectioning  PreProc
+hi def link contextSequence    Identifier
+hi def link contextSpecial     Special
+hi def link contextStyle       contextType
+hi def link contextTodo        Todo
+hi def link contextType        Type
 
 b:current_syntax = 'context'
 
diff --git a/runtime/syntax/cpp.vim b/runtime/syntax/cpp.vim
index 1c725a4bfd..121eab2c6f 100644
--- a/runtime/syntax/cpp.vim
+++ b/runtime/syntax/cpp.vim
@@ -110,6 +110,15 @@ if !exists("cpp_no_cpp23")
   syn keyword cppType		float16_t float32_t float64_t float128_t bfloat16_t
 endif
 
+" C++ 26 extensions
+if !exists("cpp_no_cpp26")
+  " attribute [[ ... ]] with optional value expr, eg [[=foo{1}]]
+  syn region cppAttribute	matchgroup=cppAttributeBracket start="\w\@1<!\[\[" end="\]\]" contains=TOP,@Spell
+  syn match cppReflect		"\^\^"
+  syn match cppSpliceBracket	"\[:\|:\]"
+  syn keyword cppStatement	contract_assert
+endif
+
 " The minimum and maximum operators in GNU C++
 syn match cppMinMax "[<>]?"
 
@@ -134,6 +143,9 @@ hi def link cppString		String
 hi def link cppNumber		Number
 hi def link cppFloat		Number
 hi def link cppModule		Include
+hi def link cppAttributeBracket	Special
+hi def link cppReflect		Operator
+hi def link cppSpliceBracket	Special
 
 let b:current_syntax = "cpp"
 
diff --git a/runtime/syntax/erlang.vim b/runtime/syntax/erlang.vim
index bbb03d52cd..71084ac1dd 100644
--- a/runtime/syntax/erlang.vim
+++ b/runtime/syntax/erlang.vim
@@ -3,7 +3,7 @@
 " Maintainer:   Csaba Hoch <csaba.hoch@gmail.com>
 " Contributor:  Adam Rutkowski <hq@mtod.org>
 "               Johannes Christ <jc@jchri.st>
-" Last Update:  2025-Nov-12
+" Last Update:  2026-Jun-14
 " License:      Vim license
 " URL:          https://github.com/vim-erlang/vim-erlang-runtime
 
@@ -178,8 +178,38 @@ syn match erlangQuotedAtomModifier '\\\%(\o\{1,3}\|x\x\x\|x{\x\+}\|\^.\|.\)' con
 syn match erlangModifier           '\$\%([^\\]\|\\\%(\o\{1,3}\|x\x\x\|x{\x\+}\|\^.\|.\)\)'
 
 " Operators, separators
-syn match erlangOperator   '==\|=:=\|/=\|=/=\|<\|=<\|>\|>=\|=>\|:=\|?=\|++\|--\|=\|!\|<-\|+\|-\|\*\|\/'
+syn match erlangOperator '='
+syn match erlangOperator '+'
+syn match erlangOperator '-'
+syn match erlangOperator '*'
+syn match erlangOperator '/'
+syn match erlangOperator '<'
+syn match erlangOperator '>'
+syn match erlangOperator '!'
+syn match erlangOperator '=<'
+syn match erlangOperator '>='
+syn match erlangOperator '=>'
+syn match erlangOperator '=='
+syn match erlangOperator '=:='
+syn match erlangOperator '/='
+syn match erlangOperator '=/='
+syn match erlangOperator ':='
+syn match erlangOperator '?='
+syn match erlangOperator '++'
+syn match erlangOperator '--'
+syn match erlangOperator '<-'
+
+" erlangEqualsBinary makes the syntax reflect how Erlang parses the following:
+"
+" A=<<<"binary">>
+"   Valid, same as: A =< <<"binary">>
+" A==<<"binary">>
+"   Valid, same as: A == <<"binary">>
+" A=<<"binary">>
+"   Invalid, parsed as: A =< <"binary">>. This is invalid because there are no
+"   "<<" before the binary, only "<".
 syn match erlangEqualsBinary '=<<\%(<\)\@!'
+
 syn keyword erlangOperator div rem or xor bor bxor bsl bsr and band not bnot andalso orelse
 syn match erlangBracket    '{\|}\|\[\|]\||\|||'
 syn match erlangPipe       '|'
@@ -207,7 +237,7 @@ syn region erlangQuotedRecord        start=/#\s*'/ end=/'/ contains=erlangQuoted
 syn match erlangShebang  '^#!.*'
 
 " Bitstrings
-syn match erlangBitType '\%(\/\%(\s\|\n\|%.*\n\)*\)\@<=\%(integer\|float\|binary\|bytes\|bitstring\|bits\|binary\|utf8\|utf16\|utf32\|signed\|unsigned\|big\|little\|native\|unit\)\%(\%(\s\|\n\|%.*\n\)*-\%(\s\|\n\|%.*\n\)*\%(integer\|float\|binary\|bytes\|bitstring\|bits\|binary\|utf8\|utf16\|utf32\|signed\|unsigned\|big\|little\|native\|unit\)\)*' contains=erlangComment
+syn match erlangBitType '\%#=1\%(\/\%(\s\|\n\|%.*\n\)*\)\@<=\<\%(integer\|float\|binary\|bytes\|bitstring\|bits\|binary\|utf8\|utf16\|utf32\|signed\|unsigned\|big\|little\|native\|unit\)\%(\%(\s\|\n\|%.*\n\)*-\%(\s\|\n\|%.*\n\)*\<\%(integer\|float\|binary\|bytes\|bitstring\|bits\|binary\|utf8\|utf16\|utf32\|signed\|unsigned\|big\|little\|native\|unit\)\)*' contains=erlangComment
 
 " Constants and Directives
 syn match erlangUnknownAttribute '^\s*-\%(\s\|\n\|%.*\n\)*\l[[:alnum:]_@]*' contains=erlangComment
diff --git a/runtime/syntax/generator/vim.vim.base b/runtime/syntax/generator/vim.vim.base
index 48414714fc..309ef2a9ba 100644
--- a/runtime/syntax/generator/vim.vim.base
+++ b/runtime/syntax/generator/vim.vim.base
@@ -2,7 +2,7 @@
 " Language:	   Vim script
 " Maintainer:	   Hirohito Higashi <h.east.727 ATMARK gmail.com>
 "	   Doug Kearns <dougkearns@gmail.com>
-" Last Change:	   2026 May 24
+" Last Change:	   2026 Jun 12
 " Former Maintainer: Charles E. Campbell
 
 " DO NOT CHANGE DIRECTLY.
@@ -236,13 +236,13 @@ Vim9 syn keyword vim9Boolean	true false
 " Numbers {{{2
 " =======
 syn case ignore
-syn match	vimNumber	"\<\d\+\%('\d\+\)*"		skipwhite nextgroup=@vimComment,vimSubscript,vimGlobal,vimSubst1
+syn match	vimNumber	"\<\d\+\%('\d\+\)*"		skipwhite nextgroup=@vimComment,vimSubscriptBrackets,vimGlobal,vimSubst1
 syn match	vimNumber	"\<\d\+\%('\d\+\)*\.\d\+\%(e[+-]\=\d\+\)\="	skipwhite nextgroup=@vimComment
-syn match	vimNumber	"\<0b[01]\+\%('[01]\+\)*"		skipwhite nextgroup=@vimComment,vimSubscript
-syn match	vimNumber	"\<0o\=\o\+\%('\o\+\)*"		skipwhite nextgroup=@vimComment,vimSubscript
-syn match	vimNumber	"\<0x\x\+\%('\x\+\)*"		skipwhite nextgroup=@vimComment,vimSubscript
+syn match	vimNumber	"\<0b[01]\+\%('[01]\+\)*"		skipwhite nextgroup=@vimComment,vimSubscriptBrackets
+syn match	vimNumber	"\<0o\=\o\+\%('\o\+\)*"		skipwhite nextgroup=@vimComment,vimSubscriptBrackets
+syn match	vimNumber	"\<0x\x\+\%('\x\+\)*"		skipwhite nextgroup=@vimComment,vimSubscriptBrackets
 syn match	vimNumber	'\<0z\>'			skipwhite nextgroup=@vimComment
-syn match	vimNumber	'\<0z\%(\x\x\)\+\%(\.\%(\x\x\)\+\)*'	skipwhite nextgroup=@vimComment,vimSubscript
+syn match	vimNumber	'\<0z\%(\x\x\)\+\%(\.\%(\x\x\)\+\)*'	skipwhite nextgroup=@vimComment,vimSubscriptBrackets
 syn case match
 
 " All vimCommands are contained by vimIsCommand. {{{2
@@ -255,20 +255,28 @@ syn match vimIsCommand	"\<\h\w*\>"	nextgroup=vimBang contains=vimCommand
 syn match vimBang	      contained	"!"
 syn match vimWhitespace contained	"\s\+"
 
-syn region vimSubscript contained	matchgroup=vimSubscriptBracket start="\[" end="]" nextgroup=vimSubscript contains=@vimExprList
+syn region vimSubscriptBrackets	contained
+      \ matchgroup=vimSubscriptBracket
+      \ start="\["
+      \ end="]"
+      \ nextgroup=vimSubscriptBrackets,vimSubscriptDot
+      \ contains=@vimExprList
+syn match  vimSubscriptDot	contained	"\."	nextgroup=vimVar,vimVarKey,vimUserFunc,vimUserFuncKey
 
-syn match vimVar	      contained	"\<\h[a-zA-Z0-9#_]*\>"	nextgroup=vimSubscript contains=vim9Super,vim9This
-syn match vimVar		"\<[bwglstav]:\h[a-zA-Z0-9#_]*\>"	nextgroup=vimSubscript contains=vimVarScope
-syn match vimVar		"\<a:\%(000\|1\=[0-9]\|20\)\>"	nextgroup=vimSubscript contains=vimVarScope
-syn match vimFBVar      contained	"\<[bwglsta]:\h[a-zA-Z0-9#_]*\>"	nextgroup=vimSubscript contains=vimVarScope
+syn match vimVar	      contained	"\<\h[a-zA-Z0-9#_]*\>"	nextgroup=vimSubscriptBrackets,vimSubscriptDot contains=vim9Super,vim9This
+" dict-key only
+syn match vimVarKey     contained	"\<\d\w*\>"		nextgroup=vimSubscriptBrackets,vimSubscriptDot
+syn match vimVar		"\<[bwglstav]:\h[a-zA-Z0-9#_]*\>"	nextgroup=vimSubscriptBrackets,vimSubscriptDot contains=vimVarScope
+syn match vimVar		"\<a:\%(000\|1\=[0-9]\|20\)\>"	nextgroup=vimSubscriptBrackets,vimSubscriptDot contains=vimVarScope
+syn match vimFBVar      contained	"\<[bwglsta]:\h[a-zA-Z0-9#_]*\>"	nextgroup=vimSubscriptBrackets,vimSubscriptDot contains=vimVarScope
 
 " match the scope prefix independently of the retrofitted scope dictionary
 syn match vimVarScope   contained	"\<[bwglstav]:"
-syn match vimVimVar     contained	"\<[bwglstav]:\%(\h\|\d\)\@!"	nextgroup=vimSubscript
+syn match vimVimVar     contained	"\<[bwglstav]:\%(\h\|\d\)\@!"	nextgroup=vimSubscriptBrackets,vimSubscriptDot
 
-syn match vimVarNameError contained "\<\h\w*\>"
-syn match vimVimVar	"\<v:"		nextgroup=vimSubscript,vimVimVarName,vimVarNameError
-syn match vimOptionVar	"&\%([lg]:\)\="		nextgroup=vimSubscript,vimOptionVarName,vimVarNameError
+syn match vimVarNameError contained "\<\h\w*\>"		nextgroup=vimSubscriptBrackets,vimSubscriptDot " just abort highlighting rather than match nextgroup?
+syn match vimVimVar	"\<v:"		nextgroup=vimSubscriptBrackets,vimSubscriptDot,vimVimVarName,vimVarNameError
+syn match vimOptionVar	"&\%([lg]:\)\="		nextgroup=vimSubscriptBrackets,vimSubscriptDot,vimOptionVarName,vimVarNameError
 syn cluster vimSpecialVar	contains=vimEnvvar,vimLetRegister,vimOptionVar,vimVimVar
 
 Vim9 syn match	vimVar	contained	 "\<\h\w*\ze<"		nextgroup=vim9TypeArgs
@@ -276,8 +284,8 @@ Vim9 syn match	vimVar	contained	 "\<\h\w*\ze<"		nextgroup=vim9TypeArgs
 Vim9 syn match	vim9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\s\+[-+/*%]\==\%(\s\|$\)"
 Vim9 syn match	vim9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\s\+\.\.=\%(\s\|$\)"
 Vim9 syn match	vim9LhsVariable	"\s\=\%([bwgt]:\)\=\h[a-zA-Z0-9#_]*\ze\s\+=<<\s"	skipwhite nextgroup=vimLetHeredoc	contains=vimVarScope
-Vim9 syn match	vim9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\["		          nextgroup=vimSubscript
-Vim9 syn match	vim9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\."		          nextgroup=vimOper	contains=vim9Super,vim9This
+Vim9 syn match	vim9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\["		          nextgroup=vimSubscriptBrackets
+Vim9 syn match	vim9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\."		          nextgroup=vimSubscriptDot	contains=vim9Super,vim9This
 Vim9 syn match	vim9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\s*->"				contains=vim9Super,vim9This
 
 Vim9 syn match vim9LhsVariableList	"\[\_[^]]\+]\ze\s\+[-+/*%]\=="			contains=vimVar,@vimSpecialVar
@@ -492,9 +500,9 @@ syn match	vimOper	"="			skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList
 syn match	vimOper	"\%#=1\%(==\|!=\|>=\|<=\|=\~\|!\~\|>\|<\)[?#]\="	skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList,vimContinueString,vimSpecFile
 syn match	vimOper	"\<is\%(not\)\=\>"		skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList,vimContinueString,vimSpecFile
 syn match	vimOper	"\<is\%(not\)\=[?#]"		skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList,vimContinueString,vimSpecFile
-syn region	vimOperParen 		matchgroup=vimParenSep start="("    end=")" contains=@vimOperGroup nextgroup=vimSubscript
-syn region	vimOperParen		matchgroup=vimSep	     start="#\={" end="}" contains=@vimOperGroup nextgroup=vimSubscript,vimVar
-syn region	vimOperParen	contained	matchgroup=vimSep	     start="\["	end="]" contains=@vimOperGroup nextgroup=vimSubscript,vimVar
+syn region	vimOperParen 		matchgroup=vimParenSep start="("    end=")" contains=@vimOperGroup nextgroup=vimSubscriptBrackets,vimSubscriptDot
+syn region	vimOperParen		matchgroup=vimSep	     start="#\={" end="}" contains=@vimOperGroup nextgroup=vimSubscriptBrackets,vimSubscriptDot,vimVar
+syn region	vimOperParen	contained	matchgroup=vimSep	     start="\["	end="]" contains=@vimOperGroup nextgroup=vimSubscriptBrackets,vimSubscriptDot,vimVar
 if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_noopererror")
  syn match	vimOperError	")"
 endif
@@ -1003,8 +1011,8 @@ syn region	vimPatSepZone	oneline   contained   matchgroup=vimPatSepZ start="\\%\
 syn region	vimPatRegion	contained transparent matchgroup=vimPatSepR start="\\[z%]\=(" end="\\)"	contains=@vimSubstList oneline
 syn match	vimNotPatSep	contained	"\\\\"
 syn cluster	vimStringGroup	contains=vimEscape,vimEscapeBrace,vimPatSep,vimNotPatSep,vimPatSepErr,vimPatSepZone,@Spell
-syn region	vimString	oneline keepend	matchgroup=vimString start=+[^a-zA-Z\\@]"+lc=1 skip=+\\\\\|\\"+ matchgroup=vimStringEnd end=+"+ nextgroup=vimSubscript contains=@vimStringGroup extend
-syn region	vimString	oneline	matchgroup=vimString start=+[^a-zA-Z\\@]'+lc=1 end=+'+		       nextgroup=vimSubscript contains=vimQuoteEscape  extend
+syn region	vimString	oneline keepend	matchgroup=vimString start=+[^a-zA-Z\\@]"+lc=1 skip=+\\\\\|\\"+ matchgroup=vimStringEnd end=+"+ nextgroup=vimSubscriptBrackets contains=@vimStringGroup extend
+syn region	vimString	oneline	matchgroup=vimString start=+[^a-zA-Z\\@]'+lc=1 end=+'+		       nextgroup=vimSubscriptBrackets contains=vimQuoteEscape  extend
 "syn region	vimString	oneline	start="\s/\s*\A"lc=1 skip="\\\\\|\\+" end="/"	contains=@vimStringGroup  " see tst45.vim
 
 syn match	vimEscape	contained	"\\."
@@ -1014,17 +1022,17 @@ syn match	vimEscape	contained	"\\<" contains=vimNotation
 syn match	vimEscape	contained	"\\<\*[^>]*>\=>"
 syn match	vimQuoteEscape	contained	"''"
 
-syn region	vimString	oneline matchgroup=vimString start=+$'+ end=+'+ nextgroup=vimSubscript contains=@vimStringInterpolation,vimQuoteEscape  extend
-syn region	vimString	oneline matchgroup=vimString start=+$"+ end=+"+ nextgroup=vimSubscript contains=@vimStringInterpolation,@vimStringGroup extend
+syn region	vimString	oneline matchgroup=vimString start=+$'+ end=+'+ nextgroup=vimSubscriptBrackets contains=@vimStringInterpolation,vimQuoteEscape  extend
+syn region	vimString	oneline matchgroup=vimString start=+$"+ end=+"+ nextgroup=vimSubscriptBrackets contains=@vimStringInterpolation,@vimStringGroup extend
 syn region	vimStringInterpolationExpr  oneline contained matchgroup=vimSep start=+{+ end=+}+ contains=@vimExprList
 syn match	vimStringInterpolationBrace contained "{{"
 syn match	vimStringInterpolationBrace contained "}}"
 syn cluster	vimStringInterpolation contains=vimStringInterpolationExpr,vimStringInterpolationBrace
 
-syn region	vimContinueString	contained	matchgroup=vimContinueString start=+"+  skip=+\n\s*\%(\\\|["#]\\ \)+ end=+"+ end="$" skipwhite nextgroup=vimSubscript,vimComment contains=@vimContinue,@vimStringGroup
-syn region	vimContinueString	contained	matchgroup=vimContinueString start=+'+  skip=+\n\s*\%(\\\|["#]\\ \)+ end=+'+ end="$" skipwhite nextgroup=vimSubscript,vimComment contains=@vimContinue,vimQuoteEscape
-syn region	vimContinueString	contained	matchgroup=vimContinueString start=+$"+ skip=+\n\s*\%(\\\|["#]\\ \)+ end=+"+ end="$" skipwhite nextgroup=vimSubscript,vimComment contains=@vimContinue,@vimStringInterpolation,@vimStringGroup
-syn region	vimContinueString	contained	matchgroup=vimContinueString start=+$'+ skip=+\n\s*\%(\\\|["#]\\ \)+ end=+'+ end="$" skipwhite nextgroup=vimSubscript,vimComment contains=@vimContinue,@vimStringInterpolation,vimQuoteEscape
+syn region	vimContinueString	contained	matchgroup=vimContinueString start=+"+  skip=+\n\s*\%(\\\|["#]\\ \)+ end=+"+ end="$" skipwhite nextgroup=vimSubscriptBrackets,vimComment contains=@vimContinue,@vimStringGroup
+syn region	vimContinueString	contained	matchgroup=vimContinueString start=+'+  skip=+\n\s*\%(\\\|["#]\\ \)+ end=+'+ end="$" skipwhite nextgroup=vimSubscriptBrackets,vimComment contains=@vimContinue,vimQuoteEscape
+syn region	vimContinueString	contained	matchgroup=vimContinueString start=+$"+ skip=+\n\s*\%(\\\|["#]\\ \)+ end=+"+ end="$" skipwhite nextgroup=vimSubscriptBrackets,vimComment contains=@vimContinue,@vimStringInterpolation,@vimStringGroup
+syn region	vimContinueString	contained	matchgroup=vimContinueString start=+$'+ skip=+\n\s*\%(\\\|["#]\\ \)+ end=+'+ end="$" skipwhite nextgroup=vimSubscriptBrackets,vimComment contains=@vimContinue,@vimStringInterpolation,vimQuoteEscape
 
 " Substitutions: {{{2
 " =============
@@ -1158,7 +1166,7 @@ syn region	vimVarList	contained
       \ start="\[" end="]"
       \ skipwhite nextgroup=vimLetHeredoc
       \ contains=@vimContinue,@vimSpecialVar,vimVar
-syn match	vimLetVar	 contained	"\<\%([bwglstav]:\)\=\h[a-zA-Z0-9#_]*\>\ze\%(\[.*]\)\=\s*=<<"	skipwhite nextgroup=vimLetVarSubscript,vimLetHeredoc	contains=vimVarScope,vimSubscript
+syn match	vimLetVar	 contained	"\<\%([bwglstav]:\)\=\h[a-zA-Z0-9#_]*\>\ze\%(\[.*]\)\=\s*=<<"	skipwhite nextgroup=vimLetVarSubscript,vimLetHeredoc	contains=vimVarScope,vimSubscriptBrackets
 hi link vimLetVar vimVar
 syn region	vimLetVarSubscript contained
       \ matchgroup=vimSubscriptBracket
@@ -2331,14 +2339,16 @@ unlet s:interfaces
 " Function Call Highlighting: {{{2
 " (following Gautam Iyer's suggestion)
 " ==========================
-syn match	vimFunc	contained	"\<\l\w*\ze\s*("					skipwhite nextgroup=vimOperParen		contains=vimFuncName
-syn match	vimUserFunc	contained	"\.\@1<=\l\w*\ze\%(\s*(\|<.*>(\)"				skipwhite nextgroup=vimOperParen,vim9TypeArgs
-syn match	vimUserFunc	contained	"\<\%([[:upper:]_]\|\%(\h\w*\.\)\+\h\)\w*\ze\%(\s*(\|<.*>(\)"		skipwhite nextgroup=vimOperParen,vim9TypeArgs	contains=vim9MethodName,vim9Super,vim9This
-syn match	vimUserFunc	contained	"\<\%(g:\)\=\%(\h\w*#\)\+\h\w*\ze\%(\s*(\|<.*>(\)"			skipwhite nextgroup=vimOperParen		contains=vimVarScope
-syn match	vimUserFunc	contained	"\%(\<[sgbwtlav]:\|<[sS][iI][dD]>\)\%(\h\w*\.\)*\h\w*\ze\%(\s*(\|<.*>(\)"	skipwhite nextgroup=vimOperParen,vim9TypeArgs	contains=vimVarScope,vimNotation
+syn match	vimFunc	contained	"\<\l\w*\ze\s*("				skipwhite nextgroup=vimOperParen		contains=vimFuncName
+" dict-key only
+syn match	vimUserFuncKey	contained	"\%(\l\|\d\)\w*\ze\%(\s*(\|<.*>(\)"			skipwhite nextgroup=vimOperParen,vim9TypeArgs	contains=vim9MethodName
+syn match	vimUserFunc	contained	"\<[[:upper:]_]\w*\ze\%(\s*(\|<.*>(\)"		skipwhite nextgroup=vimOperParen,vim9TypeArgs	contains=vim9MethodName,vim9Super,vim9This
+syn match	vimUserFunc	contained	"\<\%(g:\)\=\%(\h\w*#\)\+\h\w*\ze\%(\s*(\|<.*>(\)"		skipwhite nextgroup=vimOperParen		contains=vimVarScope
+syn match	vimUserFunc	contained	"\%(\<[sgbwtlav]:\|<[sS][iI][dD]>\)\h\w*\ze\%(\s*(\|<.*>(\)"	skipwhite nextgroup=vimOperParen,vim9TypeArgs	contains=vimVarScope,vimNotation
 
-Vim9 syn match	vim9UserFunc	"^\s*\zs\%([sgbwtv]:\|<[sS][iI][dD]>\)\=\%(\h\w*[.#]\)*\h\w*\ze[<(]"			skipwhite nextgroup=vimOperParen,vim9TypeArgs	contains=vimVarScope,vimNotation,vim9MethodName,vim9Super,vim9This
-Vim9 syn match	vim9Func	"^\s*\zs\l\w*\ze("					skipwhite nextgroup=vimOperParen		contains=vimFuncName
+Vim9 syn match	vim9UserFunc	"^\s*\zs\%([sgbwtv]:\|<[sS][iI][dD]>\)\=\h\w*\ze[(<]"			skipwhite nextgroup=vimOperParen,vim9TypeArgs	contains=vimVarScope,vimNotation,vim9MethodName,vim9Super,vim9This
+Vim9 syn match	vim9UserFunc	"^\s*\zs\%(g:\)\=\%(\h\w*#\)\+\h\w*\ze[(<]"			skipwhite nextgroup=vimOperParen		contains=vimVarScope
+Vim9 syn match	vim9Func	"^\s*\zs\l\w*\ze[(<]"				skipwhite nextgroup=vimOperParen		contains=vimFuncName
 
 syn cluster	vimFunc	contains=vimFunc,vimUserFunc
 syn cluster	vim9Func	contains=vim9Func,vim9UserFunc
@@ -2758,7 +2768,9 @@ if !exists("skip_vim_syntax_inits")
  hi def link vimUserCmdError	Error
  hi def link vimUserCmdKey	vimCommand
  hi def link vimUserFunc	Normal
+ hi def link vimUserFuncKey	vimUserFunc
  hi def link vimVar	Normal
+ hi def link vimVarKey	vimVar
  hi def link vimVarScope	Identifier
  hi def link vimVimgrep	vimCommand
  hi def link vimVimgrepadd	vimCommand
diff --git a/runtime/syntax/javascript.vim b/runtime/syntax/javascript.vim
index c910a668a2..912f99a951 100644
--- a/runtime/syntax/javascript.vim
+++ b/runtime/syntax/javascript.vim
@@ -6,7 +6,7 @@
 " 			Kevin Locke
 " 			LongJohnCoder
 " 			Devin Weaver
-" Last Change:		2026 Apr 26
+" Last Change:		2026 Jun 07
 
 " tuning parameters:
 " unlet javaScript_fold
@@ -59,7 +59,7 @@ syn keyword javaScriptConditional	if else switch
 syn keyword javaScriptRepeat		while for do in of
 syn keyword javaScriptBranch		break continue
 syn keyword javaScriptOperator		new delete instanceof typeof
-syn keyword javaScriptType		Array Boolean Date Function Number Object String RegExp
+syn keyword javaScriptType		Array Boolean Date Function Number Object String RegExp Symbol
 syn keyword javaScriptStatement		return with await yield
 syn keyword javaScriptBoolean		true false
 syn keyword javaScriptNull		null undefined
@@ -70,7 +70,7 @@ syn keyword javaScriptMessage		alert confirm prompt status
 syn keyword javaScriptGlobal		self window top parent
 syn keyword javaScriptMember		document event location
 syn keyword javaScriptDeprecated	escape unescape
-syn keyword javaScriptReserved		abstract as boolean byte char class const debugger double enum export extends final float from goto implements import int interface let long native package private protected public short super synchronized throws transient var volatile async using
+syn keyword javaScriptReserved		abstract as boolean byte char class const debugger double enum export extends final float from goto implements import int interface let long native package private protected public short super synchronized throws transient var void volatile async using
 syn keyword javaScriptModifier  static
 
 syn cluster  javaScriptEmbededExpr	contains=javaScriptBoolean,javaScriptNull,javaScriptIdentifier,javaScriptStringD,javaScriptStringS,javaScriptStringT
diff --git a/runtime/syntax/kitty.vim b/runtime/syntax/kitty.vim
index 6d37b664db..825ef64d1e 100644
--- a/runtime/syntax/kitty.vim
+++ b/runtime/syntax/kitty.vim
@@ -2,6 +2,7 @@
 " Language:          Kitty configuration files
 " Maintainer:        MD. Mouinul Hossain Shawon <mdmouinulhossainshawon [at] gmail.com>
 " Last Change:       Tue Sep 16 19:10:59 +06 2025
+" 2026 Jun 02 by Vim project: update kittyMapSeq highlight to match end-of-line #20422
 
 if exists("b:current_syntax")
   finish
@@ -46,7 +47,7 @@ syn keyword kittyMapName nextgroup=kittyMapValue skipwhite contained map
 syn region kittyMapValue start="\S" skip="[\r\n][ \t]*\\" end="\ze[\r\n]" contains=kittyMapSeq,kittyMapAction contained
 
 syn region kittyMapAction start="\S" skip="[\r\n][ \t]*\\" end="\ze[\r\n]" contains=@kittyPrimitive contained
-syn region kittyMapSeq start="\S" end="\ze\s\|^\ze[ \t]*\\" nextgroup=kittyMapAction,kittyMouseMapType skipwhite contains=kittyCtrl,kittyAlt,kittyShift,kittySuper,kittyAnd,kittyWith,kittyKey contained
+syn region kittyMapSeq start="\S" end="\ze\s\|^\ze[ \t]*\\\|\ze$" nextgroup=kittyMapAction,kittyMouseMapType skipwhite contains=kittyCtrl,kittyAlt,kittyShift,kittySuper,kittyAnd,kittyWith,kittyKey contained
 
 " Mouse shortcut """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Format: `mouse_map <keys> <type> <grabbed> <action>?`
diff --git a/runtime/syntax/luau.vim b/runtime/syntax/luau.vim
index 59eccac100..e5b3490ee4 100644
--- a/runtime/syntax/luau.vim
+++ b/runtime/syntax/luau.vim
@@ -1,15 +1,193 @@
 " Vim syntax file
-" Language:	Luau
-" Maintainer:	None yet
-" Last Change:	2023 Apr 30
+" Language:     Luau
+" Maintainer:   Lopy (@lopi-py)
+" Last Change:  2026 Jun 17
 
+" quit when a syntax file was already loaded
 if exists("b:current_syntax")
   finish
 endif
 
-" Luau is a superset of lua
-runtime! syntax/lua.vim
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn case match
+syn sync minlines=300
+
+" comments
+syn keyword luauTodo contained TODO FIXME
+syn match   luauDirective contained "--!\%(strict\|nonstrict\|nocheck\|nolint\%(Global\)\=\|native\|optimize\)\>.*"
+
+" strings
+syn match  luauSpecial contained #\\[[:digit:]]\{1,3}\|\\x[[:xdigit:]]\{2}\|\\u{[[:xdigit:]]\+}\|\\z\s*\|\\\n\|\\[^xu[:digit:]\r\n]#
+syn region luauString2 matchgroup=luauStringDelimiter start="\[\z(=*\)\[" end="\]\z1\]" contains=@Spell
+syn region luauString  matchgroup=luauStringDelimiter start=+'+ end=+'+ skip=+\\\\\|\\'+ contains=luauSpecial,@Spell
+syn region luauString  matchgroup=luauStringDelimiter start=+"+ end=+"+ skip=+\\\\\|\\"+ contains=luauSpecial,@Spell
+syn region luauInterpString matchgroup=luauStringDelimiter start=+`+ end=+`+ skip=+\\`+ contains=luauSpecial,luauInterp,@Spell
+syn region luauInterp contained transparent matchgroup=luauInterpDelimiter start=+\\\@<!{+ end=+}+ contains=TOP,luauInterpBlock
+syn region luauInterpBlock contained transparent start=+{+ end=+}+ contains=TOP,luauInterpBlock
+
+" numbers
+syn match luauNumber "\<0_*[xX][[:xdigit:]_]*[[:xdigit:]][[:xdigit:]_]*\>"
+syn match luauNumber "\<0_*[bB][01_]*[01][01_]*\>"
+syn match luauNumber "\<\d[[:digit:]_]*\%(\.[[:digit:]_]*\)\=\%([eE][-+]\=[[:digit:]_]*\d[[:digit:]_]*\)\=\>"
+syn match luauNumber "\.\d[[:digit:]_]*\%([eE][-+]\=[[:digit:]_]*\d[[:digit:]_]*\)\=\>"
+
+" keywords
+syn keyword luauStatement return local break end
+syn keyword luauStatement do nextgroup=luauStatement skipwhite
+syn keyword luauStatement contained continue
+syn match   luauStatement "^\s*\zscontinue\>\ze\s*\%(;\|end\>\|else\>\|elseif\>\|until\>\|--.*\|$\)"
+syn match   luauStatement ";\s*\zscontinue\>\ze\s*\%(;\|end\>\|else\>\|elseif\>\|until\>\|--.*\|$\)"
+syn keyword luauFunction function nextgroup=luauFunctionName,luauGenericParams skipwhite
+syn match   luauStatement "^\s*\%(@\%(\h\w*\|\[[^]]*\]\)\s*\)*\zsconst\>\ze\s\+\%(function\>\|\h\)"
+syn match   luauStatement "^\s*\%(@\%(\h\w*\|\[[^]]*\]\)\s*\)*\zsdeclare\>\ze\s\+\%(function\>\|class\>\s\+\h\|extern\s\+type\>\|\h\w*\s*:\)" nextgroup=luauStatement,luauDeclareName,luauFunction skipwhite
+syn match   luauStatement contained "\<class\>\ze\s\+\h" nextgroup=luauTypedef skipwhite
+syn match   luauDeclareName contained "\h\w*\ze\s*:" nextgroup=luauTypeColon skipwhite
+syn match   luauStatement "\<export\>\ze\s\+type\>"
+syn match   luauStatement contained "\<extern\>\ze\s\+type\>"
+syn match   luauStatement "\<extends\>\ze\s\+\h" nextgroup=luauTypeName skipwhite
+syn match   luauStatement "\<with\>\ze\s*\%(--.*\)\=$"
+syn match   luauModifier "\<public\>\ze\s\+\%(function\|\h\)"
+syn match   luauTypeKeyword "\<type\>\ze\s\+\h" nextgroup=luauTypeFunction,luauTypedef skipwhite
+syn keyword luauTypeFunction contained function nextgroup=luauFunctionName skipwhite
+syn match   luauFunctionName contained transparent "\h\w*\%([.:]\h\w*\)*" nextgroup=luauGenericParams skipwhite
+syn keyword luauCond if elseif
+syn keyword luauCond then else nextgroup=luauStatement skipwhite
+syn keyword luauRepeat while for until in
+syn keyword luauRepeat repeat nextgroup=luauStatement skipwhite
+syn keyword luauOperator and or not
+
+" operators and punctuation
+syn match luauSymbolOperator "[#+*/%^=<>~?-]\|\.\{3}\|\.\.=\="
+syn match luauSymbolOperator "->" nextgroup=luauSymbolOperator,luauConstant,luauTableType,luauTypePack,luauTypeName skipwhite
+syn match luauSymbolOperator "[|&]" nextgroup=luauConstant,luauTableType,luauTypePack,luauTypeName skipwhite
+syn match luauSymbolOperator "::"
+
+" tables
+syn region luauTableBlock transparent matchgroup=luauTable start="{" end="}" contains=TOP,luauStatement
+
+syn match   luauComment "--.*$" contains=luauTodo,luauDirective,@Spell
+syn region  luauComment matchgroup=luauCommentDelimiter start="--\[\z(=*\)\[" end="\]\z1\]" contains=luauTodo,@Spell
+
+" the first line may start with #!
+syn match luauComment "\%^#!.*"
+
+" attributes
+syn match   luauAttribute "@\h\w*"
+syn region  luauAttributeBlock matchgroup=luauAttributeDelimiter start="@\[" end="\]" contains=luauAttributeName,luauAttributeTable,luauString,luauString2,luauInterpString,luauNumber,luauConstant
+syn region  luauAttributeTable contained transparent matchgroup=luauTable start="{" end="}" contains=luauAttributeTable,luauString,luauString2,luauInterpString,luauNumber,luauConstant,luauSymbolOperator
+syn keyword luauAttributeName contained checked native deprecated
+
+" constants and types
+syn keyword luauConstant nil true false
+syn match   luauConstant "\.\.\."
+syn keyword luauSelf self
+syn match   luauSelf contained "(\s*\zsself\>\ze\s*:"
+syn cluster luauTypeCommon contains=luauGenericParams,luauString,luauString2,luauInterpString,luauNumber,luauConstant,luauSymbolOperator
+syn cluster luauTypeExpr contains=luauFunctionTypeParams,luauTableType,luauTypeParam,luauType,luauTypeKeyword,@luauTypeCommon
+syn region  luauGenericParams contained transparent matchgroup=luauSymbolOperator start="<" end=">" contains=@luauTypeExpr
+syn region  luauTypedefGenericParams contained transparent matchgroup=luauSymbolOperator start="<" end=">" contains=@luauTypeExpr nextgroup=luauTypeAliasAssign skipwhite
+syn region  luauExplicitTypeArgs transparent matchgroup=luauSymbolOperator start="<<" end=">>" contains=@luauTypeExpr
+syn match   luauTypeParam contained "\h\w*\%(\.\.\.\)\="
+syn match   luauTypedef "\h\w*" contained nextgroup=luauTypedefGenericParams,luauTypeAliasAssign skipwhite
+syn match   luauTypeAliasAssign contained "=" nextgroup=luauSymbolOperator,luauConstant,luauTableType,luauTypeName skipwhite
+syn region  luauTableType contained transparent matchgroup=luauTable start="{" end="}" contains=luauFunctionTypeParams,luauTableType,luauSelf,luauTypeIndexer,luauTableElementType,luauTypeColon,luauTypeKeyword,@luauTypeCommon
+syn match   luauTypeIndexer "^\s*\[\s*" nextgroup=luauType skipwhite
+syn match   luauTypeIndexer contained transparent "\[\s*" nextgroup=luauType skipwhite
+syn match   luauType contained "\h\w*\%(\.\h\w*\)*\ze\s*\]\s*:" nextgroup=luauGenericParams skipwhite
+syn match   luauTableElementType contained "\h\w*\%(\.\h\w*\)*\ze\s*[<?|&,;})]" nextgroup=luauGenericParams skipwhite
+syn match   luauTypeColon transparent ":" nextgroup=luauSymbolOperator,luauConstant,luauTableType,luauTypeAfterColon skipwhite
+syn match   luauTypeAfterColon contained "\h\w*\%(\.\h\w*\)*\%(\.\.\.\)\=\ze\s*\%([?=},)\]|&]\|,\|<\|->\|$\)" nextgroup=luauGenericParams skipwhite
+syn region  luauFunctionTypeParams transparent start="(\ze\%([^()]*\))\s*->" end=")\ze\s*->" contains=luauFunctionTypeParam,luauTypeColon,luauSelf,@luauTypeCommon
+syn match   luauFunctionTypeParam contained "\h\w*\%(\.\h\w*\)*\%(\.\.\.\)\=\ze\s*?\=\s*[,)|&]" nextgroup=luauGenericParams skipwhite
+syn match   luauFunctionReturnStart transparent ")\s*:\s*" nextgroup=luauSymbolOperator,luauFunctionTypeParams,luauConstant,luauTableType,luauTypePack,luauTypeName skipwhite
+syn region  luauTypePack contained transparent start="(\%([^()]*)\s*->\)\@!" end=")" contains=luauFunctionTypeParams,luauTableType,luauTypeName,@luauTypeCommon
+syn match   luauTypeName contained "\h\w*\%(\.\h\w*\)*\%(\.\.\.\)\=" nextgroup=luauGenericParams skipwhite
+syn match   luauTypeKeyword "\<\%(read\|write\)\>\ze\s*\%(\[\|\h\+\s*:\)" nextgroup=luauTypeIndexer skipwhite
+
+" metamethods
+syn keyword luauMetaMethod __index __newindex __mode __namecall __call __iter __len
+syn keyword luauMetaMethod __eq __add __sub __mul __div __idiv __mod __pow __unm
+syn keyword luauMetaMethod __lt __le __concat __type __metatable __tostring
+
+" methods
+syn match luauMethodColon transparent ":\ze\s*\h\w*\s*\%(<<.\{-}>>\s*\|<[^>]*>\s*\)\=\%((\|{\|'\|\"\|\[\)" nextgroup=luauFunc skipwhite
+syn match luauFunc contained "\h\w*\ze\s*\%(<<.\{-}>>\s*\|<[^>]*>\s*\)\=\%((\|{\|'\|\"\|\[\)"
+
+" global functions and values
+syn keyword luauFunc assert error gcinfo getfenv getmetatable
+syn keyword luauFunc ipairs loadstring newproxy next pairs pcall print
+syn keyword luauFunc rawequal rawget rawlen rawset require select setfenv
+syn keyword luauFunc setmetatable tonumber tostring unpack xpcall
+syn keyword luauGlobal _G
+syn keyword luauBuiltinConstant _VERSION
+syn match   luauFunc "\<type\>\ze\s*\%(<<.\{-}>>\s*\)\=("
+syn match   luauFunc "\<typeof\>\ze\s*\%(<<.\{-}>>\s*\)\=("
+
+" standard library members
+syn match luauFunc /\<bit32\.\%(arshift\|band\|bnot\|bor\|btest\|bxor\|byteswap\|countlz\|countrz\|extract\|lrotate\|lshift\|replace\|rrotate\|rshift\)\>/
+syn match luauFunc /\<buffer\.\%(copy\|create\|fill\|fromstring\|len\|readbits\|readf32\|readf64\|readi16\|readi32\|readi8\|readstring\|readu16\|readu32\|readu8\)\>/
+syn match luauFunc /\<buffer\.\%(tostring\|writebits\|writef32\|writef64\|writei16\|writei32\|writei8\|writestring\|writeu16\|writeu32\|writeu8\)\>/
+syn match luauFunc /\<coroutine\.\%(close\|create\|isyieldable\|resume\|running\|status\|wrap\|yield\)\>/
+syn match luauFunc /\<debug\.\%(info\|traceback\)\>/
+syn match luauFunc /\<math\.\%(abs\|acos\|asin\|atan2\=\|ceil\|clamp\|cosh\=\|deg\|exp\|floor\|fmod\|frexp\)\>/
+syn match luauFunc /\<math\.\%(isfinite\|isinf\|isnan\|ldexp\|lerp\|log\|log10\|map\|max\|min\|modf\|noise\)\>/
+syn match luauFunc /\<math\.\%(pow\|rad\|random\%(seed\)\=\|round\|sign\|sinh\=\|sqrt\|tanh\=\)\>/
+syn match luauBuiltinConstant /\<math\.\%(huge\|pi\)\>/
+syn match luauFunc /\<os\.\%(clock\|date\|difftime\|time\)\>/
+syn match luauFunc /\<string\.\%(byte\|char\|find\|format\|gmatch\|gsub\|len\|lower\|match\|pack\%(size\)\=\|rep\|reverse\|split\|sub\|unpack\|upper\)\>/
+syn match luauFunc /\<table\.\%(clear\|clone\|concat\|create\|find\|foreachi\=\|freeze\|getn\|insert\|isfrozen\|maxn\|move\|pack\|remove\|sort\|unpack\)\>/
+syn match luauFunc /\<utf8\.\%(char\|codepoint\|codes\|len\|offset\)\>/
+syn match luauBuiltinConstant /\<utf8\.charpattern\>/
+syn match luauFunc /\<vector\.\%(abs\|angle\|ceil\|clamp\|create\|cross\|dot\|floor\|lerp\|magnitude\|max\|min\|normalize\|sign\)\>/
+syn match luauBuiltinConstant /\<vector\.\%(one\|zero\)\>/
+syn match luauFunc /\<types\.\%(any\|boolean\|buffer\|copy\|generic\|intersectionof\|never\|negationof\|newfunction\|newtable\|number\|optional\|singleton\|string\|thread\|unionof\|unknown\)\>/
+
+" define the default highlighting
+hi def link luauStatement          Statement
+hi def link luauRepeat             Repeat
+hi def link luauString             String
+hi def link luauString2            String
+hi def link luauInterpString       String
+hi def link luauStringDelimiter    luauString
+hi def link luauInterpDelimiter    Special
+hi def link luauNumber             Number
+hi def link luauOperator           Operator
+hi def link luauSymbolOperator     luauOperator
+hi def link luauConstant           Constant
+hi def link luauCond               Conditional
+hi def link luauFunction           Function
+hi def link luauMetaMethod         Function
+hi def link luauTable              Structure
+hi def link luauComment            Comment
+hi def link luauCommentDelimiter   luauComment
+hi def link luauDirective          PreProc
+hi def link luauTodo               Todo
+hi def link luauSpecial            SpecialChar
+hi def link luauFunc               Identifier
+hi def link luauGlobal             Identifier
+hi def link luauBuiltinConstant    Constant
+hi def link luauSelf               Identifier
+hi def link luauModifier           StorageClass
+hi def link luauType               Type
+hi def link luauTypeAfterColon     luauType
+hi def link luauTableElementType   luauType
+hi def link luauTypeAliasAssign    luauSymbolOperator
+hi def link luauFunctionTypeParam  luauType
+hi def link luauTypeName           luauType
+hi def link luauTypedef            Typedef
+hi def link luauTypeParam          Type
+hi def link luauTypeKeyword        Keyword
+hi def link luauTypeFunction       luauFunction
+hi def link luauDeclareName        Identifier
+hi def link luauAttribute          PreProc
+hi def link luauAttributeName      PreProc
+hi def link luauAttributeDelimiter PreProc
 
 let b:current_syntax = "luau"
 
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
 " vim: nowrap sw=2 sts=2 ts=8 noet:
diff --git a/runtime/syntax/nsis.vim b/runtime/syntax/nsis.vim
index 49fa17abf1..595f9cf67e 100644
--- a/runtime/syntax/nsis.vim
+++ b/runtime/syntax/nsis.vim
@@ -1,9 +1,9 @@
 " Vim syntax file
-" Language:		NSIS script, for version of NSIS 3.08 and later
+" Language:		NSIS script, for version of NSIS 3.12 and later
 " Maintainer:		Ken Takata
 " URL:			https://github.com/k-takata/vim-nsis
 " Previous Maintainer:	Alex Jakushev <Alex.Jakushev@kemek.lt>
-" Last Change:		2022-11-05
+" Last Change:		2026-06-06
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -204,9 +204,16 @@ syn match nsisStatement		"${For}"
 syn match nsisStatement		"${ForEach}"
 syn match nsisStatement		"${ExitFor}"
 syn match nsisStatement		"${Next}"
+syn match nsisStatement		"${While}"
+syn match nsisStatement		"${ExitWhile}"
+syn match nsisStatement		"${EndWhile}"
 "STATEMENTS - Memento.nsh
 syn match nsisStatement		"${MementoSection}"
 syn match nsisStatement		"${MementoSectionEnd}"
+syn match nsisStatement		"${MementoUnselectedSection}"
+syn match nsisStatement		"${MementoSectionDone}"
+syn match nsisStatement		"${MementoSectionRestore}"
+syn match nsisStatement		"${MementoSectionSave}"
 
 
 "USER VARIABLES (4.2.1)
@@ -257,7 +264,7 @@ syn keyword nsisAttribute	contained InstallDirRegKey nextgroup=nsisRegistryOpt s
 
 syn keyword nsisAttribute	contained InstType nextgroup=nsisInstTypeOpt skipwhite
 syn region nsisInstTypeOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisInstTypeKwd
-syn match nsisInstTypeKwd	contained "/\%(NOCUSTOM\|CUSTOMSTRING\|COMPONENTSONLYONCUSTOM\)\>"
+syn match nsisInstTypeKwd	contained "/\%(NOCUSTOM\|CUSTOMSTRING\|COMPONENTSONLYONCUSTOM\|UNINSTNOCUSTOM\|UNINSTCOMPONENTSONLYONCUSTOM\)\>"
 
 syn keyword nsisAttribute	contained LicenseBkColor nextgroup=nsisLicenseBkColorOpt skipwhite
 syn region nsisLicenseBkColorOpt contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisLicenseBkColorKwd
@@ -279,6 +286,17 @@ syn keyword nsisAttribute	contained ManifestSupportedOS nextgroup=nsisManifestSu
 syn region nsisManifestSupportedOSOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisManifestSupportedOSKwd
 syn match nsisManifestSupportedOSKwd	contained "\<\%(none\|all\|WinVista\|Win7\|Win8\|Win8\.1\|Win10\)\>"
 
+syn keyword nsisAttribute	contained ManifestMaxVersionTested ManifestAppendCustomString
+syn keyword nsisAttribute	contained ManifestDPIAwareness
+
+syn keyword nsisAttribute	contained ManifestDisableWindowFiltering nextgroup=nsisManifestDisableWindowFilteringOpt skipwhite
+syn region nsisManifestDisableWindowFilteringOpt contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisManifestDisableWindowFilteringKwd
+syn match nsisManifestDisableWindowFilteringKwd  contained "\<\%(notset\|true\)\>"
+
+syn keyword nsisAttribute	contained ManifestGdiScaling nextgroup=nsisManifestGdiScalingOpt skipwhite
+syn region nsisManifestGdiScalingOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisManifestGdiScalingKwd
+syn match nsisManifestGdiScalingKwd	contained "\<\%(notset\|true\)\>"
+
 syn keyword nsisAttribute	contained PEAddResource nextgroup=nsisPEAddResourceOpt skipwhite
 syn region nsisPEAddResourceOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisPEAddResourceKwd
 syn match nsisPEAddResourceKwd	contained "/\%(OVERWRITE\|REPLACE\)\>"
@@ -287,6 +305,8 @@ syn keyword nsisAttribute	contained PERemoveResource nextgroup=nsisPERemoveResou
 syn region nsisPERemoveResourceOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisPERemoveResourceKwd
 syn match nsisPERemoveResourceKwd	contained "/NOERRORS\>"
 
+syn keyword nsisAttribute	contained PEDllCharacteristics PESubsysVer
+
 syn keyword nsisAttribute	contained RequestExecutionLevel nextgroup=nsisRequestExecutionLevelOpt skipwhite
 syn region nsisRequestExecutionLevelOpt  contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisRequestExecutionLevelKwd
 syn keyword nsisRequestExecutionLevelKwd contained none user highest admin
@@ -328,6 +348,12 @@ syn keyword nsisCompiler	contained SetOverwrite nextgroup=nsisSetOverwriteOpt sk
 syn region nsisSetOverwriteOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisSetOverwriteKwd
 syn keyword nsisSetOverwriteKwd	contained on off try ifnewer ifdiff lastused
 
+syn keyword nsisCompiler	contained SetCompressionLevel Target
+
+syn keyword nsisCompiler	contained CPU nextgroup=nsisCPUOpt skipwhite
+syn region nsisCPUOpt		contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisCPUKwd
+syn keyword nsisCPUKwd		contained x86 amd64
+
 syn keyword nsisCompiler	contained Unicode nextgroup=nsisBooleanOpt skipwhite
 
 "VERSION INFORMATION (4.8.3)
@@ -344,8 +370,8 @@ syn match nsisDeleteKwd		contained "/REBOOTOK\>"
 syn keyword nsisInstruction	contained Exec ExecWait SetOutPath
 
 syn keyword nsisInstruction	contained ExecShell ExecShellWait nextgroup=nsisExecShellOpt skipwhite
-syn region nsisExecShellOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisExecShellKwd
-syn keyword nsisExecShellKwd	contained SW_SHOWDEFAULT SW_SHOWNORMAL SW_SHOWMAXIMIZED SW_SHOWMINIMIZED SW_HIDE
+syn region nsisExecShellOpt	contained start="" end="$" transparent contains=@nsisAnyOpt,nsisExecShellKwd
+syn keyword nsisExecShellKwd	contained SW_SHOW SW_SHOWDEFAULT SW_SHOWNORMAL SW_SHOWMAXIMIZED SW_SHOWMINIMIZED SW_HIDE
 syn match nsisExecShellKwd	contained "/INVOKEIDLIST\>"
 
 syn keyword nsisInstruction	contained File nextgroup=nsisFileOpt skipwhite
@@ -370,7 +396,7 @@ syn region nsisDeleteRegKeyOpt	contained start="" end="$" transparent keepend co
 syn match nsisDeleteRegKeyKwd	contained "/\%(ifempty\|ifnosubkeys\|ifnovalues\)\>"
 
 syn keyword nsisInstruction	contained nextgroup=nsisRegistryOpt skipwhite
-			\ DeleteRegValue EnumRegKey EnumRegValue ReadRegDWORD ReadRegStr WriteRegBin WriteRegDWORD WriteRegExpandStr WriteRegStr
+			\ DeleteRegValue EnumRegKey EnumRegValue ReadRegDWORD ReadRegStr WriteRegBin WriteRegDWORD WriteRegExpandStr WriteRegNone WriteRegStr
 syn region nsisRegistryOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisRegistry
 
 syn keyword nsisInstruction	contained WriteRegMultiStr nextgroup=nsisWriteRegMultiStrOpt skipwhite
@@ -379,12 +405,12 @@ syn match nsisWriteRegMultiStrKwd  contained "/REGEDIT5\>"
 
 syn keyword nsisInstruction	contained SetRegView nextgroup=nsisSetRegViewOpt skipwhite
 syn region nsisSetRegViewOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisSetRegViewKwd
-syn keyword nsisSetRegViewKwd	contained default lastused
+syn keyword nsisSetRegViewKwd	contained 32 64 default lastused
 
 "FUNCTIONS - general purpose (4.9.3)
-syn keyword nsisInstruction	contained CallInstDLL CreateDirectory GetWinVer
+syn keyword nsisInstruction	contained CallInstDLL CreateDirectory
 syn keyword nsisInstruction	contained GetFileTime GetFileTimeLocal GetKnownFolderPath
-syn keyword nsisInstruction	contained GetTempFileName SearchPath RegDLL UnRegDLL
+syn keyword nsisInstruction	contained GetTempFileName ReadMemory SearchPath RegDLL UnRegDLL
 
 syn keyword nsisInstruction	contained CopyFiles nextgroup=nsisCopyFilesOpt skipwhite
 syn region nsisCopyFilesOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisCopyFilesKwd
@@ -417,12 +443,12 @@ syn keyword nsisFileAttrib	contained FILE_ATTRIBUTE_TEMPORARY
 syn keyword nsisInstruction	contained Abort Call ClearErrors GetCurrentAddress
 syn keyword nsisInstruction	contained GetFunctionAddress GetLabelAddress Goto
 syn keyword nsisInstruction	contained IfAbort IfErrors IfFileExists IfRebootFlag IfSilent
-syn keyword nsisInstruction	contained IfShellVarContextAll IfRtlLanguage
+syn keyword nsisInstruction	contained IfAltRegView IfRtlLanguage IfShellVarContextAll
 syn keyword nsisInstruction	contained IntCmp IntCmpU Int64Cmp Int64CmpU IntPtrCmp IntPtrCmpU
 syn keyword nsisInstruction	contained Return Quit SetErrors StrCmp StrCmpS
 
 syn keyword nsisInstruction	contained MessageBox nextgroup=nsisMessageBoxOpt skipwhite
-syn region nsisMessageBoxOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisMessageBox
+syn region nsisMessageBoxOpt	contained start="" end="$" transparent contains=@nsisAnyOpt,nsisMessageBox
 syn keyword nsisMessageBox	contained MB_OK MB_OKCANCEL MB_ABORTRETRYIGNORE MB_RETRYCANCEL MB_YESNO MB_YESNOCANCEL
 syn keyword nsisMessageBox	contained MB_ICONEXCLAMATION MB_ICONINFORMATION MB_ICONQUESTION MB_ICONSTOP MB_USERICON
 syn keyword nsisMessageBox	contained MB_TOPMOST MB_SETFOREGROUND MB_RIGHT MB_RTLREADING
@@ -444,15 +470,16 @@ syn match nsisFileWriteUTF16LEKwd  contained "/BOM\>"
 syn keyword nsisInstruction	contained WriteUninstaller
 
 "FUNCTIONS - Misc instructions (4.9.7)
-syn keyword nsisInstruction	contained GetErrorLevel GetInstDirError InitPluginsDir Nop
+syn keyword nsisInstruction	contained GetErrorLevel GetInstDirError GetRegView GetShellVarContext
+syn keyword nsisInstruction	contained InitPluginsDir Nop
 syn keyword nsisInstruction	contained SetErrorLevel Sleep
 
 syn keyword nsisInstruction	contained SetShellVarContext nextgroup=nsisSetShellVarContextOpt skipwhite
 syn region nsisSetShellVarContextOpt  contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisSetShellVarContextKwd
-syn keyword nsisSetShellVarContextKwd contained current all
+syn keyword nsisSetShellVarContextKwd contained current all lastused
 
 "FUNCTIONS - String manipulation support (4.9.8)
-syn keyword nsisInstruction	contained StrCpy StrLen
+syn keyword nsisInstruction	contained StrCpy StrLen UnsafeStrCpy
 
 "FUNCTIONS - Stack support (4.9.9)
 syn keyword nsisInstruction	contained Exch Push Pop
@@ -480,8 +507,8 @@ syn keyword nsisInstruction	contained ShowWindow
 
 syn keyword nsisInstruction	contained CreateFont nextgroup=nsisFontOpt skipwhite
 
-syn keyword nsisInstruction	contained nextgroup=nsisBooleanOpt skipwhite
-			\ LockWindow SetAutoClose
+syn keyword nsisInstruction	contained SetAutoClose nextgroup=nsisBooleanOpt skipwhite
+syn keyword nsisInstruction	contained LockWindow nextgroup=nsisOnOffOpt skipwhite
 
 syn keyword nsisInstruction	contained LoadAndSetImage nextgroup=nsisLoadAndSetImageOpt skipwhite
 syn region nsisLoadAndSetImageOpt contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisLoadAndSetImageKwd
@@ -568,6 +595,8 @@ syn match nsisSystem		contained "!packhdr\>"
 syn match nsisSystem		contained "!finalize\>"
 syn match nsisSystem		contained "!uninstfinalize\>"
 syn match nsisSystem		contained "!system\>"
+syn match nsisSystem		contained "!assert\>"
+syn match nsisSystem		contained "!appendmemfile\>"
 syn match nsisSystem		contained "!tempfile\>"
 
 " Add 'P' to avoid conflicts with nsisGetDLLVersionOpt. ('P' for preprocessor.)
@@ -656,6 +685,8 @@ hi def link nsisLicenseForceSelectionKwd Constant
 hi def link nsisManifestDPIAwareKwd	Constant
 hi def link nsisManifestLongPathAwareKwd Constant
 hi def link nsisManifestSupportedOSKwd	Constant
+hi def link nsisManifestDisableWindowFilteringKwd Constant
+hi def link nsisManifestGdiScalingKwd	Constant
 hi def link nsisPEAddResourceKwd	Constant
 hi def link nsisPERemoveResourceKwd	Constant
 hi def link nsisRequestExecutionLevelKwd Constant
@@ -665,6 +696,7 @@ hi def link nsisSilentUnInstallKwd	Constant
 hi def link nsisSetCompressKwd		Constant
 hi def link nsisSetCompressorKwd	Constant
 hi def link nsisSetOverwriteKwd		Constant
+hi def link nsisCPUKwd			Constant
 hi def link nsisDeleteKwd		Constant
 hi def link nsisExecShellKwd		Constant
 hi def link nsisFileKwd			Constant
diff --git a/runtime/syntax/odin.vim b/runtime/syntax/odin.vim
index 42f3767a43..ce961a59fa 100644
--- a/runtime/syntax/odin.vim
+++ b/runtime/syntax/odin.vim
@@ -4,34 +4,42 @@ vim9script
 # Language: Odin
 # Maintainer: Maxim Kim <habamax@gmail.com>
 # Website: https://github.com/habamax/vim-odin
-# Last Change: 2026-05-28
+# Last Change: 2026-06-01
 
 if exists("b:current_syntax")
   finish
 endif
 
 syntax keyword odinKeyword using transmute cast auto_cast distinct where dynamic
-syntax keyword odinKeyword struct enum union bit_field bit_set
-syntax keyword odinKeyword package proc map import export foreign
-syntax keyword odinKeyword size_of offset_of type_info_of typeid_of type_of align_of
+syntax keyword odinKeyword struct enum union matrix bit_field bit_set
+syntax keyword odinKeyword package proc map import foreign typeid
 syntax keyword odinKeyword return defer
-syntax keyword odinKeyword inline no_inline
 syntax keyword odinKeyword asm context
 
 syntax keyword odinConditional if when else do for switch case fallthrough
-syntax keyword odinConditional continue or_continue break or_break or_return or_else
-syntax keyword odinType string cstring bool b8 b16 b32 b64 rune any rawptr
-syntax keyword odinType f16 f32 f64 f16le f16be f32le f32be f64le f64be
-syntax keyword odinType u8 u16 u32 u64 u128 u16le u32le u64le u128le u16be
-syntax keyword odinType u32be u64be u128be uint uintptr i8 i16 i32 i64 i128
-syntax keyword odinType i16le i32le i64le i128le i16be i32be i64be i128be
-syntax keyword odinType int complex complex32 complex64 complex128 matrix typeid
-syntax keyword odinType quaternion quaternion64 quaternion128 quaternion256
+syntax keyword odinConditional continue break
+syntax keyword odinConditional or_continue or_break or_return or_else
+
+syntax keyword odinType bool b8 b16 b32 b64
+syntax keyword odinType int i8 i16 i32 i64 i128
+syntax keyword odinType uint u8 u16 u32 u64 u128 uintptr
+syntax keyword odinType i16le i32le i64le i128le u16le u32le u64le u128le
+syntax keyword odinType i16be i32be i64be i128be u16be u32be u64be u128be
+syntax keyword odinType f16 f32 f64
+syntax keyword odinType f16le f32le f64le
+syntax keyword odinType f16be f32be f64be
+syntax keyword odinType complex32 complex64 complex128
+syntax keyword odinType quaternion64 quaternion128 quaternion256
+syntax keyword odinType rune
+syntax keyword odinType string cstring
+syntax keyword odinType rawptr
+syntax keyword odinType any
+
 syntax keyword odinBool true false
 syntax keyword odinNull nil
 syntax match odinUninitialized '\s\+---\(\s\|$\)'
 
-syntax keyword odinOperator in notin not_in
+syntax keyword odinOperator in not_in
 syntax match odinOperator "?" display
 syntax match odinOperator "->" display
 
@@ -43,7 +51,7 @@ syntax match odinTodo "HACK" contained
 syntax region odinRawString start=+`+ end=+`+
 syntax region odinChar start=+'+ skip=+\\\\\|\\'+ end=+'+
 syntax region odinString start=+"+ skip=+\\\\\|\\'+ end=+"+ contains=odinEscape
-syntax match odinEscape display contained /\\\([nrt\\'"]\|x\x\{2}\)/
+syntax match odinEscape display contained /\\\([abefnrtv\\'"]\|\o\{3}\|x\x\{2}\|u\x\{4}\|U\x\{8}\)/
 
 syntax match odinProcedure "\v<\w*>(\s*::\s*proc)@="
 
diff --git a/runtime/syntax/pfmain.vim b/runtime/syntax/pfmain.vim
index af58da70ef..886fd1e931 100644
--- a/runtime/syntax/pfmain.vim
+++ b/runtime/syntax/pfmain.vim
@@ -3,6 +3,7 @@
 " Maintainer:	KELEMEN Peter <Peter dot Kelemen at cern dot ch>
 " Last Updates:	Anton Shestakov, Hong Xu
 " Last Change:	2015 Feb 10
+" 2026 Jun 13 by Vim project: add smtp_destination_rate_delay #20505
 " Version:	0.40
 " URL:		http://cern.ch/fuji/vim/syntax/pfmain.vim
 " Comment:	Based on Postfix 2.12/3.0 postconf.5.html.
@@ -497,6 +498,7 @@ syntax keyword pfmainConf smtp_defer_if_no_mx_address_found
 syntax keyword pfmainConf smtp_delivery_status_filter
 syntax keyword pfmainConf smtp_destination_concurrency_limit
 syntax keyword pfmainConf smtp_destination_recipient_limit
+syntax keyword pfmainConf smtp_destination_rate_delay
 syntax keyword pfmainConf smtp_discard_ehlo_keyword_address_maps
 syntax keyword pfmainConf smtp_discard_ehlo_keywords
 syntax keyword pfmainConf smtp_dns_reply_filter
@@ -1290,6 +1292,7 @@ syntax match pfmainRef "$\<smtp_defer_if_no_mx_address_found\>"
 syntax match pfmainRef "$\<smtp_delivery_status_filter\>"
 syntax match pfmainRef "$\<smtp_destination_concurrency_limit\>"
 syntax match pfmainRef "$\<smtp_destination_recipient_limit\>"
+syntax match pfmainRef "$\<smtp_destination_rate_delay\>"
 syntax match pfmainRef "$\<smtp_discard_ehlo_keyword_address_maps\>"
 syntax match pfmainRef "$\<smtp_discard_ehlo_keywords\>"
 syntax match pfmainRef "$\<smtp_dns_reply_filter\>"
diff --git a/runtime/syntax/testdir/README.txt b/runtime/syntax/testdir/README.txt
index bd3730435f..ecc023ac0e 100644
--- a/runtime/syntax/testdir/README.txt
+++ b/runtime/syntax/testdir/README.txt
@@ -26,9 +26,12 @@ Creating a syntax plugin test
 -----------------------------
 
 Create a source file in the language you want to test in the "input"
-directory.  Use the filetype name as the base and a file name extension
+directory.  Use the filetype name as the base and a filename extension
 matching the filetype.  Let's use Java as an example.  The file would then be
-"input/java.java".
+"input/java.java".  As another example, consider Gitignore.  Since there is no
+established filename extension for this filetype, use the filetype name for
+its base AND filename extension, "input/gitignore.gitignore", as the first
+step.
 
 Make sure to include some interesting constructs with plenty of complicated
 highlighting.  Optionally, pre-configure the testing environment by including
@@ -48,6 +51,10 @@ Continuing the Java example:
 	// VIM_TEST_SETUP let g:java_minlines = 5
 	class Test { }
 
+Continuing the Gitignore example, give the file a valid name as the last step:
+
+	# VIM_TEST_SETUP call DeferRenamingTestFileTo('.gitignore')
+
 As an alternative, setup commands can be included in an external Vim script
 file in the "input/setup" directory.  This script file must have the same base
 name as the input file.
diff --git a/runtime/syntax/testdir/dumps/algol68_denotations_00.dump b/runtime/syntax/testdir/dumps/algol68_denotations_00.dump
index 55331838a5..ba74ed8354 100644
--- a/runtime/syntax/testdir/dumps/algol68_denotations_00.dump
+++ b/runtime/syntax/testdir/dumps/algol68_denotations_00.dump
@@ -14,7 +14,7 @@
 |I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|0+0#e000002&| +0#0000000&@65
 |I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@64
 @75
-|#+0#0000e05&| |w|h|i|t|e|s|p|a|c|e| |#| +0#0000000&@60
-|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|1+0#e000002&| |0@2| |0@2| +0#0000000&@57
-@75
+|#+0#0000e05&| |s|i|z|e| |#| +0#0000000&@66
+|S+0#00e0003&|H|O|R|T| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |4|2| +0#0000000&@52
+@1|L+0#00e0003&|O|N|G| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|L+0#e000002&|O|N|G| |4|2| +0#0000000&@52
 @57|1|,|1| @10|T|o|p| 
diff --git a/runtime/syntax/testdir/dumps/algol68_denotations_01.dump b/runtime/syntax/testdir/dumps/algol68_denotations_01.dump
index a265b14050..11cbc7c584 100644
--- a/runtime/syntax/testdir/dumps/algol68_denotations_01.dump
+++ b/runtime/syntax/testdir/dumps/algol68_denotations_01.dump
@@ -1,20 +1,20 @@
 |I+0#00e0003#ffffff0|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|0+0#e000002&| +0#0000000&@65
 |I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@64
 @75
+|#+0#0000e05&| |s|i|z|e| |#| +0#0000000&@66
+|S+0#00e0003&|H|O|R|T| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |4|2| +0#0000000&@52
+@1>L+0#00e0003&|O|N|G| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|L+0#e000002&|O|N|G| |4|2| +0#0000000&@52
+|S+0#00e0003&|H|O|R|T| +0#0000000&|S+0#00e0003&|H|O|R|T| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |S|H|O|R|T| |4|2| +0#0000000&@40
+@2|L+0#00e0003&|O|N|G| +0#0000000&|L+0#00e0003&|O|N|G| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|L+0#e000002&|O|N|G| @1|L|O|N|G| |4|2| +0#0000000&@40
+@75
 |#+0#0000e05&| |w|h|i|t|e|s|p|a|c|e| |#| +0#0000000&@60
 |I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|1+0#e000002&| |0@2| |0@2| +0#0000000&@57
-> @74
+@75
 |#+0#0000e05&| |m|o|n|a|d|i|c| |o|p|e|r|a|t|o|r|s| |#| +0#0000000&@53
 |I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|-+0#af5f00255&|4+0#e000002&|2| +0#0000000&@63
 |I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|++0#af5f00255&|4+0#e000002&|2| +0#0000000&@63
-@75
-@75
-|#+0#0000e05&| |R|E|A|L| |#| +0#0000000&@66
-@75
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2| +0#0000000&@62
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2| +0#0000000&@60
-@75
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|e|4|2| +0#0000000&@60
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|E|4|2| +0#0000000&@60
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|\|4|2| +0#0000000&@60
-@57|1|9|,|0|-|1| @7|1|3|%| 
+|S+0#00e0003&|H|O|R|T| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|++0#af5f00255&|S+0#e000002&|H|O|R|T| |4|2| +0#0000000&@51
+@1|L+0#00e0003&|O|N|G| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|-+0#af5f00255&|L+0#e000002&|O|N|G| |4|2| +0#0000000&@51
+|S+0#00e0003&|H|O|R|T| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|-+0#af5f00255&|S+0#e000002&|H|O|R|T| |4|2| +0#0000000&@51
+@1|L+0#00e0003&|O|N|G| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|++0#af5f00255&|L+0#e000002&|O|N|G| |4|2| +0#0000000&@51
+@57|1|9|,|2| @10|8|%| 
diff --git a/runtime/syntax/testdir/dumps/algol68_denotations_02.dump b/runtime/syntax/testdir/dumps/algol68_denotations_02.dump
index 15f03772d3..5495e44899 100644
--- a/runtime/syntax/testdir/dumps/algol68_denotations_02.dump
+++ b/runtime/syntax/testdir/dumps/algol68_denotations_02.dump
@@ -1,20 +1,20 @@
-|R+0#00e0003#ffffff0|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|\|4|2| +0#0000000&@60
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|�|4|2| +0#0000000&@60
+| +0&#ffffff0|L+0#00e0003&|O|N|G| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|++0#af5f00255&|L+0#e000002&|O|N|G| |4|2| +0#0000000&@51
+|S+0#00e0003&|H|O|R|T| +0#0000000&|S+0#00e0003&|H|O|R|T| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|++0#af5f00255&|S+0#e000002&|H|O|R|T| |S|H|O|R|T| |4|2| +0#0000000&@39
+@2|L+0#00e0003&|O|N|G| +0#0000000&|L+0#00e0003&|O|N|G| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@2|-+0#af5f00255&|L+0#e000002&|O|N|G| |L|O|N|G| |4|2| +0#0000000&@39
+|S+0#00e0003&|H|O|R|T| +0#0000000&|S+0#00e0003&|H|O|R|T| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|-+0#af5f00255&|S+0#e000002&|H|O|R|T| |S|H|O|R|T| |4|2| +0#0000000&@39
+@2|L+0#00e0003&|O|N|G| +0#0000000&|L+0#00e0003&|O|N|G| +0#0000000&|I+0#00e0003&|N|T| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@2|++0#af5f00255&|L+0#e000002&|O|N|G| |L|O|N|G| |4|2| +0#0000000&@39
+> @74
 @75
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|e|-|4|2| +0#0000000&@59
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|E|-|4|2| +0#0000000&@59
->R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|\|-|4|2| +0#0000000&@59
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|�|-|4|2| +0#0000000&@59
+|#+0#0000e05&| |R|E|A|L| |#| +0#0000000&@66
 @75
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|e|+|4|2| +0#0000000&@59
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|E|+|4|2| +0#0000000&@59
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|\|+|4|2| +0#0000000&@59
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|�|+|4|2| +0#0000000&@59
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2| +0#0000000&@62
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2| +0#0000000&@60
 @75
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|e|4|2| +0#0000000&@59
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|E|4|2| +0#0000000&@59
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|\|4|2| +0#0000000&@59
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|�|4|2| +0#0000000&@59
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|e|4|2| +0#0000000&@60
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|E|4|2| +0#0000000&@60
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|\|4|2| +0#0000000&@60
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|�|4|2| +0#0000000&@60
 @75
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|e|-|4|2| +0#0000000&@58
-@57|3|7|,|1| @9|3|1|%| 
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|e|-|4|2| +0#0000000&@59
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|E|-|4|2| +0#0000000&@59
+@57|3|7|,|0|-|1| @7|2|0|%| 
diff --git a/runtime/syntax/testdir/dumps/algol68_denotations_03.dump b/runtime/syntax/testdir/dumps/algol68_denotations_03.dump
index 37eb216d2b..d1f1dcd4e0 100644
--- a/runtime/syntax/testdir/dumps/algol68_denotations_03.dump
+++ b/runtime/syntax/testdir/dumps/algol68_denotations_03.dump
@@ -1,20 +1,20 @@
-|R+0#00e0003#ffffff0|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|e|-|4|2| +0#0000000&@58
+|R+0#00e0003#ffffff0|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|E|-|4|2| +0#0000000&@59
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|\|-|4|2| +0#0000000&@59
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|�|-|4|2| +0#0000000&@59
+@75
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|e|+|4|2| +0#0000000&@59
+>R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|E|+|4|2| +0#0000000&@59
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|\|+|4|2| +0#0000000&@59
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|�|+|4|2| +0#0000000&@59
+@75
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|e|4|2| +0#0000000&@59
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|E|4|2| +0#0000000&@59
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|\|4|2| +0#0000000&@59
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|�|4|2| +0#0000000&@59
+@75
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|e|-|4|2| +0#0000000&@58
 |R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|E|-|4|2| +0#0000000&@58
 |R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|\|-|4|2| +0#0000000&@58
 |R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|�|-|4|2| +0#0000000&@58
 @75
->R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|e|+|4|2| +0#0000000&@58
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|E|+|4|2| +0#0000000&@58
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|\|+|4|2| +0#0000000&@58
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|�|+|4|2| +0#0000000&@58
-@75
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|e|4|2| +0#0000000&@57
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|E|4|2| +0#0000000&@57
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|\|4|2| +0#0000000&@57
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|�|4|2| +0#0000000&@57
-@75
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|e|-|4|2| +0#0000000&@56
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|E|-|4|2| +0#0000000&@56
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|\|-|4|2| +0#0000000&@56
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|�|-|4|2| +0#0000000&@56
-@57|5@1|,|1| @9|5|0|%| 
+@57|5@1|,|1| @9|3|2|%| 
diff --git a/runtime/syntax/testdir/dumps/algol68_denotations_04.dump b/runtime/syntax/testdir/dumps/algol68_denotations_04.dump
index 6b62493585..d02c5fbacd 100644
--- a/runtime/syntax/testdir/dumps/algol68_denotations_04.dump
+++ b/runtime/syntax/testdir/dumps/algol68_denotations_04.dump
@@ -1,20 +1,20 @@
-|R+0#00e0003#ffffff0|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|�|-|4|2| +0#0000000&@56
+| +0&#ffffff0@74
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|e|+|4|2| +0#0000000&@58
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|E|+|4|2| +0#0000000&@58
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|\|+|4|2| +0#0000000&@58
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|.+0#e000002&|4|2|�|+|4|2| +0#0000000&@58
+> @74
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|e|4|2| +0#0000000&@57
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|E|4|2| +0#0000000&@57
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|\|4|2| +0#0000000&@57
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|�|4|2| +0#0000000&@57
+@75
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|e|-|4|2| +0#0000000&@56
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|E|-|4|2| +0#0000000&@56
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|\|-|4|2| +0#0000000&@56
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|�|-|4|2| +0#0000000&@56
 @75
 |R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|e|+|4|2| +0#0000000&@56
 |R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|E|+|4|2| +0#0000000&@56
 |R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|\|+|4|2| +0#0000000&@56
->R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|�|+|4|2| +0#0000000&@56
-@75
-|#+0#0000e05&| |w|h|i|t|e|s|p|a|c|e| |#| +0#0000000&@60
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&| |2| |.| |4| |2| |e| |+| |4| |2| +0#0000000&@48
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&| |2| |.| |4| |2| |\| |+| |4| |2| +0#0000000&@48
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&| |2| |.| |4| |2| |�| |+| |4| |2| +0#0000000&@48
-@75
-|#+0#0000e05&| |m|o|n|a|d|i|c| |o|p|e|r|a|t|o|r|s| |#| +0#0000000&@53
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|-+0#af5f00255&|4+0#e000002&|2|.|4|2| +0#0000000&@59
-|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|++0#af5f00255&|4+0#e000002&|2|.|4|2| +0#0000000&@59
-@75
-@75
-|#+0#0000e05&| |B|I|T|S| |#| +0#0000000&@66
-@75
-@57|7|3|,|1| @9|6|8|%| 
+@57|7|3|,|0|-|1| @7|4|3|%| 
diff --git a/runtime/syntax/testdir/dumps/algol68_denotations_05.dump b/runtime/syntax/testdir/dumps/algol68_denotations_05.dump
index ff50200250..541003ba17 100644
--- a/runtime/syntax/testdir/dumps/algol68_denotations_05.dump
+++ b/runtime/syntax/testdir/dumps/algol68_denotations_05.dump
@@ -1,20 +1,20 @@
-| +0&#ffffff0@74
-|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|2+0#e000002&|r|1|0|1|0|1|0| +0#0000000&@57
-|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|r|2@2| +0#0000000&@60
-|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|8+0#e000002&|r|5|2| +0#0000000&@61
-|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|1+0#e000002&|6|r|2|a| +0#0000000&@60
-> @74
-|#+0#0000e05&| |w|h|i|t|e|s|p|a|c|e| |#| +0#0000000&@60
-|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|2+0#e000002&|r| |1|0|1|0| |1|0|1|0| +0#0000000&@53
-@75
-|#+0#0000e05&| |u|n|m|a|t|c|h|e|d| |b|y| |b|a|d| |p|a|t@1|e|r|n| |i|n| |l|e|g|a|c|y| |v|e|r|s|i|o|n|s| |o|f| |s|y|n|t|a|x| |f|i|l|e| |#| +0#0000000&@12
-|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|1+0#e000002&|6|r|9@1| +0#0000000&@60
-@75
+|R+0#00e0003#ffffff0|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|\|+|4|2| +0#0000000&@56
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|2|.|4|2|�|+|4|2| +0#0000000&@56
 @75
-|#+0#0000e05&| |S|T|R|I|N|G| |#| +0#0000000&@64
+|#+0#0000e05&| |s|i|z|e| |#| +0#0000000&@66
+|S+0#00e0003&|H|O|R|T| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |.|4|2| +0#0000000&@50
+>S+0#00e0003&|H|O|R|T| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |4|2|.|4|2| +0#0000000&@48
+|S+0#00e0003&|H|O|R|T| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |4|2|e|4|2| +0#0000000&@48
+@1|L+0#00e0003&|O|N|G| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|L+0#e000002&|O|N|G| |.|4|2| +0#0000000&@50
+@1|L+0#00e0003&|O|N|G| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|L+0#e000002&|O|N|G| |4|2|.|4|2| +0#0000000&@48
+@1|L+0#00e0003&|O|N|G| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|L+0#e000002&|O|N|G| |4|2|e|4|2| +0#0000000&@48
+|S+0#00e0003&|H|O|R|T| +0#0000000&|S+0#00e0003&|H|O|R|T| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |S|H|O|R|T| |.|4|2| +0#0000000&@38
+|S+0#00e0003&|H|O|R|T| +0#0000000&|S+0#00e0003&|H|O|R|T| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |S|H|O|R|T| |4|2|.|4|2| +0#0000000&@36
+|S+0#00e0003&|H|O|R|T| +0#0000000&|S+0#00e0003&|H|O|R|T| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |S|H|O|R|T| |4|2|e|4|2| +0#0000000&@36
+@2|L+0#00e0003&|O|N|G| +0#0000000&|L+0#00e0003&|O|N|G| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@2|L+0#e000002&|O|N|G| |L|O|N|G| |.|4|2| +0#0000000&@38
+@2|L+0#00e0003&|O|N|G| +0#0000000&|L+0#00e0003&|O|N|G| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@2|L+0#e000002&|O|N|G| |L|O|N|G| |4|2|.|4|2| +0#0000000&@36
+@2|L+0#00e0003&|O|N|G| +0#0000000&|L+0#00e0003&|O|N|G| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@2|L+0#e000002&|O|N|G| |L|O|N|G| |4|2|e|4|2| +0#0000000&@36
 @75
-|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|F|o@1| |B|a|r|"| +0#0000000&@54
-@75
-|#+0#0000e05&| |q|u|o|t|e| |e|s|c|a|p|e| |#| +0#0000000&@58
-|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|"+0#e000e06&@1|"+0#e000002&| +0#0000000&@59
-@57|9|1|,|0|-|1| @7|8|6|%| 
+|#+0#0000e05&| |w|h|i|t|e|s|p|a|c|e| |#| +0#0000000&@60
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&| |2| |.| |4| |2| |e| |+| |4| |2| +0#0000000&@48
+@57|9|1|,|1| @9|5@1|%| 
diff --git a/runtime/syntax/testdir/dumps/algol68_denotations_06.dump b/runtime/syntax/testdir/dumps/algol68_denotations_06.dump
index 7b30e05a50..5ecc6fa030 100644
--- a/runtime/syntax/testdir/dumps/algol68_denotations_06.dump
+++ b/runtime/syntax/testdir/dumps/algol68_denotations_06.dump
@@ -1,20 +1,20 @@
-|S+0#00e0003#ffffff0|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|"+0#e000e06&@1|"+0#e000002&| +0#0000000&@59
-|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&| |"+0#e000e06&@1| +0#e000002&|"| +0#0000000&@57
-|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|F|o@1|"+0#e000e06&@1|"+0#e000002&| +0#0000000&@56
-|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|"+0#e000e06&@1|B+0#e000002&|a|r|"| +0#0000000&@56
-|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|F|o@1|"+0#e000e06&@1|B+0#e000002&|a|r|"| +0#0000000&@53
-> @74
-|#+0#0000e05&| |l|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n| |#| +0#0000000&@53
-|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|F|o@1|\+0#e000e06&| +0#0000000&@58
-| +0#e000002&|B|a|r|"| +0#0000000&@69
-|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|F|o@1|"+0#e000e06&@1|\| +0#0000000&@56
-|B+0#e000002&|a|r|"| +0#0000000&@70
-|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|F|o@1|\+0#e000e06&| +0#0000000&@58
-|"+0#e000e06&@1|B+0#e000002&|a|r|"| +0#0000000&@68
+|R+0#00e0003#ffffff0|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&| |2| |.| |4| |2| |e| |+| |4| |2| +0#0000000&@48
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&| |2| |.| |4| |2| |\| |+| |4| |2| +0#0000000&@48
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&| |2| |.| |4| |2| |�| |+| |4| |2| +0#0000000&@48
 @75
-|~+0#4040ff13&| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-| +0#0000000&@56|1|0|9|,|0|-|1| @6|B|o|t| 
+|#+0#0000e05&| |m|o|n|a|d|i|c| |o|p|e|r|a|t|o|r|s| |#| +0#0000000&@53
+>R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|-+0#af5f00255&|4+0#e000002&|2|.|4|2| +0#0000000&@59
+|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|++0#af5f00255&|4+0#e000002&|2|.|4|2| +0#0000000&@59
+|S+0#00e0003&|H|O|R|T| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|++0#af5f00255&|S+0#e000002&|H|O|R|T| |4|2|.|4|2| +0#0000000&@47
+@1|L+0#00e0003&|O|N|G| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|-+0#af5f00255&|L+0#e000002&|O|N|G| |4|2|.|4|2| +0#0000000&@47
+|S+0#00e0003&|H|O|R|T| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|-+0#af5f00255&|S+0#e000002&|H|O|R|T| |4|2|.|4|2| +0#0000000&@47
+@1|L+0#00e0003&|O|N|G| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|++0#af5f00255&|L+0#e000002&|O|N|G| |4|2|.|4|2| +0#0000000&@47
+|S+0#00e0003&|H|O|R|T| +0#0000000&|S+0#00e0003&|H|O|R|T| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|++0#af5f00255&|S+0#e000002&|H|O|R|T| |S|H|O|R|T| |4|2|.|4|2| +0#0000000&@35
+@2|L+0#00e0003&|O|N|G| +0#0000000&|L+0#00e0003&|O|N|G| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@2|-+0#af5f00255&|L+0#e000002&|O|N|G| |L|O|N|G| |4|2|.|4|2| +0#0000000&@35
+|S+0#00e0003&|H|O|R|T| +0#0000000&|S+0#00e0003&|H|O|R|T| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|-+0#af5f00255&|S+0#e000002&|H|O|R|T| |S|H|O|R|T| |4|2|.|4|2| +0#0000000&@35
+@2|L+0#00e0003&|O|N|G| +0#0000000&|L+0#00e0003&|O|N|G| +0#0000000&|R+0#00e0003&|E|A|L| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@2|++0#af5f00255&|L+0#e000002&|O|N|G| |L|O|N|G| |4|2|.|4|2| +0#0000000&@35
+@75
+@75
+|#+0#0000e05&| |B|I|T|S| |#| +0#0000000&@66
+@75
+@57|1|0|9|,|1| @8|6|7|%| 
diff --git a/runtime/syntax/testdir/dumps/algol68_denotations_07.dump b/runtime/syntax/testdir/dumps/algol68_denotations_07.dump
new file mode 100644
index 0000000000..4247736fdf
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/algol68_denotations_07.dump
@@ -0,0 +1,20 @@
+| +0&#ffffff0@74
+|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|2+0#e000002&|r|1|0|1|0|1|0| +0#0000000&@57
+|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|4+0#e000002&|r|2@2| +0#0000000&@60
+|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|8+0#e000002&|r|5|2| +0#0000000&@61
+|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|1+0#e000002&|6|r|2|a| +0#0000000&@60
+> @74
+|#+0#0000e05&| |s|i|z|e| |#| +0#0000000&@66
+|S+0#00e0003&|H|O|R|T| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |2|r|1|0|1|0|1|0| +0#0000000&@45
+|S+0#00e0003&|H|O|R|T| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |4|r|2@2| +0#0000000&@48
+|S+0#00e0003&|H|O|R|T| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |8|r|5|2| +0#0000000&@49
+|S+0#00e0003&|H|O|R|T| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |1|6|r|2|a| +0#0000000&@48
+@1|L+0#00e0003&|O|N|G| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|L+0#e000002&|O|N|G| |2|r|1|0|1|0|1|0| +0#0000000&@45
+@1|L+0#00e0003&|O|N|G| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|L+0#e000002&|O|N|G| |4|r|2@2| +0#0000000&@48
+@1|L+0#00e0003&|O|N|G| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|L+0#e000002&|O|N|G| |8|r|5|2| +0#0000000&@49
+@1|L+0#00e0003&|O|N|G| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@1|L+0#e000002&|O|N|G| |1|6|r|2|a| +0#0000000&@48
+|S+0#00e0003&|H|O|R|T| +0#0000000&|S+0#00e0003&|H|O|R|T| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |S|H|O|R|T| |2|r|1|0|1|0|1|0| +0#0000000&@33
+|S+0#00e0003&|H|O|R|T| +0#0000000&|S+0#00e0003&|H|O|R|T| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |S|H|O|R|T| |4|r|2@2| +0#0000000&@36
+|S+0#00e0003&|H|O|R|T| +0#0000000&|S+0#00e0003&|H|O|R|T| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |S|H|O|R|T| |8|r|5|2| +0#0000000&@37
+|S+0#00e0003&|H|O|R|T| +0#0000000&|S+0#00e0003&|H|O|R|T| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |S|H|O|R|T| |1|6|r|2|a| +0#0000000&@36
+@57|1|2|7|,|0|-|1| @6|7|9|%| 
diff --git a/runtime/syntax/testdir/dumps/algol68_denotations_08.dump b/runtime/syntax/testdir/dumps/algol68_denotations_08.dump
new file mode 100644
index 0000000000..acd9e02caa
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/algol68_denotations_08.dump
@@ -0,0 +1,20 @@
+|S+0#00e0003#ffffff0|H|O|R|T| +0#0000000&|S+0#00e0003&|H|O|R|T| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|S+0#e000002&|H|O|R|T| |S|H|O|R|T| |1|6|r|2|a| +0#0000000&@36
+@2|L+0#00e0003&|O|N|G| +0#0000000&|L+0#00e0003&|O|N|G| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@2|L+0#e000002&|O|N|G| |L|O|N|G| |2|r|1|0|1|0|1|0| +0#0000000&@33
+@2|L+0#00e0003&|O|N|G| +0#0000000&|L+0#00e0003&|O|N|G| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@2|L+0#e000002&|O|N|G| |L|O|N|G| |4|r|2@2| +0#0000000&@36
+@2|L+0#00e0003&|O|N|G| +0#0000000&|L+0#00e0003&|O|N|G| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@2|L+0#e000002&|O|N|G| |L|O|N|G| |8|r|5|2| +0#0000000&@37
+@2|L+0#00e0003&|O|N|G| +0#0000000&|L+0#00e0003&|O|N|G| +0#0000000&|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&@2|L+0#e000002&|O|N|G| |L|O|N|G| |1|6|r|2|a| +0#0000000&@36
+> @74
+@75
+|#+0#0000e05&| |w|h|i|t|e|s|p|a|c|e| |#| +0#0000000&@60
+|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|2+0#e000002&|r| |1|0|1|0| |1|0|1|0| +0#0000000&@53
+@75
+|#+0#0000e05&| |u|n|m|a|t|c|h|e|d| |b|y| |b|a|d| |p|a|t@1|e|r|n| |i|n| |l|e|g|a|c|y| |v|e|r|s|i|o|n|s| |o|f| |s|y|n|t|a|x| |f|i|l|e| |#| +0#0000000&@12
+|B+0#00e0003&|I|T|S| +0#0000000&|x| |=+0#af5f00255&| +0#0000000&|1+0#e000002&|6|r|9@1| +0#0000000&@60
+@75
+@75
+|#+0#0000e05&| |S|T|R|I|N|G| |#| +0#0000000&@64
+@75
+|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|F|o@1| |B|a|r|"| +0#0000000&@54
+@75
+|#+0#0000e05&| |q|u|o|t|e| |e|s|c|a|p|e| |#| +0#0000000&@58
+@57|1|4|5|,|0|-|1| @6|9|0|%| 
diff --git a/runtime/syntax/testdir/dumps/algol68_denotations_09.dump b/runtime/syntax/testdir/dumps/algol68_denotations_09.dump
new file mode 100644
index 0000000000..9f32f209ad
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/algol68_denotations_09.dump
@@ -0,0 +1,20 @@
+|#+0#0000e05#ffffff0| |q|u|o|t|e| |e|s|c|a|p|e| |#| +0#0000000&@58
+|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|"+0#e000e06&@1|"+0#e000002&| +0#0000000&@59
+|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&| |"+0#e000e06&@1| +0#e000002&|"| +0#0000000&@57
+|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|F|o@1|"+0#e000e06&@1|"+0#e000002&| +0#0000000&@56
+|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|"+0#e000e06&@1|B+0#e000002&|a|r|"| +0#0000000&@56
+>S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|F|o@1|"+0#e000e06&@1|B+0#e000002&|a|r|"| +0#0000000&@53
+@75
+|#+0#0000e05&| |l|i|n|e| |c|o|n|t|i|n|u|a|t|i|o|n| |#| +0#0000000&@53
+|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|F|o@1|\+0#e000e06&| +0#0000000&@58
+| +0#e000002&|B|a|r|"| +0#0000000&@69
+|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|F|o@1|"+0#e000e06&@1|\| +0#0000000&@56
+|B+0#e000002&|a|r|"| +0#0000000&@70
+|S+0#00e0003&|T|R|I|N|G| +0#0000000&|s| |=+0#af5f00255&| +0#0000000&|"+0#e000002&|F|o@1|\+0#e000e06&| +0#0000000&@58
+|"+0#e000e06&@1|B+0#e000002&|a|r|"| +0#0000000&@68
+@75
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|1|6|3|,|1| @8|B|o|t| 
diff --git a/runtime/syntax/testdir/dumps/cpp_cpp26_00.dump b/runtime/syntax/testdir/dumps/cpp_cpp26_00.dump
new file mode 100644
index 0000000000..928d626906
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/cpp_cpp26_00.dump
@@ -0,0 +1,20 @@
+>/+0#0000e05#ffffff0@1| |C|+@1|2|6| |l|e|x|i|c|a|l| |c|o|n|s|t|r|u|c|t|s| +0#0000000&@47
+@75
+|/+0#0000e05&@1| |P|3@1|9|4| |a|n@1|o|t|a|t|i|o|n|s|:| |[@1| |.@2| |]@1| |m|a|y| |c|a|r@1|y| |a| |v|a|l|u|e| |e|x|p|r|e|s@1|i|o|n|.| +0#0000000&@13
+|[+0#e000e06&@1|=+0#0000000&|r|e|n|a|m|e|{|"+0#e000002&|f|u|l@1|_|n|a|m|e|"|}+0#0000000&|]+0#e000e06&@1| +0#0000000&|i+0#00e0003&|n|t| +0#0000000&|b|r|a|c|e|d|;| @38
+|[+0#e000e06&@1|=+0#0000000&|k|e|y|(|8+0#e000002&|)+0#0000000&|]+0#e000e06&@1| +0#0000000&@13|i+0#00e0003&|n|t| +0#0000000&|p|a|r|e|n|e|d|;| @37
+|[+0#e000e06&@1|n+0#0000000&|o|d|i|s|c|a|r|d|]+0#e000e06&@1| +0#0000000&@11|i+0#00e0003&|n|t| +0#0000000&|p|l|a|i|n|(|)|;| @37
+@75
+|/+0#0000e05&@1| |P|2|9|0@1| |c|o|n|t|r|a|c|t|s|:| |c|o|n|t|r|a|c|t|_|a|s@1|e|r|t| |i|s| |a| |k|e|y|w|o|r|d|.| +0#0000000&@25
+|v+0#00e0003&|o|i|d| +0#0000000&|c|h|e|c|k|(|i+0#00e0003&|n|t| +0#0000000&|x|)| |{| |c+0#af5f00255&|o|n|t|r|a|c|t|_|a|s@1|e|r|t|(+0#0000000&|x| |!|=| |0+0#e000002&|)+0#0000000&|;| |}| @28
+@75
+|/+0#0000e05&@1| |P|2|9@1|6| |r|e|f|l|e|c|t|i|o|n| |(|^@1|)| |a|n|d| |s|p|l|i|c|i|n|g| |(|[|:| |:|]|)|.| +0#0000000&@28
+|c+0#00e0003&|o|n|s|t|e|x|p|r| +0#0000000&|a+0#00e0003&|u|t|o| +0#0000000&|r|e|f|l| |=| |^+0#af5f00255&@1|i+0#00e0003&|n|t|;+0#0000000&| @46
+|[+0#e000e06&|:|r+0#0000000&|e|f|l|:+0#e000e06&|]| +0#0000000&|s|p|l|i|c|e|d|{|}|;| @55
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|1|,|1| @10|A|l@1| 
diff --git a/runtime/syntax/testdir/dumps/cpp_noreturn_00.dump b/runtime/syntax/testdir/dumps/cpp_noreturn_00.dump
index 2386ad118f..2c94fc0f42 100644
--- a/runtime/syntax/testdir/dumps/cpp_noreturn_00.dump
+++ b/runtime/syntax/testdir/dumps/cpp_noreturn_00.dump
@@ -6,7 +6,7 @@
 |#+0#e000e06&|i|n|c|l|u|d|e| |<+0#e000002&|s|t|d|i|o|.|h|>| +0#0000000&@56
 |#+0#e000e06&|i|n|c|l|u|d|e| |<+0#e000002&|s|t|d|l|i|b|.|h|>| +0#0000000&@55
 @75
-|[@1|n|o|r|e|t|u|r|n|]@1| |v+0#00e0003&|o|i|d| +0#0000000&|e|r@1|o|r|_|e|x|i|t|(|c+0#00e0003&|o|n|s|t| +0#0000000&|c+0#00e0003&|h|a|r|*+0#0000000&| |r|e|a|s|o|n|)| @26
+|[+0#e000e06&@1|n+0#0000000&|o|r|e|t|u|r|n|]+0#e000e06&@1| +0#0000000&|v+0#00e0003&|o|i|d| +0#0000000&|e|r@1|o|r|_|e|x|i|t|(|c+0#00e0003&|o|n|s|t| +0#0000000&|c+0#00e0003&|h|a|r|*+0#0000000&| |r|e|a|s|o|n|)| @26
 |{| @73
 @4|p|r|i|n|t|f|(|"+0#e000002&|E|r@1|o|r|:| |%+0#e000e06&|s|\|n|"+0#e000002&|,+0#0000000&| |r|e|a|s|o|n|)|;| @40
 @4|e|x|i|t|(|1+0#e000002&|)+0#0000000&|;| @62
diff --git a/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_00.dump b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_00.dump
index 39857166da..9d2ccedf0f 100644
--- a/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_00.dump
@@ -9,8 +9,8 @@
 @8|p+0#af5f00255&|u|b|l|i|c| +0#0000000&|c+0#af5f00255&|o|n|s|t| +0#0000000&|b+0#00e0e07&|:+0#0000000&| |a+0#00e0003&|n|y| +0#0000000&@47
 @75
 @8|d+0#af5f00255&|e|f| +0#0000000&|n+0#e000e06&|e|w|(|a+0#00e0e07&|:+0#0000000&| |a+0#00e0003&|n|y|,+0#0000000&| |b+0#00e0e07&|:+0#0000000&| |a+0#00e0003&|n|y|)+0#e000e06&| +0#0000000&@43
-@8| +0#00e0e07&@7|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|a+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|a+0#00e0e07&| +0#0000000&@48
-@8| +0#00e0e07&@7|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|b+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|b+0#00e0e07&| +0#0000000&@48
+@8| +0#00e0e07&@7|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|a+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|a+0#00e0e07&| +0#0000000&@48
+@8| +0#00e0e07&@7|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|b+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|b+0#00e0e07&| +0#0000000&@48
 @8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
 @75
 @8|d+0#af5f00255&|e|f| +0#0000000&|e+0#e000e06&|m|p|t|y|(|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@49
diff --git a/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_01.dump b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_01.dump
index ff3e810322..6c39c50711 100644
--- a/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_01.dump
@@ -7,7 +7,7 @@
 @16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|2+0#e000002&| +0#0000000&@50
 @8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
 @8|d+0#af5f00255&|e|f| +0#0000000&|s+0#e000e06&|t|r|i|n|g|(|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@46
-@16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|p+0#00e0e07&|r|i|n|t|f|(+0#e000e06&|'+0#e000002&|(|%|s|,| |%|s|)|'|,+0#0000000&| |t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|a+0#00e0e07&|,+0#0000000&| |t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|b+0#00e0e07&|)+0#e000e06&| +0#0000000&@17
+@16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|p+0#00e0e07&|r|i|n|t|f|(+0#e000e06&|'+0#e000002&|(|%|s|,| |%|s|)|'|,+0#0000000&| |t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|a+0#00e0e07&|,+0#0000000&| |t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|b+0#00e0e07&|)+0#e000e06&| +0#0000000&@17
 @8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
 |e+0#af5f00255&|n|d|c|l|a|s@1| +0#0000000&@66
 @75
diff --git a/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_02.dump b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_02.dump
index 22c31e20fe..195b6fa054 100644
--- a/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_02.dump
+++ b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_02.dump
@@ -6,15 +6,15 @@
 @16>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|0+0#e000002&| +0#0000000&@50
 @8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
 @8|d+0#af5f00255&|e|f| +0#0000000&|s+0#e000e06&|t|r|i|n|g|(|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@46
-@16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|n+0#00e0e07&|a|m|e| +0#0000000&@42
+@16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|n+0#00e0e07&|a|m|e| +0#0000000&@42
 @8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
 |e+0#af5f00255&|n|d|e|n|u|m| +0#0000000&@67
 @75
-|c+0#af5f00255&|o|n|s|t| +0#0000000&|b+0#00e0e07&|1|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|M+0#00e0e07&|a|r|k|e|r|E|n|u|m|T|e|s|t|.+0#af5f00255&|I+0#00e0e07&|N|S|T|A|N|C|E|)+0#e000e06&| +0#0000000&@27
-|c+0#af5f00255&|o|n|s|t| +0#0000000&|n+0#00e0e07&|1|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#af5f00255&| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|M+0#00e0e07&|a|r|k|e|r|E|n|u|m|T|e|s|t|.+0#af5f00255&|I+0#00e0e07&|N|S|T|A|N|C|E|)+0#e000e06&| +0#0000000&@27
-|c+0#af5f00255&|o|n|s|t| +0#0000000&|s+0#00e0e07&|1|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#af5f00255&| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|M+0#00e0e07&|a|r|k|e|r|E|n|u|m|T|e|s|t|.+0#af5f00255&|I+0#00e0e07&|N|S|T|A|N|C|E|)+0#e000e06&| +0#0000000&@24
-|e+0#af5f00255&|c|h|o| +0#0000000&|b+0#00e0e07&|1| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|M|a|r|k|e|r|E|n|u|m|T|e|s|t|.|I|N|S|T|A|N|C|E|.|e+0#e000e06&|m|p|t|y|(|)| +0#0000000&@32
-|e+0#af5f00255&|c|h|o| +0#0000000&|n+0#00e0e07&|1| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|0+0#e000002&| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|M|a|r|k|e|r|E|n|u|m|T|e|s|t|.|I|N|S|T|A|N|C|E|.|l+0#e000e06&|e|n|(|)| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|0+0#e000002&| +0#0000000&@24
-|e+0#af5f00255&|c|h|o| +0#0000000&|s+0#00e0e07&|1| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|'+0#e000002&|I|N|S|T|A|N|C|E|'| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|M|a|r|k|e|r|E|n|u|m|T|e|s|t|.|I|N|S|T|A|N|C|E|.|s+0#e000e06&|t|r|i|n|g|(|)| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|'+0#e000002&|I|N|S|T|A|N|C|E|'| +0#0000000&@3
+|c+0#af5f00255&|o|n|s|t| +0#0000000&|b+0#00e0e07&|1|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|M+0#00e0e07&|a|r|k|e|r|E|n|u|m|T|e|s|t|.+0#0000000&|I+0#00e0e07&|N|S|T|A|N|C|E|)+0#e000e06&| +0#0000000&@27
+|c+0#af5f00255&|o|n|s|t| +0#0000000&|n+0#00e0e07&|1|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#af5f00255&| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|M+0#00e0e07&|a|r|k|e|r|E|n|u|m|T|e|s|t|.+0#0000000&|I+0#00e0e07&|N|S|T|A|N|C|E|)+0#e000e06&| +0#0000000&@27
+|c+0#af5f00255&|o|n|s|t| +0#0000000&|s+0#00e0e07&|1|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#af5f00255&| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|M+0#00e0e07&|a|r|k|e|r|E|n|u|m|T|e|s|t|.+0#0000000&|I+0#00e0e07&|N|S|T|A|N|C|E|)+0#e000e06&| +0#0000000&@24
+|e+0#af5f00255&|c|h|o| +0#0000000&|b+0#00e0e07&|1| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|M+0#00e0e07&|a|r|k|e|r|E|n|u|m|T|e|s|t|.+0#0000000&|I+0#00e0e07&|N|S|T|A|N|C|E|.+0#0000000&|e+0#e000e06&|m|p|t|y|(|)| +0#0000000&@32
+|e+0#af5f00255&|c|h|o| +0#0000000&|n+0#00e0e07&|1| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|0+0#e000002&| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|M+0#00e0e07&|a|r|k|e|r|E|n|u|m|T|e|s|t|.+0#0000000&|I+0#00e0e07&|N|S|T|A|N|C|E|.+0#0000000&|l+0#e000e06&|e|n|(|)| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|0+0#e000002&| +0#0000000&@24
+|e+0#af5f00255&|c|h|o| +0#0000000&|s+0#00e0e07&|1| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|'+0#e000002&|I|N|S|T|A|N|C|E|'| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|M+0#00e0e07&|a|r|k|e|r|E|n|u|m|T|e|s|t|.+0#0000000&|I+0#00e0e07&|N|S|T|A|N|C|E|.+0#0000000&|s+0#e000e06&|t|r|i|n|g|(|)| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|'+0#e000002&|I|N|S|T|A|N|C|E|'| +0#0000000&@3
 @75
 @57|3|7|,|3|-|1|7| @6|7|9|%| 
diff --git a/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_03.dump b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_03.dump
index ed7c835e02..e083969762 100644
--- a/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_03.dump
+++ b/runtime/syntax/testdir/dumps/vim9_builtin_object_methods2_03.dump
@@ -1,8 +1,8 @@
 | +0&#ffffff0@74
-|c+0#af5f00255&|o|n|s|t| +0#0000000&|p+0#00e0e07&|a|i|r|:+0#0000000&| |P|a|i|r|C|l|a|s@1|T|e|s|t| |=+0#af5f00255&| +0#0000000&|P|a|i|r|C|l|a|s@1|T|e|s|t|.|n+0#e000e06&|e|w|(|0+0#e000002&|,+0#0000000&| |1+0#e000002&|)+0#e000e06&| +0#0000000&@23
-|c+0#af5f00255&|o|n|s|t| +0#0000000&|b+0#00e0e07&|2|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&|=+0#af5f00255&| +0#0000000&|!+0#af5f00255&|p+0#0000000&|a|i|r|.|e+0#e000e06&|m|p|t|y|(|)| +0#0000000&@44
-|c+0#af5f00255&|o|n|s|t| +0#0000000&|n+0#00e0e07&|2|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#af5f00255&| +0#0000000&|p|a|i|r|.|l+0#e000e06&|e|n|(|)| +0#0000000&@45
-|c+0#af5f00255&|o|n|s|t| +0#0000000&|s+0#00e0e07&|2|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#af5f00255&| +0#0000000&|p|a|i|r|.|s+0#e000e06&|t|r|i|n|g|(|)| +0#0000000&@42
+|c+0#af5f00255&|o|n|s|t| +0#0000000&|p+0#00e0e07&|a|i|r|:+0#0000000&| |P|a|i|r|C|l|a|s@1|T|e|s|t| |=+0#af5f00255&| +0#0000000&|P+0#00e0e07&|a|i|r|C|l|a|s@1|T|e|s|t|.+0#0000000&|n+0#e000e06&|e|w|(|0+0#e000002&|,+0#0000000&| |1+0#e000002&|)+0#e000e06&| +0#0000000&@23
+|c+0#af5f00255&|o|n|s|t| +0#0000000&|b+0#00e0e07&|2|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&|=+0#af5f00255&| +0#0000000&|!+0#af5f00255&|p+0#00e0e07&|a|i|r|.+0#0000000&|e+0#e000e06&|m|p|t|y|(|)| +0#0000000&@44
+|c+0#af5f00255&|o|n|s|t| +0#0000000&|n+0#00e0e07&|2|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#af5f00255&| +0#0000000&|p+0#00e0e07&|a|i|r|.+0#0000000&|l+0#e000e06&|e|n|(|)| +0#0000000&@45
+|c+0#af5f00255&|o|n|s|t| +0#0000000&|s+0#00e0e07&|2|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#af5f00255&| +0#0000000&|p+0#00e0e07&|a|i|r|.+0#0000000&|s+0#e000e06&|t|r|i|n|g|(|)| +0#0000000&@42
 >e+0#af5f00255&|c|h|o| +0#0000000&|b+0#00e0e07&|2| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|!+0#af5f00255&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|p+0#00e0e07&|a|i|r|)+0#e000e06&| +0#0000000&@51
 |e+0#af5f00255&|c|h|o| +0#0000000&|n+0#00e0e07&|2| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|2+0#e000002&| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|p+0#00e0e07&|a|i|r|)+0#e000e06&| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|2+0#e000002&| +0#0000000&@44
 |e+0#af5f00255&|c|h|o| +0#0000000&|s+0#00e0e07&|2| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|'+0#e000002&|(|0|,| |1|)|'| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|p+0#00e0e07&|a|i|r|)+0#e000e06&| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|'+0#e000002&|(|0|,| |1|)|'| +0#0000000&@27
diff --git a/runtime/syntax/testdir/dumps/vim9_constructors_00.dump b/runtime/syntax/testdir/dumps/vim9_constructors_00.dump
index 6aa0cba8d8..4e8c702363 100644
--- a/runtime/syntax/testdir/dumps/vim9_constructors_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_constructors_00.dump
@@ -6,7 +6,7 @@
 @2|s+0#af5f00255&|t|a|t|i|c| +0#0000000&|v+0#af5f00255&|a|r| +0#0000000&|_|i|n|s|t|a|n|c|e|:| |A| @49
 @2|v+0#af5f00255&|a|r| +0#0000000&|s|t|r|:| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@57
 @2|d+0#af5f00255&|e|f| +0#0000000&|_+0#00e0e07&|n|e|w|(+0#e000e06&|s+0#0000000&|t|r|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&@51
-@4|t+0#00e0e07&|h|i|s|.+0#af5f00255&|s+0#0000000&|t|r| |=+0#af5f00255&| +0#0000000&|s|t|r| @56
+@4|t+0#00e0e07&|h|i|s|.+0#0000000&|s|t|r| |=+0#af5f00255&| +0#0000000&|s|t|r| @56
 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
 @2|s+0#af5f00255&|t|a|t|i|c| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|G|e|t|I|n|s|t|a|n|c|e|(+0#e000e06&|s+0#0000000&|t|r|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&|:+0#0000000&| |A| @34
 @4|i+0#af5f00255&|f| +0#0000000&|_|i|n|s|t|a|n|c|e| |=+0#af5f00255&@1| +0#0000000&|n+0#e000002&|u|l@1| +0#0000000&@50
diff --git a/runtime/syntax/testdir/dumps/vim9_ex_enum2_01.dump b/runtime/syntax/testdir/dumps/vim9_ex_enum2_01.dump
index 2b47e5723e..0d1dc4f15b 100644
--- a/runtime/syntax/testdir/dumps/vim9_ex_enum2_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_enum2_01.dump
@@ -10,11 +10,11 @@
 @4|c+0#af5f00255&|o|n|s|t| +0#0000000&|v+0#00e0e07&|a|l|u|e|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@51
 |e+0#af5f00255&|n|d|e|n|u|m| +0#0000000&@67
 @75
-|f+0#af5f00255&|o|r| +0#0000000&|l+0#00e0e07&|e|t@1|e|r| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|L+0#00e0e07&|e|t@1|e|r|.+0#af5f00255&|v+0#00e0e07&|a|l|u|e|s| +0#0000000&@47
+|f+0#af5f00255&|o|r| +0#0000000&|l+0#00e0e07&|e|t@1|e|r| +0#0000000&|i+0#af5f00255&|n| +0#0000000&|L+0#00e0e07&|e|t@1|e|r|.+0#0000000&|v+0#00e0e07&|a|l|u|e|s| +0#0000000&@47
 @4|e+0#af5f00255&|c|h|o| +0#0000000&|l+0#00e0e07&|e|t@1|e|r| +0#0000000&@59
 |e+0#af5f00255&|n|d|f|o|r| +0#0000000&@68
 @75
-|e+0#af5f00255&|c|h|o| +0#0000000&|L+0#00e0e07&|e|t@1|e|r|.+0#af5f00255&|D+0#00e0e07&| +0#0000000&@61
+|e+0#af5f00255&|c|h|o| +0#0000000&|L+0#00e0e07&|e|t@1|e|r|.+0#0000000&|D+0#00e0e07&| +0#0000000&@61
 @75
 |~+0#4040ff13&| @73
 | +0#0000000&@56|1|9|,|0|-|1| @7|B|o|t| 
diff --git a/runtime/syntax/testdir/dumps/vim9_function_calls_12.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_12.dump
index 522ffddce7..8e7afb1804 100644
--- a/runtime/syntax/testdir/dumps/vim9_function_calls_12.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_calls_12.dump
@@ -12,9 +12,9 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|v+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
 @75
 @75
-|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@50
-|c+0#af5f00255&|a|l@1| +0#0000000&|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
-|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
+|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|m|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@50
+|c+0#af5f00255&|a|l@1| +0#0000000&|m|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
+|m|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
 @75
-|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
 @57|2|1|7|,|1| @8|7|0|%| 
diff --git a/runtime/syntax/testdir/dumps/vim9_function_calls_13.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_13.dump
index f36c967295..33e9c6dcc5 100644
--- a/runtime/syntax/testdir/dumps/vim9_function_calls_13.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_calls_13.dump
@@ -1,20 +1,20 @@
-|v+0#af5f00255#ffffff0|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
-|g+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58
+|v+0#af5f00255#ffffff0|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
+|g+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58
 @75
-|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|b+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
->c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
-|b+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58
+|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|b+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+>c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
+|b+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58
 @75
-|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|w+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
-|w+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58
+|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|w+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
+|w+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58
 @75
-|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
-|t+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58
+|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
+|t+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58
 @75
-|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|v+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|v+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
-|v+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58
+|v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|v+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|v+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
+|v+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58
 @57|2|3|5|,|1| @8|7|6|%| 
diff --git a/runtime/syntax/testdir/dumps/vim9_function_calls_14.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_14.dump
index 8511d6fe38..605a805cbf 100644
--- a/runtime/syntax/testdir/dumps/vim9_function_calls_14.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_calls_14.dump
@@ -1,4 +1,4 @@
-|v+0#00e0e07#ffffff0|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58
+|v+0#00e0e07#ffffff0|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@58
 @75
 @75
 |v+0#af5f00255&|a|r| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|m+0#0000001#ffff4012|o|d|u|l|e|#|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@50
diff --git a/runtime/syntax/testdir/dumps/vim9_function_calls_15.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_15.dump
index dfdacdd959..1b40e3d219 100644
--- a/runtime/syntax/testdir/dumps/vim9_function_calls_15.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_calls_15.dump
@@ -2,11 +2,11 @@
 @75
 |c+0#af5f00255&|a|l@1| +0#0000000&|<+0#e000e06&|S|I|D|>|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@52
 @75
-|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
->c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
-|c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
-|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
-|c+0#af5f00255&|a|l@1| +0#0000000&|v+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
+>c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|v+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
 @75
 |c+0#af5f00255&|a|l@1| +0#0000000&|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|#|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@46
 |c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|#|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
diff --git a/runtime/syntax/testdir/dumps/vim9_function_calls_16.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_16.dump
index 31a186f251..454c5c39a2 100644
--- a/runtime/syntax/testdir/dumps/vim9_function_calls_16.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_calls_16.dump
@@ -1,11 +1,11 @@
 | +0&#ffffff0@74
 |<+0#e000e06&|S|I|D|>|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@57
 @75
-|g+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@49
-|b+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@49
->w+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@49
-|t+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@49
-|v+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@49
+|g+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@49
+|b+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@49
+>w+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@49
+|t+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@49
+|v+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@49
 @75
 |s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|#|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@51
 |g+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|#|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@49
@@ -13,8 +13,8 @@
 @75
 |#+0#0000e05&| |C|h|a|i|n|e|d| |f|u|n|c|t|i|o|n| |c|a|l@1|s| +0#0000000&@50
 @75
-|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|)|.+0#af5f00255&|b+0#0000001#ffff4012|a|r|(+0#e000e06#ffffff0|)| +0#0000000&@56
-|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|)|.+0#af5f00255&|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@49
+|m|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)|.+0#0000000&|b+0#0000001#ffff4012|a|r|(+0#e000e06#ffffff0|)| +0#0000000&@56
+|m|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)|.+0#0000000&|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@49
 @75
 @75
 @57|2|8|9|,|1| @8|9|4|%| 
diff --git a/runtime/syntax/testdir/dumps/vim9_function_calls_17.dump b/runtime/syntax/testdir/dumps/vim9_function_calls_17.dump
index 82f79ef536..b1fb20e625 100644
--- a/runtime/syntax/testdir/dumps/vim9_function_calls_17.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_calls_17.dump
@@ -11,8 +11,8 @@
 @75
 |#+0#0000e05&| |I|s@1|u|e| |#|1|7@1|6@1| |(|v|a|l|i|d| |f|u|n|c|t|i|o|n| |c|a|l@1| |h|i|g|h|l|i|g|h|t|e|d| |a|s| |e|r@1|o|r|)| +0#0000000&@17
 @75
-|m|o|d|u|l|e|[|0+0#e000002&|]+0#0000000&|.+0#af5f00255&|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)| +0#0000000&@59
-|m|o|d|u|l|e|[|0+0#e000002&|]+0#0000000&|.+0#af5f00255&|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@52
+|m|o|d|u|l|e|[|0+0#e000002&|]+0#0000000&|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)| +0#0000000&@59
+|m|o|d|u|l|e|[|0+0#e000002&|]+0#0000000&|.|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@52
 @75
 |~+0#4040ff13&| @73
 |~| @73
diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_00.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_00.dump
index 165cc4c798..ecf423b33f 100644
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_00.dump
@@ -15,6 +15,6 @@
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|c+0#af5f00255&|o|n|s|t| +0#0000000&|_|s|n|d|:| |a+0#00e0003&|n|y| +0#0000000&@53
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|<+0#e000e06&|T+0#0000001#ffff4012|,+0#0000000#ffffff0| |U+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|f+0#0000000&|s|t|:| |T|,| |s|n|d|:| |U|)+0#e000e06&| +0#0000000&@39
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|f|s|t| |=+0#af5f00255&| +0#0000000&|f|s|t| @49
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|n|d| |=+0#af5f00255&| +0#0000000&|s|n|d| @49
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#0000000&|_|f|s|t| |=+0#af5f00255&| +0#0000000&|f|s|t| @49
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#0000000&|_|s|n|d| |=+0#af5f00255&| +0#0000000&|s|n|d| @49
 @57|1|,|1| @10|T|o|p| 
diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_01.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_01.dump
index e7f1197014..d01283a888 100644
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_01.dump
@@ -2,19 +2,19 @@
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|c+0#af5f00255&|o|n|s|t| +0#0000000&|_|s|n|d|:| |a+0#00e0003&|n|y| +0#0000000&@53
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|<+0#e000e06&|T+0#0000001#ffff4012|,+0#0000000#ffffff0| |U+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|f+0#0000000&|s|t|:| |T|,| |s|n|d|:| |U|)+0#e000e06&| +0#0000000&@39
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|f|s|t| |=+0#af5f00255&| +0#0000000&|f|s|t| @49
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7>t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|n|d| |=+0#af5f00255&| +0#0000000&|s|n|d| @49
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#0000000&|_|f|s|t| |=+0#af5f00255&| +0#0000000&|f|s|t| @49
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7>t+0#00e0e07&|h|i|s|.+0#0000000&|_|s|n|d| |=+0#af5f00255&| +0#0000000&|s|n|d| @49
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|F|i|r|s|t|<+0#e000e06&|T+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |T| @51
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|f|s|t| @48
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|f|s|t| @48
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|S|e|c|o|n|d|<+0#e000e06&|T+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |T| @50
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|n|d| @48
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|s|n|d| @48
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@48
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|p+0#00e0e07&|r|i|n|t|f|(+0#e000e06&|"+0#e000002&|(|%|s|,| |%|s|)|"|,+0#0000000&| |t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|f|s|t|,| |t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|n|d|)+0#e000e06&| +0#0000000&@17
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|p+0#00e0e07&|r|i|n|t|f|(+0#e000e06&|"+0#e000002&|(|%|s|,| |%|s|)|"|,+0#0000000&| |t+0#00e0e07&|h|i|s|.+0#0000000&|_|f|s|t|,| |t+0#00e0e07&|h|i|s|.+0#0000000&|_|s|n|d|)+0#e000e06&| +0#0000000&@17
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 @57|1|8|,|9| @9|7|0|%| 
diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_02.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_02.dump
index 4dde18a4f9..163092f67d 100644
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_02.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_enum_02.dump
@@ -1,8 +1,8 @@
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|e|n|u|m| +0#0000000&@65
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|C|o|m@1|o|n|P|a|i|r|.+0#af5f00255&|H+0#0000000&|e|l@1|o|W|o|r|l|d| @46
-| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|C|o|m@1|o|n|P|a|i|r|.+0#af5f00255&|B+0#0000000&|o@1|l|e|a|n|s| @48
+| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|C|o|m@1|o|n|P|a|i|r|.|H|e|l@1|o|W|o|r|l|d| @46
+| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|C|o|m@1|o|n|P|a|i|r|.|B|o@1|l|e|a|n|s| @48
 | +0#0000e05#a8a8a8255@1> +0#0000000#ffffff0@72
 |~+0#4040ff13&| @73
 |~| @73
diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_03.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_03.dump
index 2fc1beb437..c285bf78c5 100644
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_03.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_03.dump
@@ -6,14 +6,14 @@
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3>v+0#af5f00255&|a|r| +0#0000000&|_|n|e|x|t|:| |L|i|s|t|a|b|l|e| @49
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|v+0#0000000&|a|l|u|e|:| |E|)+0#e000e06&| +0#0000000&@48
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|v|a|l|u|e| |=+0#af5f00255&| +0#0000000&|v|a|l|u|e| @45
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|i|z|e| |=+0#af5f00255&| +0#0000000&|1+0#e000002&| +0#0000000&@50
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|n|e|x|t| |=+0#af5f00255&| +0#0000000&|E|m|p|t|y|L|i|s|t|.+0#af5f00255&|I+0#0000000&|N|S|T|A|N|C|E| @33
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#0000000&|_|v|a|l|u|e| |=+0#af5f00255&| +0#0000000&|v|a|l|u|e| @45
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#0000000&|_|s|i|z|e| |=+0#af5f00255&| +0#0000000&|1+0#e000002&| +0#0000000&@50
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#0000000&|_|n|e|x|t| |=+0#af5f00255&| +0#0000000&|E|m|p|t|y|L|i|s|t|.|I|N|S|T|A|N|C|E| @33
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|_+0#00e0e07&|n|e|w|C|o|n|s|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|v+0#0000000&|a|l|u|e|:| |E|,| |s|i|z|e|:| |n+0#00e0003&|u|m|b|e|r|)+0#e000e06&| +0#0000000&@29
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|v|a|l|u|e| |=+0#af5f00255&| +0#0000000&|v|a|l|u|e| @45
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|i|z|e| |=+0#af5f00255&| +0#0000000&|s|i|z|e| @47
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#0000000&|_|v|a|l|u|e| |=+0#af5f00255&| +0#0000000&|v|a|l|u|e| @45
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#0000000&|_|s|i|z|e| |=+0#af5f00255&| +0#0000000&|s|i|z|e| @47
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|C|o|n|s|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|v+0#0000000&|a|l|u|e|:| |E|)+0#e000e06&|:+0#0000000&| |L|i|s|t|a|b|l|e| @37
diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_04.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_04.dump
index b8b324cefe..7a8cb82992 100644
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_04.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_04.dump
@@ -1,6 +1,6 @@
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|C|o|n|s|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|v+0#0000000&|a|l|u|e|:| |E|)+0#e000e06&|:+0#0000000&| |L|i|s|t|a|b|l|e| @37
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|c+0#af5f00255&|o|n|s|t| +0#0000000&|l|i|s|t|:| |L|i|s|t| |=+0#af5f00255&| +0#0000000&|L|i|s|t|.|_+0#00e0e07&|n|e|w|C|o|n|s|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|v+0#0000000&|a|l|u|e|,| |(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|i|z|e| |++0#af5f00255&| +0#0000000&|1+0#e000002&|)+0#e000e06&@1| +0#0000000&@4
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|l|i|s|t|.+0#af5f00255&|_+0#0000000&|n|e|x|t| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|h|i|s| +0#0000000&@47
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|c+0#af5f00255&|o|n|s|t| +0#0000000&|l|i|s|t|:| |L|i|s|t| |=+0#af5f00255&| +0#0000000&|L|i|s|t|.|_+0#00e0e07&|n|e|w|C|o|n|s|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|v+0#0000000&|a|l|u|e|,| |(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|s|i|z|e| |++0#af5f00255&| +0#0000000&|1+0#e000002&|)+0#e000e06&@1| +0#0000000&@4
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|l|i|s|t|.|_|n|e|x|t| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|h|i|s| +0#0000000&@47
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|l|i|s|t| @53
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 ||+0#0000e05#a8a8a8255| > +0#0000000#ffffff0@72
diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_05.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_05.dump
index 2269292539..858ba4f79b 100644
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_05.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_05.dump
@@ -1,17 +1,17 @@
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|R|e|s|t|(+0#e000e06&|)|:+0#0000000&| |L|i|s|t|a|b|l|e| @48
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|n|e|x|t| @47
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|n|e|x|t| @47
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|F|i|r|s|t|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |E| @51
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|v|a|l|u|e| @46
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|v|a|l|u|e| @46
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@51
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|i|z|e| |=+0#af5f00255&@1| +0#0000000&|0+0#e000002&|)+0#e000e06&| +0#0000000&@40
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|s|i|z|e| |=+0#af5f00255&@1| +0#0000000&|0+0#e000002&|)+0#e000e06&| +0#0000000&@40
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@51
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|s|i|z|e| @47
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|s|i|z|e| @47
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@48
diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_06.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_06.dump
index 508abd90d4..632e06aa4b 100644
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_06.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_06.dump
@@ -14,7 +14,7 @@
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|x|p|o|r|t| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|M|a|k|e|E|m|p|t|y|L|i|s|t|(+0#e000e06&|)|:+0#0000000&| |L|i|s|t|a|b|l|e| @36
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|E|m|p|t|y|L|i|s|t|.+0#af5f00255&|I+0#0000000&|N|S|T|A|N|C|E| @43
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|E|m|p|t|y|L|i|s|t|.|I|N|S|T|A|N|C|E| @43
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@66
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 @57|1|0|8|,|0|-|1| @6|5|2|%| 
diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_07.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_07.dump
index 881fb09688..2fe9aa8101 100644
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_07.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_07.dump
@@ -4,7 +4,7 @@
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d@1|e|f| +0#0000000&@66
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| >e+0#af5f00255#ffffff0|x|p|o|r|t| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|M|a|p|<+0#e000e06&|T+0#0000001#ffff4012|,+0#0000000#ffffff0| |U+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|l+0#0000000&|i|s|t|a|b|l|e|:| |L|i|s|t|a|b|l|e|,| |M|a|p@1|e|r|:| |f+0#00e0003&|u|n|c|(|T+0#0000000&|)+0#00e0003&|:+0#0000000&| |U|)+0#e000e06&|:+0#0000000&| |L|i|s|t|a|b|l|e| @2
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|r|e|s|u|l|t|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|E|m|p|t|y|L|i|s|t|.+0#af5f00255&|I+0#0000000&|N|S|T|A|N|C|E| @27
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|r|e|s|u|l|t|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|E|m|p|t|y|L|i|s|t|.|I|N|S|T|A|N|C|E| @27
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|l|i|s|t|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|l|i|s|t|a|b|l|e| @39
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|w+0#af5f00255&|h|i|l|e| +0#0000000&|!+0#af5f00255&|l+0#0000000&|i|s|t|.|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)| +0#0000000&@49
diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_08.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_08.dump
index c243859a68..974cb7c4c8 100644
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_08.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_08.dump
@@ -1,6 +1,6 @@
 |-+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|x|p|o|r|t| +0#0000000&|d+0#af5f00255&|e|f| +0#0000000&|F|i|l|t|e|r|<+0#e000e06&|T+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|l+0#0000000&|i|s|t|a|b|l|e|:| |L|i|s|t|a|b|l|e|,| |P|r|e|d|i|c|a|t|e|:| |f+0#00e0003&|u|n|c|(|T+0#0000000&|)+0#00e0003&|:+0#0000000&| |b+0#00e0003&|o@1|l|)+0#e000e06&|:+0#0000000&| |L|i|s|t|a
 |-+0#0000e05#a8a8a8255| |b+0#0000000#ffffff0|l|e| @69
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|r|e|s|u|l|t|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|E|m|p|t|y|L|i|s|t|.+0#af5f00255&|I+0#0000000&|N|S|T|A|N|C|E| @27
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|r|e|s|u|l|t|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|E|m|p|t|y|L|i|s|t|.|I|N|S|T|A|N|C|E| @27
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|l|i|s|t|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|l|i|s|t|a|b|l|e| @39
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3>w+0#af5f00255&|h|i|l|e| +0#0000000&|!+0#af5f00255&|l+0#0000000&|i|s|t|.|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)| +0#0000000&@49
diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_09.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_09.dump
index 4e41855706..f7980b15e2 100644
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_09.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_list_09.dump
@@ -1,13 +1,13 @@
 | +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|M|a|k|e|E|m|p|t|y|L|i|s|t|(+0#e000e06&|)| +0#0000000&@52
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 | +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|l|i|s|t|X|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|M|a|k|e|E|m|p|t|y|L|i|s|t|(+0#e000e06&|)| +0#0000000&@33
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|.+0#af5f00255&|C+0#0000000&|o|n|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|0+0#e000002&|)+0#e000e06&|.+0#af5f00255&|C+0#0000000&|o|n|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|1+0#e000002&|)+0#e000e06&|.+0#af5f00255&|C+0#0000000&|o|n|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|2+0#e000002&|)+0#e000e06&|.+0#af5f00255&|C+0#0000000&|o|n|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|3+0#e000002&|)+0#e000e06&| +0#0000000&@4
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|.+0#af5f00255&|C+0#0000000&|o|n|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|0+0#e000002&|)+0#e000e06&|.+0#0000000&|C|o|n|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|1+0#e000002&|)+0#e000e06&|.+0#0000000&|C|o|n|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|2+0#e000002&|)+0#e000e06&|.+0#0000000&|C|o|n|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|3+0#e000002&|)+0#e000e06&| +0#0000000&@4
 | +0#0000e05#a8a8a8255@1|c+0#af5f00255#ffffff0|o|n|s|t| +0#0000000&|l|i|s|t|Y|:| |L|i|s|t|a|b|l|e| |=+0#af5f00255&| +0#0000000&|M|a|k|e|L|i|s|t|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|0+0#e000002&|)+0#e000e06&| +0#0000000&@29
-| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3>.+0#af5f00255&|C+0#0000000&|o|n|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|1+0#e000002&|)+0#e000e06&|.+0#af5f00255&|C+0#0000000&|o|n|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|2+0#e000002&|)+0#e000e06&|.+0#af5f00255&|C+0#0000000&|o|n|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|3+0#e000002&|)+0#e000e06&| +0#0000000&@20
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3>.+0#af5f00255&|C+0#0000000&|o|n|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|1+0#e000002&|)+0#e000e06&|.+0#0000000&|C|o|n|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|2+0#e000002&|)+0#e000e06&|.+0#0000000&|C|o|n|s|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|3+0#e000002&|)+0#e000e06&| +0#0000000&@20
 | +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|l|i|s|t|X| |=+0#af5f00255&@1| +0#0000000&|l|i|s|t|Y| @53
 | +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|l|i|s|t|X| @62
 | +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|l|i|s|t|X|.|R|e|v|e|r|s|e|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|)| +0#0000000&@44
-| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|M|a|k|e|E|m|p|t|y|L|i|s|t|(+0#e000e06&|)|.+0#af5f00255&|R+0#0000000&|e|v|e|r|s|e|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|)| +0#0000000&@37
+| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|M|a|k|e|E|m|p|t|y|L|i|s|t|(+0#e000e06&|)|.+0#0000000&|R|e|v|e|r|s|e|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|)| +0#0000000&@37
 | +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|F|i|l|t|e|r|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|(|l+0#0000000&|i|s|t|X|,| |(+0#e000e06&|v+0#0000000&|a|l|u|e|:| |n+0#00e0003&|u|m|b|e|r|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|v|a|l|u|e| |%+0#af5f00255&| +0#0000000&|2+0#e000002&| +0#0000000&|!+0#af5f00255&|=| +0#0000000&|0+0#e000002&|)+0#e000e06&| +0#0000000&@11
 | +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|M|a|p|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |s+0#00e0003&|t|r|i|n|g|>+0#e000e06&|(|l+0#0000000&|i|s|t|X|,| |(+0#e000e06&|v+0#0000000&|a|l|u|e|:| |n+0#00e0003&|u|m|b|e|r|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|n+0#00e0e07&|r|2|c|h|a|r|(+0#e000e06&@1|v+0#0000000&|a|l|u|e| |++0#af5f00255&| +0#0000000&|6+0#e000002&|0|)+0#e000e06&|,+0#0000000&| 
 | +0#0000e05#a8a8a8255@1|1+0#e000002#ffffff0|)+0#e000e06&@1| +0#0000000&@69
diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_01.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_01.dump
index d68c0a2ad3..b9790765de 100644
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_01.dump
@@ -5,15 +5,15 @@
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 ||+0#0000e05#a8a8a8255| > +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)| +0#0000000&@56
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s| |=+0#af5f00255&| +0#0000000&|{+0#e000e06&|}| +0#0000000&@45
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|a|p@1|e|r| |=+0#af5f00255&| +0#0000000&|_|M|a|p@1|e|r|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(@1|s+0#0000000&|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&|:+0#0000000&| |E| |=+0#af5f00255&|>| +0#0000000&|e+0#00e0e07&|v|a|l|(+0#e000e06&|s+0#0000000&|)+0#e000e06&@1| +0#0000000&@12
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|T+0#0000000&|o|S|t|r|i|n|g|e|r| |=+0#af5f00255&| +0#0000000&|(+0#e000e06&|a+0#0000000&|:| |E|)+0#e000e06&|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|a+0#0000000&|)+0#e000e06&| +0#0000000&@19
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|F+0#0000000&|r|o|m|S|t|r|i|n|g|e|r| |=+0#af5f00255&| +0#0000000&|(+0#e000e06&|s+0#0000000&|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&|:+0#0000000&| |E| |=+0#af5f00255&|>| +0#0000000&|e+0#00e0e07&|v|a|l|(+0#e000e06&|s+0#0000000&|)+0#e000e06&| +0#0000000&@19
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#0000000&|_|e|l|e|m|e|n|t|s| |=+0#af5f00255&| +0#0000000&|{+0#e000e06&|}| +0#0000000&@45
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#0000000&|_|M|a|p@1|e|r| |=+0#af5f00255&| +0#0000000&|_|M|a|p@1|e|r|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(@1|s+0#0000000&|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&|:+0#0000000&| |E| |=+0#af5f00255&|>| +0#0000000&|e+0#00e0e07&|v|a|l|(+0#e000e06&|s+0#0000000&|)+0#e000e06&@1| +0#0000000&@12
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#0000000&|T|o|S|t|r|i|n|g|e|r| |=+0#af5f00255&| +0#0000000&|(+0#e000e06&|a+0#0000000&|:| |E|)+0#e000e06&|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|a+0#0000000&|)+0#e000e06&| +0#0000000&@19
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#0000000&|F|r|o|m|S|t|r|i|n|g|e|r| |=+0#af5f00255&| +0#0000000&|(+0#e000e06&|s+0#0000000&|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&|:+0#0000000&| |E| |=+0#af5f00255&|>| +0#0000000&|e+0#00e0e07&|v|a|l|(+0#e000e06&|s+0#0000000&|)+0#e000e06&| +0#0000000&@19
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|e+0#0000000&|l|e|m|e|n|t|s|:| |l+0#00e0003&|i|s|t|<|E+0#0000000&|>+0#00e0003&|,+0#0000000&| |T|o|S|t|r|i|n|g|e|r|:| |f+0#00e0003&|u|n|c|(|E+0#0000000&|)+0#00e0003&|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|,+0#0000000&| @2
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@39|F|r|o|m|S|t|r|i|n|g|e|r|:| |f+0#00e0003&|u|n|c|(|s|t|r|i|n|g|)|:+0#0000000&| |E|)+0#e000e06&| +0#0000000&@2
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s| |=+0#af5f00255&| +0#0000000&|e|l|e|m|e|n|t|s| @39
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#0000000&|_|e|l|e|m|e|n|t|s| |=+0#af5f00255&| +0#0000000&|e|l|e|m|e|n|t|s| @39
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|r+0#00e0e07&|e|d|u|c|e|(+0#e000e06&@2|F+0#0000000&|:| |f+0#00e0003&|u|n|c|(|E+0#0000000&|)+0#00e0003&|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|d+0#0000000&|:| |d+0#00e0003&|i|c|t|<|n|u|m|b|e|r|>|,+0#0000000&| |v|:| |E|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15|e+0#00e0e07&|x|t|e|n|d|(+0#e000e06&|{|[|F+0#0000000&|(+0#e000e06&|v+0#0000000&|)+0#e000e06&|]|:+0#0000000&| |1+0#e000002&|}+0#e000e06&|,+0#0000000&| |d|)+0#e000e06&@1|(|T+0#0000000&|o|S|t|r|i|n|g|e|r|)+0#e000e06&|,+0#0000000&| @20
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15|{+0#e000e06&|}|)| +0#0000000&@53
diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_02.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_02.dump
index c9388ef44b..8a2ca54066 100644
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_02.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_02.dump
@@ -1,20 +1,20 @@
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15|{+0#e000e06&|}|)| +0#0000000&@53
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|a|p@1|e|r| |=+0#af5f00255&| +0#0000000&|_|M|a|p@1|e|r|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|F+0#0000000&|r|o|m|S|t|r|i|n|g|e|r|)+0#e000e06&| +0#0000000&@25
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|T+0#0000000&|o|S|t|r|i|n|g|e|r| |=+0#af5f00255&| +0#0000000&|T|o|S|t|r|i|n|g|e|r| @36
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#af5f00255&|F+0#0000000&|r|o|m|S|t|r|i|n|g|e|r| |=+0#af5f00255&| +0#0000000&|F|r|o|m|S|t|r|i|n|g|e|r| @32
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#0000000&|_|M|a|p@1|e|r| |=+0#af5f00255&| +0#0000000&|_|M|a|p@1|e|r|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|F+0#0000000&|r|o|m|S|t|r|i|n|g|e|r|)+0#e000e06&| +0#0000000&@25
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#0000000&|T|o|S|t|r|i|n|g|e|r| |=+0#af5f00255&| +0#0000000&|T|o|S|t|r|i|n|g|e|r| @36
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|t+0#00e0e07&|h|i|s|.+0#0000000&|F|r|o|m|S|t|r|i|n|g|e|r| |=+0#af5f00255&| +0#0000000&|F|r|o|m|S|t|r|i|n|g|e|r| @32
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 ||+0#0000e05#a8a8a8255| > +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|_|F|r|o|m|L|i|s|t|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|e+0#0000000&|l|e|m|e|n|t|s|:| |l+0#00e0003&|i|s|t|<|E+0#0000000&|>+0#00e0003&|)+0#e000e06&|:+0#0000000&| |S|e|t| @28
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|S|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|e+0#0000000&|l|e|m|e|n|t|s|,| |t+0#00e0e07&|h|i|s|.+0#af5f00255&|T+0#0000000&|o|S|t|r|i|n|g|e|r|,| |t+0#00e0e07&|h|i|s|.+0#af5f00255&|F+0#0000000&|r|o|m|S|t|r
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|S|e|t|.|n+0#00e0e07&|e|w|F|r|o|m|L|i|s|t|<+0#e000e06&|E+0#0000000&|>+0#e000e06&|(|e+0#0000000&|l|e|m|e|n|t|s|,| |t+0#00e0e07&|h|i|s|.+0#0000000&|T|o|S|t|r|i|n|g|e|r|,| |t+0#00e0e07&|h|i|s|.+0#0000000&|F|r|o|m|S|t|r
 |2+0#0000e05#a8a8a8255| |i+0#0000000#ffffff0|n|g|e|r|)+0#e000e06&| +0#0000000&@66
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|C|o|n|t|a|i|n|s|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|e+0#0000000&|l|e|m|e|n|t|:| |E|)+0#e000e06&|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@35
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|h+0#00e0e07&|a|s|_|k|e|y|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|,| |t+0#00e0e07&|h|i|s|.+0#0000000&|T|o|S|t|r|i|n|g|e|r|(+0#e000e06&|e+0#0000000&|l|e|m|e|n|t|)+0#e000e06&@1| +0#0000000&@8
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|h+0#00e0e07&|a|s|_|k|e|y|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|e|l|e|m|e|n|t|s|,| |t+0#00e0e07&|h|i|s|.+0#0000000&|T|o|S|t|r|i|n|g|e|r|(+0#e000e06&|e+0#0000000&|l|e|m|e|n|t|)+0#e000e06&@1| +0#0000000&@8
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|E|l|e|m|e|n|t|s|<+0#e000e06&|E+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|)|:+0#0000000&| |l+0#00e0003&|i|s|t|<|E+0#0000000&|>+0#00e0003&| +0#0000000&@42
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&|-+0#af5f00255&|>|m+0#00e0e07&|a|p|n|e|w|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|a|p@1|e|r|)+0#e000e06&| +0#0000000&@15
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|k+0#00e0e07&|e|y|s|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|e|l|e|m|e|n|t|s|)+0#e000e06&|-+0#af5f00255&|>|m+0#00e0e07&|a|p|n|e|w|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|M|a|p@1|e|r|)+0#e000e06&| +0#0000000&@15
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 @57|3|5|,|0|-|1| @7|1|8|%| 
diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_03.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_03.dump
index 84f58af60b..d17b1b3045 100644
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_03.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_03.dump
@@ -1,20 +1,20 @@
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|)|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@51
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&@36
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|e+0#00e0e07&|m|p|t|y|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&@36
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3>d+0#af5f00255&|e|f| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@51
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&@38
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&@38
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|)|:+0#0000000&| |s+0#00e0003&|t|r|i|n|g| +0#0000000&@48
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|k+0#00e0e07&|e|y|s|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&@1| +0#0000000&@29
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#00e0e07&|t|r|i|n|g|(+0#e000e06&|k+0#00e0e07&|e|y|s|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|e|l|e|m|e|n|t|s|)+0#e000e06&@1| +0#0000000&@29
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|#+0#0000e05&| |{|1|,| |2|,| |3|}| |⊇| |{|1|,| |2|}|.| +0#0000000&@47
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|S|u|p|e|r|s|e|t|(+0#e000e06&|t+0#0000000&|h|a|t|:| |S|e|t|)+0#e000e06&|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@39
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&|l+0#00e0e07&|e|n|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&|>+0#af5f00255&|=| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|t+0#0000000&|h|a|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&@1| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|t|h|a|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&|l+0#00e0e07&|e|n|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&|>+0#af5f00255&|=| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|t+0#0000000&|h|a|t|.|_|e|l|e|m|e|n|t|s|)+0#e000e06&@1| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|t|h|a|t|.|_|e|l|e|m
 |2+0#0000e05#a8a8a8255| |e+0#0000000#ffffff0|n|t|s| @68
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|k+0#00e0e07&|e|y|s|(+0#e000e06&|)| +0#0000000&@52
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|i+0#00e0e07&|n|d|e|x|o|f|(+0#e000e06&@2|s+0#0000000&|e|t|:| |S|e|t|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|!+0#af5f00255&|s+0#0000000&|e|t|.+0#af5f00255&|_+0#0000000&|e|@+0#4040ff13&@2
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|i+0#00e0e07&|n|d|e|x|o|f|(+0#e000e06&@2|s+0#0000000&|e|t|:| |S|e|t|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|!+0#af5f00255&|s+0#0000000&|e|t|.|_|e|@+0#4040ff13&@2
 | +0#0000000&@56|5|2|,|5| @9|2|8|%| 
diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_04.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_04.dump
index f0ef27db55..5a7d673b1c 100644
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_04.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_04.dump
@@ -1,14 +1,14 @@
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|i+0#00e0e07&|n|d|e|x|o|f|(+0#e000e06&@2|s+0#0000000&|e|t|:| |S|e|t|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|!+0#af5f00255&|s+0#0000000&|e|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|i+0#00e0e07&|n|d|e|x|o|f|(+0#e000e06&@2|s+0#0000000&|e|t|:| |S|e|t|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|!+0#af5f00255&|s+0#0000000&|e|t|.|_|e|l|e|m
 |2+0#0000e05#a8a8a8255| |e+0#0000000#ffffff0|n|t|s| @68
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15|-+0#af5f00255&|>|h+0#00e0e07&|a|s|_|k|e|y|(+0#e000e06&|v+0#0000000&|)+0#e000e06&@1|(|t+0#00e0e07&|h|i|s|)+0#e000e06&@1| +0#0000000&|<+0#af5f00255&| +0#0000000&|0+0#e000002&| +0#0000000&@32
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3>#+0#0000e05&| |{|1|,| |2|}| |⊆| |{|1|,| |2|,| |3|}|.| +0#0000000&@47
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|S|u|b|s|e|t|(+0#e000e06&|t+0#0000000&|h|a|t|:| |S|e|t|)+0#e000e06&|:+0#0000000&| |b+0#00e0003&|o@1|l| +0#0000000&@41
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&|l+0#00e0e07&|e|n|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&|<+0#af5f00255&|=| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|t+0#0000000&|h|a|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&@1| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&|l+0#00e0e07&|e|n|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&|<+0#af5f00255&|=| +0#0000000&|l+0#00e0e07&|e|n|(+0#e000e06&|t+0#0000000&|h|a|t|.|_|e|l|e|m|e|n|t|s|)+0#e000e06&@1| +0#0000000&|&+0#af5f00255&@1| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|e|l|e|m
 |2+0#0000e05#a8a8a8255| |e+0#0000000#ffffff0|n|t|s| @68
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|k+0#00e0e07&|e|y|s|(+0#e000e06&|)| +0#0000000&@52
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|i+0#00e0e07&|n|d|e|x|o|f|(+0#e000e06&@2|s+0#0000000&|e|t|:| |S|e|t|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|!+0#af5f00255&|s+0#0000000&|e|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|i+0#00e0e07&|n|d|e|x|o|f|(+0#e000e06&@2|s+0#0000000&|e|t|:| |S|e|t|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|!+0#af5f00255&|s+0#0000000&|e|t|.|_|e|l|e|m
 |2+0#0000e05#a8a8a8255| |e+0#0000000#ffffff0|n|t|s| @68
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15|-+0#af5f00255&|>|h+0#00e0e07&|a|s|_|k|e|y|(+0#e000e06&|v+0#0000000&|)+0#e000e06&@1|(|t+0#0000000&|h|a|t|)+0#e000e06&@1| +0#0000000&|<+0#af5f00255&| +0#0000000&|0+0#e000002&| +0#0000000&@32
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
@@ -16,5 +16,5 @@
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|#+0#0000e05&| |{|1|,| |2|,| |3|}| |∪| |{|2|,| |3|,| |4|}| |=| |{|1|,| |2|,| |3|,| |4|}|.| +0#0000000&@29
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|U|n|i|o|n|(+0#e000e06&|t+0#0000000&|h|a|t|:| |S|e|t|)+0#e000e06&|:+0#0000000&| |S|e|t| @43
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|F|r|o|m|L|i|s|t|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|{|}| +0#0000000&@35
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|e+0#00e0e07&|x|t|e|n|d|(+0#e000e06&|t+0#0000000&|h|a|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&@36
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|e+0#00e0e07&|x|t|e|n|d|(+0#e000e06&|t+0#0000000&|h|a|t|.|_|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&@36
 @57|6|8|,|5| @9|3|9|%| 
diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_05.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_05.dump
index 32901e8ee4..bf0b76c842 100644
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_05.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_05.dump
@@ -1,17 +1,17 @@
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|e+0#00e0e07&|x|t|e|n|d|(+0#e000e06&|t+0#0000000&|h|a|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&@36
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|e+0#00e0e07&|x|t|e|n|d|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&@36
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|e+0#00e0e07&|x|t|e|n|d|(+0#e000e06&|t+0#0000000&|h|a|t|.|_|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&@36
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|e+0#00e0e07&|x|t|e|n|d|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|e|l|e|m|e|n|t|s|)+0#e000e06&| +0#0000000&@36
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|k+0#00e0e07&|e|y|s|(+0#e000e06&|)| +0#0000000&@52
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|m+0#00e0e07&|a|p|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|a|p@1|e|r|)+0#e000e06&@1| +0#0000000&@40
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|m+0#00e0e07&|a|p|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|M|a|p@1|e|r|)+0#e000e06&@1| +0#0000000&@40
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 ||+0#0000e05#a8a8a8255| > +0#0000000#ffffff0@72
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|#+0#0000e05&| |{|1|,| |2|,| |3|}| |∩| |{|2|,| |3|,| |4|}| |=| |{|2|,| |3|}|.| +0#0000000&@35
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|I|n|t|e|r|s|e|c|t|i|o|n|(+0#e000e06&|t+0#0000000&|h|a|t|:| |S|e|t|)+0#e000e06&|:+0#0000000&| |S|e|t| @36
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|F|r|o|m|L|i|s|t|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s| @23
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|F|r|o|m|L|i|s|t|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|t+0#00e0e07&|h|i|s|.+0#0000000&|_|e|l|e|m|e|n|t|s| @23
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|k+0#00e0e07&|e|y|s|(+0#e000e06&|)| +0#0000000&@52
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|f+0#00e0e07&|i|l|t|e|r|(+0#e000e06&@2|s+0#0000000&|e|t|:| |S|e|t|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|s|e|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|f+0#00e0e07&|i|l|t|e|r|(+0#e000e06&@2|s+0#0000000&|e|t|:| |S|e|t|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|s|e|t|.|_|e|l|e|m|e|n
 |2+0#0000e05#a8a8a8255| |t+0#0000000#ffffff0|s| @70
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15|-+0#af5f00255&|>|h+0#00e0e07&|a|s|_|k|e|y|(+0#e000e06&|v+0#0000000&|)+0#e000e06&@1|(|t+0#0000000&|h|a|t|)+0#e000e06&@1| +0#0000000&@36
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|m+0#00e0e07&|a|p|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|a|p@1|e|r|)+0#e000e06&@1| +0#0000000&@40
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|m+0#00e0e07&|a|p|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|M|a|p@1|e|r|)+0#e000e06&@1| +0#0000000&@40
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|#+0#0000e05&| |{|1|,| |2|,| |3|}| |\| |{|2|,| |3|,| |4|}| |=| |{|1|}|.| +0#0000000&@38
diff --git a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_06.dump b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_06.dump
index c613084a97..6024e2dd1b 100644
--- a/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_06.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_function_example_set_06.dump
@@ -1,15 +1,15 @@
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|S|e|t|D|i|f@1|e|r|e|n|c|e|(+0#e000e06&|t+0#0000000&|h|a|t|:| |S|e|t|)+0#e000e06&|:+0#0000000&| |S|e|t| @35
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|F|r|o|m|L|i|s|t|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e|n|t|s| @23
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|F|r|o|m|L|i|s|t|<+0#e000e06&|a+0#00e0003&|n|y|>+0#e000e06&|(|t+0#00e0e07&|h|i|s|.+0#0000000&|_|e|l|e|m|e|n|t|s| @23
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|k+0#00e0e07&|e|y|s|(+0#e000e06&|)| +0#0000000&@52
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|f+0#00e0e07&|i|l|t|e|r|(+0#e000e06&@2|s+0#0000000&|e|t|:| |S|e|t|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|!+0#af5f00255&|s+0#0000000&|e|t|.+0#af5f00255&|_+0#0000000&|e|l|e|m|e
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|f+0#00e0e07&|i|l|t|e|r|(+0#e000e06&@2|s+0#0000000&|e|t|:| |S|e|t|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|(+0#e000e06&|_+0#0000000&|:| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |v|:| |s+0#00e0003&|t|r|i|n|g|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|!+0#af5f00255&|s+0#0000000&|e|t|.|_|e|l|e|m|e
 |2+0#0000e05#a8a8a8255| |n+0#0000000#ffffff0|t|s| @69
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@15>-+0#af5f00255&|>|h+0#00e0e07&|a|s|_|k|e|y|(+0#e000e06&|v+0#0000000&|)+0#e000e06&@1|(|t+0#0000000&|h|a|t|)+0#e000e06&@1| +0#0000000&@36
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|m+0#00e0e07&|a|p|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|a|p@1|e|r|)+0#e000e06&@1| +0#0000000&@40
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@11|-+0#af5f00255&|>|m+0#00e0e07&|a|p|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|M|a|p@1|e|r|)+0#e000e06&@1| +0#0000000&@40
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|#+0#0000e05&| |{|1|,| |2|,| |3|}| |â–³| |{|2|,| |3|,| |4|}| |=| |{|1|,| |4|}|.| +0#0000000&@35
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|S|y|m@1|e|t|r|i|c|D|i|f@1|e|r|e|n|c|e|(+0#e000e06&|t+0#0000000&|h|a|t|:| |S|e|t|)+0#e000e06&|:+0#0000000&| |S|e|t| @29
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|U|n|i|o|n|(+0#e000e06&|t+0#0000000&|h|a|t|)+0#e000e06&|.+0#af5f00255&|S+0#0000000&|e|t|D|i|f@1|e|r|e|n|c|e|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#0000000&|I|n|t|e|r|s|e|c|t|i|o|n|(+0#e000e06&|t+0#0000000&|h|a|t|)+0#e000e06&@1| +0#0000000&@2
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|U|n|i|o|n|(+0#e000e06&|t+0#0000000&|h|a|t|)+0#e000e06&|.+0#0000000&|S|e|t|D|i|f@1|e|r|e|n|c|e|(+0#e000e06&|t+0#00e0e07&|h|i|s|.+0#0000000&|I|n|t|e|r|s|e|c|t|i|o|n|(+0#e000e06&|t+0#0000000&|h|a|t|)+0#e000e06&@1| +0#0000000&@2
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@62
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
diff --git a/runtime/syntax/testdir/dumps/vim9_generic_functions_03.dump b/runtime/syntax/testdir/dumps/vim9_generic_functions_03.dump
index e38ebf06bb..caeacdee1f 100644
--- a/runtime/syntax/testdir/dumps/vim9_generic_functions_03.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_functions_03.dump
@@ -8,13 +8,13 @@
 | +0#0000e05#a8a8a8255@1|v+0#af5f00255#ffffff0|a|r| +0#0000000&|F|o@1| |=+0#af5f00255&| +0#0000000&|B|a|r|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&| +0#0000000&@51
 | +0#0000e05#a8a8a8255@1|E+0#0000000#ffffff0|x|e|c|u|t|e|(+0#e000e06&|B+0#0000000&|a|r|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&|)| +0#0000000&@52
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|v+0#af5f00255#ffffff0|a|r| +0#0000000&|F|o@1| |=+0#af5f00255&| +0#0000000&|b|a|r|.+0#af5f00255&|B+0#0000000&|a|z|<+0#e000e06&|s+0#00e0003&|t|r|i|n|g|>+0#e000e06&| +0#0000000&@47
-| +0#0000e05#a8a8a8255@1|E+0#0000000#ffffff0|x|e|c|u|t|e|(+0#e000e06&|b+0#0000000&|a|r|.+0#af5f00255&|B+0#0000000&|a|z|<+0#e000e06&|s+0#00e0003&|t|r|i|n|g|>+0#e000e06&|)| +0#0000000&@48
+| +0#0000e05#a8a8a8255@1|v+0#af5f00255#ffffff0|a|r| +0#0000000&|F|o@1| |=+0#af5f00255&| +0#0000000&|b|a|r|.|B|a|z|<+0#e000e06&|s+0#00e0003&|t|r|i|n|g|>+0#e000e06&| +0#0000000&@47
+| +0#0000e05#a8a8a8255@1|E+0#0000000#ffffff0|x|e|c|u|t|e|(+0#e000e06&|b+0#0000000&|a|r|.|B|a|z|<+0#e000e06&|s+0#00e0003&|t|r|i|n|g|>+0#e000e06&|)| +0#0000000&@48
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| |c+0#af5f00255#ffffff0|l|a|s@1| +0#0000000&|F|o@1| @63
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|d+0#af5f00255&|e|f| +0#0000000&|_|M|e|t|h|o|d|A|<+0#e000e06&|T+0#0000001#ffff4012|>+0#e000e06#ffffff0|(|a+0#0000000&|r|g|:| |T|)+0#e000e06&| +0#0000000&@47
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|e+0#af5f00255&|c|h|o| +0#0000000&|a|r|g| @60
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|d+0#af5f00255&|e|f| +0#0000000&|M|e|t|h|o|d|B|(+0#e000e06&|)| +0#0000000&@57
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|F| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|e|t|h|o|d|A|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&| +0#0000000&@39
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|F| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|M|e|t|h|o|d|A|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&| +0#0000000&@39
 @57|5@1|,|1| @9|6|2|%| 
diff --git a/runtime/syntax/testdir/dumps/vim9_generic_functions_04.dump b/runtime/syntax/testdir/dumps/vim9_generic_functions_04.dump
index 791efc23c9..adb4dc4503 100644
--- a/runtime/syntax/testdir/dumps/vim9_generic_functions_04.dump
+++ b/runtime/syntax/testdir/dumps/vim9_generic_functions_04.dump
@@ -1,11 +1,11 @@
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|F| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|_+0#0000000&|M|e|t|h|o|d|A|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&| +0#0000000&@39
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|F| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|_|M|e|t|h|o|d|A|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&| +0#0000000&@39
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|F|(+0#e000e06&|"+0#e000002&|t|e|x|t|"|)+0#e000e06&| +0#0000000&@59
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |-+0#0000e05#a8a8a8255| >c+0#af5f00255#ffffff0|l|a|s@1| +0#0000000&|B|a|r| |e+0#af5f00255&|x|t|e|n|d|s| +0#0000000&|F|o@1| @51
 |-+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|d+0#af5f00255&|e|f| +0#0000000&|M|e|t|h|o|d|C|(+0#e000e06&|)| +0#0000000&@57
-|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|F| |=+0#af5f00255&| +0#0000000&|s+0#00e0e07&|u|p|e|r|.+0#af5f00255&|_+0#0000000&|M|e|t|h|o|d|A|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&| +0#0000000&@38
+|2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|F| |=+0#af5f00255&| +0#0000000&|s+0#00e0e07&|u|p|e|r|.+0#0000000&|_|M|e|t|h|o|d|A|<+0#e000e06&|n+0#00e0003&|u|m|b|e|r|>+0#e000e06&| +0#0000000&@38
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@3|F|(+0#e000e06&|"+0#e000002&|t|e|x|t|"|)+0#e000e06&| +0#0000000&@59
 |2+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
diff --git a/runtime/syntax/testdir/dumps/vim9_lambdas_08.dump b/runtime/syntax/testdir/dumps/vim9_lambdas_08.dump
index 10fad7f49f..0194343af0 100644
--- a/runtime/syntax/testdir/dumps/vim9_lambdas_08.dump
+++ b/runtime/syntax/testdir/dumps/vim9_lambdas_08.dump
@@ -12,7 +12,7 @@
 @75
 |d+0#af5f00255&|e|f| +0#0000000&|O|p|(+0#e000e06&|)|:+0#0000000&| |f+0#00e0003&|u|n|c|(|f|u|n|c|(|n|u|m|b|e|r|,+0#0000000&| |n+0#00e0003&|u|m|b|e|r|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|)|:+0#0000000&| |f+0#00e0003&|u|n|c|(|n|u|m|b|e|r|,+0#0000000&| |D|i|g|i|t|)+0#00e0003&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@1
 @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#0000001#ffff4012|F+0#00e0e07#ffffff0|:+0#0000000&| |f+0#00e0003&|u|n|c|(|n|u|m|b|e|r|,+0#0000000&| |n+0#00e0003&|u|m|b|e|r|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|)+0#0000001#ffff4012| +0#0000000#ffffff0|=+0#0000001#ffff4012|>| +0#0000000#ffffff0@27
-@8|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |y+0#00e0e07&|:+0#0000000&| |D|i|g|i|t|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|F|(+0#e000e06&|x+0#00e0e07&|,+0#0000000&| |y+0#00e0e07&|.+0#af5f00255&|v+0#00e0e07&|a|l|u|e|)+0#e000e06&| +0#0000000&@20
+@8|(+0#0000001#ffff4012|x+0#00e0e07#ffffff0|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|,+0#0000000&| |y+0#00e0e07&|:+0#0000000&| |D|i|g|i|t|)+0#0000001#ffff4012|:+0#0000000#ffffff0| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#0000001#ffff4012|>| +0#0000000#ffffff0|F|(+0#e000e06&|x+0#00e0e07&|,+0#0000000&| |y+0#00e0e07&|.+0#0000000&|v+0#00e0e07&|a|l|u|e|)+0#e000e06&| +0#0000000&@20
 |e+0#af5f00255&|n|d@1|e|f| +0#0000000&|#+0#0000e05&@22| |^| |v|i|m|C|o|m@1|a|n|d|?| +0#0000000&@30
 @75
 @75
diff --git a/runtime/syntax/testdir/dumps/vim9_legacy_header_00.dump b/runtime/syntax/testdir/dumps/vim9_legacy_header_00.dump
index f01edc18fb..456cd3b731 100644
--- a/runtime/syntax/testdir/dumps/vim9_legacy_header_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_legacy_header_00.dump
@@ -5,7 +5,7 @@
 @75
 |i+0#af5f00255&|f| +0#0000000&|!+0#af5f00255&|h+0#00e0e07&|a|s|(+0#e000e06&|'+0#e000002&|v|i|m|9|s|c|r|i|p|t|'|)+0#e000e06&| +0#0000000&@53
 @2|#| |4+0#e000002&|2| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@58
-@2|s+0#af5f00255&|o|u|r|c|e| +0#00e0e07&|f|o@1|.+0#af5f00255&|v+0#00e0e07&|i|m| +0#0000000&@58
+@2|s+0#af5f00255&|o|u|r|c|e| +0#00e0e07&|f|o@1|.+0#0000000&|v+0#00e0e07&|i|m| +0#0000000&@58
 @2|f+0#af5f00255&|i|n|i|s|h| +0#0000000&@66
 |e+0#af5f00255&|n|d|i|f| +0#0000000&@69
 @75
diff --git a/runtime/syntax/testdir/dumps/vim9_legacy_header_fold_00.dump b/runtime/syntax/testdir/dumps/vim9_legacy_header_fold_00.dump
index 89b32ceae0..3852e3665d 100644
--- a/runtime/syntax/testdir/dumps/vim9_legacy_header_fold_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_legacy_header_fold_00.dump
@@ -7,7 +7,7 @@
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
 ||+0#0000e05#a8a8a8255| |i+0#af5f00255#ffffff0|f| +0#0000000&|!+0#af5f00255&|h+0#00e0e07&|a|s|(+0#e000e06&|'+0#e000002&|v|i|m|9|s|c|r|i|p|t|'|)+0#e000e06&| +0#0000000&@51
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|#| |4+0#e000002&|2| +0#0000000&|"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@56
-||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|s+0#af5f00255&|o|u|r|c|e| +0#0000000&|f|o@1|.+0#af5f00255&|v+0#0000000&|i|m| @56
+||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|s+0#af5f00255&|o|u|r|c|e| +0#0000000&|f|o@1|.|v|i|m| @56
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@1|f+0#af5f00255&|i|n|i|s|h| +0#0000000&@64
 ||+0#0000e05#a8a8a8255| |e+0#af5f00255#ffffff0|n|d|i|f| +0#0000000&@67
 ||+0#0000e05#a8a8a8255| | +0#0000000#ffffff0@72
diff --git a/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_00.dump b/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_00.dump
index 8a7d4edd94..525ab4b920 100644
--- a/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_00.dump
@@ -9,11 +9,11 @@
 @2|v+0#af5f00255&|a|r| +0#0000000&|_+0#00e0e07&|v|a|l|u|e|:+0#0000000&| |a+0#00e0003&|n|y| +0#0000000&@57
 @75
 @2|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|(+0#e000e06&|v+0#00e0e07&|a|l|u|e|:+0#0000000&| |a+0#00e0003&|n|y|)+0#e000e06&| +0#0000000&@53
-@3| +0#00e0e07&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|_+0#0000000&|B|a|s|e|I|n|i|t|(+0#e000e06&|v+0#00e0e07&|a|l|u|e|)+0#e000e06&| +0#0000000&@49
+@3| +0#00e0e07&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|_|B|a|s|e|I|n|i|t|(+0#e000e06&|v+0#00e0e07&|a|l|u|e|)+0#e000e06&| +0#0000000&@49
 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
 @75
 @2|d+0#af5f00255&|e|f| +0#0000000&|_|B|a|s|e|I|n|i|t|(+0#e000e06&|v+0#00e0e07&|a|l|u|e|:+0#0000000&| |a+0#00e0003&|n|y|)+0#e000e06&| +0#0000000&@47
-@3| +0#00e0e07&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|_+0#00e0e07&|v|a|l|u|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|v+0#00e0e07&|a|l|u|e| +0#0000000&@51
+@3| +0#00e0e07&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|_+0#00e0e07&|v|a|l|u|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|v+0#00e0e07&|a|l|u|e| +0#0000000&@51
 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
 @75
 @2|d+0#af5f00255&|e|f| +0#0000000&|V|a|l|u|e|(+0#e000e06&|)|:+0#0000000&| |a+0#00e0003&|n|y| +0#0000000&@56
diff --git a/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_01.dump b/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_01.dump
index aaa99d7464..325cbec165 100644
--- a/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_01.dump
@@ -1,20 +1,20 @@
 | +0&#ffffff0@74
 @2|d+0#af5f00255&|e|f| +0#0000000&|_|B|a|s|e|I|n|i|t|(+0#e000e06&|v+0#00e0e07&|a|l|u|e|:+0#0000000&| |a+0#00e0003&|n|y|)+0#e000e06&| +0#0000000&@47
-@3| +0#00e0e07&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|_+0#00e0e07&|v|a|l|u|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|v+0#00e0e07&|a|l|u|e| +0#0000000&@51
+@3| +0#00e0e07&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|_+0#00e0e07&|v|a|l|u|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|v+0#00e0e07&|a|l|u|e| +0#0000000&@51
 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
 @75
 @2>d+0#af5f00255&|e|f| +0#0000000&|V|a|l|u|e|(+0#e000e06&|)|:+0#0000000&| |a+0#00e0003&|n|y| +0#0000000&@56
-@4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|_+0#00e0e07&|v|a|l|u|e| +0#0000000&@52
+@4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|_+0#00e0e07&|v|a|l|u|e| +0#0000000&@52
 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
 |e+0#af5f00255&|n|d|c|l|a|s@1| +0#0000000&@66
 @75
 |c+0#af5f00255&|l|a|s@1| +0#0000000&|B| |e+0#af5f00255&|x|t|e|n|d|s| +0#0000000&|A| @57
 @2|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|(+0#e000e06&|v+0#00e0e07&|a|l|u|e|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r|)+0#e000e06&| +0#0000000&@50
-@3| +0#00e0e07&|s+0#0000001#ffff4012|u|p|e|r|.+0#af5f00255#ffffff0|_+0#0000000&|B|a|s|e|I|n|i|t|(+0#e000e06&|v+0#00e0e07&|a|l|u|e|)+0#e000e06&| +0#0000000&@48
+@3| +0#00e0e07&|s+0#0000001#ffff4012|u|p|e|r|.+0#0000000#ffffff0|_|B|a|s|e|I|n|i|t|(+0#e000e06&|v+0#00e0e07&|a|l|u|e|)+0#e000e06&| +0#0000000&@48
 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
 @75
 @2|d+0#af5f00255&|e|f| +0#0000000&|V|a|l|u|e|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@53
 @4|e+0#af5f00255&|c|h|o| +0#0000000&|t+0#0000001#ffff4012|h|i|s| +0#0000000#ffffff0@61
-@4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#0000001#ffff4012|u|p|e|r|.+0#af5f00255#ffffff0|_+0#00e0e07&|v|a|l|u|e| +0#0000000&@51
+@4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|s+0#0000001#ffff4012|u|p|e|r|.+0#0000000#ffffff0|_+0#00e0e07&|v|a|l|u|e| +0#0000000&@51
 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
 @57|1|9|,|3| @9|2|9|%| 
diff --git a/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_03.dump b/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_03.dump
index 17439c33d7..1d39b6b5ba 100644
--- a/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_03.dump
+++ b/runtime/syntax/testdir/dumps/vim9_super_this_keywords2_03.dump
@@ -8,8 +8,8 @@
 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
 |e+0#af5f00255&|n|d|c|l|a|s@1| +0#0000000&@66
 @75
-|e+0#af5f00255&|c|h|o| +0#0000000&|1+0#e000002&| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|A|.|n+0#00e0e07&|e|w|(+0#e000e06&|1+0#e000002&|)+0#e000e06&|.+0#af5f00255&|V+0#0000000&|a|l|u|e|(+0#e000e06&|)| +0#0000000&@48
-|e+0#af5f00255&|c|h|o| +0#0000000&|2+0#e000002&| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|B|.|n+0#00e0e07&|e|w|(+0#e000e06&|2+0#e000002&|)+0#e000e06&|.+0#af5f00255&|V+0#0000000&|a|l|u|e|(+0#e000e06&|)| +0#0000000&@48
+|e+0#af5f00255&|c|h|o| +0#0000000&|1+0#e000002&| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|A+0#00e0e07&|.+0#0000000&|n+0#00e0e07&|e|w|(+0#e000e06&|1+0#e000002&|)+0#e000e06&|.+0#0000000&|V|a|l|u|e|(+0#e000e06&|)| +0#0000000&@48
+|e+0#af5f00255&|c|h|o| +0#0000000&|2+0#e000002&| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|B+0#00e0e07&|.+0#0000000&|n+0#00e0e07&|e|w|(+0#e000e06&|2+0#e000002&|)+0#e000e06&|.+0#0000000&|V|a|l|u|e|(+0#e000e06&|)| +0#0000000&@48
 |d+0#af5f00255&|e|f|c|o|m|p|i|l|e| +0#0000000&|C| @62
 @75
 |~+0#4040ff13&| @73
diff --git a/runtime/syntax/testdir/dumps/vim9_super_this_keywords3_00.dump b/runtime/syntax/testdir/dumps/vim9_super_this_keywords3_00.dump
index aada2bbb4f..3c7d2289ea 100644
--- a/runtime/syntax/testdir/dumps/vim9_super_this_keywords3_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_super_this_keywords3_00.dump
@@ -12,7 +12,7 @@
 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
 @75
 @4|d+0#af5f00255&|e|f| +0#0000000&|K|(+0#e000e06&|)|:+0#0000000&| |f+0#00e0003&|u|n|c|(|a|n|y|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@44
-@8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&@1|_+0#00e0e07&|:+0#0000000&| |a+0#00e0003&|n|y|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|_+0#00e0e07&|v|a|l|u|e|)+0#e000e06&| +0#0000000&@34
+@8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&@1|_+0#00e0e07&|:+0#0000000&| |a+0#00e0003&|n|y|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|_+0#00e0e07&|v|a|l|u|e|)+0#e000e06&| +0#0000000&@34
 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
 |e+0#af5f00255&|n|d|c|l|a|s@1| +0#0000000&@66
 @75
diff --git a/runtime/syntax/testdir/dumps/vim9_super_this_keywords3_01.dump b/runtime/syntax/testdir/dumps/vim9_super_this_keywords3_01.dump
index f1c2d22300..e057e9fe46 100644
--- a/runtime/syntax/testdir/dumps/vim9_super_this_keywords3_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_super_this_keywords3_01.dump
@@ -1,16 +1,16 @@
 | +0&#ffffff0@3|d+0#af5f00255&|e|f| +0#0000000&|K|(+0#e000e06&|)|:+0#0000000&| |f+0#00e0003&|u|n|c|(|a|n|y|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@44
-@8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&@1|_+0#00e0e07&|:+0#0000000&| |a+0#00e0003&|n|y|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|_+0#00e0e07&|v|a|l|u|e|)+0#e000e06&| +0#0000000&@34
+@8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&@1|_+0#00e0e07&|:+0#0000000&| |a+0#00e0003&|n|y|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|_+0#00e0e07&|v|a|l|u|e|)+0#e000e06&| +0#0000000&@34
 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
 |e+0#af5f00255&|n|d|c|l|a|s@1| +0#0000000&@66
 @75
 >c+0#af5f00255&|l|a|s@1| +0#0000000&|B| |e+0#af5f00255&|x|t|e|n|d|s| +0#0000000&|A| @57
 @4|d+0#af5f00255&|e|f| +0#0000000&|K|(+0#e000e06&|)|:+0#0000000&| |f+0#00e0003&|u|n|c|(|a|n|y|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@44
-@8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&@1|_+0#00e0e07&|:+0#0000000&| |a+0#00e0003&|n|y|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|s+0#0000001#ffff4012|u|p|e|r|.+0#af5f00255#ffffff0|_+0#00e0e07&|v|a|l|u|e|)+0#e000e06&| +0#0000000&@33
+@8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(+0#e000e06&@1|_+0#00e0e07&|:+0#0000000&| |a+0#00e0003&|n|y|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|s+0#0000001#ffff4012|u|p|e|r|.+0#0000000#ffffff0|_+0#00e0e07&|v|a|l|u|e|)+0#e000e06&| +0#0000000&@33
 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
 |e+0#af5f00255&|n|d|c|l|a|s@1| +0#0000000&@66
 @75
-|e+0#af5f00255&|c|h|o| +0#0000000&|1+0#e000002&| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|A|.|n+0#00e0e07&|e|w|(+0#e000e06&|1+0#e000002&|)+0#e000e06&|.+0#af5f00255&|K+0#0000000&|(+0#e000e06&|)|(|n+0#e000002&|u|l@1|)+0#e000e06&| +0#0000000&@46
-|e+0#af5f00255&|c|h|o| +0#0000000&|2+0#e000002&| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|B|.|n+0#00e0e07&|e|w|(+0#e000e06&|2+0#e000002&|)+0#e000e06&|.+0#af5f00255&|K+0#0000000&|(+0#e000e06&|)|(|n+0#e000002&|u|l@1|)+0#e000e06&| +0#0000000&@46
+|e+0#af5f00255&|c|h|o| +0#0000000&|1+0#e000002&| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|A+0#00e0e07&|.+0#0000000&|n+0#00e0e07&|e|w|(+0#e000e06&|1+0#e000002&|)+0#e000e06&|.+0#0000000&|K|(+0#e000e06&|)|(|n+0#e000002&|u|l@1|)+0#e000e06&| +0#0000000&@46
+|e+0#af5f00255&|c|h|o| +0#0000000&|2+0#e000002&| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|B+0#00e0e07&|.+0#0000000&|n+0#00e0e07&|e|w|(+0#e000e06&|2+0#e000002&|)+0#e000e06&|.+0#0000000&|K|(+0#e000e06&|)|(|n+0#e000002&|u|l@1|)+0#e000e06&| +0#0000000&@46
 @75
 |~+0#4040ff13&| @73
 |~| @73
diff --git a/runtime/syntax/testdir/dumps/vim9_super_this_keywords_00.dump b/runtime/syntax/testdir/dumps/vim9_super_this_keywords_00.dump
index ea8eaecb47..b687306a87 100644
--- a/runtime/syntax/testdir/dumps/vim9_super_this_keywords_00.dump
+++ b/runtime/syntax/testdir/dumps/vim9_super_this_keywords_00.dump
@@ -10,11 +10,11 @@
 @75
 |c+0#af5f00255&|l|a|s@1| +0#0000000&|F|o@1| @65
 @2|v+0#af5f00255&|a|r| +0#0000000&|x+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#af5f00255&| +0#0000000&|4+0#e000002&|2| +0#0000000&@54
-@2|v+0#af5f00255&|a|r| +0#0000000&|y+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#af5f00255&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|x+0#00e0e07&| +0#0000000&|++0#af5f00255&| +0#0000000&|4+0#e000002&|1| +0#0000000&@45
-@2|v+0#af5f00255&|a|r| +0#0000000&|z+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#af5f00255&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|x+0#00e0e07&| +0#0000000&|++0#af5f00255&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|y+0#00e0e07&| +0#0000000&@41
+@2|v+0#af5f00255&|a|r| +0#0000000&|y+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#af5f00255&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|x+0#00e0e07&| +0#0000000&|++0#af5f00255&| +0#0000000&|4+0#e000002&|1| +0#0000000&@45
+@2|v+0#af5f00255&|a|r| +0#0000000&|z+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#af5f00255&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|x+0#00e0e07&| +0#0000000&|++0#af5f00255&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|y+0#00e0e07&| +0#0000000&@41
 @75
 @2|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|(+0#e000e06&|)| +0#0000000&@63
-@4|e+0#af5f00255&|c|h|o| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|x+0#00e0e07&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|y+0#00e0e07&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|z+0#00e0e07&| +0#0000000&@45
+@4|e+0#af5f00255&|c|h|o| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|x+0#00e0e07&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|y+0#00e0e07&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|z+0#00e0e07&| +0#0000000&@45
 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
 @75
 @57|1|,|1| @10|T|o|p| 
diff --git a/runtime/syntax/testdir/dumps/vim9_super_this_keywords_01.dump b/runtime/syntax/testdir/dumps/vim9_super_this_keywords_01.dump
index 1777272462..42b21778dc 100644
--- a/runtime/syntax/testdir/dumps/vim9_super_this_keywords_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_super_this_keywords_01.dump
@@ -1,20 +1,20 @@
-| +0&#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|z+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#af5f00255&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|x+0#00e0e07&| +0#0000000&|++0#af5f00255&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|y+0#00e0e07&| +0#0000000&@41
+| +0&#ffffff0@1|v+0#af5f00255&|a|r| +0#0000000&|z+0#00e0e07&|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&|=+0#af5f00255&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|x+0#00e0e07&| +0#0000000&|++0#af5f00255&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|y+0#00e0e07&| +0#0000000&@41
 @75
 @2|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|(+0#e000e06&|)| +0#0000000&@63
-@4|e+0#af5f00255&|c|h|o| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|x+0#00e0e07&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|y+0#00e0e07&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|z+0#00e0e07&| +0#0000000&@45
+@4|e+0#af5f00255&|c|h|o| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|x+0#00e0e07&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|y+0#00e0e07&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|z+0#00e0e07&| +0#0000000&@45
 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
 > @74
 @2|d+0#af5f00255&|e|f| +0#0000000&|n+0#00e0e07&|e|w|X|Y|(+0#e000e06&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|x+0#00e0e07&|,+0#0000000&| |t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|y+0#00e0e07&|,+0#0000000&| |t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|z+0#00e0e07&|)+0#e000e06&| +0#0000000&@39
 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
 @75
 @2|d+0#af5f00255&|e|f| +0#0000000&|D|e|f|1|(+0#e000e06&|a+0#00e0e07&|r|g| +0#0000000&|=+0#af5f00255&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|x+0#00e0e07&|)+0#e000e06&| +0#0000000&@50
-@3| +0#00e0e07&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|y+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|a+0#00e0e07&|r|g| +0#0000000&@58
-@3| +0#00e0e07&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|z+0#00e0e07&| +0#0000000&|++0#af5f00255&|=| +0#0000000&|a+0#00e0e07&|r|g| +0#0000000&@57
+@3| +0#00e0e07&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|y+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|a+0#00e0e07&|r|g| +0#0000000&@58
+@3| +0#00e0e07&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|z+0#00e0e07&| +0#0000000&|++0#af5f00255&|=| +0#0000000&|a+0#00e0e07&|r|g| +0#0000000&@57
 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
 @75
-@2|d+0#af5f00255&|e|f| +0#0000000&|D|e|f|2|(+0#e000e06&|a+0#00e0e07&|r|g| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#e000e06&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|x+0#00e0e07&| +0#0000000&|++0#af5f00255&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|y+0#00e0e07&| +0#0000000&|++0#af5f00255&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|z+0#00e0e07&|)+0#e000e06&@1| +0#0000000&@30
-@4|E|c|h|o|(+0#e000e06&|t+0#0000001#ffff4012|h|i|s|,+0#0000000#ffffff0| |t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|x+0#00e0e07&|,+0#0000000&| |t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|y+0#00e0e07&|,+0#0000000&| |t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|z+0#00e0e07&|)+0#e000e06&| +0#0000000&@36
-@3| +0#00e0e07&|t+0#0000001#ffff4012|h|i|s|-+0#af5f00255#ffffff0|>|E+0#0000000&|c|h|o|(+0#e000e06&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|x+0#00e0e07&|,+0#0000000&| |t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|y+0#00e0e07&|,+0#0000000&| |t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|z+0#00e0e07&|)+0#e000e06&| +0#0000000&@36
+@2|d+0#af5f00255&|e|f| +0#0000000&|D|e|f|2|(+0#e000e06&|a+0#00e0e07&|r|g| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#e000e06&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|x+0#00e0e07&| +0#0000000&|++0#af5f00255&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|y+0#00e0e07&| +0#0000000&|++0#af5f00255&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|z+0#00e0e07&|)+0#e000e06&@1| +0#0000000&@30
+@4|E|c|h|o|(+0#e000e06&|t+0#0000001#ffff4012|h|i|s|,+0#0000000#ffffff0| |t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|x+0#00e0e07&|,+0#0000000&| |t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|y+0#00e0e07&|,+0#0000000&| |t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|z+0#00e0e07&|)+0#e000e06&| +0#0000000&@36
+@3| +0#00e0e07&|t+0#0000001#ffff4012|h|i|s|-+0#af5f00255#ffffff0|>|E+0#0000000&|c|h|o|(+0#e000e06&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|x+0#00e0e07&|,+0#0000000&| |t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|y+0#00e0e07&|,+0#0000000&| |t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|z+0#00e0e07&|)+0#e000e06&| +0#0000000&@36
 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
 @75
 @57|1|9|,|0|-|1| @7|1|9|%| 
diff --git a/runtime/syntax/testdir/dumps/vim9_super_this_keywords_02.dump b/runtime/syntax/testdir/dumps/vim9_super_this_keywords_02.dump
index feed1359e0..e5bc889673 100644
--- a/runtime/syntax/testdir/dumps/vim9_super_this_keywords_02.dump
+++ b/runtime/syntax/testdir/dumps/vim9_super_this_keywords_02.dump
@@ -10,11 +10,11 @@
 @75
 |c+0#af5f00255&|l|a|s@1| +0#0000000&|B|a|r| |e+0#af5f00255&|x|t|e|n|d|s| +0#0000000&|F|o@1| @53
 @2|d+0#af5f00255&|e|f| +0#0000000&|D|e|f|1|(+0#e000e06&|)| +0#0000000&@62
-@3| +0#00e0e07&|s+0#0000001#ffff4012|u|p|e|r|.+0#af5f00255#ffffff0|D+0#0000000&|e|f|1|(+0#e000e06&|)| +0#0000000&@58
+@3| +0#00e0e07&|s+0#0000001#ffff4012|u|p|e|r|.+0#0000000#ffffff0|D|e|f|1|(+0#e000e06&|)| +0#0000000&@58
 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
 @75
 @2|d+0#af5f00255&|e|f| +0#0000000&|D|e|f|2|(+0#e000e06&|)| +0#0000000&@62
-@4|v+0#af5f00255&|a|r| +0#0000000&|a+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|s+0#0000001#ffff4012|u|p|e|r|.+0#af5f00255#ffffff0|x+0#00e0e07&| +0#0000000&|*+0#af5f00255&| +0#0000000&|s+0#0000001#ffff4012|u|p|e|r|.+0#af5f00255#ffffff0|y+0#00e0e07&| +0#0000000&|*+0#af5f00255&| +0#0000000&|s+0#0000001#ffff4012|u|p|e|r|.+0#af5f00255#ffffff0|z+0#00e0e07&| +0#0000000&@35
-@4|v+0#af5f00255&|a|r| +0#0000000&|b+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|[+0#e000e06&|s+0#0000001#ffff4012|u|p|e|r|.+0#af5f00255#ffffff0|x+0#00e0e07&|,+0#0000000&| |s+0#0000001#ffff4012|u|p|e|r|.+0#af5f00255#ffffff0|y+0#00e0e07&|,+0#0000000&| |s+0#0000001#ffff4012|u|p|e|r|.+0#af5f00255#ffffff0|z+0#00e0e07&|]+0#e000e06&| +0#0000000&@35
-@4|v+0#af5f00255&|a|r| +0#0000000&|c+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#e000e06&|s+0#00e0e07&|u|p|e|r|:+0#0000000&| |s+0#0000001#ffff4012|u|p|e|r|.+0#af5f00255#ffffff0|x+0#00e0e07&|,+0#0000000&| |t+0#00e0e07&|h|i|s|:+0#0000000&| |s+0#0000001#ffff4012|u|p|e|r|.+0#af5f00255#ffffff0|y+0#00e0e07&|,+0#0000000&| |t+0#e000002&|r|u|e|:+0#0000000&| |s+0#0000001#ffff4012|u|p|e|r|.+0#af5f00255#ffffff0|z+0#00e0e07&|}+0#e000e06&| +0#0000000&@16
+@4|v+0#af5f00255&|a|r| +0#0000000&|a+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|s+0#0000001#ffff4012|u|p|e|r|.+0#0000000#ffffff0|x+0#00e0e07&| +0#0000000&|*+0#af5f00255&| +0#0000000&|s+0#0000001#ffff4012|u|p|e|r|.+0#0000000#ffffff0|y+0#00e0e07&| +0#0000000&|*+0#af5f00255&| +0#0000000&|s+0#0000001#ffff4012|u|p|e|r|.+0#0000000#ffffff0|z+0#00e0e07&| +0#0000000&@35
+@4|v+0#af5f00255&|a|r| +0#0000000&|b+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|[+0#e000e06&|s+0#0000001#ffff4012|u|p|e|r|.+0#0000000#ffffff0|x+0#00e0e07&|,+0#0000000&| |s+0#0000001#ffff4012|u|p|e|r|.+0#0000000#ffffff0|y+0#00e0e07&|,+0#0000000&| |s+0#0000001#ffff4012|u|p|e|r|.+0#0000000#ffffff0|z+0#00e0e07&|]+0#e000e06&| +0#0000000&@35
+@4|v+0#af5f00255&|a|r| +0#0000000&|c+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#e000e06&|s+0#00e0e07&|u|p|e|r|:+0#0000000&| |s+0#0000001#ffff4012|u|p|e|r|.+0#0000000#ffffff0|x+0#00e0e07&|,+0#0000000&| |t+0#00e0e07&|h|i|s|:+0#0000000&| |s+0#0000001#ffff4012|u|p|e|r|.+0#0000000#ffffff0|y+0#00e0e07&|,+0#0000000&| |t+0#e000002&|r|u|e|:+0#0000000&| |s+0#0000001#ffff4012|u|p|e|r|.+0#0000000#ffffff0|z+0#00e0e07&|}+0#e000e06&| +0#0000000&@16
 @57|3|7|,|3| @9|4|5|%| 
diff --git a/runtime/syntax/testdir/dumps/vim9_super_this_keywords_03.dump b/runtime/syntax/testdir/dumps/vim9_super_this_keywords_03.dump
index 934eaa5e06..f501920b1e 100644
--- a/runtime/syntax/testdir/dumps/vim9_super_this_keywords_03.dump
+++ b/runtime/syntax/testdir/dumps/vim9_super_this_keywords_03.dump
@@ -1,17 +1,17 @@
-| +0&#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|c+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#e000e06&|s+0#00e0e07&|u|p|e|r|:+0#0000000&| |s+0#0000001#ffff4012|u|p|e|r|.+0#af5f00255#ffffff0|x+0#00e0e07&|,+0#0000000&| |t+0#00e0e07&|h|i|s|:+0#0000000&| |s+0#0000001#ffff4012|u|p|e|r|.+0#af5f00255#ffffff0|y+0#00e0e07&|,+0#0000000&| |t+0#e000002&|r|u|e|:+0#0000000&| |s+0#0000001#ffff4012|u|p|e|r|.+0#af5f00255#ffffff0|z+0#00e0e07&|}+0#e000e06&| +0#0000000&@16
+| +0&#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|c+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#e000e06&|s+0#00e0e07&|u|p|e|r|:+0#0000000&| |s+0#0000001#ffff4012|u|p|e|r|.+0#0000000#ffffff0|x+0#00e0e07&|,+0#0000000&| |t+0#00e0e07&|h|i|s|:+0#0000000&| |s+0#0000001#ffff4012|u|p|e|r|.+0#0000000#ffffff0|y+0#00e0e07&|,+0#0000000&| |t+0#e000002&|r|u|e|:+0#0000000&| |s+0#0000001#ffff4012|u|p|e|r|.+0#0000000#ffffff0|z+0#00e0e07&|}+0#e000e06&| +0#0000000&@16
 @4|v+0#af5f00255&|a|r| +0#0000000&|d+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#e000e06&|s+0#00e0e07&|u|p|e|r|:+0#0000000&| |c+0#00e0e07&|,+0#0000000&| |t+0#00e0e07&|h|i|s|:+0#0000000&| |c+0#00e0e07&|}+0#e000e06&| +0#0000000&@43
-@4|e+0#af5f00255&|c|h|o| +0#0000000&|c+0#00e0e07&|.+0#af5f00255&|s+0#00e0e07&|u|p|e|r| +0#0000000&@58
-@4|e+0#af5f00255&|c|h|o| +0#0000000&|c+0#00e0e07&|.+0#af5f00255&|t+0#00e0e07&|h|i|s| +0#0000000&@59
-@4|e+0#af5f00255&|c|h|o| +0#0000000&|d+0#00e0e07&|.+0#af5f00255&|s+0#00e0e07&|u|p|e|r|.+0#af5f00255&|t+0#00e0e07&|h|i|s| +0#0000000&@53
-@4>e+0#af5f00255&|c|h|o| +0#0000000&|d+0#00e0e07&|.+0#af5f00255&|t+0#00e0e07&|h|i|s|.+0#af5f00255&|s+0#00e0e07&|u|p|e|r| +0#0000000&@53
+@4|e+0#af5f00255&|c|h|o| +0#0000000&|c+0#00e0e07&|.+0#0000000&|s+0#00e0e07&|u|p|e|r| +0#0000000&@58
+@4|e+0#af5f00255&|c|h|o| +0#0000000&|c+0#00e0e07&|.+0#0000000&|t+0#00e0e07&|h|i|s| +0#0000000&@59
+@4|e+0#af5f00255&|c|h|o| +0#0000000&|d+0#00e0e07&|.+0#0000000&|s+0#00e0e07&|u|p|e|r|.+0#0000000&|t+0#00e0e07&|h|i|s| +0#0000000&@53
+@4>e+0#af5f00255&|c|h|o| +0#0000000&|d+0#00e0e07&|.+0#0000000&|t+0#00e0e07&|h|i|s|.+0#0000000&|s+0#00e0e07&|u|p|e|r| +0#0000000&@53
 @4|e+0#af5f00255&|c|h|o| +0#0000000&|a+0#00e0e07&| +0#0000000&|b+0#00e0e07&| +0#0000000&|c+0#00e0e07&| +0#0000000&@60
 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
 @75
 @2|d+0#af5f00255&|e|f| +0#0000000&|D|e|f|5|(+0#e000e06&|)| +0#0000000&@62
-@4|v+0#af5f00255&|a|r| +0#0000000&|a+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|x+0#00e0e07&| +0#0000000&|*+0#af5f00255&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|y+0#00e0e07&| +0#0000000&@47
-@4|v+0#af5f00255&|a|r| +0#0000000&|b+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#e000e06&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|x+0#00e0e07&| +0#0000000&|*+0#af5f00255&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|y+0#00e0e07&|)+0#e000e06&| +0#0000000&@45
-@4|v+0#af5f00255&|a|r| +0#0000000&|c+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|[+0#e000e06&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|x+0#00e0e07&|,+0#0000000&| |t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|y+0#00e0e07&|]+0#e000e06&| +0#0000000&@46
-@4|v+0#af5f00255&|a|r| +0#0000000&|d+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#e000e06&|s+0#00e0e07&|u|p|e|r|:+0#0000000&| |t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|x+0#00e0e07&|,+0#0000000&| |t+0#00e0e07&|h|i|s|:+0#0000000&| |t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|y+0#00e0e07&|}+0#e000e06&| +0#0000000&@33
+@4|v+0#af5f00255&|a|r| +0#0000000&|a+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|x+0#00e0e07&| +0#0000000&|*+0#af5f00255&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|y+0#00e0e07&| +0#0000000&@47
+@4|v+0#af5f00255&|a|r| +0#0000000&|b+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#e000e06&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|x+0#00e0e07&| +0#0000000&|*+0#af5f00255&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|y+0#00e0e07&|)+0#e000e06&| +0#0000000&@45
+@4|v+0#af5f00255&|a|r| +0#0000000&|c+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|[+0#e000e06&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|x+0#00e0e07&|,+0#0000000&| |t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|y+0#00e0e07&|]+0#e000e06&| +0#0000000&@46
+@4|v+0#af5f00255&|a|r| +0#0000000&|d+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#e000e06&|s+0#00e0e07&|u|p|e|r|:+0#0000000&| |t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|x+0#00e0e07&|,+0#0000000&| |t+0#00e0e07&|h|i|s|:+0#0000000&| |t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|y+0#00e0e07&|}+0#e000e06&| +0#0000000&@33
 @4|e+0#af5f00255&|c|h|o| +0#0000000&|a+0#00e0e07&| +0#0000000&|b+0#00e0e07&| +0#0000000&|c+0#00e0e07&| +0#0000000&|d+0#00e0e07&| +0#0000000&@58
 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
 @75
diff --git a/runtime/syntax/testdir/dumps/vim9_super_this_keywords_04.dump b/runtime/syntax/testdir/dumps/vim9_super_this_keywords_04.dump
index 4e9ce2c159..551c9f6c25 100644
--- a/runtime/syntax/testdir/dumps/vim9_super_this_keywords_04.dump
+++ b/runtime/syntax/testdir/dumps/vim9_super_this_keywords_04.dump
@@ -1,7 +1,7 @@
 | +0&#ffffff0@3|v+0#af5f00255&|a|r| +0#0000000&|x+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|t+0#0000001#ffff4012|h|i|s|#+0#00e0e07#ffffff0|s|u|p|e|r|#|x| +0#0000000&@50
 @4|v+0#af5f00255&|a|r| +0#0000000&|y+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|s+0#00e0e07&|u|p|e|r|#|t+0#0000001#ffff4012|h|i|s|#+0#00e0e07#ffffff0|y| +0#0000000&@50
-@4|t+0#0000001#ffff4012|h|i|s|#+0#0000000#ffffff0|s|u|p|e|r|#|F|u|n|c|(+0#e000e06&|)| +0#0000000&@53
-@4|s|u|p|e|r|#|t+0#0000001#ffff4012|h|i|s|#+0#0000000#ffffff0|F|u|n|c|(+0#e000e06&|)| +0#0000000&@53
+@4|t|h|i|s|#|s|u|p|e|r|#|F|u|n|c|(+0#e000e06&|)| +0#0000000&@53
+@4|s|u|p|e|r|#|t|h|i|s|#|F|u|n|c|(+0#e000e06&|)| +0#0000000&@53
 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
 > @74
 @2|d+0#af5f00255&|e|f| +0#0000000&|D|e|f|7|(+0#e000e06&|a+0#00e0e07&|r|g| +0#0000000&|=+0#af5f00255&| +0#0000000&|s+0#0000001#ffff4012|u|p|e|r|.+0#0000000#ffffff0|D|e|f|3|(+0#e000e06&|)@1| +0#0000000&@44
@@ -9,8 +9,8 @@
 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
 @75
 @2|d+0#af5f00255&|e|f| +0#0000000&|D|e|f|8|(+0#e000e06&|)|:+0#0000000&| |n+0#00e0003&|u|m|b|e|r| +0#0000000&@54
-@4|v+0#af5f00255&|a|r| +0#0000000&|F+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#e000e06&|)| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|x+0#00e0e07&| +0#0000000&@50
-@4|v+0#af5f00255&|a|r| +0#0000000&|G+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#e000e06&|)| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|s+0#0000001#ffff4012|u|p|e|r|.+0#af5f00255#ffffff0|x+0#00e0e07&| +0#0000000&@49
+@4|v+0#af5f00255&|a|r| +0#0000000&|F+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#e000e06&|)| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|x+0#00e0e07&| +0#0000000&@50
+@4|v+0#af5f00255&|a|r| +0#0000000&|G+0#00e0e07&| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#e000e06&|)| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|s+0#0000001#ffff4012|u|p|e|r|.+0#0000000#ffffff0|x+0#00e0e07&| +0#0000000&@49
 @4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|F|(+0#e000e06&|)| +0#0000000&|++0#af5f00255&| +0#0000000&|G|(+0#e000e06&|)| +0#0000000&@54
 @2|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@66
 |e+0#af5f00255&|n|d|c|l|a|s@1| +0#0000000&@66
diff --git a/runtime/syntax/testdir/dumps/vim9_types_example_object_01.dump b/runtime/syntax/testdir/dumps/vim9_types_example_object_01.dump
index 21d48d7c59..b8f1e6068b 100644
--- a/runtime/syntax/testdir/dumps/vim9_types_example_object_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_types_example_object_01.dump
@@ -10,7 +10,7 @@
 |e+0#af5f00255&|n|d|e|n|u|m| +0#0000000&@67
 @75
 |v+0#af5f00255&|a|r| +0#0000000&|c|:| |o+0#00e0003&|b|j|e|c|t|<|C+0#0000000&|>+0#00e0003&| +0#0000000&|=+0#af5f00255&| +0#0000000&|C|.|n+0#00e0e07&|e|w|(+0#e000e06&|)| +0#0000000&@48
-|v+0#af5f00255&|a|r| +0#0000000&|e|:| |o+0#00e0003&|b|j|e|c|t|<|E+0#0000000&|>+0#00e0003&| +0#0000000&|=+0#af5f00255&| +0#0000000&|E|.+0#af5f00255&|I+0#0000000&|N|S|T|A|N|C|E| @45
+|v+0#af5f00255&|a|r| +0#0000000&|e|:| |o+0#00e0003&|b|j|e|c|t|<|E+0#0000000&|>+0#00e0003&| +0#0000000&|=+0#af5f00255&| +0#0000000&|E|.|I|N|S|T|A|N|C|E| @45
 |v+0#af5f00255&|a|r| +0#0000000&|o|s|:| |t+0#00e0003&|u|p|l|e|<|o|b|j|e|c|t|<|a|n|y|>|,+0#0000000&| |o+0#00e0003&|b|j|e|c|t|<|I+0#0000000&|>+0#00e0003&@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|(+0#e000e06&|c+0#0000000&|,| |e|)+0#e000e06&| +0#0000000&@28
 |e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|c+0#0000000&|,| |e|)+0#e000e06&| +0#0000000&|=+0#af5f00255&@1| +0#0000000&|o|s| @57
 @75
diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_nested_00.dump b/runtime/syntax/testdir/dumps/vim_ex_def_nested_00.dump
index 9fe6696f43..96d4c98004 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_def_nested_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_def_nested_00.dump
@@ -15,6 +15,6 @@
 @12|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|G|i|v|e|N|a|m|e|(+0#e000e06&|)| +0#0000000&@45
 @8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
 @75
-| +0#00e0e07&@7|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|n+0#00e0e07&|a|m|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|N|a|m|e|(+0#e000e06&|)| +0#0000000&@48
+| +0#00e0e07&@7|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|n+0#00e0e07&|a|m|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|N|a|m|e|(+0#e000e06&|)| +0#0000000&@48
 @4|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
 @57|1|,|1| @10|T|o|p| 
diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_nested_01.dump b/runtime/syntax/testdir/dumps/vim_ex_def_nested_01.dump
index 0fc35aaf48..473be656e8 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_def_nested_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_def_nested_01.dump
@@ -2,11 +2,11 @@
 @12|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|G|i|v|e|N|a|m|e|(+0#e000e06&|)| +0#0000000&@45
 @8|e+0#af5f00255&|n|d@1|e|f| +0#0000000&@60
 @75
-| +0#00e0e07&@7|t+0#0000001#ffff4012|h|i|s|.+0#af5f00255#ffffff0|n+0#00e0e07&|a|m|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|N|a|m|e|(+0#e000e06&|)| +0#0000000&@48
+| +0#00e0e07&@7|t+0#0000001#ffff4012|h|i|s|.+0#0000000#ffffff0|n+0#00e0e07&|a|m|e| +0#0000000&|=+0#af5f00255&| +0#0000000&|N|a|m|e|(+0#e000e06&|)| +0#0000000&@48
 @4>e+0#af5f00255&|n|d@1|e|f| +0#0000000&@64
 |e+0#af5f00255&|n|d|c|l|a|s@1| +0#0000000&@66
 @75
-|e+0#af5f00255&|c|h|o| +0#0000000&|T|e|s|t|.|n+0#00e0e07&|e|w|(+0#e000e06&|)| +0#0000000&@59
+|e+0#af5f00255&|c|h|o| +0#0000000&|T+0#00e0e07&|e|s|t|.+0#0000000&|n+0#00e0e07&|e|w|(+0#e000e06&|)| +0#0000000&@59
 @75
 |~+0#4040ff13&| @73
 |~| @73
diff --git a/runtime/syntax/testdir/dumps/vim_ex_def_nested_fold_00.dump b/runtime/syntax/testdir/dumps/vim_ex_def_nested_fold_00.dump
index 26c48152e8..e12e03e312 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_def_nested_fold_00.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_def_nested_fold_00.dump
@@ -11,7 +11,7 @@
 |++0#0000e05#a8a8a8255| |+|-@1| |1@1| |l|i|n|e|s|:| |d|e|f| |n|e|w|(|)|-@49
 | @1|e+0#af5f00255#ffffff0|n|d|c|l|a|s@1| +0#0000000&@64
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
-| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|T|e|s|t|.|n+0#00e0e07&|e|w|(+0#e000e06&|)| +0#0000000&@57
+| +0#0000e05#a8a8a8255@1|e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|T+0#00e0e07&|e|s|t|.+0#0000000&|n+0#00e0e07&|e|w|(+0#e000e06&|)| +0#0000000&@57
 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
 |~+0#4040ff13&| @73
 |~| @73
diff --git a/runtime/syntax/testdir/dumps/vim_ex_echo_03.dump b/runtime/syntax/testdir/dumps/vim_ex_echo_03.dump
index 239a31dfa9..82c698c6c1 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_echo_03.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_echo_03.dump
@@ -2,7 +2,7 @@
 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#e000e06&|'+0#e000002&|e|n|d|'|:+0#0000000&| |1+0#e000002&|2|3|}+0#e000e06&| +0#0000000&@52
 @75
 |i+0#af5f00255&|f| +0#0000000&|1+0#e000002&|2|3| +0#0000000&@68
-@8|e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|f+0#00e0e07&|o@1|.+0#af5f00255&|e+0#00e0e07&|n|d|)+0#e000e06&| +0#0000000&@52
+@8|e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|f+0#00e0e07&|o@1|.+0#0000000&|e+0#00e0e07&|n|d|)+0#e000e06&| +0#0000000&@52
 >e+0#af5f00255&|l|s|e| +0#0000000&@70
 @8|e+0#af5f00255&|c|h|o| +0#0000000&|'+0#e000002&|b|a|r|'| +0#0000000&@56
 |e+0#af5f00255&|n|d|i|f| +0#0000000&@69
diff --git a/runtime/syntax/testdir/dumps/vim_ex_execute_03.dump b/runtime/syntax/testdir/dumps/vim_ex_execute_03.dump
index 7f52581b96..07726510eb 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_execute_03.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_execute_03.dump
@@ -11,7 +11,7 @@
 |"+0#0000e05&| |I|s@1|u|e| |#|9@1|8|7| |(|p|a|r|e|n|t|h|e|s|i|s|e|d| |a|r|g|u|m|e|n|t| |-| |n|o|t| |a| |f|u|n|c|t|i|o|n| |c|a|l@1|)| +0#0000000&@14
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|{+0#e000e06&|'+0#e000002&|a|r|g|'|:+0#0000000&| |"+0#e000002&|c|a|l@1| |F|o@1|(|)|"|}+0#e000e06&| +0#0000000&@43
-|e+0#af5f00255&|x|e|c|u|t|e| +0#0000000&|(+0#e000e06&|f+0#00e0e07&|o@1|.+0#af5f00255&|a+0#00e0e07&|r|g|)+0#e000e06&| +0#0000000&@57
+|e+0#af5f00255&|x|e|c|u|t|e| +0#0000000&|(+0#e000e06&|f+0#00e0e07&|o@1|.+0#0000000&|a+0#00e0e07&|r|g|)+0#e000e06&| +0#0000000&@57
 @75
 |~+0#4040ff13&| @73
 |~| @73
diff --git a/runtime/syntax/testdir/dumps/vim_ex_menu_04.dump b/runtime/syntax/testdir/dumps/vim_ex_menu_04.dump
index 9c99fb70a2..9a1bd9f149 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_menu_04.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_menu_04.dump
@@ -13,8 +13,8 @@
 |"+0#0000e05&| |a| |m|e|n|u| |i|t|e|m| |n|a|m|e| |c|a|n@1|o|t| |s|t|a|r|t| |w|i|t|h| |'|.|'| +0#0000000&@34
 @75
 |d+0#af5f00255&|e|f| +0#0000000&|H|i|s|t|o|r|y|J|u|m|p|M|e|n|u|(+0#e000e06&|)| +0#0000000&@53
-@3| +0#00e0e07&|p|o|p|u|p|.+0#af5f00255&|F+0#0000000&|i|l|t|e|r|M|e|n|u|(+0#e000e06&|"+0#e000002&|J|u|m|p| |h|i|s|t|o|r|y|"|,+0#0000000&| |d+0#00e0e07&|i|r|_|h|i|s|t|,+0#0000000&| @28
+@3| +0#00e0e07&|p|o|p|u|p|.+0#0000000&|F|i|l|t|e|r|M|e|n|u|(+0#e000e06&|"+0#e000002&|J|u|m|p| |h|i|s|t|o|r|y|"|,+0#0000000&| |d+0#00e0e07&|i|r|_|h|i|s|t|,+0#0000000&| @28
 @8|(+0#e000e06&|r+0#00e0e07&|e|s|,+0#0000000&| |_+0#00e0e07&|)+0#e000e06&| +0#0000000&|=+0#af5f00255&|>| +0#0000000&|{+0#e000e06&| +0#0000000&@53
-@12|H|i|s|t|o|r|y|J|u|m|p|(+0#e000e06&|r+0#00e0e07&|e|s|.+0#af5f00255&|t+0#00e0e07&|e|x|t|)+0#e000e06&| +0#0000000&@41
+@12|H|i|s|t|o|r|y|J|u|m|p|(+0#e000e06&|r+0#00e0e07&|e|s|.+0#0000000&|t+0#00e0e07&|e|x|t|)+0#e000e06&| +0#0000000&@41
 @8|}+0#e000e06&|)| +0#0000000&@64
 @57|7|1|,|1| @9|9|4|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_function_calls_01.dump b/runtime/syntax/testdir/dumps/vim_function_calls_01.dump
index 05ba8237b0..d3f3c42b8a 100644
--- a/runtime/syntax/testdir/dumps/vim_function_calls_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_calls_01.dump
@@ -17,4 +17,4 @@
 |"+0#0000e05&| |c|o|m@1|a|n|d| +0#0000000&@65
 |c+0#af5f00255&|a|l@1|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@66
 |c+0#af5f00255&|a|l@1| +0#0000000&|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@65
-@57|1|9|,|1| @10|5|%| 
+@57|1|9|,|1| @10|4|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_function_calls_02.dump b/runtime/syntax/testdir/dumps/vim_function_calls_02.dump
index 9de7ceebbf..7244cd5fc6 100644
--- a/runtime/syntax/testdir/dumps/vim_function_calls_02.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_calls_02.dump
@@ -17,4 +17,4 @@
 |"+0#0000e05&| |c|o|m@1|a|n|d| +0#0000000&@65
 |c+0#af5f00255&|o|p|y|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@66
 |c+0#af5f00255&|o|p|y| +0#0000000&|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@65
-@57|3|7|,|1| @9|1|2|%| 
+@57|3|7|,|1| @9|1@1|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_function_calls_04.dump b/runtime/syntax/testdir/dumps/vim_function_calls_04.dump
index 0b24a8ebdf..4a1edd0f4d 100644
--- a/runtime/syntax/testdir/dumps/vim_function_calls_04.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_calls_04.dump
@@ -17,4 +17,4 @@
 |"+0#0000e05&| |c|o|m@1|a|n|d| +0#0000000&@65
 |i+0#af5f00255&|n|s|e|r|t| +0#0000000&@68
 |.+0#af5f00255&| +0#0000000&@73
-@57|7|3|,|1| @9|2|5|%| 
+@57|7|3|,|1| @9|2|4|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_function_calls_05.dump b/runtime/syntax/testdir/dumps/vim_function_calls_05.dump
index ae5ffb84d4..7c764ed74a 100644
--- a/runtime/syntax/testdir/dumps/vim_function_calls_05.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_calls_05.dump
@@ -17,4 +17,4 @@
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|m|a|t|c|h| |=+0#af5f00255&| +0#0000000&|m+0#00e0e07&|a|t|c|h|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
 |c+0#af5f00255&|a|l@1| +0#0000000&|m+0#00e0e07&|a|t|c|h|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
-@57|9|1|,|1| @9|3|2|%| 
+@57|9|1|,|1| @9|3|1|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_function_calls_06.dump b/runtime/syntax/testdir/dumps/vim_function_calls_06.dump
index 40b1322990..0142cb07d5 100644
--- a/runtime/syntax/testdir/dumps/vim_function_calls_06.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_calls_06.dump
@@ -17,4 +17,4 @@
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|s|u|b|s|t|i|t|u|t|e| |=+0#af5f00255&| +0#0000000&|s+0#00e0e07&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@43
 |c+0#af5f00255&|a|l@1| +0#0000000&|s+0#00e0e07&|u|b|s|t|i|t|u|t|e|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
-@57|1|0|9|,|1| @8|3|9|%| 
+@57|1|0|9|,|1| @8|3|8|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_function_calls_07.dump b/runtime/syntax/testdir/dumps/vim_function_calls_07.dump
index 8e4c2494bf..edc2aa09e2 100644
--- a/runtime/syntax/testdir/dumps/vim_function_calls_07.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_calls_07.dump
@@ -17,4 +17,4 @@
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|u|n|i|q| |=+0#af5f00255&| +0#0000000&|u+0#00e0e07&|n|i|q|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|u+0#00e0e07&|n|i|q|(+0#e000e06&|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@61
-@57|1|2|7|,|1| @8|4|6|%| 
+@57|1|2|7|,|1| @8|4@1|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_function_calls_08.dump b/runtime/syntax/testdir/dumps/vim_function_calls_08.dump
index 882b3258df..204322789c 100644
--- a/runtime/syntax/testdir/dumps/vim_function_calls_08.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_calls_08.dump
@@ -17,4 +17,4 @@
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|e|c|h|o| |=+0#af5f00255&| +0#0000000&|e+0#ffffff16#ff404010|c|h|o|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|e+0#ffffff16#ff404010|c|h|o|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@61
-@57|1|4|5|,|0|-|1| @6|5|3|%| 
+@57|1|4|5|,|0|-|1| @6|5|1|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_function_calls_09.dump b/runtime/syntax/testdir/dumps/vim_function_calls_09.dump
index 207e4efcc1..9c94d84475 100644
--- a/runtime/syntax/testdir/dumps/vim_function_calls_09.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_calls_09.dump
@@ -17,4 +17,4 @@
 |e+0#af5f00255&|c|h|o| +0#0000000&|(+0#e000e06&|F+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)@1| +0#0000000&@62
 |e+0#af5f00255&|c|h|o| +0#0000000&|F+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)| +0#0000000&|++0#af5f00255&| +0#0000000&|b|a|r| @58
 |e+0#af5f00255&|c|h|o| +0#0000000&|b|a|r| |++0#af5f00255&| +0#0000000&|F+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)| +0#0000000&@58
-@57|1|6|3|,|0|-|1| @6|6|0|%| 
+@57|1|6|3|,|0|-|1| @6|5|8|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_function_calls_10.dump b/runtime/syntax/testdir/dumps/vim_function_calls_10.dump
index c385765365..04eec79be8 100644
--- a/runtime/syntax/testdir/dumps/vim_function_calls_10.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_calls_10.dump
@@ -17,4 +17,4 @@
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
-@57|1|8|1|,|1| @8|6|7|%| 
+@57|1|8|1|,|1| @8|6|5|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_function_calls_11.dump b/runtime/syntax/testdir/dumps/vim_function_calls_11.dump
index 09576638a1..06c9080fc3 100644
--- a/runtime/syntax/testdir/dumps/vim_function_calls_11.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_calls_11.dump
@@ -10,11 +10,11 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|v+0#00e0e07&|:|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@60
 @75
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@50
-|c+0#af5f00255&|a|l@1| +0#0000000&|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
+|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|m|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@50
+|c+0#af5f00255&|a|l@1| +0#0000000&|m|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|s+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
+|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|s+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|m|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@55
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-@57|1|9@1|,|1| @8|7|4|%| 
+|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+@57|1|9@1|,|1| @8|7|1|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_function_calls_12.dump b/runtime/syntax/testdir/dumps/vim_function_calls_12.dump
index e4a47d3831..4b22be851b 100644
--- a/runtime/syntax/testdir/dumps/vim_function_calls_12.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_calls_12.dump
@@ -1,20 +1,20 @@
-|l+0#af5f00255#ffffff0|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
+|l+0#af5f00255#ffffff0|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|g+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|b+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
+|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|b+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
 > @74
-|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|w+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
+|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|w+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
+|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|t+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|l+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|l+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
+|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|l+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|l+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|a+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|a+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
+|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|a+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|a+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
 @75
-|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|v+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-@57|2|1|7|,|0|-|1| @6|8|1|%| 
+|l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|v+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+@57|2|1|7|,|0|-|1| @6|7|8|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_function_calls_13.dump b/runtime/syntax/testdir/dumps/vim_function_calls_13.dump
index 6ad6d7d0a9..8ded6b7c94 100644
--- a/runtime/syntax/testdir/dumps/vim_function_calls_13.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_calls_13.dump
@@ -1,5 +1,5 @@
-|l+0#af5f00255#ffffff0|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|v+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
-|c+0#af5f00255&|a|l@1| +0#0000000&|v+0#00e0e07&|:|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
+|l+0#af5f00255#ffffff0|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|v+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@48
+|c+0#af5f00255&|a|l@1| +0#0000000&|v+0#00e0e07&|:|m+0#0000000&|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@53
 @75
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|f|o@1| |=+0#af5f00255&| +0#0000000&|m+0#0000001#ffff4012|o|d|u|l|e|#|f|o@1|(+0#e000e06#ffffff0|4+0#e000002&|2|)+0#e000e06&| +0#0000000&@50
@@ -17,4 +17,4 @@
 |c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@55
 |c+0#af5f00255&|a|l@1| +0#0000000&|l+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@55
-@57|2|3|5|,|1| @8|8@1|%| 
+@57|2|3|5|,|1| @8|8|5|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_function_calls_14.dump b/runtime/syntax/testdir/dumps/vim_function_calls_14.dump
index b5d23c07fe..17c35c606b 100644
--- a/runtime/syntax/testdir/dumps/vim_function_calls_14.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_calls_14.dump
@@ -4,17 +4,17 @@
 @75
 |c+0#af5f00255&|a|l@1| +0#0000000&|<+0#e000e06&|S|I|D|>|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@52
 > @74
-|c+0#af5f00255&|a|l@1| +0#0000000&|s+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
-|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
-|c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
-|c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
-|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
-|c+0#af5f00255&|a|l@1| +0#0000000&|l+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
-|c+0#af5f00255&|a|l@1| +0#0000000&|a+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
-|c+0#af5f00255&|a|l@1| +0#0000000&|v+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|.|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|s+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|b+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|w+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|t+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|l+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|a+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|v+0#00e0e07&|:|s+0#0000000&|u|b|s|t|i|t|u|t|e|.|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
 @75
 |c+0#af5f00255&|a|l@1| +0#0000000&|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|#|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@46
 |c+0#af5f00255&|a|l@1| +0#0000000&|g+0#00e0e07&|:|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|#|s|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
 @75
 @75
-@57|2|5|3|,|0|-|1| @6|9|5|%| 
+@57|2|5|3|,|0|-|1| @6|9|1|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_function_calls_15.dump b/runtime/syntax/testdir/dumps/vim_function_calls_15.dump
index 50bf79772f..4a38aee85c 100644
--- a/runtime/syntax/testdir/dumps/vim_function_calls_15.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_calls_15.dump
@@ -1,20 +1,20 @@
 | +0&#ffffff0@74
 |"+0#0000e05&| |C|h|a|i|n|e|d| |f|u|n|c|t|i|o|n| |c|a|l@1|s| +0#0000000&@50
 @75
-|c+0#af5f00255&|a|l@1| +0#0000000&|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|)|.+0#af5f00255&|b+0#0000001#ffff4012|a|r|(+0#e000e06#ffffff0|)| +0#0000000&@51
-|c+0#af5f00255&|a|l@1| +0#0000000&|m+0#0000001#ffff4012|o|d|u|l|e|.|f|o@1|(+0#e000e06#ffffff0|)|.+0#af5f00255&|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
+|c+0#af5f00255&|a|l@1| +0#0000000&|m|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)|.+0#0000000&|b+0#0000001#ffff4012|a|r|(+0#e000e06#ffffff0|)| +0#0000000&@51
+|c+0#af5f00255&|a|l@1| +0#0000000&|m|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)|.+0#0000000&|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@44
 > @74
 @75
-|"+0#0000e05&| |I|s@1|u|e| |#|1|7@1|6@1| |(|v|a|l|i|d| |f|u|n|c|t|i|o|n| |c|a|l@1| |h|i|g|h|l|i|g|h|t|e|d| |a|s| |e|r@1|o|r|)| +0#0000000&@17
+|"+0#0000e05&| |D|i|c|t|-|k|e|y| |o|n|l|y| +0#0000000&@59
+@75
+|e+0#af5f00255&|c|h|o| +0#0000000&|m|o|d|u|l|e|.|4+0#0000001#ffff4012|2|(+0#e000e06#ffffff0|)| +0#0000000&@58
+|e+0#af5f00255&|c|h|o| +0#0000000&|m|o|d|u|l|e|[|0+0#e000002&|]+0#0000000&|.|4+0#0000001#ffff4012|2|(+0#e000e06#ffffff0|)| +0#0000000&@55
+|e+0#af5f00255&|c|h|o| +0#0000000&|m|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)|.+0#0000000&|4+0#0000001#ffff4012|2|(+0#e000e06#ffffff0|)| +0#0000000&@52
 @75
-|c+0#af5f00255&|a|l@1| +0#0000000&|m|o|d|u|l|e|[|0+0#e000002&|]+0#0000000&|.+0#af5f00255&|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)| +0#0000000&@54
-|c+0#af5f00255&|a|l@1| +0#0000000&|m|o|d|u|l|e|[|0+0#e000002&|]+0#0000000&|.+0#af5f00255&|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@47
+|e+0#af5f00255&|c|h|o| +0#0000000&|m|o|d|u|l|e|.|4+0#0000001#ffff4012|2|l|i|f|e|(+0#e000e06#ffffff0|)| +0#0000000&@54
+|e+0#af5f00255&|c|h|o| +0#0000000&|m|o|d|u|l|e|[|0+0#e000002&|]+0#0000000&|.|4+0#0000001#ffff4012|2|l|i|f|e|(+0#e000e06#ffffff0|)| +0#0000000&@51
+|e+0#af5f00255&|c|h|o| +0#0000000&|m|o|d|u|l|e|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)|.+0#0000000&|4+0#0000001#ffff4012|2|l|i|f|e|(+0#e000e06#ffffff0|)| +0#0000000&@48
 @75
-|~+0#4040ff13&| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-| +0#0000000&@56|2|7|1|,|0|-|1| @6|B|o|t| 
+@75
+|"+0#0000e05&| |I|s@1|u|e| |#|1|7@1|6@1| |(|v|a|l|i|d| |f|u|n|c|t|i|o|n| |c|a|l@1| |h|i|g|h|l|i|g|h|t|e|d| |a|s| |e|r@1|o|r|)| +0#0000000&@17
+@57|2|7|1|,|0|-|1| @6|9|8|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_function_calls_16.dump b/runtime/syntax/testdir/dumps/vim_function_calls_16.dump
new file mode 100644
index 0000000000..21d60f2f00
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/vim_function_calls_16.dump
@@ -0,0 +1,20 @@
+|"+0#0000e05#ffffff0| |I|s@1|u|e| |#|1|7@1|6@1| |(|v|a|l|i|d| |f|u|n|c|t|i|o|n| |c|a|l@1| |h|i|g|h|l|i|g|h|t|e|d| |a|s| |e|r@1|o|r|)| +0#0000000&@17
+@75
+|c+0#af5f00255&|a|l@1| +0#0000000&|m|o|d|u|l|e|[|0+0#e000002&|]+0#0000000&|.|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)| +0#0000000&@54
+|c+0#af5f00255&|a|l@1| +0#0000000&|m|o|d|u|l|e|[|0+0#e000002&|]+0#0000000&|.|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)| +0#0000000&@47
+> @74
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|2|8@1|,|0|-|1| @6|B|o|t| 
diff --git a/runtime/syntax/testdir/dumps/vim_variables_04.dump b/runtime/syntax/testdir/dumps/vim_variables_04.dump
index b633655bac..d82972b6f3 100644
--- a/runtime/syntax/testdir/dumps/vim_variables_04.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_04.dump
@@ -17,4 +17,4 @@
 |l+0#af5f00255&|e|t| +0#0000000&|s+0#00e0e07&|:|f|o@1| +0#0000000&|.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|t+0#00e0e07&|:|f|o@1| +0#0000000&|=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58
-@57|7|3|,|1| @9|1|7|%| 
+@57|7|3|,|1| @9|1|6|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_variables_06.dump b/runtime/syntax/testdir/dumps/vim_variables_06.dump
index 031115c191..891b022434 100644
--- a/runtime/syntax/testdir/dumps/vim_variables_06.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_06.dump
@@ -17,4 +17,4 @@
 |l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|*+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
 |l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|/+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
 |l+0#af5f00255&|e|t| +0#0000000&|v+0#00e0e07&|:|t|r|u|e| +0#0000000&|%+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@56
-@57|1|0|9|,|0|-|1| @6|2|6|%| 
+@57|1|0|9|,|0|-|1| @6|2|5|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_variables_08.dump b/runtime/syntax/testdir/dumps/vim_variables_08.dump
index 5ca7f0d364..d9d3d6b816 100644
--- a/runtime/syntax/testdir/dumps/vim_variables_08.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_08.dump
@@ -17,4 +17,4 @@
 |l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|t|_|k|1| +0#0000000&|=+0#af5f00255&| +0#0000000&|"+0#e000002&|\+0#e000e06&|<|E|s|c|>|[+0#e000002&|2|3|4|;|"| +0#0000000&@49
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|a|r|i| +0#0000000&|.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@58
-@57|1|4|5|,|0|-|1| @6|3|5|%| 
+@57|1|4|5|,|0|-|1| @6|3|4|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_variables_09.dump b/runtime/syntax/testdir/dumps/vim_variables_09.dump
index 737a044c63..1d402f1643 100644
--- a/runtime/syntax/testdir/dumps/vim_variables_09.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_09.dump
@@ -17,4 +17,4 @@
 |l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|g|:|a|l|e|p|h| +0#0000000&|++0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
 |l+0#af5f00255&|e|t| +0#0000000&|&+0#00e0e07&|g|:|a|l|e|p|h| +0#0000000&|-+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@54
 @75
-@57|1|6|3|,|1| @8|4|0|%| 
+@57|1|6|3|,|1| @8|3|9|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_variables_10.dump b/runtime/syntax/testdir/dumps/vim_variables_10.dump
index d7a7d46d4b..6cb1461415 100644
--- a/runtime/syntax/testdir/dumps/vim_variables_10.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_10.dump
@@ -17,4 +17,4 @@
 @75
 |l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |.+0#af5f00255&|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@52
 |l+0#af5f00255&|e|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |.+0#af5f00255&@1|=| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
-@57|1|8|1|,|1| @8|4@1|%| 
+@57|1|8|1|,|1| @8|4|3|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_variables_11.dump b/runtime/syntax/testdir/dumps/vim_variables_11.dump
index 042f712354..6bb0142d67 100644
--- a/runtime/syntax/testdir/dumps/vim_variables_11.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_11.dump
@@ -17,4 +17,4 @@
 |l+0#af5f00255&|e|t| +0#0000000&|[|&+0#00e0e07&|a|r|i|,+0#0000000&| |&+0#00e0e07&|b|k|c|;+0#0000000&| |&+0#00e0e07&|c|m|p|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@45
 |l+0#af5f00255&|e|t| +0#0000000&|[|&+0#00e0e07&|a|r|i|,+0#0000000&| @64
 @6|\+0#e000e06&| +0#0000000&|&+0#00e0e07&|b|k|c|;+0#0000000&| @61
-@57|1|9@1|,|1| @8|4|9|%| 
+@57|1|9@1|,|1| @8|4|8|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_variables_12.dump b/runtime/syntax/testdir/dumps/vim_variables_12.dump
index d2acc484d5..c125fd1ade 100644
--- a/runtime/syntax/testdir/dumps/vim_variables_12.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_12.dump
@@ -17,4 +17,4 @@
 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|=+0#e000e06&|<@1| |t|r|i|m| |e|v|a|l| |E|N|D| +0#0000000&@49
 |.+0#e000002&@2| +0#0000000&@71
 |E+0#e000e06&|N|D| +0#0000000&@71
-@57|2|1|7|,|7| @8|5|3|%| 
+@57|2|1|7|,|7| @8|5|2|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_variables_13.dump b/runtime/syntax/testdir/dumps/vim_variables_13.dump
index 11593c5d7e..4d86247072 100644
--- a/runtime/syntax/testdir/dumps/vim_variables_13.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_13.dump
@@ -17,4 +17,4 @@
 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| |"+0#0000e05&| |c|o|m@1|e|n|t| +0#0000000&@53
 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| ||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@50
 |l+0#af5f00255&|e|t| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b|a|r| |"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@52
-@57|2|3|5|,|1| @8|5|8|%| 
+@57|2|3|5|,|1| @8|5|6|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_variables_14.dump b/runtime/syntax/testdir/dumps/vim_variables_14.dump
index e85091b1d8..9d9f09ccc9 100644
--- a/runtime/syntax/testdir/dumps/vim_variables_14.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_14.dump
@@ -17,4 +17,4 @@
 |u+0#af5f00255&|n|l|e|t| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&@64
 |u+0#af5f00255&|n|l|e|t|!| +0#0000000&|$+0#e000e06&|F|O@1| +0#0000000&@63
 @75
-@57|2|5|3|,|1| @8|6|3|%| 
+@57|2|5|3|,|1| @8|6|1|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_variables_15.dump b/runtime/syntax/testdir/dumps/vim_variables_15.dump
index 567fd59df5..ec564a34b9 100644
--- a/runtime/syntax/testdir/dumps/vim_variables_15.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_15.dump
@@ -17,4 +17,4 @@
 @75
 |c+0#af5f00255&|o|n|s|t| +0#0000000&|[|f+0#00e0e07&|o@1|,+0#0000000&| |b+0#00e0e07&|a|r|]+0#0000000&| |=+0#af5f00255&| +0#0000000&|e+0#00e0e07&|x|p|r| +0#0000000&@51
 @75
-@57|2|7|1|,|0|-|1| @6|6|7|%| 
+@57|2|7|1|,|0|-|1| @6|6|5|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_variables_16.dump b/runtime/syntax/testdir/dumps/vim_variables_16.dump
index 5a4618c68b..264c91ff85 100644
--- a/runtime/syntax/testdir/dumps/vim_variables_16.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_16.dump
@@ -17,4 +17,4 @@
 |.+0#e000002&@2| +0#0000000&@71
 |E+0#e000e06&|N|D| +0#0000000&@71
 @75
-@57|2|8|9|,|1| @8|7|2|%| 
+@57|2|8|9|,|1| @8|7|0|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_variables_17.dump b/runtime/syntax/testdir/dumps/vim_variables_17.dump
index 2a49205a91..4c905cf259 100644
--- a/runtime/syntax/testdir/dumps/vim_variables_17.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_17.dump
@@ -17,4 +17,4 @@
 |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@63
 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
 @6|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@63
-@57|3|0|7|,|0|-|1| @6|7|6|%| 
+@57|3|0|7|,|0|-|1| @6|7|4|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_variables_18.dump b/runtime/syntax/testdir/dumps/vim_variables_18.dump
index 4e6913502a..226a532849 100644
--- a/runtime/syntax/testdir/dumps/vim_variables_18.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_18.dump
@@ -17,4 +17,4 @@
 |l+0#af5f00255&|o|c|k|v|a|r|!| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&||| |e+0#af5f00255&|c|h|o| +0#0000000&|"+0#e000002&|F|o@1|"| +0#0000000&@45
 @75
 |l+0#af5f00255&|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@61
-@57|3|2|5|,|1| @8|8|1|%| 
+@57|3|2|5|,|1| @8|7|9|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_variables_19.dump b/runtime/syntax/testdir/dumps/vim_variables_19.dump
index 5510ea6406..3872c439ac 100644
--- a/runtime/syntax/testdir/dumps/vim_variables_19.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_19.dump
@@ -17,4 +17,4 @@
 @6|"+0#0000e05&|\| |c|o|m@1|e|n|t| +0#0000000&@58
 @6|\+0#e000e06&| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@63
 @75
-@57|3|4|3|,|0|-|1| @6|8|5|%| 
+@57|3|4|3|,|0|-|1| @6|8|3|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_variables_20.dump b/runtime/syntax/testdir/dumps/vim_variables_20.dump
index 2b1c0c7e30..0b5efe084b 100644
--- a/runtime/syntax/testdir/dumps/vim_variables_20.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_20.dump
@@ -17,4 +17,4 @@
 @75
 |u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&@59
 |u+0#af5f00255&|n|l|o|c|k|v|a|r| +0#0000000&|2+0#e000002&| +0#0000000&|f+0#00e0e07&|o@1| +0#0000000&|b+0#00e0e07&|a|r| +0#0000000&@55
-@57|3|6|1|,|0|-|1| @6|9|0|%| 
+@57|3|6|1|,|0|-|1| @6|8@1|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_variables_21.dump b/runtime/syntax/testdir/dumps/vim_variables_21.dump
index a721556daf..fdb1ca07f8 100644
--- a/runtime/syntax/testdir/dumps/vim_variables_21.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_21.dump
@@ -17,4 +17,4 @@
 |e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|l+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51
 |e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|s+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51
 |e+0#af5f00255&|c|h|o| +0#0000000&|g+0#00e0e07&|e|t|(+0#e000e06&|a+0#00e0e07&|:|,+0#0000000&| |'+0#e000002&|f|o@1|'|,+0#0000000&| |4+0#e000002&|2|)+0#e000e06&| +0#0000000&@51
-@57|3|7|9|,|1| @8|9|5|%| 
+@57|3|7|9|,|1| @8|9|2|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_variables_22.dump b/runtime/syntax/testdir/dumps/vim_variables_22.dump
index 48956348b3..af2e31ae80 100644
--- a/runtime/syntax/testdir/dumps/vim_variables_22.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_22.dump
@@ -17,4 +17,4 @@
 |e+0#af5f00255&|c|h|o| +0#0000000&|&+0#00e0e07&|c+0#0000000&|h|a|n@1|e|l| |&+0#00e0e07&|i+0#0000000&|n|c@1|o|m@1|a|n|d| |&+0#00e0e07&|m+0#0000000&|o|u|s|e|s|c|r|o|l@1| |&+0#00e0e07&|p+0#0000000&|u|m|b|l|e|n|d| |&+0#00e0e07&|r+0#0000000&|e|d|r|a|w|d|e|b|u|g| |&+0#00e0e07&|s+0#0000000&|c|r|o|l@1|b|a|c|k| @1
 |e+0#af5f00255&|c|h|o| +0#0000000&|&+0#00e0e07&|s+0#0000000&|h|a|d|a| |&+0#00e0e07&|s+0#0000000&|h|a|d|a|f|i|l|e| |&+0#00e0e07&|s+0#0000000&|t|a|t|u|s|c|o|l|u|m|n| |&+0#00e0e07&|t+0#0000000&|e|r|m|p|a|s|t|e|f|i|l|t|e|r| |&+0#00e0e07&|t|e|r|m|s|y|n|c| +0#0000000&|&+0#00e0e07&|w+0#0000000&|i|n|b|a|r| @3
 |e+0#af5f00255&|c|h|o| +0#0000000&|&+0#00e0e07&|w+0#0000000&|i|n|b|l|e|n|d| @60
-@57|3|9|7|,|1| @8|9@1|%| 
+@57|3|9|7|,|1| @8|9|7|%| 
diff --git a/runtime/syntax/testdir/dumps/vim_variables_23.dump b/runtime/syntax/testdir/dumps/vim_variables_23.dump
index a8897b5ad8..e0a97da085 100644
--- a/runtime/syntax/testdir/dumps/vim_variables_23.dump
+++ b/runtime/syntax/testdir/dumps/vim_variables_23.dump
@@ -1,5 +1,15 @@
 |e+0#af5f00255#ffffff0|c|h|o| +0#0000000&|&+0#00e0e07&|w+0#0000000&|i|n|b|l|e|n|d| @60
-> @74
+@75
+|"+0#0000e05&| |D|i|c|t|-|k|e|y| |o|n|l|y| +0#0000000&@59
+@75
+|e+0#af5f00255&|c|h|o| +0#0000000&|m+0#00e0e07&|o|d|u|l|e|.+0#0000000&|4+0#00e0e07&|2| +0#0000000&@60
+>e+0#af5f00255&|c|h|o| +0#0000000&|m+0#00e0e07&|o|d|u|l|e|[+0#0000000&|0+0#e000002&|]+0#0000000&|.|4+0#00e0e07&|2| +0#0000000&@57
+|e+0#af5f00255&|c|h|o| +0#0000000&|m+0#00e0e07&|o|d|u|l|e|.+0#0000000&|f|o@1|(+0#e000e06&|)|.+0#0000000&|4+0#00e0e07&|2| +0#0000000&@54
+@75
+|e+0#af5f00255&|c|h|o| +0#0000000&|m+0#00e0e07&|o|d|u|l|e|.+0#0000000&|4+0#00e0e07&|2|l|i|f|e| +0#0000000&@56
+|e+0#af5f00255&|c|h|o| +0#0000000&|m+0#00e0e07&|o|d|u|l|e|[+0#0000000&|0+0#e000002&|]+0#0000000&|.|4+0#00e0e07&|2|l|i|f|e| +0#0000000&@53
+|e+0#af5f00255&|c|h|o| +0#0000000&|m+0#00e0e07&|o|d|u|l|e|.+0#0000000&|f|o@1|(+0#e000e06&|)|.+0#0000000&|4+0#00e0e07&|2|l|i|f|e| +0#0000000&@50
+@75
 |~+0#4040ff13&| @73
 |~| @73
 |~| @73
@@ -7,14 +17,4 @@
 |~| @73
 |~| @73
 |~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-| +0#0000000&@56|4|1@1|,|0|-|1| @6|B|o|t| 
+| +0#0000000&@56|4|1|5|,|1| @8|B|o|t| 
diff --git a/runtime/syntax/testdir/input/algol68_denotations.a68 b/runtime/syntax/testdir/input/algol68_denotations.a68
index f3ff57b976..0cd8c6e6eb 100644
--- a/runtime/syntax/testdir/input/algol68_denotations.a68
+++ b/runtime/syntax/testdir/input/algol68_denotations.a68
@@ -14,12 +14,26 @@ BOOL x = FALSE
 INT x = 0
 INT x = 42
 
+# size #
+SHORT INT x = SHORT 42
+ LONG INT x =  LONG 42
+SHORT SHORT INT x = SHORT SHORT 42
+  LONG LONG INT x =  LONG  LONG 42
+
 # whitespace #
 INT x = 1 000 000
 
 # monadic operators #
 INT x = -42
 INT x = +42
+SHORT INT x = +SHORT 42
+ LONG INT x =  -LONG 42
+SHORT INT x = -SHORT 42
+ LONG INT x =  +LONG 42
+SHORT SHORT INT x = +SHORT SHORT 42
+  LONG LONG INT x =   -LONG LONG 42
+SHORT SHORT INT x = -SHORT SHORT 42
+  LONG LONG INT x =   +LONG LONG 42
 
 
 # REAL #
@@ -72,6 +86,20 @@ REAL x = 42.42E+42
 REAL x = 42.42\+42
 REAL x = 42.42�+42
 
+# size #
+SHORT REAL x = SHORT .42
+SHORT REAL x = SHORT 42.42
+SHORT REAL x = SHORT 42e42
+ LONG REAL x =  LONG .42
+ LONG REAL x =  LONG 42.42
+ LONG REAL x =  LONG 42e42
+SHORT SHORT REAL x = SHORT SHORT .42
+SHORT SHORT REAL x = SHORT SHORT 42.42
+SHORT SHORT REAL x = SHORT SHORT 42e42
+  LONG LONG REAL x =   LONG LONG .42
+  LONG LONG REAL x =   LONG LONG 42.42
+  LONG LONG REAL x =   LONG LONG 42e42
+
 # whitespace #
 REAL x = 4 2 . 4 2 e + 4 2
 REAL x = 4 2 . 4 2 \ + 4 2
@@ -80,6 +108,14 @@ REAL x = 4 2 . 4 2 � + 4 2
 # monadic operators #
 REAL x = -42.42
 REAL x = +42.42
+SHORT REAL x = +SHORT 42.42
+ LONG REAL x =  -LONG 42.42
+SHORT REAL x = -SHORT 42.42
+ LONG REAL x =  +LONG 42.42
+SHORT SHORT REAL x = +SHORT SHORT 42.42
+  LONG LONG REAL x =   -LONG LONG 42.42
+SHORT SHORT REAL x = -SHORT SHORT 42.42
+  LONG LONG REAL x =   +LONG LONG 42.42
 
 
 # BITS #
@@ -89,6 +125,25 @@ BITS x = 4r222
 BITS x = 8r52
 BITS x = 16r2a
 
+# size #
+SHORT BITS x = SHORT 2r101010
+SHORT BITS x = SHORT 4r222
+SHORT BITS x = SHORT 8r52
+SHORT BITS x = SHORT 16r2a
+ LONG BITS x =  LONG 2r101010
+ LONG BITS x =  LONG 4r222
+ LONG BITS x =  LONG 8r52
+ LONG BITS x =  LONG 16r2a
+SHORT SHORT BITS x = SHORT SHORT 2r101010
+SHORT SHORT BITS x = SHORT SHORT 4r222
+SHORT SHORT BITS x = SHORT SHORT 8r52
+SHORT SHORT BITS x = SHORT SHORT 16r2a
+  LONG LONG BITS x =   LONG LONG 2r101010
+  LONG LONG BITS x =   LONG LONG 4r222
+  LONG LONG BITS x =   LONG LONG 8r52
+  LONG LONG BITS x =   LONG LONG 16r2a
+
+
 # whitespace #
 BITS x = 2r 1010 1010
 
diff --git a/runtime/syntax/testdir/input/cpp_cpp26.cpp b/runtime/syntax/testdir/input/cpp_cpp26.cpp
new file mode 100644
index 0000000000..97fe4a6524
--- /dev/null
+++ b/runtime/syntax/testdir/input/cpp_cpp26.cpp
@@ -0,0 +1,13 @@
+// C++26 lexical constructs
+
+// P3394 annotations: [[ ... ]] may carry a value expression.
+[[=rename{"full_name"}]] int braced;
+[[=key(8)]]              int parened;
+[[nodiscard]]            int plain();
+
+// P2900 contracts: contract_assert is a keyword.
+void check(int x) { contract_assert(x != 0); }
+
+// P2996 reflection (^^) and splicing ([: :]).
+constexpr auto refl = ^^int;
+[:refl:] spliced{};
diff --git a/runtime/syntax/testdir/input/setup/java_module_info.vim b/runtime/syntax/testdir/input/setup/java_module_info.vim
index 2711c1a9a0..73f8128905 100644
--- a/runtime/syntax/testdir/input/setup/java_module_info.vim
+++ b/runtime/syntax/testdir/input/setup/java_module_info.vim
@@ -1,30 +1,3 @@
-vim9script
-
-# Test filenames are required to begin with the filetype name prefix,
-# whereas the name of a Java module declaration must be "module-info".
-const name_a: string = 'input/java_module_info.java'
-const name_b: string = 'input/module-info.java'
-
-def ChangeFilename()
-    exec 'saveas! ' .. name_b
-enddef
-
-def RestoreFilename()
-    exec 'saveas! ' .. name_a
-    delete(name_b)
-enddef
-
-autocmd_add([{
-    replace:	true,
-    group:	'java_syntax_tests',
-    event:	'BufEnter',
-    pattern:	name_a,
-    cmd:	'ChangeFilename()',
-    once:	true,
-}, {
-    group:	'java_syntax_tests',
-    event:	['BufLeave', 'ExitPre'],
-    pattern:	name_b,
-    cmd:	'RestoreFilename()',
-    once:	true,
-}])
+" Test filenames are required to begin with the filetype name prefix,
+" whereas the name of a Java module declaration must be "module-info".
+call DeferRenamingTestFileTo('module-info.java')
diff --git a/runtime/syntax/testdir/input/vim_function_calls.vim b/runtime/syntax/testdir/input/vim_function_calls.vim
index 60158161c4..8e4e850973 100644
--- a/runtime/syntax/testdir/input/vim_function_calls.vim
+++ b/runtime/syntax/testdir/input/vim_function_calls.vim
@@ -270,6 +270,17 @@ call module.foo().bar()
 call module.foo().substitute()
 
 
+" Dict-key only
+
+echo module.42()
+echo module[0].42()
+echo module.foo().42()
+
+echo module.42life()
+echo module[0].42life()
+echo module.foo().42life()
+
+
 " Issue #17766 (valid function call highlighted as error)
 
 call module[0].foo()
diff --git a/runtime/syntax/testdir/input/vim_variables.vim b/runtime/syntax/testdir/input/vim_variables.vim
index d062efbb03..255bc9f98c 100644
--- a/runtime/syntax/testdir/input/vim_variables.vim
+++ b/runtime/syntax/testdir/input/vim_variables.vim
@@ -409,3 +409,13 @@ echo &channel &inccommand &mousescroll &pumblend &redrawdebug &scrollback
 echo &shada &shadafile &statuscolumn &termpastefilter &termsync &winbar
 echo &winblend
 
+" Dict-key only
+
+echo module.42
+echo module[0].42
+echo module.foo().42
+
+echo module.42life
+echo module[0].42life
+echo module.foo().42life
+
diff --git a/runtime/syntax/testdir/runtest.vim b/runtime/syntax/testdir/runtest.vim
index b3a6612b77..86fbf0e06a 100644
--- a/runtime/syntax/testdir/runtest.vim
+++ b/runtime/syntax/testdir/runtest.vim
@@ -253,6 +253,8 @@ func RunTest()
     " Track the cursor progress through a syntax test file so that any
     " degenerate input can be reported.  Each file will have its own cursor.
     let s:cursor = 1
+    " Give a new name to a file-associated buffer on demand.
+    let s:new_fname = ''
 
     " extra info for shell variables
     func ShellInfo()
@@ -294,14 +296,50 @@ func RunTest()
 	exe substitute(getline(lnum), '\C.*\<VIM_TEST_SETUP\>', '', '')
       endfor
       call cursor(1, 1)
+      let [old_name, new_name] = s:ResolveFilenames()
+      call s:ChangeFilenameTo(new_name)
       " BEGIN [runtime/defaults.vim]
       " Also, disable italic highlighting to avoid issues on some terminals.
       set display=lastline ruler scrolloff=5 t_ZH= t_ZR=
       syntax on
       " END [runtime/defaults.vim]
+      call s:RestoreFilename(new_name, old_name)
       redraw!
     endfunc
 
+    def s:ChangeFilenameTo(name: string)
+      if !empty(name)
+	exe 'saveas! ' .. name
+      endif
+    enddef
+
+    def s:RestoreFilename(new_name: string, old_name: string)
+      if !empty(new_name) && !empty(old_name)
+	exe 'saveas! ' .. old_name
+	delete(new_name)
+      endif
+    enddef
+
+    def s:ResolveFilenames(): tuple<string, string>
+      if !empty(new_fname)
+	const old_name: string = fnamemodify(bufname(), ':.')
+	# Get a platform-independent pathname prefix, cf. "expand('%:p:h') .. '/'".
+	const new_name: string = strpart(
+	    old_name,
+	    0,
+	    strridx(old_name, fnamemodify(bufname(), ':t'))) ..
+	  new_fname
+	return (old_name, new_name)
+      else
+	return ("", "")
+      endif
+    enddef
+
+    def DeferRenamingTestFileTo(name: string)
+      # Strip any leading pathname and mask the filenames of '.' and '..'.
+      new_fname = substitute(fnamemodify(name, ':t'), '^\.\.\=$', '', '')
+    enddef
+
     def s:AssertCursorForwardProgress(): bool
       const curnum: number = line('.')
       if curnum <= cursor
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index 2b6f48e63c..093c74aecb 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -2,7 +2,7 @@
 " Language:	   Vim script
 " Maintainer:	   Hirohito Higashi <h.east.727 ATMARK gmail.com>
 "	   Doug Kearns <dougkearns@gmail.com>
-" Last Change:	   2026 May 24
+" Last Change:	   2026 Jun 12
 " Former Maintainer: Charles E. Campbell
 
 " DO NOT CHANGE DIRECTLY.
@@ -154,14 +154,14 @@ syn case match
 " Function Names {{{2
 " GEN_SYN_VIM: vimFuncName, START_STR='syn keyword vimFuncName contained', END_STR=''
 syn keyword vimFuncName contained abs acos add and append appendbufline argc argidx arglistid argv asin assert_beeps assert_equal assert_equalfile assert_exception assert_fails assert_false assert_inrange assert_match assert_nobeep assert_notequal assert_notmatch assert_report assert_true atan atan2 autocmd_add autocmd_delete autocmd_get balloon_gettext balloon_show balloon_split base64_decode base64_encode bindtextdomain blob2list blob2str browse browsedir bufadd bufexists buflisted bufload bufloaded bufname bufnr bufwinid bufwinnr byte2line byteidx byteidxcomp call ceil ch_canread ch_close ch_close_in ch_evalexpr ch_evalraw ch_getbufnr ch_getjob ch_info ch_listen ch_log ch_logfile ch_open ch_read ch_readblob ch_readraw ch_sendexpr ch_sendraw ch_setoptions ch_status
-syn keyword vimFuncName contained changenr char2nr charclass charcol charidx chdir cindent clearmatches cmdcomplete_info col complete complete_add complete_check complete_info confirm copy cos cosh count cscope_connection cursor debugbreak deepcopy delete deletebufline did_filetype diff diff_filler diff_hlID digraph_get digraph_getlist digraph_set digraph_setlist echoraw empty environ err_teapot escape eval eventhandler executable execute exepath exists exists_compiled exp expand expandcmd extend extendnew feedkeys filecopy filereadable filewritable filter finddir findfile flatten flattennew float2nr floor fmod fnameescape fnamemodify foldclosed foldclosedend foldlevel foldtext foldtextresult foreach foreground fullcommand funcref function garbagecollect get getbufinfo
-syn keyword vimFuncName contained getbufline getbufoneline getbufvar getcellpixels getcellwidths getchangelist getchar getcharmod getcharpos getcharsearch getcharstr getcmdcomplpat getcmdcompltype getcmdline getcmdpos getcmdprompt getcmdscreenpos getcmdtype getcmdwintype getcompletion getcompletiontype getcurpos getcursorcharpos getcwd getenv getfontname getfperm getfsize getftime getftype getimstatus getjumplist getline getloclist getmarklist getmatches getmousepos getmouseshape getpid getpos getqflist getreg getreginfo getregion getregionpos getregtype getscriptinfo getstacktrace gettabinfo gettabvar gettabwinvar gettagstack gettext getwininfo getwinpos getwinposx getwinposy getwinvar glob glob2regpat globpath has has_key haslocaldir hasmapto histadd histdel
-syn keyword vimFuncName contained histget histnr hlID hlexists hlget hlset hostname iconv id indent index indexof input inputdialog inputlist inputrestore inputsave inputsecret insert instanceof interrupt invert isabsolutepath isdirectory isinf islocked isnan items job_getchannel job_info job_setoptions job_start job_status job_stop join js_decode js_encode json_decode json_encode keys keytrans len libcall libcallnr line line2byte lispindent list2blob list2str list2tuple listener_add listener_flush listener_remove localtime log log10 luaeval map maparg mapcheck maplist mapnew mapset match matchadd matchaddpos matcharg matchbufline matchdelete matchend matchfuzzy matchfuzzypos matchlist matchstr matchstrlist matchstrpos max menu_info min mkdir mode mzeval nextnonblank
-syn keyword vimFuncName contained ngettext nr2char or pathshorten perleval popup_atcursor popup_beval popup_clear popup_close popup_create popup_dialog popup_filter_menu popup_filter_yesno popup_findecho popup_findinfo popup_findpreview popup_getoptions popup_getpos popup_hide popup_list popup_locate popup_menu popup_move popup_notification popup_setbuf popup_setoptions popup_settext popup_show pow preinserted prevnonblank printf prompt_getprompt prompt_setcallback prompt_setinterrupt prompt_setprompt prop_add prop_add_list prop_clear prop_find prop_list prop_remove prop_type_add prop_type_change prop_type_delete prop_type_get prop_type_list pum_getpos pumvisible py3eval pyeval pyxeval rand range readblob readdir readdirex readfile redraw_listener_add redraw_listener_remove
-syn keyword vimFuncName contained reduce reg_executing reg_recording reltime reltimefloat reltimestr remote_expr remote_foreground remote_peek remote_read remote_send remote_startserver remove rename repeat resolve reverse round rubyeval screenattr screenchar screenchars screencol screenpos screenrow screenstring search searchcount searchdecl searchpair searchpairpos searchpos server2client serverlist setbufline setbufvar setcellwidths setcharpos setcharsearch setcmdline setcmdpos setcursorcharpos setenv setfperm setline setloclist setmatches setpos setqflist setreg settabvar settabwinvar settagstack setwinvar sha256 shellescape shiftwidth sign_define sign_getdefined sign_getplaced sign_jump sign_place sign_placelist sign_undefine sign_unplace sign_unplacelist
-syn keyword vimFuncName contained simplify sin sinh slice sort sound_clear sound_playevent sound_playfile sound_stop soundfold spellbadword spellsuggest split sqrt srand state str2blob str2float str2list str2nr strcharlen strcharpart strchars strdisplaywidth strftime strgetchar stridx string strlen strpart strptime strridx strtrans strutf16len strwidth submatch substitute swapfilelist swapinfo swapname synID synIDattr synIDtrans synconcealed synstack system systemlist tabpagebuflist tabpagenr tabpagewinnr tabpanel_getinfo tabpanel_scroll tagfiles taglist tan tanh tempname term_dumpdiff term_dumpload term_dumpwrite term_getaltscreen term_getansicolors term_getattr term_getcursor term_getjob term_getline term_getscrolled term_getsize term_getstatus term_gettitle
-syn keyword vimFuncName contained term_gettty term_list term_scrape term_sendkeys term_setansicolors term_setapi term_setkill term_setrestore term_setsize term_start term_wait terminalprops test_alloc_fail test_autochdir test_feedinput test_garbagecollect_now test_garbagecollect_soon test_getvalue test_gui_event test_ignore_error test_mswin_event test_null_blob test_null_channel test_null_dict test_null_function test_null_job test_null_list test_null_partial test_null_string test_null_tuple test_option_not_set test_override test_refcount test_setmouse test_settime test_srand_seed test_unknown test_void timer_info timer_pause timer_start timer_stop timer_stopall tolower toupper tr trim trunc tuple2list type typename undofile undotree uniq uri_decode uri_encode
-syn keyword vimFuncName contained utf16idx values virtcol virtcol2col visualmode wildmenumode wildtrigger win_execute win_findbuf win_getid win_gettype win_gotoid win_id2tabwin win_id2win win_move_separator win_move_statusline win_screenpos win_splitmove winbufnr wincol windowsversion winheight winlayout winline winnr winrestcmd winrestview winsaveview winwidth wordcount writefile xor
+syn keyword vimFuncName contained changenr char2nr charclass charcol charidx chdir cindent clearmatches cmdcomplete_info col complete complete_add complete_check complete_info confirm copy cos cosh count cscope_connection cursor debugbreak deepcopy delete deletebufline did_filetype diff diff_filler diff_hlID digraph_get digraph_getlist digraph_set digraph_setlist echoraw empty environ err_teapot escape eval eventhandler executable execute exepath exists exists_compiled exp expand expandcmd extend extendnew feedkeys filecopy filereadable filewritable filter finddir findfile flatten flattennew float2nr floor fmod fnameescape fnamemodify foldclosed foldclosedend foldlevel foldtext foldtextresult foreach foreground fullcommand funcref function garbagecollect get getbgcolor
+syn keyword vimFuncName contained getbufinfo getbufline getbufoneline getbufvar getcellpixels getcellwidths getchangelist getchar getcharmod getcharpos getcharsearch getcharstr getcmdcomplpat getcmdcompltype getcmdline getcmdpos getcmdprompt getcmdscreenpos getcmdtype getcmdwintype getcompletion getcompletiontype getcurpos getcursorcharpos getcwd getenv getfontname getfperm getfsize getftime getftype getimstatus getjumplist getline getloclist getmarklist getmatches getmousepos getmouseshape getpid getpos getqflist getreg getreginfo getregion getregionpos getregtype getscriptinfo getstacktrace gettabinfo gettabvar gettabwinvar gettagstack gettext getwininfo getwinpos getwinposx getwinposy getwinvar glob glob2regpat globpath has has_key haslocaldir hasmapto histadd
+syn keyword vimFuncName contained histdel histget histnr hlID hlexists hlget hlset hostname iconv id indent index indexof input inputdialog inputlist inputrestore inputsave inputsecret insert instanceof interrupt invert isabsolutepath isdirectory isinf islocked isnan items job_getchannel job_info job_setoptions job_start job_status job_stop join js_decode js_encode json_decode json_encode keys keytrans len libcall libcallnr line line2byte lispindent list2blob list2str list2tuple listener_add listener_flush listener_remove localtime log log10 luaeval map maparg mapcheck maplist mapnew mapset match matchadd matchaddpos matcharg matchbufline matchdelete matchend matchfuzzy matchfuzzypos matchlist matchstr matchstrlist matchstrpos max menu_info min mkdir mode mzeval
+syn keyword vimFuncName contained nextnonblank ngettext nr2char or pathshorten perleval popup_atcursor popup_beval popup_clear popup_close popup_create popup_dialog popup_filter_menu popup_filter_yesno popup_findecho popup_findinfo popup_findpreview popup_getoptions popup_getpos popup_hide popup_list popup_locate popup_menu popup_move popup_notification popup_setbuf popup_setoptions popup_settext popup_show pow preinserted prevnonblank printf prompt_getprompt prompt_setcallback prompt_setinterrupt prompt_setprompt prop_add prop_add_list prop_clear prop_find prop_list prop_remove prop_type_add prop_type_change prop_type_delete prop_type_get prop_type_list pum_getpos pumvisible py3eval pyeval pyxeval rand range readblob readdir readdirex readfile redraw_listener_add
+syn keyword vimFuncName contained redraw_listener_remove reduce reg_executing reg_recording reltime reltimefloat reltimestr remote_expr remote_foreground remote_peek remote_read remote_send remote_startserver remove rename repeat resolve reverse round rubyeval screenattr screenchar screenchars screencol screenpos screenrow screenstring search searchcount searchdecl searchpair searchpairpos searchpos server2client serverlist setbufline setbufvar setcellwidths setcharpos setcharsearch setcmdline setcmdpos setcursorcharpos setenv setfperm setline setloclist setmatches setpos setqflist setreg settabvar settabwinvar settagstack setwinvar sha256 shellescape shiftwidth sign_define sign_getdefined sign_getplaced sign_jump sign_place sign_placelist sign_undefine sign_unplace
+syn keyword vimFuncName contained sign_unplacelist simplify sin sinh slice sort sound_clear sound_playevent sound_playfile sound_stop soundfold spellbadword spellsuggest split sqrt srand state str2blob str2float str2list str2nr strcharlen strcharpart strchars strdisplaywidth strftime strgetchar stridx string strlen strpart strptime strridx strtrans strutf16len strwidth submatch substitute swapfilelist swapinfo swapname synID synIDattr synIDtrans synconcealed synstack system systemlist tabpagebuflist tabpagenr tabpagewinnr tabpanel_getinfo tabpanel_scroll tagfiles taglist tan tanh tempname term_dumpdiff term_dumpload term_dumpwrite term_getaltscreen term_getansicolors term_getattr term_getcursor term_getjob term_getline term_getscrolled term_getsize term_getstatus
+syn keyword vimFuncName contained term_gettitle term_gettty term_list term_scrape term_sendkeys term_setansicolors term_setapi term_setkill term_setrestore term_setsize term_start term_wait terminalprops test_alloc_fail test_autochdir test_feedinput test_garbagecollect_now test_garbagecollect_soon test_getvalue test_gui_event test_ignore_error test_mswin_event test_null_blob test_null_channel test_null_dict test_null_function test_null_job test_null_list test_null_partial test_null_string test_null_tuple test_option_not_set test_override test_refcount test_setmouse test_settime test_srand_seed test_unknown test_void timer_info timer_pause timer_start timer_stop timer_stopall tolower toupper tr trim trunc tuple2list type typename undofile undotree uniq uri_decode
+syn keyword vimFuncName contained uri_encode utf16idx values virtcol virtcol2col visualmode wildmenumode wildtrigger win_execute win_findbuf win_getid win_gettype win_gotoid win_id2tabwin win_id2win win_move_separator win_move_statusline win_screenpos win_splitmove winbufnr wincol windowsversion winheight winlayout winline winnr winrestcmd winrestview winsaveview winwidth wordcount writefile xor
 
 " MacVim specific
 syn keyword vimFuncName contained showdefinition
@@ -293,13 +293,13 @@ Vim9 syn keyword vim9Boolean	true false
 " Numbers {{{2
 " =======
 syn case ignore
-syn match	vimNumber	"\<\d\+\%('\d\+\)*"		skipwhite nextgroup=@vimComment,vimSubscript,vimGlobal,vimSubst1
+syn match	vimNumber	"\<\d\+\%('\d\+\)*"		skipwhite nextgroup=@vimComment,vimSubscriptBrackets,vimGlobal,vimSubst1
 syn match	vimNumber	"\<\d\+\%('\d\+\)*\.\d\+\%(e[+-]\=\d\+\)\="	skipwhite nextgroup=@vimComment
-syn match	vimNumber	"\<0b[01]\+\%('[01]\+\)*"		skipwhite nextgroup=@vimComment,vimSubscript
-syn match	vimNumber	"\<0o\=\o\+\%('\o\+\)*"		skipwhite nextgroup=@vimComment,vimSubscript
-syn match	vimNumber	"\<0x\x\+\%('\x\+\)*"		skipwhite nextgroup=@vimComment,vimSubscript
+syn match	vimNumber	"\<0b[01]\+\%('[01]\+\)*"		skipwhite nextgroup=@vimComment,vimSubscriptBrackets
+syn match	vimNumber	"\<0o\=\o\+\%('\o\+\)*"		skipwhite nextgroup=@vimComment,vimSubscriptBrackets
+syn match	vimNumber	"\<0x\x\+\%('\x\+\)*"		skipwhite nextgroup=@vimComment,vimSubscriptBrackets
 syn match	vimNumber	'\<0z\>'			skipwhite nextgroup=@vimComment
-syn match	vimNumber	'\<0z\%(\x\x\)\+\%(\.\%(\x\x\)\+\)*'	skipwhite nextgroup=@vimComment,vimSubscript
+syn match	vimNumber	'\<0z\%(\x\x\)\+\%(\.\%(\x\x\)\+\)*'	skipwhite nextgroup=@vimComment,vimSubscriptBrackets
 syn case match
 
 " All vimCommands are contained by vimIsCommand. {{{2
@@ -312,20 +312,28 @@ syn match vimIsCommand	"\<\h\w*\>"	nextgroup=vimBang contains=vimCommand
 syn match vimBang	      contained	"!"
 syn match vimWhitespace contained	"\s\+"
 
-syn region vimSubscript contained	matchgroup=vimSubscriptBracket start="\[" end="]" nextgroup=vimSubscript contains=@vimExprList
+syn region vimSubscriptBrackets	contained
+      \ matchgroup=vimSubscriptBracket
+      \ start="\["
+      \ end="]"
+      \ nextgroup=vimSubscriptBrackets,vimSubscriptDot
+      \ contains=@vimExprList
+syn match  vimSubscriptDot	contained	"\."	nextgroup=vimVar,vimVarKey,vimUserFunc,vimUserFuncKey
 
-syn match vimVar	      contained	"\<\h[a-zA-Z0-9#_]*\>"	nextgroup=vimSubscript contains=vim9Super,vim9This
-syn match vimVar		"\<[bwglstav]:\h[a-zA-Z0-9#_]*\>"	nextgroup=vimSubscript contains=vimVarScope
-syn match vimVar		"\<a:\%(000\|1\=[0-9]\|20\)\>"	nextgroup=vimSubscript contains=vimVarScope
-syn match vimFBVar      contained	"\<[bwglsta]:\h[a-zA-Z0-9#_]*\>"	nextgroup=vimSubscript contains=vimVarScope
+syn match vimVar	      contained	"\<\h[a-zA-Z0-9#_]*\>"	nextgroup=vimSubscriptBrackets,vimSubscriptDot contains=vim9Super,vim9This
+" dict-key only
+syn match vimVarKey     contained	"\<\d\w*\>"		nextgroup=vimSubscriptBrackets,vimSubscriptDot
+syn match vimVar		"\<[bwglstav]:\h[a-zA-Z0-9#_]*\>"	nextgroup=vimSubscriptBrackets,vimSubscriptDot contains=vimVarScope
+syn match vimVar		"\<a:\%(000\|1\=[0-9]\|20\)\>"	nextgroup=vimSubscriptBrackets,vimSubscriptDot contains=vimVarScope
+syn match vimFBVar      contained	"\<[bwglsta]:\h[a-zA-Z0-9#_]*\>"	nextgroup=vimSubscriptBrackets,vimSubscriptDot contains=vimVarScope
 
 " match the scope prefix independently of the retrofitted scope dictionary
 syn match vimVarScope   contained	"\<[bwglstav]:"
-syn match vimVimVar     contained	"\<[bwglstav]:\%(\h\|\d\)\@!"	nextgroup=vimSubscript
+syn match vimVimVar     contained	"\<[bwglstav]:\%(\h\|\d\)\@!"	nextgroup=vimSubscriptBrackets,vimSubscriptDot
 
-syn match vimVarNameError contained "\<\h\w*\>"
-syn match vimVimVar	"\<v:"		nextgroup=vimSubscript,vimVimVarName,vimVarNameError
-syn match vimOptionVar	"&\%([lg]:\)\="		nextgroup=vimSubscript,vimOptionVarName,vimVarNameError
+syn match vimVarNameError contained "\<\h\w*\>"		nextgroup=vimSubscriptBrackets,vimSubscriptDot " just abort highlighting rather than match nextgroup?
+syn match vimVimVar	"\<v:"		nextgroup=vimSubscriptBrackets,vimSubscriptDot,vimVimVarName,vimVarNameError
+syn match vimOptionVar	"&\%([lg]:\)\="		nextgroup=vimSubscriptBrackets,vimSubscriptDot,vimOptionVarName,vimVarNameError
 syn cluster vimSpecialVar	contains=vimEnvvar,vimLetRegister,vimOptionVar,vimVimVar
 
 Vim9 syn match	vimVar	contained	 "\<\h\w*\ze<"		nextgroup=vim9TypeArgs
@@ -333,8 +341,8 @@ Vim9 syn match	vimVar	contained	 "\<\h\w*\ze<"		nextgroup=vim9TypeArgs
 Vim9 syn match	vim9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\s\+[-+/*%]\==\%(\s\|$\)"
 Vim9 syn match	vim9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\s\+\.\.=\%(\s\|$\)"
 Vim9 syn match	vim9LhsVariable	"\s\=\%([bwgt]:\)\=\h[a-zA-Z0-9#_]*\ze\s\+=<<\s"	skipwhite nextgroup=vimLetHeredoc	contains=vimVarScope
-Vim9 syn match	vim9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\["		          nextgroup=vimSubscript
-Vim9 syn match	vim9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\."		          nextgroup=vimOper	contains=vim9Super,vim9This
+Vim9 syn match	vim9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\["		          nextgroup=vimSubscriptBrackets
+Vim9 syn match	vim9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\."		          nextgroup=vimSubscriptDot	contains=vim9Super,vim9This
 Vim9 syn match	vim9LhsVariable	"\s\=\h[a-zA-Z0-9#_]*\ze\s*->"				contains=vim9Super,vim9This
 
 Vim9 syn match vim9LhsVariableList	"\[\_[^]]\+]\ze\s\+[-+/*%]\=="			contains=vimVar,@vimSpecialVar
@@ -550,9 +558,9 @@ syn match	vimOper	"="			skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList
 syn match	vimOper	"\%#=1\%(==\|!=\|>=\|<=\|=\~\|!\~\|>\|<\)[?#]\="	skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList,vimContinueString,vimSpecFile
 syn match	vimOper	"\<is\%(not\)\=\>"		skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList,vimContinueString,vimSpecFile
 syn match	vimOper	"\<is\%(not\)\=[?#]"		skipwhite skipnl nextgroup=@vimOperContinue,@vimExprList,vimContinueString,vimSpecFile
-syn region	vimOperParen 		matchgroup=vimParenSep start="("    end=")" contains=@vimOperGroup nextgroup=vimSubscript
-syn region	vimOperParen		matchgroup=vimSep	     start="#\={" end="}" contains=@vimOperGroup nextgroup=vimSubscript,vimVar
-syn region	vimOperParen	contained	matchgroup=vimSep	     start="\["	end="]" contains=@vimOperGroup nextgroup=vimSubscript,vimVar
+syn region	vimOperParen 		matchgroup=vimParenSep start="("    end=")" contains=@vimOperGroup nextgroup=vimSubscriptBrackets,vimSubscriptDot
+syn region	vimOperParen		matchgroup=vimSep	     start="#\={" end="}" contains=@vimOperGroup nextgroup=vimSubscriptBrackets,vimSubscriptDot,vimVar
+syn region	vimOperParen	contained	matchgroup=vimSep	     start="\["	end="]" contains=@vimOperGroup nextgroup=vimSubscriptBrackets,vimSubscriptDot,vimVar
 if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_noopererror")
  syn match	vimOperError	")"
 endif
@@ -1063,8 +1071,8 @@ syn region	vimPatSepZone	oneline   contained   matchgroup=vimPatSepZ start="\\%\
 syn region	vimPatRegion	contained transparent matchgroup=vimPatSepR start="\\[z%]\=(" end="\\)"	contains=@vimSubstList oneline
 syn match	vimNotPatSep	contained	"\\\\"
 syn cluster	vimStringGroup	contains=vimEscape,vimEscapeBrace,vimPatSep,vimNotPatSep,vimPatSepErr,vimPatSepZone,@Spell
-syn region	vimString	oneline keepend	matchgroup=vimString start=+[^a-zA-Z\\@]"+lc=1 skip=+\\\\\|\\"+ matchgroup=vimStringEnd end=+"+ nextgroup=vimSubscript contains=@vimStringGroup extend
-syn region	vimString	oneline	matchgroup=vimString start=+[^a-zA-Z\\@]'+lc=1 end=+'+		       nextgroup=vimSubscript contains=vimQuoteEscape  extend
+syn region	vimString	oneline keepend	matchgroup=vimString start=+[^a-zA-Z\\@]"+lc=1 skip=+\\\\\|\\"+ matchgroup=vimStringEnd end=+"+ nextgroup=vimSubscriptBrackets contains=@vimStringGroup extend
+syn region	vimString	oneline	matchgroup=vimString start=+[^a-zA-Z\\@]'+lc=1 end=+'+		       nextgroup=vimSubscriptBrackets contains=vimQuoteEscape  extend
 "syn region	vimString	oneline	start="\s/\s*\A"lc=1 skip="\\\\\|\\+" end="/"	contains=@vimStringGroup  " see tst45.vim
 
 syn match	vimEscape	contained	"\\."
@@ -1074,17 +1082,17 @@ syn match	vimEscape	contained	"\\<" contains=vimNotation
 syn match	vimEscape	contained	"\\<\*[^>]*>\=>"
 syn match	vimQuoteEscape	contained	"''"
 
-syn region	vimString	oneline matchgroup=vimString start=+$'+ end=+'+ nextgroup=vimSubscript contains=@vimStringInterpolation,vimQuoteEscape  extend
-syn region	vimString	oneline matchgroup=vimString start=+$"+ end=+"+ nextgroup=vimSubscript contains=@vimStringInterpolation,@vimStringGroup extend
+syn region	vimString	oneline matchgroup=vimString start=+$'+ end=+'+ nextgroup=vimSubscriptBrackets contains=@vimStringInterpolation,vimQuoteEscape  extend
+syn region	vimString	oneline matchgroup=vimString start=+$"+ end=+"+ nextgroup=vimSubscriptBrackets contains=@vimStringInterpolation,@vimStringGroup extend
 syn region	vimStringInterpolationExpr  oneline contained matchgroup=vimSep start=+{+ end=+}+ contains=@vimExprList
 syn match	vimStringInterpolationBrace contained "{{"
 syn match	vimStringInterpolationBrace contained "}}"
 syn cluster	vimStringInterpolation contains=vimStringInterpolationExpr,vimStringInterpolationBrace
 
-syn region	vimContinueString	contained	matchgroup=vimContinueString start=+"+  skip=+\n\s*\%(\\\|["#]\\ \)+ end=+"+ end="$" skipwhite nextgroup=vimSubscript,vimComment contains=@vimContinue,@vimStringGroup
-syn region	vimContinueString	contained	matchgroup=vimContinueString start=+'+  skip=+\n\s*\%(\\\|["#]\\ \)+ end=+'+ end="$" skipwhite nextgroup=vimSubscript,vimComment contains=@vimContinue,vimQuoteEscape
-syn region	vimContinueString	contained	matchgroup=vimContinueString start=+$"+ skip=+\n\s*\%(\\\|["#]\\ \)+ end=+"+ end="$" skipwhite nextgroup=vimSubscript,vimComment contains=@vimContinue,@vimStringInterpolation,@vimStringGroup
-syn region	vimContinueString	contained	matchgroup=vimContinueString start=+$'+ skip=+\n\s*\%(\\\|["#]\\ \)+ end=+'+ end="$" skipwhite nextgroup=vimSubscript,vimComment contains=@vimContinue,@vimStringInterpolation,vimQuoteEscape
+syn region	vimContinueString	contained	matchgroup=vimContinueString start=+"+  skip=+\n\s*\%(\\\|["#]\\ \)+ end=+"+ end="$" skipwhite nextgroup=vimSubscriptBrackets,vimComment contains=@vimContinue,@vimStringGroup
+syn region	vimContinueString	contained	matchgroup=vimContinueString start=+'+  skip=+\n\s*\%(\\\|["#]\\ \)+ end=+'+ end="$" skipwhite nextgroup=vimSubscriptBrackets,vimComment contains=@vimContinue,vimQuoteEscape
+syn region	vimContinueString	contained	matchgroup=vimContinueString start=+$"+ skip=+\n\s*\%(\\\|["#]\\ \)+ end=+"+ end="$" skipwhite nextgroup=vimSubscriptBrackets,vimComment contains=@vimContinue,@vimStringInterpolation,@vimStringGroup
+syn region	vimContinueString	contained	matchgroup=vimContinueString start=+$'+ skip=+\n\s*\%(\\\|["#]\\ \)+ end=+'+ end="$" skipwhite nextgroup=vimSubscriptBrackets,vimComment contains=@vimContinue,@vimStringInterpolation,vimQuoteEscape
 
 " Substitutions: {{{2
 " =============
@@ -1218,7 +1226,7 @@ syn region	vimVarList	contained
       \ start="\[" end="]"
       \ skipwhite nextgroup=vimLetHeredoc
       \ contains=@vimContinue,@vimSpecialVar,vimVar
-syn match	vimLetVar	 contained	"\<\%([bwglstav]:\)\=\h[a-zA-Z0-9#_]*\>\ze\%(\[.*]\)\=\s*=<<"	skipwhite nextgroup=vimLetVarSubscript,vimLetHeredoc	contains=vimVarScope,vimSubscript
+syn match	vimLetVar	 contained	"\<\%([bwglstav]:\)\=\h[a-zA-Z0-9#_]*\>\ze\%(\[.*]\)\=\s*=<<"	skipwhite nextgroup=vimLetVarSubscript,vimLetHeredoc	contains=vimVarScope,vimSubscriptBrackets
 hi link vimLetVar vimVar
 syn region	vimLetVarSubscript contained
       \ matchgroup=vimSubscriptBracket
@@ -2397,14 +2405,16 @@ unlet s:interfaces
 " Function Call Highlighting: {{{2
 " (following Gautam Iyer's suggestion)
 " ==========================
-syn match	vimFunc	contained	"\<\l\w*\ze\s*("					skipwhite nextgroup=vimOperParen		contains=vimFuncName
-syn match	vimUserFunc	contained	"\.\@1<=\l\w*\ze\%(\s*(\|<.*>(\)"				skipwhite nextgroup=vimOperParen,vim9TypeArgs
-syn match	vimUserFunc	contained	"\<\%([[:upper:]_]\|\%(\h\w*\.\)\+\h\)\w*\ze\%(\s*(\|<.*>(\)"		skipwhite nextgroup=vimOperParen,vim9TypeArgs	contains=vim9MethodName,vim9Super,vim9This
-syn match	vimUserFunc	contained	"\<\%(g:\)\=\%(\h\w*#\)\+\h\w*\ze\%(\s*(\|<.*>(\)"			skipwhite nextgroup=vimOperParen		contains=vimVarScope
-syn match	vimUserFunc	contained	"\%(\<[sgbwtlav]:\|<[sS][iI][dD]>\)\%(\h\w*\.\)*\h\w*\ze\%(\s*(\|<.*>(\)"	skipwhite nextgroup=vimOperParen,vim9TypeArgs	contains=vimVarScope,vimNotation
+syn match	vimFunc	contained	"\<\l\w*\ze\s*("				skipwhite nextgroup=vimOperParen		contains=vimFuncName
+" dict-key only
+syn match	vimUserFuncKey	contained	"\%(\l\|\d\)\w*\ze\%(\s*(\|<.*>(\)"			skipwhite nextgroup=vimOperParen,vim9TypeArgs	contains=vim9MethodName
+syn match	vimUserFunc	contained	"\<[[:upper:]_]\w*\ze\%(\s*(\|<.*>(\)"		skipwhite nextgroup=vimOperParen,vim9TypeArgs	contains=vim9MethodName,vim9Super,vim9This
+syn match	vimUserFunc	contained	"\<\%(g:\)\=\%(\h\w*#\)\+\h\w*\ze\%(\s*(\|<.*>(\)"		skipwhite nextgroup=vimOperParen		contains=vimVarScope
+syn match	vimUserFunc	contained	"\%(\<[sgbwtlav]:\|<[sS][iI][dD]>\)\h\w*\ze\%(\s*(\|<.*>(\)"	skipwhite nextgroup=vimOperParen,vim9TypeArgs	contains=vimVarScope,vimNotation
 
-Vim9 syn match	vim9UserFunc	"^\s*\zs\%([sgbwtv]:\|<[sS][iI][dD]>\)\=\%(\h\w*[.#]\)*\h\w*\ze[<(]"			skipwhite nextgroup=vimOperParen,vim9TypeArgs	contains=vimVarScope,vimNotation,vim9MethodName,vim9Super,vim9This
-Vim9 syn match	vim9Func	"^\s*\zs\l\w*\ze("					skipwhite nextgroup=vimOperParen		contains=vimFuncName
+Vim9 syn match	vim9UserFunc	"^\s*\zs\%([sgbwtv]:\|<[sS][iI][dD]>\)\=\h\w*\ze[(<]"			skipwhite nextgroup=vimOperParen,vim9TypeArgs	contains=vimVarScope,vimNotation,vim9MethodName,vim9Super,vim9This
+Vim9 syn match	vim9UserFunc	"^\s*\zs\%(g:\)\=\%(\h\w*#\)\+\h\w*\ze[(<]"			skipwhite nextgroup=vimOperParen		contains=vimVarScope
+Vim9 syn match	vim9Func	"^\s*\zs\l\w*\ze[(<]"				skipwhite nextgroup=vimOperParen		contains=vimFuncName
 
 syn cluster	vimFunc	contains=vimFunc,vimUserFunc
 syn cluster	vim9Func	contains=vim9Func,vim9UserFunc
@@ -2824,7 +2834,9 @@ if !exists("skip_vim_syntax_inits")
  hi def link vimUserCmdError	Error
  hi def link vimUserCmdKey	vimCommand
  hi def link vimUserFunc	Normal
+ hi def link vimUserFuncKey	vimUserFunc
  hi def link vimVar	Normal
+ hi def link vimVarKey	vimVar
  hi def link vimVarScope	Identifier
  hi def link vimVimgrep	vimCommand
  hi def link vimVimgrepadd	vimCommand
diff --git a/runtime/syntax/xsd.vim b/runtime/syntax/xsd.vim
index 5ba6b4499a..f5a0517601 100644
--- a/runtime/syntax/xsd.vim
+++ b/runtime/syntax/xsd.vim
@@ -1,10 +1,10 @@
 " Vim syntax file
 " Language:	XSD (XML Schema)
-" Maintainer:	Johannes Zellner <johannes@zellner.org>
-" Last Change:	Tue, 27 Apr 2004 14:54:59 CEST
+" Maintainer:	Christian Brabandt <cb@256bit.org>
+" Repository:	https://github.com/chrisbra/vim-xml-ftplugin
+" Previous Maintainer:	Johannes Zellner <johannes@zellner.org>
+" Last Change:	21 Jun 2026
 " Filenames:	*.xsd
-" $Id: xsd.vim,v 1.1 2004/06/13 18:20:48 vimboss Exp $
-
 " REFERENCES:
 "   [1] http://www.w3.org/TR/xmlschema-0
 "
@@ -14,48 +14,26 @@ if exists("b:current_syntax")
     finish
 endif
 
-runtime syntax/xml.vim
+runtime! syntax/xml.vim
 
 syn cluster xmlTagHook add=xsdElement
 syn case match
 
-syn match xsdElement '\%(xsd:\)\@<=all'
-syn match xsdElement '\%(xsd:\)\@<=annotation'
-syn match xsdElement '\%(xsd:\)\@<=any'
-syn match xsdElement '\%(xsd:\)\@<=anyAttribute'
-syn match xsdElement '\%(xsd:\)\@<=appInfo'
-syn match xsdElement '\%(xsd:\)\@<=attribute'
-syn match xsdElement '\%(xsd:\)\@<=attributeGroup'
-syn match xsdElement '\%(xsd:\)\@<=choice'
-syn match xsdElement '\%(xsd:\)\@<=complexContent'
-syn match xsdElement '\%(xsd:\)\@<=complexType'
-syn match xsdElement '\%(xsd:\)\@<=documentation'
-syn match xsdElement '\%(xsd:\)\@<=element'
-syn match xsdElement '\%(xsd:\)\@<=enumeration'
-syn match xsdElement '\%(xsd:\)\@<=extension'
-syn match xsdElement '\%(xsd:\)\@<=field'
-syn match xsdElement '\%(xsd:\)\@<=group'
-syn match xsdElement '\%(xsd:\)\@<=import'
-syn match xsdElement '\%(xsd:\)\@<=include'
-syn match xsdElement '\%(xsd:\)\@<=key'
-syn match xsdElement '\%(xsd:\)\@<=keyref'
-syn match xsdElement '\%(xsd:\)\@<=length'
-syn match xsdElement '\%(xsd:\)\@<=list'
-syn match xsdElement '\%(xsd:\)\@<=maxInclusive'
-syn match xsdElement '\%(xsd:\)\@<=maxLength'
-syn match xsdElement '\%(xsd:\)\@<=minInclusive'
-syn match xsdElement '\%(xsd:\)\@<=minLength'
-syn match xsdElement '\%(xsd:\)\@<=pattern'
-syn match xsdElement '\%(xsd:\)\@<=redefine'
-syn match xsdElement '\%(xsd:\)\@<=restriction'
-syn match xsdElement '\%(xsd:\)\@<=schema'
-syn match xsdElement '\%(xsd:\)\@<=selector'
-syn match xsdElement '\%(xsd:\)\@<=sequence'
-syn match xsdElement '\%(xsd:\)\@<=simpleContent'
-syn match xsdElement '\%(xsd:\)\@<=simpleType'
-syn match xsdElement '\%(xsd:\)\@<=union'
-syn match xsdElement '\%(xsd:\)\@<=unique'
+for s:element in [
+    \ 'all', 'annotation', 'any', 'anyAttribute', 'appInfo', 'attribute',
+    \ 'attributeGroup', 'choice', 'complexContent', 'complexType',
+    \ 'documentation', 'element', 'enumeration', 'extension', 'field', 'group',
+    \ 'import', 'include', 'key', 'keyref', 'length', 'list', 'maxInclusive',
+    \ 'maxLength', 'minInclusive', 'minLength', 'pattern', 'redefine',
+    \ 'restriction', 'schema', 'selector', 'sequence', 'simpleContent',
+    \ 'simpleType', 'union', 'unique',
+    \ ]
+    execute 'syn match xsdElement contained /\%#=1\%([</]xsd:\)\@5<=' . s:element . '[^ /!?<>"'']\@!/'
+endfor
+unlet s:element
 
 hi def link xsdElement Statement
 
+let b:current_syntax = 'xsd'
+
 " vim: ts=8
diff --git a/runtime/syntax/xslt.vim b/runtime/syntax/xslt.vim
index 900b8ca049..524c8369be 100644
--- a/runtime/syntax/xslt.vim
+++ b/runtime/syntax/xslt.vim
@@ -1,10 +1,11 @@
 " Vim syntax file
 " Language:	XSLT
-" Maintainer:   Bogdan Barbu <l4b.bogdan.barbu@gmail.com>
-" Previous Maintainer:	Johannes Zellner <johannes@zellner.org>
-" Last Change:	Fri, 17 Jan 2020 07:15:37 +0200
+" Maintainer:	Christian Brabandt <cb@256bit.org>
+" Repository:	https://github.com/chrisbra/vim-xml-ftplugin
+" Previous Maintainer:	Johannes Zellner <johannes@zellner.org>,
+"			Bogdan Barbu <l4b.bogdan.barbu@gmail.com>
+" Last Change:	21 Jun 2026
 " Filenames:	*.xsl
-" $Id: xslt.vim,v 1.1 2004/06/13 15:52:10 vimboss Exp $
 
 " REFERENCES:
 "   [1] http://www.w3.org/TR/xslt
@@ -15,57 +16,28 @@ if exists("b:current_syntax")
     finish
 endif
 
-runtime syntax/xml.vim
+runtime! syntax/xml.vim
 
 syn cluster xmlTagHook add=xslElement
 syn case match
 
-syn match xslElement '\%(xsl:\)\@<=analyze-string'
-syn match xslElement '\%(xsl:\)\@<=apply-imports'
-syn match xslElement '\%(xsl:\)\@<=apply-templates'
-syn match xslElement '\%(xsl:\)\@<=attribute'
-syn match xslElement '\%(xsl:\)\@<=attribute-set'
-syn match xslElement '\%(xsl:\)\@<=call-template'
-syn match xslElement '\%(xsl:\)\@<=character-map'
-syn match xslElement '\%(xsl:\)\@<=choose'
-syn match xslElement '\%(xsl:\)\@<=comment'
-syn match xslElement '\%(xsl:\)\@<=copy'
-syn match xslElement '\%(xsl:\)\@<=copy-of'
-syn match xslElement '\%(xsl:\)\@<=decimal-format'
-syn match xslElement '\%(xsl:\)\@<=document'
-syn match xslElement '\%(xsl:\)\@<=element'
-syn match xslElement '\%(xsl:\)\@<=fallback'
-syn match xslElement '\%(xsl:\)\@<=for-each'
-syn match xslElement '\%(xsl:\)\@<=for-each-group'
-syn match xslElement '\%(xsl:\)\@<=function'
-syn match xslElement '\%(xsl:\)\@<=if'
-syn match xslElement '\%(xsl:\)\@<=include'
-syn match xslElement '\%(xsl:\)\@<=import'
-syn match xslElement '\%(xsl:\)\@<=import-schema'
-syn match xslElement '\%(xsl:\)\@<=key'
-syn match xslElement '\%(xsl:\)\@<=message'
-syn match xslElement '\%(xsl:\)\@<=namespace'
-syn match xslElement '\%(xsl:\)\@<=namespace-alias'
-syn match xslElement '\%(xsl:\)\@<=number'
-syn match xslElement '\%(xsl:\)\@<=otherwise'
-syn match xslElement '\%(xsl:\)\@<=output'
-syn match xslElement '\%(xsl:\)\@<=param'
-syn match xslElement '\%(xsl:\)\@<=perform-sort'
-syn match xslElement '\%(xsl:\)\@<=processing-instruction'
-syn match xslElement '\%(xsl:\)\@<=preserve-space'
-syn match xslElement '\%(xsl:\)\@<=script'
-syn match xslElement '\%(xsl:\)\@<=sequence'
-syn match xslElement '\%(xsl:\)\@<=sort'
-syn match xslElement '\%(xsl:\)\@<=strip-space'
-syn match xslElement '\%(xsl:\)\@<=stylesheet'
-syn match xslElement '\%(xsl:\)\@<=template'
-syn match xslElement '\%(xsl:\)\@<=transform'
-syn match xslElement '\%(xsl:\)\@<=text'
-syn match xslElement '\%(xsl:\)\@<=value-of'
-syn match xslElement '\%(xsl:\)\@<=variable'
-syn match xslElement '\%(xsl:\)\@<=when'
-syn match xslElement '\%(xsl:\)\@<=with-param'
+for s:element in [
+    \ 'analyze-string', 'apply-imports', 'apply-templates', 'attribute',
+    \ 'attribute-set', 'call-template', 'character-map', 'choose', 'comment',
+    \ 'copy', 'copy-of', 'decimal-format', 'document', 'element', 'fallback',
+    \ 'for-each', 'for-each-group', 'function', 'if', 'include', 'import',
+    \ 'import-schema', 'key', 'message', 'namespace', 'namespace-alias',
+    \ 'number', 'otherwise', 'output', 'param', 'perform-sort',
+    \ 'processing-instruction', 'preserve-space', 'script', 'sequence', 'sort',
+    \ 'strip-space', 'stylesheet', 'template', 'transform', 'text', 'value-of',
+    \ 'variable', 'when', 'with-param',
+    \ ]
+    execute 'syn match xslElement contained /\%#=1\%([</]xsl:\)\@5<=' . s:element . '[^ /!?<>"'']\@!/'
+endfor
+unlet s:element
 
 hi def link xslElement Statement
 
+let b:current_syntax = 'xslt'
+
 " vim: ts=8
diff --git a/runtime/tools/ccfilter.c b/runtime/tools/ccfilter.c
index 269e4ee662..5fe6307bf8 100644
--- a/runtime/tools/ccfilter.c
+++ b/runtime/tools/ccfilter.c
@@ -18,15 +18,24 @@
 #include <string.h>
 #include <unistd.h>
 
-#define LINELENGTH 2048
+/*
+ * sscanf() needs a literal field width on each "%[", so define the widths
+ * once and derive the buffer sizes (width + 1) and format widths (via STR()).
+ */
+#define STR_(x) #x
+#define STR(x)	STR_(x)
+#define LINEWIDTH  2047
+#define LINELENGTH (LINEWIDTH + 1)
+#define PATHWIDTH  1023
+#define PATHLENGTH (PATHWIDTH + 1)
 
 /* Collector(s) */
 char	       Line[LINELENGTH];
 char	       Line2[LINELENGTH];
 /* Components */
-char	       FileName[1024];
-char	       BasePath[1024];
-char	       CWD[1024];
+char	       FileName[PATHLENGTH];
+char	       BasePath[PATHLENGTH];
+char	       CWD[PATHLENGTH];
 unsigned long  Row;
 unsigned long  Col;
 char	       Severity;
@@ -184,7 +193,7 @@ int main( int argc, char *argv[] )
 	  case COMPILER_GCC:
 	    Severity = 'e';
 #ifdef GOTO_FROM_WHERE_INCLUDED
-	    rv = sscanf( Line, "In file included from %[^:]:%lu:",
+	    rv = sscanf( Line, "In file included from %" STR(PATHWIDTH) "[^:]:%lu:",
 			       FileName, &Row );
 	    if ( rv == 2 )
 	      {
@@ -193,11 +202,11 @@ int main( int argc, char *argv[] )
 	    else
 #endif
 	      {
-		if ((rv = sscanf( Line, "%[^:]:%lu: warning: %[^\n]",
+		if ((rv = sscanf( Line, "%" STR(PATHWIDTH) "[^:]:%lu: warning: %" STR(LINEWIDTH) "[^\n]",
 				   FileName, &Row, Reason ))==3) {
 		 Severity = 'w';
 		} else {
-		rv = sscanf( Line, "%[^:]:%lu: %[^\n]",
+		rv = sscanf( Line, "%" STR(PATHWIDTH) "[^:]:%lu: %" STR(LINEWIDTH) "[^\n]",
 				   FileName, &Row, Reason );
 		}
 		ok = ( rv == 3 );
@@ -205,24 +214,24 @@ int main( int argc, char *argv[] )
 	    Col = (dec_col ? 1 : 0 );
 	    break;
 	  case COMPILER_AIX:
-	    rv = sscanf( Line, "\"%[^\"]\", line %lu.%lu: %*s (%c) %[^\n]",
+	    rv = sscanf( Line, "\"%" STR(PATHWIDTH) "[^\"]\", line %lu.%lu: %*s (%c) %" STR(LINEWIDTH) "[^\n]",
 			       FileName, &Row, &Col, &Severity, Reason );
 	    ok = ( rv == 5 );
 	    break;
 	  case COMPILER_HPUX:
-	    rv = sscanf( Line, "cc: \"%[^\"]\", line %lu: %c%*[^:]: %[^\n]",
+	    rv = sscanf( Line, "cc: \"%" STR(PATHWIDTH) "[^\"]\", line %lu: %c%*[^:]: %" STR(LINEWIDTH) "[^\n]",
 			       FileName, &Row, &Severity, Reason );
 	    ok = ( rv == 4 );
 	    Col = (dec_col ? 1 : 0 );
 	    break;
 	  case COMPILER_SOLARIS:
-	    rv = sscanf( Line, "\"%[^\"]\", line %lu: warning: %[^\n]",
+	    rv = sscanf( Line, "\"%" STR(PATHWIDTH) "[^\"]\", line %lu: warning: %" STR(LINEWIDTH) "[^\n]",
 			       FileName, &Row, Reason );
 	    Severity = 'w';
 	    ok = ( rv == 3 );
 	    if ( rv != 3 )
 	      {
-		rv = sscanf( Line, "\"%[^\"]\", line %lu: %[^\n]",
+		rv = sscanf( Line, "\"%" STR(PATHWIDTH) "[^\"]\", line %lu: %" STR(LINEWIDTH) "[^\n]",
 				   FileName, &Row, Reason );
 		Severity = 'e';
 		ok = ( rv == 3 );
@@ -230,18 +239,18 @@ int main( int argc, char *argv[] )
 	    Col = (dec_col ? 1 : 0 );
 	    break;
 	  case COMPILER_ATT:
-	    rv	 = sscanf( Line, "%c \"%[^\"]\",L%lu/C%lu%*[^:]:%[^\n]",
+	    rv	 = sscanf( Line, "%c \"%" STR(PATHWIDTH) "[^\"]\",L%lu/C%lu%*[^:]:%" STR(LINEWIDTH) "[^\n]",
 				 &Severity, FileName, &Row, &Col, Reason );
 	    ok = ( rv == 5 );
 
 	    if (rv != 5)
-	      { rv   = sscanf( Line, "%c \"%[^\"]\",L%lu/C%lu: %[^\n]",
+	      { rv   = sscanf( Line, "%c \"%" STR(PATHWIDTH) "[^\"]\",L%lu/C%lu: %" STR(LINEWIDTH) "[^\n]",
 				     &Severity, FileName, &Row, &Col, Reason );
 		ok = ( rv == 5 );
 	      }
 
 	    if (rv != 5)
-	      { rv  = sscanf( Line, "%c \"%[^\"]\",L%lu: %[^\n]",
+	      { rv  = sscanf( Line, "%c \"%" STR(PATHWIDTH) "[^\"]\",L%lu: %" STR(LINEWIDTH) "[^\n]",
 				   &Severity, FileName, &Row, Reason );
 		ok = ( rv == 4 );
 		Col = (dec_col ? 1 : 0 );
@@ -273,10 +282,10 @@ int main( int argc, char *argv[] )
 		  }
 		 else
 		  {
-		    rv = sscanf( p+2, "%[^:]: %lu: %[^\n]",
+		    rv = sscanf( p+2, "%" STR(PATHWIDTH) "[^:]: %lu: %" STR(LINEWIDTH) "[^\n]",
 				 FileName, &Row, Reason );
 		    if (rv != 3)
-		      rv = sscanf( p+2, "%[^,], line %lu: %[^\n]",
+		      rv = sscanf( p+2, "%" STR(PATHWIDTH) "[^,], line %lu: %" STR(LINEWIDTH) "[^\n]",
 				   FileName, &Row, Reason );
 		    ok = ( rv == 3 );
 		  }
@@ -307,7 +316,7 @@ int main( int argc, char *argv[] )
 	      p = &Line[1];
 	  else
 	      p = &Line[0];
-	  ok = sscanf( p, "make[%*d]: Entering directory `%[^']",
+	  ok = sscanf( p, "make[%*d]: Entering directory `%" STR(PATHWIDTH) "[^']",
 		       BasePath );
 	  if (verbose)
 	    printf( "[%u]?%s\n", (unsigned)ok, Line );
diff --git a/runtime/tools/ccfilter_README.txt b/runtime/tools/ccfilter_README.txt
index ea989f2574..70d8f3f4d2 100644
--- a/runtime/tools/ccfilter_README.txt
+++ b/runtime/tools/ccfilter_README.txt
@@ -5,7 +5,8 @@ ccfilter is a C program to filter the output of a few compilers to a common
 QuickFix format.  It is provided with Vim to make quickfix useful for more
 compilers.
 
-ccfilter WILL FAIL with long lines (more than 2047 bytes).
+ccfilter handles input lines up to 2047 bytes; longer lines are split and
+may not be parsed correctly.
 
 
 COMPILING AND INSTALLING:
diff --git a/runtime/tutor/README.it.txt b/runtime/tutor/README.it.txt
new file mode 100644
index 0000000000..d62d01bc83
--- /dev/null
+++ b/runtime/tutor/README.it.txt
@@ -0,0 +1,35 @@
+Il "tutor" è un'introduzione "pratica" per nuovi utenti dell'editor Vim.
+
+La maggioranza dei nuovi utenti lo può completare in meno di un'ora.  Alla
+fine, si sarà in grado di usare Vim per le modifiche più semplici a un file.
+
+Il "tutor" è un file che contiene le lezioni introduttive. Dalla directory che
+contiene il file che state leggendo si può semplicemente immettere "vim
+tutor1.it" e poi seguire le istruzioni nelle lezioni.  Le lezioni spiegano
+come modificare il file stesso, quindi NON VA USATA LA COPIA ORIGINALE del
+file, ma occorre copiarlo prima da qualche altra parte, e poi usare il file
+copiato.
+
+Nei sistemi di tipo UNIX (e in Windows) basta eseguire lo script "vimtutor",
+che genera per voi una copia modificabile del file che contiene le lezioni.
+
+Ho pensato di aggiungere lezioni più avanzate, ma non ho trovato il tempo.
+Sappiatemi dire cosa ne pensate, e fatemi avere i miglioramenti che avete
+apportato.
+
+Bob Ware, Colorado School of Mines, Golden, Co 80401, USA (303) 273-3987
+bware@mines.colorado.edu bware@slate.mines.colorado.edu bware@mines.bitnet
+
+Quanto detto sopra riguardo al capitolo 1 del "tutor" vale anche per il
+capitolo 2.  Però, per eseguirlo, va usato il comando "vim tutor2.it",
+oppure "vimtutor -c 2".
+
+Il capitolo 2 del "tutor" è stato scritto da Paul D. Parker.
+
+Traduzioni
+----------
+I file tutor1.xx per il capitolo 1 e tutor2.xx per il capitolo 2 del
+"tutor" sono delle traduzioni (dove "xx" indica il linguaggio).
+La codifica di tutor1.xx e tutor2.xx dev'essere utf-8.
+
+[Questo file è stato modificato per Vim da Bram Moolenaar et al.]
diff --git a/runtime/tutor/ru/vim-01-beginner.tutor b/runtime/tutor/ru/vim-01-beginner.tutor
index 087e84a2d8..d21c775b87 100644
--- a/runtime/tutor/ru/vim-01-beginner.tutor
+++ b/runtime/tutor/ru/vim-01-beginner.tutor
@@ -144,7 +144,7 @@
      Повторите шаги �о 2 по 4, пока предложение не будет и�правлено полно�тью.
 
 Ча�ть текта в �троке бе��ледно .
-Ча�ть тек�та в �той �троке бе��ледно пропало.
+Ча�ть тек�та в �той �троке бе��ледно пропала.
 
   5. Когда о�воите в�тавку тек�та, переходите к уроку [1.1.5](*1-1-5*).
 
@@ -165,7 +165,7 @@
      и повторите шаги �о 2 по 3 дл� и�правлени� �той �троки.
 
 Ча�ть тек�та в �той �троке бе��ле
-Ча�ть тек�та в �той �троке бе��ледно пропало.
+Ча�ть тек�та в �той �троке бе��ледно пропала.
 Зде�ь также недо�таёт ча�
 Зде�ь также недо�таёт ча�ти тек�та.
 
diff --git a/runtime/tutor/ru/vim-01-beginner.tutor.json b/runtime/tutor/ru/vim-01-beginner.tutor.json
index 50d32b23e3..6dfcd979b9 100644
--- a/runtime/tutor/ru/vim-01-beginner.tutor.json
+++ b/runtime/tutor/ru/vim-01-beginner.tutor.json
@@ -2,10 +2,10 @@
   "expect": {
     "33": -1,
     "121": "От топота копыт пыль по полю летит.",
-    "146": "Ча�ть тек�та в �той �троке бе��ледно пропало.",
-    "147": "Ча�ть тек�та в �той �троке бе��ледно пропало.",
-    "167": "Ча�ть тек�та в �той �троке бе��ледно пропало.",
-    "168": "Ча�ть тек�та в �той �троке бе��ледно пропало.",
+    "146": "Ча�ть тек�та в �той �троке бе��ледно пропала.",
+    "147": "Ча�ть тек�та в �той �троке бе��ледно пропала.",
+    "167": "Ча�ть тек�та в �той �троке бе��ледно пропала.",
+    "168": "Ча�ть тек�та в �той �троке бе��ледно пропала.",
     "169": "Зде�ь также недо�таёт ча�ти тек�та.",
     "170": "Зде�ь также недо�таёт ча�ти тек�та.",
     "253": "�е�колько �лов в �том предложении излишни.",
diff --git a/runtime/tutor/tutor1.ru b/runtime/tutor/tutor1.ru
index 9d4cab3346..53b2ae3333 100644
--- a/runtime/tutor/tutor1.ru
+++ b/runtime/tutor/tutor1.ru
@@ -111,7 +111,7 @@
 
 
 ---> Ча�ть текта в �троке бе��ледно .
----> Ча�ть тек�та в �той �троке бе��ледно пропало.
+---> Ча�ть тек�та в �той �троке бе��ледно пропала.
 
 
   5. Когда о�воите в�тавку тек�та, переходите к уроку 1.1.5.
@@ -133,7 +133,7 @@
 	и повторите шаги �о 2 по 3 дл� и�правлени� �той �троки.
 
 ---> Ча�ть тек�та в �той �троке бе��ле
-     Ча�ть тек�та в �той �троке бе��ледно пропало.
+     Ча�ть тек�та в �той �троке бе��ледно пропала.
 ---> Зде�ь также недо�таёт ча�
      Зде�ь также недо�таёт ча�ти тек�та.
 
diff --git a/src/GvimExt/Make_ming.mak b/src/GvimExt/Make_ming.mak
index b73e6fd92a..341f4add52 100644
--- a/src/GvimExt/Make_ming.mak
+++ b/src/GvimExt/Make_ming.mak
@@ -86,8 +86,8 @@ $(DLL): $(OBJ) $(RES) $(DEFFILE)
 			$(LIBS) \
 		-Wl,-Bstatic $(STATIC_LIBS) -Wl,-Bdynamic
 
-gvimext.o: gvimext.cpp
-	$(CXX) $(CXXFLAGS) -DFEAT_GETTEXT -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) -c $? -o $@
+gvimext.o: gvimext.cpp gvimext.h ../version.h
+	$(CXX) $(CXXFLAGS) -DFEAT_GETTEXT -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) -c $< -o $@
 
 $(RES): gvimext_ming.rc
 	$(WINDRES) $(WINDRES_FLAGS) --input-format=rc --output-format=coff -DMING $? -o $@
diff --git a/src/GvimExt/Make_mvc.mak b/src/GvimExt/Make_mvc.mak
index 874b34c74e..b05a431472 100644
--- a/src/GvimExt/Make_mvc.mak
+++ b/src/GvimExt/Make_mvc.mak
@@ -50,7 +50,7 @@ CPU = ARM64
 cc = cl
 link = link
 rc = rc
-cflags = -nologo -c
+cflags = -nologo -c -GF
 lflags = -incremental:no -nologo
 rcflags = /r
 olelibsdll = ole32.lib uuid.lib oleaut32.lib user32.lib gdi32.lib advapi32.lib
@@ -84,7 +84,7 @@ gvimext.dll: gvimext.obj gvimext.res
 		-out:$*.dll $** $(olelibsdll) shell32.lib comctl32.lib \
 		-subsystem:$(SUBSYSTEM)
 
-gvimext.obj: gvimext.h
+gvimext.obj: gvimext.h ../version.h
 
 .cpp.obj:
 	$(cc) $(cflags) -DFEAT_GETTEXT $(cvarsmt) $*.cpp
diff --git a/src/GvimExt/gvimext.cpp b/src/GvimExt/gvimext.cpp
index f98423c15f..40b84777f6 100644
--- a/src/GvimExt/gvimext.cpp
+++ b/src/GvimExt/gvimext.cpp
@@ -15,6 +15,9 @@
  */
 
 #include "gvimext.h"
+#include "../version.h"
+
+#define ARRAY_LENGTH(a) (sizeof(a) / sizeof((a)[0]))
 
 static char *searchpath(char *name);
 
@@ -50,7 +53,7 @@ UINT cbFiles = 0;
 // Returns the path in name[BUFSIZE].  It's empty when it fails.
 //
     static void
-getGvimName(char *name, int runtime)
+getGvimName(char *name, BOOL runtime)
 {
     HKEY	keyhandle;
     DWORD	hlen;
@@ -100,9 +103,9 @@ getGvimName(char *name, int runtime)
 }
 
     static void
-getGvimInvocation(char *name, int runtime)
+getGvimInvocation(char *name)
 {
-    getGvimName(name, runtime);
+    getGvimName(name, FALSE);
     // avoid that Vim tries to expand wildcards in the file names
     strcat(name, " --literal");
 }
@@ -113,11 +116,20 @@ getGvimInvocationW(wchar_t *nameW)
     char *name;
 
     name = (char *)malloc(BUFSIZE);
-    getGvimInvocation(name, 0);
+    getGvimInvocation(name);
     mbstowcs(nameW, name, BUFSIZE);
     free(name);
 }
 
+    static BOOL
+FileExists(LPCTSTR szPath)
+{
+    DWORD dwAttrib = GetFileAttributes(szPath);
+
+    return (dwAttrib != INVALID_FILE_ATTRIBUTES
+	    && !(dwAttrib & FILE_ATTRIBUTE_DIRECTORY));
+}
+
 //
 // Get the Vim runtime directory into buf[BUFSIZE].
 // The result is empty when it failed.
@@ -128,21 +140,47 @@ getRuntimeDir(char *buf)
 {
     int		idx;
 
-    getGvimName(buf, 1);
-    if (buf[0] != 0)
-    {
-	// When no path found, use the search path to expand it.
-	if (strchr(buf, '/') == NULL && strchr(buf, '\\') == NULL)
-	    strcpy(buf, searchpath(buf));
+    getGvimName(buf, TRUE);
+    if (buf[0] == 0)
+	return;
 
-	// remove "gvim.exe" from the end
-	for (idx = (int)strlen(buf) - 1; idx >= 0; idx--)
-	    if (buf[idx] == '\\' || buf[idx] == '/')
-	    {
-		buf[idx + 1] = 0;
-		break;
-	    }
+    // When no path found, use the search path to expand it.
+    if (strchr(buf, '/') == NULL && strchr(buf, '\\') == NULL)
+	strcpy(buf, searchpath(buf));
+
+    // remove "gvim.exe" from the end
+    for (idx = (int)strlen(buf) - 1; idx >= 0; idx--)
+	if (buf[idx] == '\\' || buf[idx] == '/')
+	{
+	    buf[++idx] = 0;
+	    break;
+	}
+
+    // Check the existence of defaults.vim
+    char *p = buf + idx;
+    strcpy(p, "defaults.vim");
+    if (FileExists(buf))
+    {
+	*p = 0;		// Cut "defaults.vim"
+	return;
     }
+    // Check the existence of vimXX\defaults.vim
+    strcpy(p, VIM_VERSION_NODOT "\\" "defaults.vim");
+    if (FileExists(buf))
+    {
+	p[ARRAY_LENGTH(VIM_VERSION_NODOT)] = 0;	// Cut "defaults.vim"
+	return;
+    }
+    // Check the existence of runtime\defaults.vim
+    strcpy(p, "runtime" "\\" "defaults.vim");
+    if (FileExists(buf))
+    {
+	p[ARRAY_LENGTH("runtime")] = 0;		// Cut "defaults.vim"
+	return;
+    }
+    // Not found
+    buf[0] = 0;
+    return;
 }
 
     WCHAR *
@@ -849,7 +887,7 @@ STDMETHODIMP CShellExt::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi)
 		    // If execution reaches this point we likely have an
 		    // inconsistency between the code that setup the menus
 		    // and this code that determines what the user
-		    // selected.  This should be detected and fixed during 
+		    // selected.  This should be detected and fixed during
 		    // development.
 		    return E_FAIL;
 	    }
@@ -921,10 +959,10 @@ BOOL CALLBACK CShellExt::EnumWindowsProc(HWND hWnd, LPARAM lParam)
     // No child window ???
     // if (GetParent(hWnd)) return TRUE;
     // Class name should be Vim, if failed to get class name, return
-    if (GetClassName(hWnd, temp, sizeof(temp)) == 0)
+    if (GetClassName(hWnd, temp, ARRAY_LENGTH(temp)) == 0)
 	return TRUE;
     // Compare class name to that of vim, if not, return
-    if (_strnicmp(temp, "vim", sizeof("vim")) != 0)
+    if (_strnicmp(temp, "vim", ARRAY_LENGTH("vim")) != 0)
 	return TRUE;
     // First check if the number of vim instance exceeds MAX_HWND
     CShellExt *cs = (CShellExt*) lParam;
@@ -940,7 +978,7 @@ BOOL CALLBACK CShellExt::EnumWindowsProc(HWND hWnd, LPARAM lParam)
 BOOL CShellExt::LoadMenuIcon()
 {
     char vimExeFile[BUFSIZE];
-    getGvimName(vimExeFile, 1);
+    getGvimName(vimExeFile, TRUE);
     if (vimExeFile[0] == '\0')
 	return FALSE;
     HICON hVimIcon;
@@ -956,19 +994,20 @@ BOOL CShellExt::LoadMenuIcon()
     static char *
 searchpath(char *name)
 {
-    static char widename[2 * BUFSIZE];
-    static char location[2 * BUFSIZE + 2];
+    static union {
+	char	location[2 * BUFSIZE];
+	WCHAR	wname[BUFSIZE];
+    };
+    WCHAR wlocation[BUFSIZE + 1];
 
     // There appears to be a bug in FindExecutableA() on Windows NT.
     // Use FindExecutableW() instead...
-    MultiByteToWideChar(CP_ACP, 0, (LPCSTR)name, -1,
-	    (LPWSTR)widename, BUFSIZE);
-    if (FindExecutableW((LPCWSTR)widename, (LPCWSTR)"",
-		(LPWSTR)location) > (HINSTANCE)32)
+    MultiByteToWideChar(CP_ACP, 0, name, -1, wname, BUFSIZE);
+    if (FindExecutableW(wname, L"", wlocation) > (HINSTANCE)32)
     {
-	WideCharToMultiByte(CP_ACP, 0, (LPWSTR)location, -1,
-		(LPSTR)widename, 2 * BUFSIZE, NULL, NULL);
-	return widename;
+	WideCharToMultiByte(CP_ACP, 0, wlocation, -1,
+		location, sizeof(location), NULL, NULL);
+	return location;
     }
     return (char *)"";
 }
@@ -1002,7 +1041,7 @@ STDMETHODIMP CShellExt::InvokeSingleGvim(HWND hParent,
 	DragQueryFileW((HDROP)medium.hGlobal,
 		i,
 		m_szFileUserClickedOn,
-		sizeof(m_szFileUserClickedOn));
+		ARRAY_LENGTH(m_szFileUserClickedOn));
 
 	len = wcslen(cmdStrW) + wcslen(m_szFileUserClickedOn) + 4;
 	if (len > cmdlen)
diff --git a/src/MacVim/Info.plist b/src/MacVim/Info.plist
index 5f5ed71ee2..a043df6105 100644
--- a/src/MacVim/Info.plist
+++ b/src/MacVim/Info.plist
@@ -1255,7 +1255,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>183</string>
+	<string>183.1</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>NSAppTransportSecurity</key>
diff --git a/src/Make_ami.mak b/src/Make_ami.mak
index 5211e6559c..8f02dbbec1 100644
--- a/src/Make_ami.mak
+++ b/src/Make_ami.mak
@@ -169,6 +169,9 @@ SRC += \
 	session.c \
 	sha256.c \
 	sign.c \
+	sixel.c \
+	kitty.c \
+	cairo.c \
 	spell.c \
 	spellfile.c \
 	spellsuggest.c \
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 24db4ccfff..0fcfb94c28 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -877,6 +877,9 @@ OBJ = \
 	$(OUTDIR)/session.o \
 	$(OUTDIR)/sha256.o \
 	$(OUTDIR)/sign.o \
+	$(OUTDIR)/sixel.o \
+	$(OUTDIR)/kitty.o \
+	$(OUTDIR)/cairo.o \
 	$(OUTDIR)/socketserver.o \
 	$(OUTDIR)/spell.o \
 	$(OUTDIR)/spellfile.o \
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 3b9ccb98f8..c646f8ec3a 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -772,6 +772,9 @@ OBJ = \
 	$(OUTDIR)\session.obj \
 	$(OUTDIR)\sha256.obj \
 	$(OUTDIR)\sign.obj \
+	$(OUTDIR)\sixel.obj \
+	$(OUTDIR)\kitty.obj \
+	$(OUTDIR)\cairo.obj \
 	$(OUTDIR)\socketserver.obj \
 	$(OUTDIR)\spell.obj \
 	$(OUTDIR)\spellfile.obj \
@@ -1768,6 +1771,12 @@ $(OUTDIR)/sha256.obj: $(OUTDIR) sha256.c $(INCL)
 
 $(OUTDIR)/sign.obj: $(OUTDIR) sign.c $(INCL)
 
+$(OUTDIR)/sixel.obj: $(OUTDIR) sixel.c $(INCL)
+
+$(OUTDIR)/kitty.obj: $(OUTDIR) kitty.c $(INCL)
+
+$(OUTDIR)/cairo.obj: $(OUTDIR) cairo.c $(INCL)
+
 $(OUTDIR)/socketserver.obj: $(OUTDIR) socketserver.c $(INCL)
 
 $(OUTDIR)/spell.obj: $(OUTDIR) spell.c $(INCL)
diff --git a/src/Make_vms.mms b/src/Make_vms.mms
index e019897fac..446e36a289 100644
--- a/src/Make_vms.mms
+++ b/src/Make_vms.mms
@@ -582,6 +582,9 @@ SRC = \
  session.c \
  sha256.c \
  sign.c \
+ sixel.c \
+ kitty.c \
+ cairo.c \
  sound.c \
  spell.c \
  spellfile.c \
@@ -720,6 +723,9 @@ OBJ = \
  [.$(DEST)]session.obj \
  [.$(DEST)]sha256.obj \
  [.$(DEST)]sign.obj \
+ [.$(DEST)]sixel.obj \
+ [.$(DEST)]kitty.obj \
+ [.$(DEST)]cairo.obj \
  [.$(DEST)]sound.obj \
  [.$(DEST)]spell.obj \
  [.$(DEST)]spellfile.obj \
@@ -1329,6 +1335,18 @@ lua_env :
  ascii.h keymap.h termdefs.h macros.h option.h structs.h regexp.h gui.h \
  beval.h alloc.h ex_cmds.h spell.h proto.h \
  errors.h globals.h
+[.$(DEST)]sixel.obj : sixel.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
+ ascii.h keymap.h termdefs.h macros.h option.h structs.h regexp.h gui.h \
+ beval.h alloc.h ex_cmds.h spell.h proto.h \
+ errors.h globals.h
+[.$(DEST)]kitty.obj : kitty.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
+ ascii.h keymap.h termdefs.h macros.h option.h structs.h regexp.h gui.h \
+ beval.h alloc.h ex_cmds.h spell.h proto.h \
+ errors.h globals.h
+[.$(DEST)]cairo.obj : cairo.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
+ ascii.h keymap.h termdefs.h macros.h option.h structs.h regexp.h gui.h \
+ beval.h alloc.h ex_cmds.h spell.h proto.h \
+ errors.h globals.h
 [.$(DEST)]sound.obj : sound.c vim.h [.$(DEST)]config.h feature.h
 [.$(DEST)]spell.obj : spell.c vim.h [.$(DEST)]config.h feature.h os_unix.h \
  ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
diff --git a/src/Makefile b/src/Makefile
index bd03bcf94b..c78d55cc18 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -597,13 +597,19 @@ CClink = $(CC)
 #CFLAGS = -O -Olimit 2000
 #CFLAGS = -O -FOlimit,2000
 
+# Add $(FORTIFY_CFLAGS) to optimizing example lines below: at higher levels
+# (the compiler default with -O) the buffer overflow check aborts Vim on the
+# "x[1] but actually longer" struct-hack arrays (e.g. dictitem di_key).
+# configure adds this automatically; these examples bypass it.
+FORTIFY_CFLAGS = -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
+
 # Often used for GCC: mixed optimizing, lot of optimizing, debugging
-#CFLAGS = -g -O2 -fno-strength-reduce -Wall -Wshadow -Wmissing-prototypes
-#CFLAGS = -g -O2 -fno-strength-reduce -Wall -Wmissing-prototypes
+#CFLAGS = -g -O2 -fno-strength-reduce -Wall -Wshadow -Wmissing-prototypes $(FORTIFY_CFLAGS)
+#CFLAGS = -g -O2 -fno-strength-reduce -Wall -Wmissing-prototypes $(FORTIFY_CFLAGS)
 #CFLAGS = -g -Wall -Wmissing-prototypes
-#CFLAGS = -O6 -fno-strength-reduce -Wall -Wshadow -Wmissing-prototypes
+#CFLAGS = -O6 -fno-strength-reduce -Wall -Wshadow -Wmissing-prototypes $(FORTIFY_CFLAGS)
 #CFLAGS = -g -DDEBUG -Wall -Wshadow -Wmissing-prototypes
-#CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce -Wall -Wmissing-prototypes
+#CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce -Wall -Wmissing-prototypes $(FORTIFY_CFLAGS)
 
 # Use this with GCC to check for mistakes, unused arguments, etc.
 # Note: If you use -Wextra and get warnings in GTK code about function
@@ -1234,9 +1240,17 @@ GTK_BUNDLE	=
 
 ### GTK4 GUI
 GTK4_SRC	= gui.c gui_gtk4.c gui_gtk4_f.c \
+			gui_gtk4_cb.c \
+			gui_gtk4_da.c \
+			gui_beval.o \
+			gui_gtk4_tb.c \
 			$(GRESOURCE_SRC)
 GTK4_OBJ	= objects/gui.o objects/gui_gtk4.o \
 			objects/gui_gtk4_f.o \
+			objects/gui_gtk4_cb.o \
+			objects/gui_gtk4_da.o \
+			objects/gui_beval.o \
+			objects/gui_gtk4_tb.o \
 			$(GRESOURCE_OBJ)
 GTK4_DEFS	= -DFEAT_GUI_GTK $(NARROW_PROTO)
 GTK4_IPATH	= $(GUI_INC_LOC)
@@ -1260,7 +1274,7 @@ MOTIF_IPATH	= $(GUI_INC_LOC)
 MOTIF_LIBS_DIR	= $(GUI_LIB_LOC)
 MOTIF_LIBS1	=
 MOTIF_LIBS2	= $(MOTIF_LIBNAME) -lXt
-MOTIF_INSTALL   = install_normal install_gui_extra
+MOTIF_INSTALL	= install_normal install_gui_extra
 MOTIF_TARGETS	= installglinks
 MOTIF_MAN_TARGETS = yes
 MOTIF_TESTTARGET = gui
@@ -1323,7 +1337,7 @@ MACVIMGUI_BUNDLE = macvim
 MACVIMGUI_TESTARG = VIMPROG=../$(RELEASEDIR)/MacVim.app/Contents/MacOS/$(VIMTARGET)
 
 # All GUI files
-ALL_GUI_SRC  = gui.c gui_gtk.c gui_gtk_f.c gui_gtk4.c gui_gtk4_f.c gui_motif.c gui_xmdlg.c gui_xmebw.c gui_gtk_x11.c gui_x11.c gui_haiku.cc
+ALL_GUI_SRC  = gui.c gui_gtk.c gui_gtk_f.c gui_gtk4.c gui_gtk4_f.c gui_gtk4_cb.c gui_gtk4_da.c gui_gtk4_tb.c gui_motif.c gui_xmdlg.c gui_xmebw.c gui_gtk_x11.c gui_x11.c gui_haiku.cc
 ALL_GUI_PRO  = proto/gui.pro proto/gui_gtk.pro proto/gui_gtk4.pro proto/gui_motif.pro proto/gui_xmdlg.pro proto/gui_gtk_x11.pro proto/gui_x11.pro proto/gui_w32.pro proto/gui_photon.pro
 
 ALL_GUI_SRC  += MacVim/gui_macvim.m MacVim/MMBackend.m MacVim/MacVim.m
@@ -1590,6 +1604,9 @@ BASIC_SRC = \
 	session.c \
 	sha256.c \
 	sign.c \
+	sixel.c \
+	kitty.c \
+	cairo.c \
 	socketserver.c \
 	sound.c \
 	spell.c \
@@ -1769,6 +1786,9 @@ OBJ_COMMON = \
 	objects/session.o \
 	objects/sha256.o \
 	objects/sign.o \
+	objects/sixel.o \
+	objects/kitty.o \
+	objects/cairo.o \
 	objects/socketserver.o \
 	objects/sound.o \
 	objects/spell.o \
@@ -1975,6 +1995,9 @@ PROTO_FILES = \
 	proto/session.pro \
 	proto/sha256.pro \
 	proto/sign.pro \
+	proto/sixel.pro \
+	proto/kitty.pro \
+	proto/cairo.pro \
 	proto/sound.pro \
 	proto/spell.pro \
 	proto/spellfile.pro \
@@ -3295,7 +3318,7 @@ objects/clientserver.o: clientserver.c
 	$(CCC) -o $@ clientserver.c
 
 objects/clipboard.o: clipboard.c $(WAYLAND_SRC)
-	$(CCC) -o $@ clipboard.c
+	$(CCC) $(WAYLAND_CFLAGS) $(WAYLAND_CPPFLAGS) -o $@ clipboard.c
 
 objects/cmdexpand.o: cmdexpand.c
 	$(CCC) -o $@ cmdexpand.c
@@ -3420,6 +3443,15 @@ objects/gui_gtk4.o: gui_gtk4.c
 objects/gui_gtk4_f.o: gui_gtk4_f.c
 	$(CCC) -o $@ gui_gtk4_f.c
 
+objects/gui_gtk4_cb.o: gui_gtk4_cb.c
+	$(CCC) -o $@ gui_gtk4_cb.c
+
+objects/gui_gtk4_da.o: gui_gtk4_da.c
+	$(CCC) -o $@ gui_gtk4_da.c
+
+objects/gui_gtk4_tb.o: gui_gtk4_tb.c
+	$(CCC) -o $@ gui_gtk4_tb.c
+
 
 objects/gui_haiku.o: gui_haiku.cc
 	$(CCC) -o $@ gui_haiku.cc
@@ -3628,6 +3660,15 @@ objects/sha256.o: sha256.c
 objects/sign.o: sign.c
 	$(CCC) -o $@ sign.c
 
+objects/sixel.o: sixel.c
+	$(CCC) -o $@ sixel.c
+
+objects/kitty.o: kitty.c
+	$(CCC) -o $@ kitty.c
+
+objects/cairo.o: cairo.c
+	$(CCC) -o $@ cairo.c
+
 objects/socketserver.o: socketserver.c
 	$(CCC) -o $@ socketserver.c
 
@@ -4403,6 +4444,16 @@ objects/sign.o: sign.c vim.h protodef.h auto/config.h feature.h os_unix.h ascii.
   structs.h regexp.h gui.h libvterm/include/vterm.h \
   libvterm/include/vterm_keycodes.h xdiff/xdiff.h xdiff/../vim.h alloc.h \
   ex_cmds.h spell.h proto.h globals.h errors.h
+objects/sixel.o: sixel.c vim.h protodef.h auto/config.h feature.h os_unix.h \
+  ascii.h keymap.h termdefs.h macros.h option.h beval.h \
+  structs.h regexp.h gui.h libvterm/include/vterm.h \
+  libvterm/include/vterm_keycodes.h xdiff/xdiff.h xdiff/../vim.h alloc.h \
+  ex_cmds.h spell.h proto.h globals.h errors.h
+objects/kitty.o: kitty.c vim.h protodef.h auto/config.h feature.h os_unix.h \
+  ascii.h keymap.h termdefs.h macros.h option.h beval.h \
+  structs.h regexp.h gui.h libvterm/include/vterm.h \
+  libvterm/include/vterm_keycodes.h xdiff/xdiff.h xdiff/../vim.h alloc.h \
+  ex_cmds.h spell.h proto.h globals.h errors.h
 objects/socketserver.o: socketserver.c vim.h protodef.h auto/config.h feature.h \
   os_unix.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \
   structs.h regexp.h gui.h libvterm/include/vterm.h \
@@ -4603,6 +4654,11 @@ objects/gui_gtk4.o: gui_gtk4.c vim.h protodef.h auto/config.h feature.h os_unix.
   structs.h regexp.h gui.h libvterm/include/vterm.h \
   libvterm/include/vterm_keycodes.h xdiff/xdiff.h xdiff/../vim.h alloc.h \
   ex_cmds.h spell.h proto.h globals.h errors.h
+objects/gui_gtk4_da.o: gui_gtk4_da.c vim.h protodef.h auto/config.h feature.h \
+  os_unix.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \
+  structs.h regexp.h gui.h libvterm/include/vterm.h \
+  libvterm/include/vterm_keycodes.h xdiff/xdiff.h xdiff/../vim.h alloc.h \
+  ex_cmds.h spell.h proto.h globals.h errors.h
 objects/gui_gtk_x11.o: gui_gtk_x11.c vim.h protodef.h auto/config.h feature.h \
   os_unix.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \
   structs.h regexp.h gui.h libvterm/include/vterm.h \
@@ -4870,7 +4926,9 @@ proto/search.pro: search.c
 proto/session.pro: session.c
 proto/sha256.pro: sha256.c
 proto/sign.pro: sign.c
-proto/socketserver.pro: socketserver.c
+proto/sixel.pro: sixel.c
+proto/kitty.pro: kitty.c
+proto/cairo.pro: cairo.c
 proto/sound.pro: sound.c
 proto/spell.pro: spell.c
 proto/spellfile.pro: spellfile.c
diff --git a/src/alloc.c b/src/alloc.c
index 463a7104e3..d6eb6f29c1 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -475,6 +475,10 @@ free_all_mem(void)
     free_quickfix();
 # endif
 
+# ifdef FEAT_IMAGE_SIXEL
+    sixel_free_all();
+# endif
+
     // Close all script inputs.
     close_all_scripts();
 
diff --git a/src/auto/configure b/src/auto/configure
index 9ec6f2f0d8..07686b00f6 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -868,6 +868,7 @@ enable_gui
 enable_gtk2_check
 enable_gnome_check
 enable_gtk4_check
+enable_gtk4_hwaccel
 enable_gtk3_check
 enable_motif_check
 enable_macvim_check
@@ -1551,6 +1552,7 @@ Optional Features:
   --enable-gtk2-check     If auto-select GUI, check for GTK+ 2 default=yes
   --enable-gnome-check    If GTK GUI, check for GNOME default=no
   --enable-gtk4-check     If auto-select GUI, check for GTK 4 default=yes
+  --enable-gtk4-hwaccel  Use hardware accelerated rendering backend for GTK4 default=no
   --enable-gtk3-check     If auto-select GUI, check for GTK+ 3 default=yes
   --enable-motif-check    If auto-select GUI, check for Motif default=yes
   --enable-macvim-check   If auto-select GUI, check for MacVim default=yes
@@ -8821,10 +8823,6 @@ printf "%s\n" "$rubyhdrdir" >&6; }
             librubyarg=
 	fi
 
-	if test "X$librubyarg" != "X"; then
-	  RUBY_LIBS="$librubyarg $RUBY_LIBS"
-	fi
-
 
 	RUBY_SRC="if_ruby.c"
 	RUBY_OBJ="objects/if_ruby.o"
@@ -8840,6 +8838,12 @@ printf "%s\n" "$rubyhdrdir" >&6; }
 
 	  RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby_soname\\\" $RUBY_CFLAGS"
 	  RUBY_LIBS=
+	  	  	  	  	  for arg in $librubyarg; do
+	    case "$arg" in
+	      -L*|-R*|-Wl,-R*|-Wl,-rpath*) RUBY_LIBS="$RUBY_LIBS $arg" ;;
+	    esac
+	  done
+	  librubyarg=
 
       # MacVim patch to hack in a different default dynamic lib path for
       # arm64.  We don't test that it links here so this has to be binary
@@ -8858,6 +8862,9 @@ printf "%s\n" "${vi_cv_dll_name_ruby_arm64}" >&6; }
 printf "%s\n" "<none>" >&6; }
       fi
 	fi
+	if test "X$librubyarg" != "X"; then
+	  RUBY_LIBS="$librubyarg $RUBY_LIBS"
+	fi
 	if test "X$CLANG_VERSION" != "X" -a "$rubyversion" -ge 30; then
 	  RUBY_CFLAGS="$RUBY_CFLAGS -fdeclspec"
 	fi
@@ -10851,6 +10858,28 @@ printf "%s\n" "$enable_gtk4_check" >&6; }
   fi
 fi
 
+if test "x$SKIP_GTK4" != "xYES" -a "$enable_gui_canon" = "gtk4"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-gtk4-hwaccel argument" >&5
+printf %s "checking --enable-gtk4-hwaccel argument... " >&6; }
+  # Check whether --enable-gtk4-hwaccel was given.
+if test ${enable_gtk4_hwaccel+y}
+then :
+  enableval=$enable_gtk4_hwaccel;
+else case e in #(
+  e) enable_gtk4_hwaccel="no" ;;
+esac
+fi
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_gtk4_hwaccel" >&5
+printf "%s\n" "$enable_gtk4_hwaccel" >&6; }
+
+  if test "x$enable_gtk4_hwaccel" = "xyes"; then
+    printf "%s\n" "#define USE_GTK4_SNAPSHOT 1" >>confdefs.h
+
+  fi
+fi
+
+
 if test "x$SKIP_GTK3" != "xYES" -a "$enable_gui_canon" != "gtk3"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether or not to look for GTK+ 3" >&5
 printf %s "checking whether or not to look for GTK+ 3... " >&6; }
diff --git a/src/beval.c b/src/beval.c
index 14288e8afd..0f1af845e7 100644
--- a/src/beval.c
+++ b/src/beval.c
@@ -335,6 +335,8 @@ general_beval_cb(BalloonEval *beval, int state UNUSED)
 	    recursive = FALSE;
 	    return;
 	}
+	else
+	    vim_free(text);
     }
 # endif
 # ifdef FEAT_NETBEANS_INTG
diff --git a/src/buffer.c b/src/buffer.c
index 14d2cf1ff9..c28853dd34 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4874,7 +4874,9 @@ build_stl_str_hl_local(
 		p = p - n + 1;
 
 		// Fill up space left over by half a double-wide char.
-		while (++l < stl_items[stl_groupitem[groupdepth]].stl_minwid)
+		int minwid_fixed = MIN(stl_items[stl_groupitem[groupdepth]].stl_minwid,
+				       stl_items[stl_groupitem[groupdepth]].stl_maxwid);
+		while (++l < minwid_fixed)
 		    MB_CHAR2BYTES(fillchar, p);
 
 		// correct the start of the items for the truncation
@@ -4890,25 +4892,30 @@ build_stl_str_hl_local(
 	    {
 		// fill
 		n = stl_items[stl_groupitem[groupdepth]].stl_minwid;
+		int fillchar_len = MB_CHAR2LEN(fillchar);
 		if (n < 0)
 		{
 		    // fill by appending characters
 		    n = 0 - n;
-		    while (l++ < n && p + 1 < out + outlen)
+		    while (l++ < n && p + fillchar_len < out + outlen)
 			MB_CHAR2BYTES(fillchar, p);
 		}
 		else
 		{
 		    // fill by inserting characters
-		    l = (n - l) * MB_CHAR2LEN(fillchar);
-		    mch_memmove(t + l, t, (size_t)(p - t));
+		    n = n - l;
+		    l = n * fillchar_len;
 		    if (p + l >= out + outlen)
-			l = (long)((out + outlen) - p - 1);
+		    {
+			n = (long)((out + outlen) - p - 1) / fillchar_len;
+			l = n * fillchar_len;
+		    }
+		    mch_memmove(t + l, t, (size_t)(p - t));
 		    p += l;
+		    for ( ; n > 0; n--)
+			MB_CHAR2BYTES(fillchar, t);
 		    for (n = stl_groupitem[groupdepth] + 1; n < curitem; n++)
 			stl_items[n].stl_start += l;
-		    for ( ; l > 0; l--)
-			MB_CHAR2BYTES(fillchar, t);
 		}
 	    }
 	    continue;
diff --git a/src/cairo.c b/src/cairo.c
new file mode 100644
index 0000000000..7543a33d9b
--- /dev/null
+++ b/src/cairo.c
@@ -0,0 +1,205 @@
+/* vi:set ts=8 sts=4 sw=4 noet:
+ *
+ * VIM - Vi IMproved	by Bram Moolenaar
+ *
+ * Do ":help uganda"  in Vim to read copying and usage conditions.
+ * Do ":help credits" in Vim to see a list of people who contributed.
+ * See README.txt for an overview of the Vim source code.
+ */
+
+/*
+ * cairo.c: Cairo-based image backend for popup_create({image: ...}),
+ *	    by Yasuhiro Matsumoto.
+ *
+ * Builds a cairo_image_surface_t from the popup's RGB / RGBA pixel
+ * buffer and composites it onto a target cairo surface (typically the
+ * front-end's offscreen `gui.surface`).  Used today by the GTK2/3
+ * backend in gui_gtk_x11.c, and intended to be reusable by other
+ * cairo-based front-ends (e.g. a future GTK4 port).
+ *
+ * The cached surface is stored as void* on win_T->w_popup_image_surface
+ * so structs.h does not need to pull in <cairo.h>.
+ */
+
+#include "vim.h"
+
+#if defined(FEAT_IMAGE_CAIRO) || defined(PROTO)
+# include <cairo.h>
+
+/*
+ * Convert the popup's RGB / RGBA pixel buffer into the cached cairo
+ * surface's pixel layout.  Cairo's CAIRO_FORMAT_ARGB32 / RGB24 wants
+ * native-endian uint32 quartets shaped as 0xAARRGGBB, with ARGB32
+ * pixels premultiplied; we build the integer per pixel so the
+ * resulting bytes come out correct on either endianness.
+ */
+    static void
+cairo_popup_image_fill_surface(win_T *wp, cairo_surface_t *surf)
+{
+    unsigned char   *src = wp->w_popup_image_data;
+    unsigned char   *dst;
+    int		     w = wp->w_popup_image_w;
+    int		     h = wp->w_popup_image_h;
+    int		     stride;
+    int		     x, y;
+
+    cairo_surface_flush(surf);
+    dst = cairo_image_surface_get_data(surf);
+    stride = cairo_image_surface_get_stride(surf);
+
+    if (wp->w_popup_image_alpha)
+    {
+	for (y = 0; y < h; ++y)
+	{
+	    unsigned int *p = (unsigned int *)(dst + y * stride);
+
+	    for (x = 0; x < w; ++x)
+	    {
+		int idx = (y * w + x) * 4;
+		unsigned r = src[idx + 0];
+		unsigned g = src[idx + 1];
+		unsigned b = src[idx + 2];
+		unsigned a = src[idx + 3];
+
+		// Premultiply alpha for ARGB32.
+		r = (r * a + 127) / 255;
+		g = (g * a + 127) / 255;
+		b = (b * a + 127) / 255;
+		p[x] = ((unsigned int)a << 24)
+		     | ((unsigned int)r << 16)
+		     | ((unsigned int)g << 8)
+		     |  (unsigned int)b;
+	    }
+	}
+    }
+    else
+    {
+	for (y = 0; y < h; ++y)
+	{
+	    unsigned int *p = (unsigned int *)(dst + y * stride);
+
+	    for (x = 0; x < w; ++x)
+	    {
+		int idx = (y * w + x) * 3;
+		unsigned r = src[idx + 0];
+		unsigned g = src[idx + 1];
+		unsigned b = src[idx + 2];
+
+		// RGB24's high byte is unused but conventionally 0xff.
+		p[x] = (0xffu << 24)
+		     | ((unsigned int)r << 16)
+		     | ((unsigned int)g << 8)
+		     |  (unsigned int)b;
+	    }
+	}
+    }
+    cairo_surface_mark_dirty(surf);
+}
+
+/*
+ * Build the cached cairo_image_surface_t for "wp" from its RGB / RGBA
+ * pixel buffer.  Existing cache is freed first.  Returns true on
+ * success, false on bad input or out-of-memory.
+ */
+    bool
+cairo_popup_image_ensure(win_T *wp)
+{
+    cairo_surface_t *surf;
+    cairo_format_t   fmt;
+
+    if (wp->w_popup_image_data == NULL
+	    || wp->w_popup_image_w <= 0 || wp->w_popup_image_h <= 0)
+	return false;
+
+    if (wp->w_popup_image_surface != NULL)
+	return true;
+
+    fmt = wp->w_popup_image_alpha ? CAIRO_FORMAT_ARGB32 : CAIRO_FORMAT_RGB24;
+    surf = cairo_image_surface_create(fmt,
+		wp->w_popup_image_w, wp->w_popup_image_h);
+    if (cairo_surface_status(surf) != CAIRO_STATUS_SUCCESS)
+    {
+	cairo_surface_destroy(surf);
+	return false;
+    }
+    cairo_popup_image_fill_surface(wp, surf);
+    wp->w_popup_image_surface = surf;
+    return true;
+}
+
+/*
+ * Same-size pixel swap: refill the existing cached surface in place
+ * with new bytes from wp->w_popup_image_data.  Returns false when
+ * there is no cache yet (caller should fall back to a full rebuild).
+ */
+    bool
+cairo_popup_image_update(win_T *wp)
+{
+    if (wp->w_popup_image_surface == NULL || wp->w_popup_image_data == NULL)
+	return false;
+    cairo_popup_image_fill_surface(wp,
+	    (cairo_surface_t *)wp->w_popup_image_surface);
+    return true;
+}
+
+/*
+ * Release the cached cairo surface attached to "wp".  Safe to call
+ * when no cache is present.
+ */
+    void
+cairo_popup_image_free(win_T *wp)
+{
+    if (wp->w_popup_image_surface != NULL)
+    {
+	cairo_surface_destroy((cairo_surface_t *)wp->w_popup_image_surface);
+	wp->w_popup_image_surface = NULL;
+    }
+}
+
+/*
+ * Composite a sub-rect of the popup's cached image onto "target" at pixel
+ * position (x, y).  (src_x, src_y, draw_w, draw_h) describe which pixel
+ * sub-rect of the source bitmap should be drawn -- "clipwindow" popups pass
+ * non-zero offsets to crop the portion that falls outside the host window.
+ * Builds the cache on first call.  Caller is responsible for scheduling a
+ * redraw of the target's owning widget if needed (e.g.
+ * gtk_widget_queue_draw_area on GTK).
+ */
+    void
+cairo_popup_image_paint(
+	win_T	*wp,
+	void	*target,
+	int	 x,
+	int	 y,
+	int	 src_x,
+	int	 src_y,
+	int	 draw_w,
+	int	 draw_h)
+{
+    cairo_t *cr;
+
+    if (target == NULL || draw_w <= 0 || draw_h <= 0)
+	return;
+    if (!cairo_popup_image_ensure(wp))
+	return;
+    cairo_surface_t *surface = (cairo_surface_t *)wp->w_popup_image_surface;
+
+
+# if !GTK_CHECK_VERSION(3,0,0)
+    cr = gdk_cairo_create((GdkDrawable *)target);
+# else
+    cr = cairo_create((cairo_surface_t *)target);
+# endif
+    cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
+    // Position the source so its (src_x, src_y) pixel lands at (x, y),
+    // then clip to the visible (draw_w x draw_h) rectangle.
+    cairo_set_source_surface(cr,
+	    surface,
+	    x - src_x, y - src_y);
+
+    cairo_rectangle(cr, x, y, draw_w, draw_h);
+    cairo_fill(cr);
+    cairo_destroy(cr);
+}
+
+#endif // FEAT_IMAGE_CAIRO || PROTO
diff --git a/src/channel.c b/src/channel.c
index 0902ba3822..e85fee5e17 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -1327,7 +1327,7 @@ channel_parse_socketserver_address(
     if (*address == NUL)
 	goto fail;
 
-    if (!STRNCMP(address, "unix:", 5))
+    if (STRNCMP(address, "unix:", 5) == 0)
     {
 	*unix_path = vim_strsave(address + 5);
 	return OK;
@@ -1380,7 +1380,7 @@ channel_open_func(typval_T *argvars)
 	return NULL;
     }
 
-    if (!STRNCMP(address, "unix:", 5))
+    if (STRNCMP(address, "unix:", 5) == 0)
     {
 	is_unix = TRUE;
 	address += 5;
@@ -1477,7 +1477,7 @@ channel_listen_func(typval_T *argvars)
 	return NULL;
     }
 
-    if (!STRNCMP(arg, "unix:", 5))
+    if (STRNCMP(arg, "unix:", 5) == 0)
     {
 	is_unix = TRUE;
 	arg += 5;
@@ -5990,6 +5990,9 @@ f_ch_setoptions(typval_T *argvars, typval_T *rettv UNUSED)
     channel_T	*channel;
     jobopt_T	opt;
 
+    if (check_restricted() || check_secure())
+	return;
+
     if (in_vim9script()
 	    && (check_for_chan_or_job_arg(argvars, 0) == FAIL
 		|| check_for_dict_arg(argvars, 1) == FAIL))
diff --git a/src/cindent.c b/src/cindent.c
index 94c01db7e8..b3a55c108c 100644
--- a/src/cindent.c
+++ b/src/cindent.c
@@ -146,6 +146,76 @@ is_pos_in_string(char_u *line, colnr_T col)
     return !((colnr_T)(p - line) <= col);
 }
 
+/*
+ * Check if line[] contains a "//" comment, ignoring matches inside strings.
+ * Return MAXCOL if not, otherwise return the column.
+ * The line is scanned once (skipping strings), so this stays linear even on
+ * lines with many slashes (e.g. base64 data).
+ */
+    int
+check_linecomment(char_u *line)
+{
+    char_u  *p;
+
+    p = line;
+    // skip Lispish one-line comments
+    if (curbuf->b_p_lisp)
+    {
+	if (vim_strchr(p, ';') != NULL) // there may be comments
+	{
+	    int in_str = FALSE;	// inside of string
+
+	    p = line;		// scan from start
+	    while ((p = vim_strpbrk(p, (char_u *)"\";")) != NULL)
+	    {
+		if (*p == '"')
+		{
+		    if (in_str)
+		    {
+			if (*(p - 1) != '\\') // skip escaped quote
+			    in_str = FALSE;
+		    }
+		    else if (p == line || ((p - line) >= 2
+				      // skip #\" form
+				      && *(p - 1) != '\\' && *(p - 2) != '#'))
+			in_str = TRUE;
+		}
+		else if (!in_str && ((p - line) < 2
+				    || (*(p - 1) != '\\' && *(p - 2) != '#'))
+			       && !is_pos_in_string(line, (colnr_T)(p - line)))
+		    break;	// found!
+		++p;
+	    }
+	}
+	else
+	    p = NULL;
+    }
+    else
+    {
+	// Scan the line once, skipping over strings, char constants and raw
+	// strings, instead of testing each '/' with is_pos_in_string() (which
+	// rescans from the start, making this quadratic on lines with many
+	// slashes).
+	for ( ; *p != NUL; ++p)
+	{
+	    p = skip_string(p);
+	    if (*p == NUL)
+		break;
+	    // Accept a double /, unless it's preceded with * and followed by
+	    // *, because * / / * is an end and start of a C comment.
+	    if (p[0] == '/' && p[1] == '/'
+				 && (p == line || p[-1] != '*' || p[2] != '*'))
+		break;
+	}
+	if (*p == NUL)
+	    p = NULL;
+    }
+
+    if (p == NULL)
+	return MAXCOL;
+    return (int)(p - line);
+}
+
 /*
  * Find the start of a comment, not knowing if we are in a comment right now.
  * Search starts at w_cursor.lnum and goes backwards.
@@ -748,7 +818,7 @@ cin_is_compound_init(char_u *s)
     {
 	if (*p == '=')
 	    p = r = cin_skipcomment(p + 1);
-	else if (!STRNCMP(p, "return", 6) && !vim_isIDc(p[6])
+	else if (STRNCMP(p, "return", 6) == 0 && !vim_isIDc(p[6])
 		&& (p == s || (p > s && !vim_isIDc(p[-1]))))
 	    p = r = cin_skipcomment(p + 6);
 	else
@@ -1217,6 +1287,8 @@ find_last_paren(char_u *l, int start, int end)
     for (i = 0; l[i] != NUL; i++)
     {
 	i = (int)(cin_skipcomment(l + i) - l); // ignore parens in comments
+	if (l[i] == NUL)
+	    break;
 	i = (int)(skip_string(l + i) - l);    // ignore parens in quotes
 	if (l[i] == start)
 	    ++open_count;
@@ -1422,19 +1494,19 @@ cin_is_if_for_while_before_offset(char_u *line, int *poffset)
 	--offset;
 
     offset -= 1;
-    if (!STRNCMP(line + offset, "if", 2))
+    if (STRNCMP(line + offset, "if", 2) == 0)
 	goto probablyFound;
 
     if (offset >= 1)
     {
 	offset -= 1;
-	if (!STRNCMP(line + offset, "for", 3))
+	if (STRNCMP(line + offset, "for", 3) == 0)
 	    goto probablyFound;
 
 	if (offset >= 2)
 	{
 	    offset -= 2;
-	    if (!STRNCMP(line + offset, "while", 5))
+	    if (STRNCMP(line + offset, "while", 5) == 0)
 		goto probablyFound;
 	}
     }
diff --git a/src/clientserver.c b/src/clientserver.c
index 95978c59fe..360915a18d 100644
--- a/src/clientserver.c
+++ b/src/clientserver.c
@@ -1313,3 +1313,28 @@ f_serverlist(typval_T *argvars UNUSED, typval_T *rettv)
     rettv->vval.v_string = r;
 }
 #endif
+
+#ifdef FEAT_CLIENTSERVER_BACKENDS
+/*
+ * Check the $VIM_CLIENTSERVER environment variable and set the method
+ */
+    void
+check_clientserver_method_env(void)
+{
+    char_u *env = mch_getenv("VIM_CLIENTSERVER");
+
+    if (env == NULL)
+	return;
+
+    if (STRICMP(env, "socket") == 0)
+	clientserver_method = CLIENTSERVER_METHOD_SOCKET;
+# ifdef FEAT_X11
+    else if (STRICMP(env, "x11") == 0)
+	clientserver_method = CLIENTSERVER_METHOD_X11;
+# endif
+# ifdef MSWIN
+    else if (STRICMP(env, "mswin") == 0)
+	clientserver_method = CLIENTSERVER_METHOD_MSWIN;
+# endif
+}
+#endif
diff --git a/src/clipboard.c b/src/clipboard.c
index 64e073d9b4..25af07a277 100644
--- a/src/clipboard.c
+++ b/src/clipboard.c
@@ -72,7 +72,9 @@ typedef struct {
 // Mimes with a lower index in the array are prioritized first when we are
 // receiving data.
 static const char *supported_mimes[] = {
+    VIMENC_MIMETYPE_NAME,
     VIMENC_ATOM_NAME,
+    VIM_MIMETYPE_NAME,
     VIM_ATOM_NAME,
     "text/plain;charset=utf-8",
     "text/plain",
@@ -1428,6 +1430,10 @@ open_app_context(void)
 
 static Atom	vim_atom;	// Vim's own special selection format
 static Atom	vimenc_atom;	// Vim's extended selection format
+static Atom	vim_mt_atom;	// Vim's own special selection format (in mime
+				// type format)
+static Atom	vimenc_mt_atom;	// Vim's extended selection format (in mime type
+				// format)
 static Atom	utf8_atom;
 static Atom	compound_text_atom;
 static Atom	text_atom;
@@ -1439,6 +1445,8 @@ x11_setup_atoms(Display *dpy)
 {
     vim_atom	       = XInternAtom(dpy, VIM_ATOM_NAME,   False);
     vimenc_atom	       = XInternAtom(dpy, VIMENC_ATOM_NAME,False);
+    vim_mt_atom	       = XInternAtom(dpy, VIM_MIMETYPE_NAME,   False);
+    vimenc_mt_atom     = XInternAtom(dpy, VIMENC_MIMETYPE_NAME,False);
     utf8_atom	       = XInternAtom(dpy, "UTF8_STRING",   False);
     compound_text_atom = XInternAtom(dpy, "COMPOUND_TEXT", False);
     text_atom	       = XInternAtom(dpy, "TEXT",	   False);
@@ -1480,13 +1488,15 @@ clip_x11_convert_selection_cb(
     // requestor wants to know what target types we support
     if (*target == targets_atom)
     {
-	static Atom array[7];
+	static Atom array[9];
 
 	*value = (XtPointer)array;
 	i = 0;
 	array[i++] = targets_atom;
 	array[i++] = vimenc_atom;
 	array[i++] = vim_atom;
+	array[i++] = vimenc_mt_atom;
+	array[i++] = vim_mt_atom;
 	if (enc_utf8)
 	    array[i++] = utf8_atom;
 	array[i++] = XA_STRING;
@@ -1503,8 +1513,10 @@ clip_x11_convert_selection_cb(
 
     if (       *target != XA_STRING
 	    && *target != vimenc_atom
+	    && *target != vimenc_mt_atom
 	    && (*target != utf8_atom || !enc_utf8)
 	    && *target != vim_atom
+	    && *target != vim_mt_atom
 	    && *target != text_atom
 	    && *target != compound_text_atom)
 	return False;
@@ -1515,11 +1527,11 @@ clip_x11_convert_selection_cb(
 	return False;
 
     // For our own format, the first byte contains the motion type
-    if (*target == vim_atom)
+    if (*target == vim_atom || *target == vim_mt_atom)
 	(*length)++;
 
     // Our own format with encoding: motion 'encoding' NUL text
-    if (*target == vimenc_atom)
+    if (*target == vimenc_atom || *target == vimenc_mt_atom)
 	*length += STRLEN(p_enc) + 2;
 
     if (save_length < *length || save_length / 2 >= *length)
@@ -1562,20 +1574,26 @@ clip_x11_convert_selection_cb(
 	save_result = (char_u *)*value;
 	save_length = *length;
     }
-    else if (*target == vimenc_atom)
+    else if (*target == vimenc_atom || *target == vimenc_mt_atom)
     {
 	int l = STRLEN(p_enc);
 
 	save_result[0] = motion_type;
 	STRCPY(save_result + 1, p_enc);
 	mch_memmove(save_result + l + 2, string, (size_t)(*length - l - 2));
-	*type = vimenc_atom;
+	if (*target == vimenc_atom)
+	    *type = vimenc_atom;
+	else
+	    *type = vimenc_mt_atom;
     }
     else
     {
 	save_result[0] = motion_type;
 	mch_memmove(save_result + 1, string, (size_t)(*length - 1));
-	*type = vim_atom;
+	if (*target == vim_atom)
+	    *type = vim_atom;
+	else
+	    *type = vim_mt_atom;
     }
     *format = 8;	    // 8 bits per char
     vim_free(string);
@@ -1685,13 +1703,13 @@ clip_x11_request_selection_cb(
     }
     p = (char_u *)value;
     len = *length;
-    if (*type == vim_atom)
+    if (*type == vim_atom || *type == vim_mt_atom)
     {
 	motion_type = *p++;
 	len--;
     }
 
-    else if (*type == vimenc_atom)
+    else if (*type == vimenc_atom || *type == vimenc_mt_atom)
     {
 	char_u		*enc;
 	vimconv_T	conv;
@@ -1769,15 +1787,17 @@ clip_x11_request_selection(
     time_t	start_time;
     int		timed_out = FALSE;
 
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < 8; i++)
     {
 	switch (i)
 	{
-	    case 0:  type = vimenc_atom;	break;
-	    case 1:  type = vim_atom;		break;
-	    case 2:  type = utf8_atom;		break;
-	    case 3:  type = compound_text_atom; break;
-	    case 4:  type = text_atom;		break;
+	    case 0:  type = vimenc_mt_atom;	break;
+	    case 1:  type = vimenc_atom;	break;
+	    case 2:  type = vim_mt_atom;	break;
+	    case 3:  type = vim_atom;		break;
+	    case 4:  type = utf8_atom;		break;
+	    case 5:  type = compound_text_atom; break;
+	    case 6:  type = text_atom;		break;
 	    default: type = XA_STRING;
 	}
 	if (type == utf8_atom
@@ -2159,7 +2179,7 @@ clip_yank_selection(
     str_to_reg(y_ptr, type, str, len, -1, FALSE);
 }
 
-    static int
+    int
 clip_convert_selection_offset(
 	char_u	    **str,
 	long_u	    *len,
@@ -2558,16 +2578,19 @@ clip_reset_wayland(void)
     return OK;
 }
 
+
 /*
  * Read data from a file descriptor and write it to the given clipboard.
  */
     static void
 clip_wl_receive_data(Clipboard_T *cbd, const char *mime_type, int fd)
 {
-    char_u	*start, *final, *enc;
+    char_u	*start, *final;
+    long	len;
     garray_T	buf;
     int		motion_type = MAUTO;
     ssize_t	r = 0;
+    char_u	*tofree = NULL;
 #  ifndef HAVE_SELECT
     struct pollfd   pfd;
 
@@ -2632,47 +2655,16 @@ clip_wl_receive_data(Clipboard_T *cbd, const char *mime_type, int fd)
     }
 
     final = buf.ga_data;
-
-    if (STRCMP(mime_type, VIM_ATOM_NAME) == 0 && buf.ga_len >= 2)
-    {
-	motion_type = *final++;
-	buf.ga_len--;
-    }
-    else if (STRCMP(mime_type, VIMENC_ATOM_NAME) == 0 && buf.ga_len >= 3)
-    {
-	vimconv_T   conv;
-	int	    convlen;
-
-	// first byte is motion type
-	motion_type = *final++;
-	buf.ga_len--;
-
-	// Get encoding of selection
-	enc = final;
-
-	// Skip the encoding type including null terminator in final text
-	final += STRLEN(final) + 1;
-
-	// Subtract pointers to get length of encoding;
-	buf.ga_len -= final - enc;
-
-	conv.vc_type = CONV_NONE;
-	convert_setup(&conv, enc, p_enc);
-	if (conv.vc_type != CONV_NONE)
-	{
-	   char_u *tmp;
-
-	   convlen = buf.ga_len;
-	   tmp = string_convert(&conv, final, &convlen);
-	   buf.ga_len = convlen;
-	   if (tmp != NULL)
-		final = tmp;
-	   convert_setup(&conv, NULL, NULL);
-	}
-    }
-
-    clip_yank_selection(motion_type, final, (long)buf.ga_len, cbd);
+    len = buf.ga_len;
+
+    if (clip_convert_data(&final, &len, &motion_type,
+	    STRCMP(mime_type, VIM_ATOM_NAME) == 0
+	    || STRCMP(mime_type, VIM_MIMETYPE_NAME) == 0,
+	    STRCMP(mime_type, VIMENC_ATOM_NAME) == 0
+	    || STRCMP(mime_type, VIMENC_MIMETYPE_NAME) == 0, &tofree) == OK)
+	clip_yank_selection(motion_type, final, len, cbd);
     ga_clear(&buf);
+    vim_free(tofree);
 }
 
 /*
@@ -2776,8 +2768,10 @@ vwl_data_source_listener_event_send(
     // format, after the first byte is the encoding type, which is null
     // terminated.
 
-    is_vimenc = STRCMP(mime_type, VIMENC_ATOM_NAME) == 0;
-    is_vim = STRCMP(mime_type, VIM_ATOM_NAME) == 0;
+    is_vimenc = STRCMP(mime_type, VIMENC_ATOM_NAME) == 0
+	|| STRCMP(mime_type, VIMENC_MIMETYPE_NAME) == 0;
+    is_vim = STRCMP(mime_type, VIM_ATOM_NAME) == 0
+	|| STRCMP(mime_type, VIM_MIMETYPE_NAME) == 0;
 
     if (is_vimenc)
 	offset += 2 + STRLEN(p_enc);
@@ -3734,3 +3728,72 @@ dec_clip_provider(void)
 }
 
 #endif // FEAT_CLIPBOARD_PROVIDER
+
+#if defined(FEAT_WAYLAND_CLIPBOARD) || (defined(FEAT_GUI_GTK) && defined(USE_GTK4))
+/*
+ * If "vim" is TRUE, then get the motion type. If "vimenc" is TRUE, then get the
+ * motion type and also convert "*buf". "buf" and "len_store" will be updated to
+ * reflect the actual contents, but should be set beforehand with the initial
+ * contents. Returns OK on success and FAIL on failure.
+ */
+    int
+clip_convert_data(
+	char_u	**buf,
+	long	*len_store,
+	int	*motion,
+	bool	vim,
+	bool	vimenc,
+	char_u	**tofree)
+{
+    char_u  *final = *buf;
+    char_u  *enc;
+    long    len = *len_store;
+
+    if (vim && len >= 2)
+    {
+	*motion = *final++;
+	len--;
+    }
+    else if (vimenc && len >= 3)
+    {
+	vimconv_T   conv;
+	int	    convlen;
+
+	// First byte is motion type
+	*motion = *final++;
+	len--;
+
+	// Get encoding of selection
+	enc = final;
+
+	// Skip the encoding type including null terminator in final text
+	final = memchr(final, NUL, len);
+	if (final == NULL)
+	    return FAIL;
+	final++; // Skip NUL
+
+	// Subtract pointers to get length of encoding;
+	len -= final - enc;
+
+	conv.vc_type = CONV_NONE;
+	convert_setup(&conv, enc, p_enc);
+	if (conv.vc_type != CONV_NONE)
+	{
+	   char_u *tmp;
+
+	   convlen = len;
+	   tmp = string_convert(&conv, final, &convlen);
+	   len = convlen;
+	   if (tmp != NULL)
+	   {
+		final = tmp;
+		*tofree = final;
+	   }
+	   convert_setup(&conv, NULL, NULL);
+	}
+    }
+    *buf = final;
+    *len_store = len;
+    return OK;
+}
+#endif
diff --git a/src/cmdexpand.c b/src/cmdexpand.c
index dabc4374e9..4ff6a2c486 100644
--- a/src/cmdexpand.c
+++ b/src/cmdexpand.c
@@ -25,6 +25,8 @@ static int	expand_shellcmd(char_u *filepat, char_u ***matches, int *numMatches,
 #if defined(FEAT_EVAL)
 static int	ExpandUserDefined(char_u *pat, expand_T *xp, regmatch_T *regmatch, char_u ***matches, int *numMatches);
 static int	ExpandUserList(expand_T *xp, char_u ***matches, int *numMatches);
+static char_u	*apply_user_completeopt_escape(expand_T *xp, char_u *str);
+static char_u	*unescape_user_completeopt_pat(expand_T *xp, char_u *src, int srclen, int *new_lenp);
 #endif
 static int	expand_pattern_in_buf(char_u *pat, int dir, char_u ***matches, int *numMatches);
 
@@ -294,13 +296,24 @@ nextwild(
     else
     {
 	char_u	*tmp;
+	char_u	*pat_src = xp->xp_pattern;
+	int	pat_len = xp->xp_pattern_len;
+#if defined(FEAT_EVAL)
+	char_u	*unesc = unescape_user_completeopt_pat(xp, pat_src, pat_len,
+								  &pat_len);
+	if (unesc != NULL)
+	    pat_src = unesc;
+#endif
 
 	if (cmdline_fuzzy_completion_supported(xp)
 		|| xp->xp_context == EXPAND_PATTERN_IN_BUF)
 	    // Don't modify the search string
-	    tmp = vim_strnsave(xp->xp_pattern, xp->xp_pattern_len);
+	    tmp = vim_strnsave(pat_src, pat_len);
 	else
-	    tmp = addstar(xp->xp_pattern, xp->xp_pattern_len, xp->xp_context);
+	    tmp = addstar(pat_src, pat_len, xp->xp_context);
+#if defined(FEAT_EVAL)
+	vim_free(unesc);
+#endif
 
 	// Translate string into pattern and expand it.
 	if (tmp == NULL)
@@ -805,6 +818,72 @@ win_redr_status_matches(
     vim_free(buf);
 }
 
+#if defined(FEAT_EVAL)
+/*
+ * Apply -completeopt=escape to a string about to be inserted into the command
+ * line as a completion result.  If "str" is non-NULL and the active expansion
+ * context is a customlist/custom user command with UCC_ESCAPE set, free "str"
+ * and return a newly-allocated copy with spaces, tabs and backslashes prefixed
+ * by a backslash.  Otherwise return "str" unchanged.
+ */
+    static char_u *
+apply_user_completeopt_escape(expand_T *xp, char_u *str)
+{
+    char_u  *p;
+
+    if (str == NULL)
+	return NULL;
+    if ((xp->xp_context != EXPAND_USER_DEFINED
+		&& xp->xp_context != EXPAND_USER_LIST)
+	    || !(xp->xp_complete_opt & UCC_ESCAPE))
+	return str;
+    p = vim_strsave_escaped(str, (char_u *)" \t\\");
+    if (p == NULL)
+	return str;
+    vim_free(str);
+    return p;
+}
+
+/*
+ * For -completeopt=escape on a user command, build the "logical" ArgLead by
+ * collapsing a backslash before a space, tab or backslash in the typed text.
+ * The completion function then sees "foo bar" instead of "foo\ bar".
+ * Returns a newly-allocated string and stores its length in "*new_lenp", or
+ * NULL when no unescape is applicable (caller should keep the original).
+ */
+    static char_u *
+unescape_user_completeopt_pat(
+    expand_T	*xp,
+    char_u	*src,
+    int		srclen,
+    int		*new_lenp)
+{
+    char_u  *buf, *p, *d, *end;
+
+    if ((xp->xp_context != EXPAND_USER_DEFINED
+		&& xp->xp_context != EXPAND_USER_LIST)
+	    || !(xp->xp_complete_opt & UCC_ESCAPE))
+	return NULL;
+
+    buf = alloc(srclen + 1);
+    if (buf == NULL)
+	return NULL;
+
+    d = buf;
+    end = src + srclen;
+    for (p = src; p < end; ++p)
+    {
+	if (*p == '\\' && p + 1 < end
+			   && (p[1] == ' ' || p[1] == TAB || p[1] == '\\'))
+	    ++p;
+	*d++ = *p;
+    }
+    *d = NUL;
+    *new_lenp = (int)(d - buf);
+    return buf;
+}
+#endif
+
 /*
  * Get the next or prev cmdline completion match. The index of the match is set
  * in "xp->xp_selected"
@@ -901,7 +980,13 @@ get_next_or_prev_match(int mode, expand_T *xp)
 
     xp->xp_selected = findex;
     // Return the original text or the selected match
-    return vim_strsave(findex == -1 ? xp->xp_orig : xp->xp_files[findex]);
+    if (findex == -1)
+	return vim_strsave(xp->xp_orig);
+#if defined(FEAT_EVAL)
+    return apply_user_completeopt_escape(xp, vim_strsave(xp->xp_files[findex]));
+#else
+    return vim_strsave(xp->xp_files[findex]);
+#endif
 }
 
 /*
@@ -1101,6 +1186,12 @@ ExpandOne(
 {
     char_u	*ss = NULL;
     int		orig_saved = FALSE;
+#if defined(FEAT_EVAL)
+    // ss_is_match is TRUE when ss is derived from xp_files and should be
+    // escaped per -completeopt=escape before being inserted.  WILD_CANCEL
+    // and WILD_APPLY-without-selection return xp_orig unchanged.
+    int		ss_is_match = FALSE;
+#endif
 
     // first handle the case of using an old match
     if (mode == WILD_NEXT || mode == WILD_PREV
@@ -1110,9 +1201,17 @@ ExpandOne(
     if (mode == WILD_CANCEL)
 	ss = vim_strsave(xp->xp_orig ? xp->xp_orig : (char_u *)"");
     else if (mode == WILD_APPLY)
-	ss = vim_strsave(xp->xp_selected == -1
-			    ? (xp->xp_orig ? xp->xp_orig : (char_u *)"")
-			    : xp->xp_files[xp->xp_selected]);
+    {
+	if (xp->xp_selected == -1)
+	    ss = vim_strsave(xp->xp_orig ? xp->xp_orig : (char_u *)"");
+	else
+	{
+	    ss = vim_strsave(xp->xp_files[xp->xp_selected]);
+#if defined(FEAT_EVAL)
+	    ss_is_match = TRUE;
+#endif
+	}
+    }
 
     // free old names
     if (xp->xp_numfiles != -1 && mode != WILD_ALL && mode != WILD_LONGEST)
@@ -1138,6 +1237,10 @@ ExpandOne(
 	orig_saved = TRUE;
 
 	ss = ExpandOne_start(mode, xp, str, options);
+#if defined(FEAT_EVAL)
+	if (ss != NULL)
+	    ss_is_match = TRUE;
+#endif
     }
 
     // Find longest common part
@@ -1145,6 +1248,10 @@ ExpandOne(
     {
 	ss = find_longest_match(xp, options);
 	xp->xp_selected = -1;			// next p_wc gets first one
+#if defined(FEAT_EVAL)
+	if (ss != NULL)
+	    ss_is_match = TRUE;
+#endif
     }
 
     // Concatenate all matching names.  Unless interrupted, this can be slow
@@ -1156,6 +1263,38 @@ ExpandOne(
 	char	*suffix = (options & WILD_USE_NL) ? "\n" : " ";
 	int	n = xp->xp_numfiles - 1;
 	int	i;
+#if defined(FEAT_EVAL)
+	char_u	**files = xp->xp_files;
+	char_u	**escaped = NULL;
+
+	// When -completeopt=escape is set for a user command, escape each
+	// match before joining so the separator spaces stay unescaped.
+	if ((xp->xp_context == EXPAND_USER_DEFINED
+		    || xp->xp_context == EXPAND_USER_LIST)
+		&& (xp->xp_complete_opt & UCC_ESCAPE))
+	{
+	    escaped = ALLOC_MULT(char_u *, xp->xp_numfiles);
+	    if (escaped != NULL)
+	    {
+		for (i = 0; i < xp->xp_numfiles; ++i)
+		{
+		    escaped[i] = vim_strsave_escaped(xp->xp_files[i],
+						       (char_u *)" \t\\");
+		    if (escaped[i] == NULL)
+		    {
+			while (--i >= 0)
+			    vim_free(escaped[i]);
+			VIM_CLEAR(escaped);
+			break;
+		    }
+		}
+		if (escaped != NULL)
+		    files = escaped;
+	    }
+	}
+#else
+	char_u	**files = xp->xp_files;
+#endif
 
 	if (xp->xp_prefix == XP_PREFIX_NO)
 	{
@@ -1169,7 +1308,7 @@ ExpandOne(
 	}
 
 	for (i = 0; i < xp->xp_numfiles; ++i)
-	    ss_size += STRLEN(xp->xp_files[i]) + 1;	// +1 for the suffix
+	    ss_size += STRLEN(files[i]) + 1;		// +1 for the suffix
 	++ss_size;					// +1 for the NUL
 
 	ss = alloc(ss_size);
@@ -1184,10 +1323,18 @@ ExpandOne(
 		    ss_size - ss_len,
 		    "%s%s%s",
 		    (i > 0) ? prefix : "",
-		    (char *)xp->xp_files[i],
+		    (char *)files[i],
 		    (i < n) ? suffix : "");
 	    }
 	}
+#if defined(FEAT_EVAL)
+	if (escaped != NULL)
+	{
+	    for (i = 0; i < xp->xp_numfiles; ++i)
+		vim_free(escaped[i]);
+	    vim_free(escaped);
+	}
+#endif
     }
 
     if (mode == WILD_EXPAND_FREE || mode == WILD_ALL)
@@ -1197,6 +1344,12 @@ ExpandOne(
     if (!orig_saved)
 	vim_free(orig);
 
+#if defined(FEAT_EVAL)
+    // WILD_ALL already escaped its component matches in place, so don't
+    // re-escape the joined string (its separator spaces would break).
+    if (ss_is_match && mode != WILD_ALL)
+	ss = apply_user_completeopt_escape(xp, ss);
+#endif
     return ss;
 }
 
@@ -2302,13 +2455,13 @@ set_context_in_filetype_cmd(expand_T *xp, char_u *arg)
 
     for (;;)
     {
-	if (STRNCMP(p, "plugin", 6) == 0)
+	if (STRNCMP(p, "plugin", 6) == 0 && VIM_ISWHITE(p[6]))
 	{
 	    val |= EXPAND_FILETYPECMD_PLUGIN;
 	    p = skipwhite(p + 6);
 	    continue;
 	}
-	if (STRNCMP(p, "indent", 6) == 0)
+	if (STRNCMP(p, "indent", 6) == 0 && VIM_ISWHITE(p[6]))
 	{
 	    val |= EXPAND_FILETYPECMD_INDENT;
 	    p = skipwhite(p + 6);
@@ -3062,11 +3215,25 @@ expand_cmdline(
 
     // add star to file name, or convert to regexp if not exp. files.
     xp->xp_pattern_len = (int)(str + col - xp->xp_pattern);
-    if (cmdline_fuzzy_completion_supported(xp))
-	// If fuzzy matching, don't modify the search string
-	file_str = vim_strsave(xp->xp_pattern);
-    else
-	file_str = addstar(xp->xp_pattern, xp->xp_pattern_len, xp->xp_context);
+    {
+	char_u	*pat_src = xp->xp_pattern;
+	int	pat_len = xp->xp_pattern_len;
+#if defined(FEAT_EVAL)
+	char_u	*unesc = unescape_user_completeopt_pat(xp, pat_src, pat_len,
+								  &pat_len);
+	if (unesc != NULL)
+	    pat_src = unesc;
+#endif
+
+	if (cmdline_fuzzy_completion_supported(xp))
+	    // If fuzzy matching, don't modify the search string
+	    file_str = vim_strnsave(pat_src, pat_len);
+	else
+	    file_str = addstar(pat_src, pat_len, xp->xp_context);
+#if defined(FEAT_EVAL)
+	vim_free(unesc);
+#endif
+    }
     if (file_str == NULL)
 	return EXPAND_UNSUCCESSFUL;
 
@@ -3369,6 +3536,7 @@ ExpandOther(
 	{EXPAND_USER_CMD_FLAGS, get_user_cmd_flags, FALSE, TRUE},
 	{EXPAND_USER_NARGS, get_user_cmd_nargs, FALSE, TRUE},
 	{EXPAND_USER_COMPLETE, get_user_cmd_complete, FALSE, TRUE},
+	{EXPAND_USER_COMPLETEOPT, get_user_cmd_completeopt, FALSE, TRUE},
 #ifdef FEAT_EVAL
 	{EXPAND_USER_VARS, get_user_var_name, FALSE, TRUE},
 	{EXPAND_FUNCTIONS, get_function_name, FALSE, TRUE},
@@ -4034,7 +4202,13 @@ call_user_expand_func(
 	ccline->cmdbuff[ccline->cmdlen] = 0;
     }
 
-    pat = vim_strnsave(xp->xp_pattern, xp->xp_pattern_len);
+    {
+	int unesc_len;
+	pat = unescape_user_completeopt_pat(xp, xp->xp_pattern,
+						  xp->xp_pattern_len, &unesc_len);
+	if (pat == NULL)
+	    pat = vim_strnsave(xp->xp_pattern, xp->xp_pattern_len);
+    }
 
     args[0].v_type = VAR_STRING;
     args[0].vval.v_string = pat;
@@ -4795,11 +4969,21 @@ f_getcompletion(typval_T *argvars, typval_T *rettv)
 	}
     }
 
-    if (cmdline_fuzzy_completion_supported(&xpc))
-	// when fuzzy matching, don't modify the search string
-	pat = vim_strnsave(xpc.xp_pattern, xpc.xp_pattern_len);
-    else
-	pat = addstar(xpc.xp_pattern, xpc.xp_pattern_len, xpc.xp_context);
+    {
+	char_u	*pat_src = xpc.xp_pattern;
+	int	pat_len = xpc.xp_pattern_len;
+	char_u	*unesc = unescape_user_completeopt_pat(&xpc, pat_src, pat_len,
+								  &pat_len);
+	if (unesc != NULL)
+	    pat_src = unesc;
+
+	if (cmdline_fuzzy_completion_supported(&xpc))
+	    // when fuzzy matching, don't modify the search string
+	    pat = vim_strnsave(pat_src, pat_len);
+	else
+	    pat = addstar(pat_src, pat_len, xpc.xp_context);
+	vim_free(unesc);
+    }
 
     if (rettv_list_alloc(rettv) == OK && pat != NULL)
     {
diff --git a/src/config.h.in b/src/config.h.in
index e4273f5b7c..7861329897 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -499,6 +499,9 @@
 /* Define if GTK GUI is to be linked against GTK 4 */
 #undef USE_GTK4
 
+/* Define if GTK4 GUI should use hardware accelerated backend */
+#undef USE_GTK4_SNAPSHOT
+
 /* Define if we have isinf() */
 #undef HAVE_ISINF
 
diff --git a/src/configure.ac b/src/configure.ac
index 664bf6b1e3..0c1f05ecb9 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -2311,10 +2311,6 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
             librubyarg=
 	fi
 
-	if test "X$librubyarg" != "X"; then
-	  RUBY_LIBS="$librubyarg $RUBY_LIBS"
-	fi
-
 	dnl Here the Ruby LDFLAGS used to be added to LDFLAGS, but that turns
 	dnl out to cause trouble and was removed.
 
@@ -2330,6 +2326,16 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
 	  AC_DEFINE(DYNAMIC_RUBY)
 	  RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby_soname\\\" $RUBY_CFLAGS"
 	  RUBY_LIBS=
+	  dnl For dynamic Ruby keep only the library search path / runpath from
+	  dnl librubyarg so the dlopen()ed library can be found at runtime,
+	  dnl without adding -lruby and thus a hard dependency on the Ruby
+	  dnl library, which would defeat dynamic loading.
+	  for arg in $librubyarg; do
+	    case "$arg" in
+	      -L*|-R*|-Wl,-R*|-Wl,-rpath*) RUBY_LIBS="$RUBY_LIBS $arg" ;;
+	    esac
+	  done
+	  librubyarg=
 
       # MacVim patch to hack in a different default dynamic lib path for
       # arm64.  We don't test that it links here so this has to be binary
@@ -2345,6 +2351,9 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
         AC_MSG_RESULT([<none>])
       fi
 	fi
+	if test "X$librubyarg" != "X"; then
+	  RUBY_LIBS="$librubyarg $RUBY_LIBS"
+	fi
 	if test "X$CLANG_VERSION" != "X" -a "$rubyversion" -ge 30; then
 	  RUBY_CFLAGS="$RUBY_CFLAGS -fdeclspec"
 	fi
@@ -2898,6 +2907,19 @@ if test "x$SKIP_GTK4" != "xYES" -a "$enable_gui_canon" != "gtk4"; then
   fi
 fi
 
+if test "x$SKIP_GTK4" != "xYES" -a "$enable_gui_canon" = "gtk4"; then
+  AC_MSG_CHECKING(--enable-gtk4-hwaccel argument)
+  AC_ARG_ENABLE(gtk4-hwaccel,
+	[  --enable-gtk4-hwaccel  Use hardware accelerated rendering backend for GTK4 [default=no]],
+	, enable_gtk4_hwaccel="no")
+  AC_MSG_RESULT($enable_gtk4_hwaccel)
+
+  if test "x$enable_gtk4_hwaccel" = "xyes"; then
+    AC_DEFINE(USE_GTK4_SNAPSHOT)
+  fi
+fi
+
+
 if test "x$SKIP_GTK3" != "xYES" -a "$enable_gui_canon" != "gtk3"; then
   AC_MSG_CHECKING(whether or not to look for GTK+ 3)
   AC_ARG_ENABLE(gtk3-check,
diff --git a/src/crypt.c b/src/crypt.c
index 2fade5db9d..879ecbf6ce 100644
--- a/src/crypt.c
+++ b/src/crypt.c
@@ -1262,7 +1262,8 @@ crypt_sodium_buffer_decode(
 
     if (sod_st->count == 0)
     {
-	if (crypto_secretstream_xchacha20poly1305_init_pull(&sod_st->state,
+	if (len < crypto_secretstream_xchacha20poly1305_HEADERBYTES ||
+		crypto_secretstream_xchacha20poly1305_init_pull(&sod_st->state,
 						       from, sod_st->key) != 0)
 	{
 	    emsg(_(e_libsodium_decryption_failed_header_incomplete));
diff --git a/src/drawline.c b/src/drawline.c
index c6eb697c0a..6e73ba591a 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -2875,8 +2875,11 @@ win_line(
 #ifdef FEAT_TERMINAL
 		if (term_show_buffer(wp->w_buffer)
 		    && wlv.vcol == 0
-		    && wlv.win_attr == term_get_attr(wp, lnum, -1))
-		    // reset highlighting attribute
+		    && wlv.win_attr == term_get_attr(wp, lnum, -1)
+		    && wlv.win_attr == term_get_default_attr(wp))
+		    // Reset the attribute for an empty line with the
+		    // default background, so a Visual selection shows;
+		    // keep an explicitly set background color.
 		    wlv.win_attr = 0;
 #endif
 	    }
@@ -3693,6 +3696,17 @@ win_line(
 			else if (wlv.line_attr)
 			    wlv.char_attr = hl_combine_attr(
 						 wlv.char_attr, wlv.line_attr);
+			// Show a Visual or search highlight on the first cell
+			// of an empty line, on top of the background color.
+			if (wlv.vcol == 0)
+			{
+			    if (area_attr != 0)
+				wlv.char_attr = hl_combine_attr(
+						     wlv.char_attr, area_attr);
+			    else if (search_attr != 0)
+				wlv.char_attr = hl_combine_attr(
+						   wlv.char_attr, search_attr);
+			}
 		    }
 # endif
 		}
diff --git a/src/drawscreen.c b/src/drawscreen.c
index 7e1c40c383..f18b291e28 100644
--- a/src/drawscreen.c
+++ b/src/drawscreen.c
@@ -449,6 +449,14 @@ update_screen(int type_arg)
     }
 #endif
 
+#if defined(FEAT_IMAGE_GDI) || defined(FEAT_IMAGE_CAIRO) \
+    || defined(FEAT_IMAGE_GDK)
+    // GUI only: the cursor redraw and other late blits paint directly onto
+    // the canvas and may damage the popup images blitted by update_popups();
+    // restore the image layer.  No-op in terminal mode.
+    update_popup_images();
+#endif
+
 #ifdef FEAT_EVAL
     invoke_redraw_listener_start_or_end(false);
     redraw_listener_cleanup();
diff --git a/src/edit.c b/src/edit.c
index 88d86bc49a..6d43293213 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -1242,7 +1242,21 @@ edit(
 	case K_PAGEUP:
 	case K_KPAGEUP:
 	    if (pum_visible())
+	    {
+#ifdef FEAT_PROP_POPUP
+		// CTRL-SHIFT-<Up> scrolls the info popup up a line,
+		// CTRL-SHIFT-<PageUp> a page.  Shift is folded into K_S_UP but
+		// stays in mod_mask for PageUp, hence the asymmetric check.
+		if (c == K_S_UP ? (mod_mask & MOD_MASK_CTRL)
+			: ((mod_mask & MOD_MASK_CTRL)
+			    && (mod_mask & MOD_MASK_SHIFT)))
+		{
+		    popup_scroll_info(-1, c != K_S_UP);
+		    break;
+		}
+#endif
 		goto docomplete;
+	    }
 	    ins_pageup();
 	    break;
 
@@ -1259,7 +1273,19 @@ edit(
 	case K_PAGEDOWN:
 	case K_KPAGEDOWN:
 	    if (pum_visible())
+	    {
+#ifdef FEAT_PROP_POPUP
+		// CTRL-SHIFT-<Down>/<PageDown> scroll the info popup down.
+		if (c == K_S_DOWN ? (mod_mask & MOD_MASK_CTRL)
+			: ((mod_mask & MOD_MASK_CTRL)
+			    && (mod_mask & MOD_MASK_SHIFT)))
+		{
+		    popup_scroll_info(1, c != K_S_DOWN);
+		    break;
+		}
+#endif
 		goto docomplete;
+	    }
 	    ins_pagedown();
 	    break;
 
@@ -1374,6 +1400,15 @@ edit(
 
 	case Ctrl_P:	// Do previous/next pattern completion
 	case Ctrl_N:
+#ifdef FEAT_PROP_POPUP
+	    // CTRL-SHIFT-P/N scroll the info popup one line.
+	    if (pum_visible() && (mod_mask & MOD_MASK_SHIFT)
+		    && (c == Ctrl_P || c == Ctrl_N))
+	    {
+		popup_scroll_info(c == Ctrl_P ? -1 : 1, false);
+		break;
+	    }
+#endif
 	    // if 'complete' is empty then plain ^P is no longer special,
 	    // but it is under other ^X modes
 	    if (*curbuf->b_p_cpt == NUL
@@ -2644,6 +2679,8 @@ stop_insert(
 		curwin->w_cursor.col = strip_col;
 		for (;;)
 		{
+		    if (gchar_cursor() == NUL && curwin->w_cursor.col > 0)
+			--curwin->w_cursor.col;
 		    cc = gchar_cursor();
 		    if (!VIM_ISWHITE(cc))
 			break;
diff --git a/src/errors.h b/src/errors.h
index 8cb60ba0c4..45471480ed 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -3821,3 +3821,5 @@ EXTERN char e_invalid_format_string_single_percent_s[]
 EXTERN char e_too_many_postponed_prefixes_spell[]
 	INIT(= N_("E1578: Too many postponed prefixes and/or compound flags"));
 #endif
+EXTERN char e_completeopt_escape_cannot_be_used_with_nargs_underscore[]
+	INIT(= N_("E1579: -completeopt=escape cannot be used with -nargs=_"));
diff --git a/src/evalfunc.c b/src/evalfunc.c
index da6f49551d..1309e1c681 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -63,6 +63,7 @@ static void f_funcref(typval_T *argvars, typval_T *rettv);
 static void f_function(typval_T *argvars, typval_T *rettv);
 static void f_garbagecollect(typval_T *argvars, typval_T *rettv);
 static void f_get(typval_T *argvars, typval_T *rettv);
+static void f_getbgcolor(typval_T *argvars, typval_T *rettv);
 static void f_getcellpixels(typval_T *argvars, typval_T *rettv);
 static void f_getchangelist(typval_T *argvars, typval_T *rettv);
 static void f_getcharpos(typval_T *argvars, typval_T *rettv);
@@ -2267,6 +2268,8 @@ static const funcentry_T global_functions[] =
 			ret_void,	    f_garbagecollect},
     {"get",		2, 3, FEARG_1,	    arg23_get,
 			ret_any,	    f_get},
+    {"getbgcolor",	0, 0, 0,	    NULL,
+			ret_list_any,	    f_getbgcolor},
     {"getbufinfo",	0, 1, FEARG_1,	    arg1_buffer_or_dict_any,
 			ret_list_dict_any,  f_getbufinfo},
     {"getbufline",	2, 3, FEARG_1,	    arg3_buffer_lnum_lnum,
@@ -5672,6 +5675,71 @@ f_get(typval_T *argvars, typval_T *rettv)
 	copy_tv(tv, rettv);
 }
 
+/*
+ * "getbgcolor()" function
+ *
+ * Returns a list [r, g, b] (0..255) describing the current background
+ * colour: in GUI mode the "Normal" highlight group's bg, in terminal
+ * mode the value reported by the OSC 11 response (see v:termrbgresp).
+ * Returns an empty list when no value is available, e.g. before the
+ * terminal has answered the query, or when "Normal" has no bg colour.
+ */
+    static void
+f_getbgcolor(typval_T *argvars UNUSED, typval_T *rettv)
+{
+    if (rettv_list_alloc(rettv) == FAIL)
+	return;
+
+#if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS)
+    {
+	bool try_hl = false;
+
+# ifdef FEAT_GUI
+	if (gui.in_use)
+	    try_hl = true;
+# endif
+# ifdef FEAT_TERMGUICOLORS
+	if (p_tgc)
+	    try_hl = true;
+# endif
+	if (try_hl)
+	{
+	    guicolor_T	fg, bg;
+	    int		hl_id = syn_name2id((char_u *)"Normal");
+
+	    if (hl_id > 0)
+	    {
+		(void)syn_id2colors(hl_id, &fg, &bg);
+		if (bg != INVALCOLOR)
+		{
+		    long_u  rgb = GUI_MCH_GET_RGB(bg);
+
+		    list_append_number(rettv->vval.v_list,
+					    (varnumber_T)((rgb >> 16) & 0xff));
+		    list_append_number(rettv->vval.v_list,
+					    (varnumber_T)((rgb >> 8) & 0xff));
+		    list_append_number(rettv->vval.v_list,
+					    (varnumber_T)(rgb & 0xff));
+		    return;
+		}
+	    }
+	}
+    }
+#endif
+#ifdef FEAT_TERMRESPONSE
+    {
+	char_u	r = 0, g = 0, b = 0;
+
+	if (term_get_bg_color(&r, &g, &b) == OK)
+	{
+	    list_append_number(rettv->vval.v_list, (varnumber_T)r);
+	    list_append_number(rettv->vval.v_list, (varnumber_T)g);
+	    list_append_number(rettv->vval.v_list, (varnumber_T)b);
+	}
+    }
+#endif
+}
+
 /*
  * "getcellpixels()" function
  */
@@ -5699,7 +5767,7 @@ f_getcellpixels(typval_T *argvars UNUSED, typval_T *rettv)
 #endif
     {
 	struct cellsize cs;
-#if defined(UNIX)
+#if defined(UNIX) || defined(MSWIN)
 	mch_calc_cell_size(&cs);
 #else
 	// Non-Unix CUIs are not supported, so set this to -1x-1.
@@ -7205,6 +7273,48 @@ f_has(typval_T *argvars, typval_T *rettv)
 		1
 #else
 		0
+#endif
+		},
+	{"image",
+#ifdef FEAT_IMAGE
+		1
+#else
+		0
+#endif
+		},
+	{"image_cairo",
+#ifdef FEAT_IMAGE_CAIRO
+		1
+#else
+		0
+#endif
+		},
+	{"image_gdi",
+#ifdef FEAT_IMAGE_GDI
+		1
+#else
+		0
+#endif
+		},
+	{"image_gdk",
+#ifdef FEAT_IMAGE_GDK
+		1
+#else
+		0
+#endif
+		},
+	{"image_kitty",
+#ifdef FEAT_IMAGE_KITTY
+		1
+#else
+		0
+#endif
+		},
+	{"image_sixel",
+#ifdef FEAT_IMAGE_SIXEL
+		1
+#else
+		0
 #endif
 		},
 	{"insert_expand", 1},
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 7999cba0e0..6a1715a6bd 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -1516,8 +1516,18 @@ do_filter(
 	     */
 	    curwin->w_cursor.lnum = line1;
 	    del_lines(linecount, TRUE);
-	    curbuf->b_op_start.lnum -= linecount;	// adjust '[
-	    curbuf->b_op_end.lnum -= linecount;		// adjust ']
+	    if (read_linecount == 0)
+	    {
+		// no filter output: clamp '[ and '] to a valid line
+		curbuf->b_op_start.lnum = curbuf->b_op_end.lnum =
+					MIN(line1, curbuf->b_ml.ml_line_count);
+		curbuf->b_op_start.col = curbuf->b_op_end.col = 0;
+	    }
+	    else
+	    {
+		curbuf->b_op_start.lnum -= linecount;	// adjust '[
+		curbuf->b_op_end.lnum -= linecount;	// adjust ']
+	    }
 	    write_lnum_adjust(-linecount);		// adjust last line
 							// for next write
 #ifdef FEAT_FOLDING
@@ -2515,8 +2525,17 @@ do_wqall(exarg_T *eap)
 #ifdef FEAT_TERMINAL
 	if (exiting && !eap->forceit && term_job_running(buf->b_term))
 	{
-	    no_write_message_buf(buf);
-	    ++error;
+	    bufref_T	bufref;
+
+	    set_bufref(&bufref, buf);
+	    if (term_try_stop_job(buf) == FAIL)
+	    {
+		no_write_message_buf(buf);
+		++error;
+	    }
+	    // Stopping the job may have freed the terminal buffer.
+	    else if (!bufref_valid(&bufref))
+		buf = firstbuf;
 	}
 	else
 #endif
@@ -4856,7 +4875,7 @@ ex_substitute(exarg_T *eap)
 #ifdef FEAT_PROP_POPUP
 		    if (curbuf->b_has_textprop)
 		    {
-			int bytes_added = sublen - 1 - (regmatch.endpos[0].col
+			int bytes_added = (int)sublen - 1 - (regmatch.endpos[0].col
 						   - regmatch.startpos[0].col);
 
 			// When text properties are changed, need to save for
@@ -4922,7 +4941,7 @@ ex_substitute(exarg_T *eap)
 					continue;
 				    text_props[wi] = text_props[pi];
 				    text_props[wi].tp_col +=
-					regmatch.startpos[0].col + sublen - 1;
+					regmatch.startpos[0].col + (colnr_T)sublen - 1;
 				    text_props[wi].u.tp_text = NULL;
 				    ++wi;
 				}
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 787fb56af0..e2f8a56554 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -2064,12 +2064,18 @@ getcmdline_int(
 	// navigating the wild menu (i.e. the key is not 'wildchar' or
 	// 'wildcharm' or Ctrl-N or Ctrl-P or Ctrl-A or Ctrl-L).
 	// If the popup menu is displayed, then PageDown and PageUp keys are
-	// also used to navigate the menu.
+	// also used to navigate the menu, the mouse scroll wheel keys scroll
+	// the info popup, and CTRL-SHIFT-<Up>/<Down> scroll it with the
+	// keyboard.
 	end_wildmenu = (!key_is_wc
 		&& c != Ctrl_N && c != Ctrl_P && c != Ctrl_A && c != Ctrl_L);
 	end_wildmenu = end_wildmenu && (!cmdline_pum_active() ||
 			    (c != K_PAGEDOWN && c != K_PAGEUP
-			     && c != K_KPAGEDOWN && c != K_KPAGEUP));
+			     && c != K_KPAGEDOWN && c != K_KPAGEUP
+			     && c != K_MOUSEDOWN && c != K_MOUSEUP
+			     && c != K_MOUSELEFT && c != K_MOUSERIGHT
+			     && !((c == K_S_UP || c == K_S_DOWN)
+				 && (mod_mask & MOD_MASK_CTRL))));
 
 	// free expanded names when finished walking through matches
 	if (end_wildmenu)
@@ -2413,11 +2419,21 @@ getcmdline_int(
 		cmdline_left_right_mouse(c, &ignore_drag_release);
 		goto cmdline_not_changed;
 
-	// Mouse scroll wheel: ignored here
+	// Mouse scroll wheel: scroll the completion info popup when the mouse
+	// is on top of it, otherwise ignored here.
 	case K_MOUSEDOWN:
 	case K_MOUSEUP:
 	case K_MOUSELEFT:
 	case K_MOUSERIGHT:
+#ifdef FEAT_PROP_POPUP
+		if (cmdline_pum_active())
+		    cmdline_mousescroll(c == K_MOUSEDOWN ? MSCR_DOWN
+				      : c == K_MOUSEUP ? MSCR_UP
+				      : c == K_MOUSELEFT ? MSCR_LEFT
+				      : MSCR_RIGHT);
+#endif
+		goto cmdline_not_changed;
+
 	// Alternate buttons ignored here
 	case K_X1MOUSE:
 	case K_X1DRAG:
@@ -2514,6 +2530,15 @@ getcmdline_int(
 
 	case Ctrl_N:	    // next match
 	case Ctrl_P:	    // previous match
+#ifdef FEAT_PROP_POPUP
+		// CTRL-SHIFT-P/N scroll the info popup one line.
+		if (cmdline_pum_active() && (mod_mask & MOD_MASK_SHIFT))
+		{
+		    if (popup_scroll_info(c == Ctrl_P ? -1 : 1, false))
+			cmdline_pum_display();
+		    goto cmdline_not_changed;
+		}
+#endif
 		if (xpc.xp_numfiles > 0)
 		{
 		    wild_type = (c == Ctrl_P) ? WILD_PREV : WILD_NEXT;
@@ -2530,6 +2555,27 @@ getcmdline_int(
 	case K_KPAGEUP:
 	case K_PAGEDOWN:
 	case K_KPAGEDOWN:
+#ifdef FEAT_PROP_POPUP
+		// CTRL-SHIFT-<Up>/<Down> scroll the info popup a line,
+		// CTRL-SHIFT-<PageUp>/<PageDown> a page.  Shift is folded into
+		// K_S_UP/K_S_DOWN but stays in mod_mask for the Page keys.
+		if (cmdline_pum_active()
+			&& ((c == K_S_UP || c == K_S_DOWN)
+			    ? (mod_mask & MOD_MASK_CTRL)
+			    : ((c == K_PAGEUP || c == K_KPAGEUP
+				    || c == K_PAGEDOWN || c == K_KPAGEDOWN)
+				&& (mod_mask & MOD_MASK_CTRL)
+				&& (mod_mask & MOD_MASK_SHIFT))))
+		{
+		    int	up = c == K_S_UP || c == K_PAGEUP
+							|| c == K_KPAGEUP;
+
+		    if (popup_scroll_info(up ? -1 : 1,
+					     c != K_S_UP && c != K_S_DOWN))
+			cmdline_pum_display();
+		    goto cmdline_not_changed;
+		}
+#endif
 		if (cmdline_pum_active()
 			&& (c == K_PAGEUP || c == K_PAGEDOWN ||
 			    c == K_KPAGEUP || c == K_KPAGEDOWN))
diff --git a/src/feature.h b/src/feature.h
index ce898a5651..4e1ad2b4ac 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -1121,6 +1121,43 @@
 # define FEAT_PROP_POPUP
 #endif
 
+/*
+ * +image		RGB image rendering inside popup windows.
+ * +image_sixel		terminal backend: emit DEC sixel DCS sequences.
+ * +image_kitty		terminal backend: emit kitty graphics protocol APC
+ *			sequences.  Selected at runtime when the host
+ *			terminal advertises kitty graphics support and
+ *			falls back to sixel otherwise.
+ * +image_gdi		Windows GUI backend: BitBlt a cached DIB section onto
+ *			the GUI canvas.
+ * +image_cairo		Cairo GUI backend: composite a cairo_image_surface_t
+ *			onto gui.surface; covers GTK2/3/4 today.
+ *
+ * The parent FEAT_IMAGE flag enables the popup "image" attribute and the
+ * shared RGB plumbing; at least one backend has to be enabled to actually
+ * paint anything.
+ */
+#if defined(FEAT_HUGE) && defined(FEAT_PROP_POPUP)
+# define FEAT_IMAGE
+#endif
+
+#if defined(FEAT_IMAGE) && !defined(ALWAYS_USE_GUI)
+# define FEAT_IMAGE_SIXEL
+# define FEAT_IMAGE_KITTY
+#endif
+
+#if defined(FEAT_IMAGE) && defined(FEAT_GUI_MSWIN)
+# define FEAT_IMAGE_GDI
+#endif
+
+#if defined(FEAT_IMAGE) && defined(FEAT_GUI_GTK)
+# ifdef USE_GTK4_SNAPSHOT
+#  define FEAT_IMAGE_GDK
+# else
+#  define FEAT_IMAGE_CAIRO
+# endif
+#endif
+
 /*
  * +message_window	use a popup for messages when 'cmdheight' is zero
  */
diff --git a/src/fileio.c b/src/fileio.c
index 218b3a907e..91a5729d03 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5411,6 +5411,19 @@ vim_closetempdir(void)
     closedir(vim_tempdir_dp);
     vim_tempdir_dp = NULL;
 }
+
+/*
+ * Return true if the temp directory we created is gone.
+ */
+    static bool
+vim_tempdir_gone(void)
+{
+    stat_T	st;
+
+    if (vim_tempdir_dp == NULL)
+	return false;
+    return fstat(dirfd(vim_tempdir_dp), &st) < 0 || st.st_nlink == 0;
+}
 # endif
 
 /*
@@ -5491,6 +5504,15 @@ vim_tempname(
     stat_T	st;
 # endif
 
+# if defined(UNIX) && defined(HAVE_FLOCK) && defined(HAVE_DIRFD)
+    // if the temp directory is gone, force re-creation of it
+    if (vim_tempdir != NULL && vim_tempdir_gone())
+    {
+	vim_closetempdir();
+	VIM_CLEAR(vim_tempdir);
+    }
+# endif
+
     /*
      * This will create a directory for private use by this instance of Vim.
      * This is done once, and the same directory is used for all temp files.
diff --git a/src/fuzzy.c b/src/fuzzy.c
index c8709c1079..db006be0f9 100644
--- a/src/fuzzy.c
+++ b/src/fuzzy.c
@@ -135,10 +135,10 @@ fuzzy_match(
 	if (has_match(pat, str))
 	{
 	    fzy_score = match_positions(pat, str, matches + numMatches);
-	    score = (fzy_score == SCORE_MIN) ? INT_MIN + 1
-		: (fzy_score == SCORE_MAX) ? INT_MAX
-		: (fzy_score < 0) ? (int)ceil(fzy_score * SCORE_SCALE - 0.5)
-		: (int)floor(fzy_score * SCORE_SCALE + 0.5);
+	    if (fzy_score != SCORE_MIN)
+		score = (fzy_score == SCORE_MAX) ? INT_MAX
+		    : (fzy_score < 0) ? (int)ceil(fzy_score * SCORE_SCALE - 0.5)
+		    : (int)floor(fzy_score * SCORE_SCALE + 0.5);
 	}
 
 	if (score == FUZZY_SCORE_NONE)
@@ -1137,8 +1137,6 @@ match_positions(char_u *needle, char_u *haystack, int_u *positions)
     if (m > MATCH_MAX_LEN || n > m)
     {
 	// Unreasonably large candidate: return no score
-	// If it is a valid match it will still be returned, it will
-	// just be ranked below any reasonably sized candidates
 	return SCORE_MIN;
     }
     else if (n == m)
@@ -1146,12 +1144,26 @@ match_positions(char_u *needle, char_u *haystack, int_u *positions)
 	// Since this method can only be called with a haystack which
 	// matches needle. If the lengths of the strings are equal the
 	// strings themselves must also be equal (ignoring case).
-	if (positions)
+	// After truncation to MATCH_MAX_LEN n == m can also happen for
+	// unequal strings, so check before taking the shortcut.
+	bool equal = true;
+	for (int i = 0; i < n; i++)
 	{
-	    for (int i = 0; i < n; i++)
-		positions[i] = i;
+	    if (match.lower_needle[i] != match.lower_haystack[i])
+	    {
+		equal = false;
+		break;
+	    }
+	}
+	if (equal)
+	{
+	    if (positions)
+	    {
+		for (int i = 0; i < n; i++)
+		    positions[i] = i;
+	    }
+	    return SCORE_MAX;
 	}
-	return SCORE_MAX;
     }
 
     // ensure n * MATCH_MAX_LEN * 2 won't overflow
diff --git a/src/getchar.c b/src/getchar.c
index 0c4872ec8a..96e9a4345f 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -2731,6 +2731,7 @@ typedef enum {
 /*
  * Check if the bytes at the start of the typeahead buffer are a character used
  * in Insert mode completion.  This includes the form with a CTRL modifier.
+ * During completion started by complete() keys are mapped as usual.
  */
     static int
 at_ins_compl_key(void)
@@ -2741,10 +2742,14 @@ at_ins_compl_key(void)
     if (typebuf.tb_len > 3
 	    && (c == K_SPECIAL || c == CSI)  // CSI is used by the GUI
 	    && p[1] == KS_MODIFIER
-	    && (p[2] & MOD_MASK_CTRL))
+	    && (p[2] & MOD_MASK_CTRL)
+	    // CTRL-SHIFT-N/P scroll the info popup, so they must not be folded
+	    // to the CTRL-N/CTRL-P completion keys here.
+	    && !(p[2] & MOD_MASK_SHIFT))
 	c = p[3] & 0x1f;
-    return (ctrl_x_mode_not_default() && vim_is_ctrl_x_key(c))
-		|| (compl_status_local() && (c == Ctrl_N || c == Ctrl_P));
+    return !ctrl_x_mode_eval()
+	    && ((ctrl_x_mode_not_default() && vim_is_ctrl_x_key(c))
+		|| (compl_status_local() && (c == Ctrl_N || c == Ctrl_P)));
 }
 
 /*
@@ -2882,7 +2887,8 @@ handle_mapping(
      * - in insert or cmdline mode and 'paste' option set
      * - waiting for "hit return to continue" and CR or SPACE typed
      * - waiting for a char with --more--
-     * - in Ctrl-X mode, and we get a valid char for that mode
+     * - in Ctrl-X mode (not started by complete()), and we get a valid char
+     *   for that mode
      * - currently receiving OSC sequence
      */
     tb_c1 = typebuf.tb_buf[typebuf.tb_off];
diff --git a/src/globals.h b/src/globals.h
index d85680d444..806bf01dab 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -2011,6 +2011,7 @@ EXTERN int  disable_char_avail_for_testing INIT(= FALSE);
 EXTERN int  disable_redraw_for_testing INIT(= FALSE);
 EXTERN int  ignore_redraw_flag_for_testing INIT(= FALSE);
 EXTERN int  nfa_fail_for_testing INIT(= FALSE);
+EXTERN int  disable_syn_idlist_cache_for_testing INIT(= FALSE);
 EXTERN int  no_query_mouse_for_testing INIT(= FALSE);
 EXTERN int  ui_delay_for_testing INIT(= 0);
 EXTERN int  reset_term_props_on_termresponse INIT(= FALSE);
diff --git a/src/gui.c b/src/gui.c
index ed26c4c471..b363396111 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -10,6 +10,10 @@
 
 #include "vim.h"
 
+#if defined(FEAT_IMAGE_GDI)
+void update_popup_images_rect(int left, int top, int right, int bottom);
+#endif
+
 // Structure containing all the GUI information
 gui_T gui;
 
@@ -1371,6 +1375,11 @@ gui_update_cursor(
     if (!gui.in_focus)
     {
 	gui_mch_draw_hollow_cursor(cbg);
+#if defined(FEAT_GUI_GTK) && defined(FEAT_IMAGE_CAIRO)
+# if !GTK_CHECK_VERSION(4,0,0)
+	update_popup_images();
+# endif
+#endif
 	return;
     }
 
@@ -1428,7 +1437,10 @@ gui_update_cursor(
 	    --gui.col;
 #endif
 
-#ifndef FEAT_GUI_MSWIN	    // doesn't seem to work for MSWindows
+	// Doesn't seem to work for MSWindows. Not necessary when using
+	// GtkSnapshot, because everything is drawn in order in the snapshot
+	// vfunc.
+#if !defined(FEAT_GUI_MSWIN) && !defined(USE_GTK4_SNAPSHOT)
 	gui.highlight_mask = ScreenAttrs[LineOffset[gui.row] + gui.col];
 	(void)gui_screenchar(LineOffset[gui.row] + gui.col,
 		GUI_MON_TRS_CURSOR | GUI_MON_NOCLEAR,
@@ -1436,6 +1448,11 @@ gui_update_cursor(
 #endif
     }
     gui.highlight_mask = old_hl_mask;
+#if defined(FEAT_GUI_GTK) && defined(FEAT_IMAGE_CAIRO)
+# if !GTK_CHECK_VERSION(4,0,0)
+    update_popup_images();
+# endif
+#endif
 }
 
 #if defined(FEAT_MENU)
@@ -1623,6 +1640,10 @@ gui_resize_shell(int pixel_width, int pixel_height)
     gui.num_cols = (pixel_width - gui_get_base_width()) / gui.char_width;
     gui.num_rows = (pixel_height - gui_get_base_height()) / gui.char_height;
 
+#ifdef USE_GTK4_SNAPSHOT
+    gui_gtk4_update_size();
+#endif
+
     gui_position_components(pixel_width);
     gui_reset_scroll_region();
 
@@ -2785,6 +2806,15 @@ gui_undraw_cursor(void)
 #endif
     gui_redraw_block(gui.cursor_row, startcol,
 	    gui.cursor_row, endcol, GUI_MON_NOCLEAR);
+#if defined(FEAT_IMAGE_GDI)
+    {
+	int left   = FILL_X(startcol);
+	int top    = FILL_Y(gui.cursor_row);
+	int right  = FILL_X(endcol + 1);
+	int bottom = FILL_Y(gui.cursor_row + 1);
+	update_popup_images_rect(left, top, right, bottom);
+    }
+#endif
 
     // Cursor_is_valid is reset when the cursor is undrawn, also reset it
     // here in case it wasn't needed to undraw it.
@@ -4173,6 +4203,8 @@ gui_drag_scrollbar(scrollbar_T *sb, long value, int still_dragging)
 	// Keep the "dragged_wp" value until after the scrolling, for when the
 	// mouse button is released.  GTK2 doesn't send the button-up event.
 	gui.dragged_wp = NULL;
+	// WinScrolled event
+	gui_focus_change(TRUE);
 #endif
     }
 
diff --git a/src/gui.h b/src/gui.h
index 1fcf374f6d..75651f9681 100644
--- a/src/gui.h
+++ b/src/gui.h
@@ -403,7 +403,9 @@ typedef struct Gui
     GdkColor	*spcolor;	    // GDK-styled special color
 # endif
 # if defined(USE_GTK3) || defined(USE_GTK4)
+#  ifndef USE_GTK4_SNAPSHOT
     cairo_surface_t *surface;       // drawarea surface
+#  endif
 # else
     GdkGC	*text_gc;	    // cached GC for normal text
 # endif
@@ -500,6 +502,10 @@ typedef struct Gui
 
 #if defined(FEAT_GUI_GTK) && defined(USE_GTK4)
     int decor_height;
+
+    // Used for clipboard functionality in GTK4 GUI
+    GdkContentProvider *regular_provider;
+    GdkContentProvider *primary_provider;
 #endif
 } gui_T;
 
diff --git a/src/gui_beval.c b/src/gui_beval.c
index fd29697168..bb4c93031f 100644
--- a/src/gui_beval.c
+++ b/src/gui_beval.c
@@ -48,15 +48,21 @@ static BalloonEval *current_beval = NULL;
 # ifdef FEAT_GUI_GTK
 static void addEventHandler(GtkWidget *, BalloonEval *);
 static void removeEventHandler(BalloonEval *);
+#  ifdef USE_GTK4
+static gboolean event_cb(GtkEventController *, GdkEvent *, BalloonEval *);
+#  else
 static gint target_event_cb(GtkWidget *, GdkEvent *, gpointer);
 static gint mainwin_event_cb(GtkWidget *, GdkEvent *, gpointer);
+#  endif
 static void pointer_event(BalloonEval *, int, int, unsigned);
 static void key_event(BalloonEval *, unsigned, int);
 static gboolean timeout_cb(gpointer);
-#  if GTK_CHECK_VERSION(3,0,0)
+#  ifndef USE_GTK4
+#   if GTK_CHECK_VERSION(3,0,0)
 static gboolean balloon_draw_event_cb (GtkWidget *, cairo_t *, gpointer);
-#  else
+#   else
 static gint balloon_expose_event_cb (GtkWidget *, GdkEventExpose *, gpointer);
+#   endif
 #  endif
 # else
 static void addEventHandler(Widget, BalloonEval *);
@@ -140,7 +146,7 @@ gui_mch_create_beval_area(
     return beval;
 }
 
-# if defined(FEAT_BEVAL_TIP)
+# if defined(FEAT_BEVAL_TIP) || defined(USE_GTK4)
 /*
  * Destroy a balloon-eval and free its associated memory.
  */
@@ -151,7 +157,11 @@ gui_mch_destroy_beval_area(BalloonEval *beval)
     removeEventHandler(beval);
     // Children will automatically be destroyed
 #  ifdef FEAT_GUI_GTK
+#   ifdef USE_GTK4
+    gtk_widget_unparent(beval->balloonShell);
+#   else
     gtk_widget_destroy(beval->balloonShell);
+#   endif
 #  else
     XtDestroyWidget(beval->balloonShell);
 #  endif
@@ -228,6 +238,14 @@ gui_mch_unpost_balloon(BalloonEval *beval)
     static void
 addEventHandler(GtkWidget *target, BalloonEval *beval)
 {
+#  ifdef USE_GTK4
+    GtkEventController *controller = gtk_event_controller_legacy_new();
+
+    g_signal_connect(controller, "event", G_CALLBACK(event_cb), beval);
+
+    g_object_set_data(G_OBJECT(target), "beval", controller);
+    gtk_widget_add_controller(target, controller);
+#  else
     /*
      * Connect to the generic "event" signal instead of the individual
      * signals for each event type, because the former is emitted earlier.
@@ -252,11 +270,23 @@ addEventHandler(GtkWidget *target, BalloonEval *beval)
 			 G_CALLBACK(mainwin_event_cb),
 			 beval);
     }
+#  endif
 }
 
     static void
 removeEventHandler(BalloonEval *beval)
 {
+#  ifdef USE_GTK4
+    GtkWidget		*target = beval->target;
+    GtkEventController	*controller;
+
+    controller = g_object_get_data(G_OBJECT(target), "beval");
+    if (controller != NULL)
+    {
+	gtk_widget_remove_controller(target, controller);
+	g_object_set_data(G_OBJECT(target), "beval", NULL);
+    }
+#  else
     g_signal_handlers_disconnect_by_func(G_OBJECT(beval->target),
 					 FUNC2GENERIC(target_event_cb),
 					 beval);
@@ -268,8 +298,64 @@ removeEventHandler(BalloonEval *beval)
 					     FUNC2GENERIC(mainwin_event_cb),
 					     beval);
     }
+#  endif
 }
 
+#  ifdef USE_GTK4
+    static gboolean
+event_cb(GtkEventController *controller, GdkEvent *event, BalloonEval *beval)
+{
+    int type = gdk_event_get_event_type(event);
+
+    switch (type)
+    {
+	case GDK_ENTER_NOTIFY:
+	case GDK_MOTION_NOTIFY:
+	{
+	    GtkWidget		*root;
+	    graphene_point_t	p;
+	    graphene_point_t	result;
+	    double		x = 0, y = 0;
+
+	    // x and y coords returned by gdk_event_get_position are relative to
+	    // the surface, not the widget, must convert them into widget local
+	    // coordinates.
+	    root = GTK_WIDGET(gtk_widget_get_root(beval->target));
+	    gdk_event_get_position(event, &x, &y);
+	    p.x = x;
+	    p.y = y;
+
+	    if (gtk_widget_compute_point(root, beval->target, &p, &result))
+	    {
+		x = result.x;
+		y = result.y;
+	    }
+
+	    pointer_event(beval, (int)x, (int)y,
+		    gdk_event_get_modifier_state(event));
+	    break;
+	}
+	case GDK_LEAVE_NOTIFY:
+	    if (gdk_crossing_event_get_mode(event) == GDK_CROSSING_NORMAL)
+		cancelBalloon(beval);
+	    break;
+	case GDK_BUTTON_PRESS:
+	case GDK_SCROLL:
+	    cancelBalloon(beval);
+	    break;
+	case GDK_KEY_PRESS:
+	case GDK_KEY_RELEASE:
+	    key_event(beval, gdk_key_event_get_keyval(event),
+		    type == GDK_KEY_PRESS);
+	    break;
+	default:
+	    break;
+    }
+
+    // Always pass through events?
+    return FALSE;
+}
+#  else
     static gint
 target_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
@@ -292,22 +378,22 @@ target_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
 		 * GDK_POINTER_MOTION_HINT_MASK is set, thus we cannot obtain
 		 * the coordinates from the GdkEventMotion struct directly.
 		 */
-#  if GTK_CHECK_VERSION(3,0,0)
+#   if GTK_CHECK_VERSION(3,0,0)
 		{
 		    GdkWindow * const win = gtk_widget_get_window(widget);
 		    GdkDisplay * const dpy = gdk_window_get_display(win);
-#   if GTK_CHECK_VERSION(3,20,0)
+#    if GTK_CHECK_VERSION(3,20,0)
 		    GdkSeat * const seat = gdk_display_get_default_seat(dpy);
 		    GdkDevice * const dev = gdk_seat_get_pointer(seat);
-#   else
+#    else
 		    GdkDeviceManager * const mngr = gdk_display_get_device_manager(dpy);
 		    GdkDevice * const dev = gdk_device_manager_get_client_pointer(mngr);
-#   endif
+#    endif
 		    gdk_window_get_device_position(win, dev , &x, &y, &state);
 		}
-#  else
+#   else
 		gdk_window_get_pointer(widget->window, &x, &y, &state);
-#  endif
+#   endif
 		pointer_event(beval, x, y, (unsigned int)state);
 	    }
 	    else
@@ -367,6 +453,7 @@ mainwin_event_cb(GtkWidget *widget UNUSED, GdkEvent *event, gpointer data)
 
     return FALSE; // continue emission
 }
+#  endif
 
     static void
 pointer_event(BalloonEval *beval, int x, int y, unsigned state)
@@ -472,7 +559,8 @@ timeout_cb(gpointer data)
     return FALSE; // don't call me again
 }
 
-#  if GTK_CHECK_VERSION(3,0,0)
+#  ifndef USE_GTK4
+#   if GTK_CHECK_VERSION(3,0,0)
     static gboolean
 balloon_draw_event_cb(GtkWidget *widget,
 		      cairo_t	*cr,
@@ -502,7 +590,7 @@ balloon_draw_event_cb(GtkWidget *widget,
 
     return FALSE;
 }
-#  else
+#   else
     static gint
 balloon_expose_event_cb(GtkWidget *widget,
 			GdkEventExpose *event,
@@ -515,7 +603,8 @@ balloon_expose_event_cb(GtkWidget *widget,
 
     return FALSE; // continue emission
 }
-#  endif // !GTK_CHECK_VERSION(3,0,0)
+#   endif // !GTK_CHECK_VERSION(3,0,0)
+#  endif
 
 # else // !FEAT_GUI_GTK
 
@@ -913,6 +1002,39 @@ set_printable_label_text(GtkLabel *label, char_u *text)
 /*
  * Draw a balloon.
  */
+#  ifdef USE_GTK4
+    static void
+drawBalloon(BalloonEval *beval)
+{
+    GdkRectangle    rect;
+    int		    natural_width = 0;
+
+    if (beval->msg == NULL)
+	return;
+
+    set_printable_label_text(GTK_LABEL(beval->balloonLabel), beval->msg);
+
+    rect.x = beval->x;
+    rect.y = beval->y;
+
+    // Make popover appear at the bottom right of the pointer. Also add an
+    // offset (gui.char_width * 3, gui.char_height), so that popover doesn't
+    // block the text. This also prevents the popover from stealing motion
+    // events, making pressing alt (to force show beval) and moving cursor
+    // around feel smooth.
+    gtk_widget_measure(beval->balloonLabel, GTK_ORIENTATION_HORIZONTAL, -1,
+	    NULL, &natural_width, NULL, NULL);
+
+    rect.width = (natural_width > 0 ? natural_width : 1) + gui.char_width * 3;
+    rect.height = gui.char_height;
+
+    gtk_popover_set_pointing_to(GTK_POPOVER(beval->balloonShell), &rect);
+    gtk_popover_popup(GTK_POPOVER(beval->balloonShell));
+
+    beval->showState = ShS_SHOWING;
+    gui_mch_update();
+}
+#  else
     static void
 drawBalloon(BalloonEval *beval)
 {
@@ -930,18 +1052,18 @@ drawBalloon(BalloonEval *beval)
     int		y_offset = EVAL_OFFSET_Y;
     PangoLayout	*layout;
 
-#  if !GTK_CHECK_VERSION(3,22,2)
+#   if !GTK_CHECK_VERSION(3,22,2)
     GdkScreen	*screen;
 
     screen = gtk_widget_get_screen(beval->target);
     gtk_window_set_screen(GTK_WINDOW(beval->balloonShell), screen);
-#  endif
+#   endif
     gui_gtk_get_screen_geom_of_win(beval->target, 0, 0,
 	    &screen_x, &screen_y, &screen_w, &screen_h);
-#  if !GTK_CHECK_VERSION(3,0,0)
+#   if !GTK_CHECK_VERSION(3,0,0)
     gtk_widget_ensure_style(beval->balloonShell);
     gtk_widget_ensure_style(beval->balloonLabel);
-#  endif
+#   endif
 
     set_printable_label_text(GTK_LABEL(beval->balloonLabel), beval->msg);
     /*
@@ -950,11 +1072,11 @@ drawBalloon(BalloonEval *beval)
      * builtin maximum value of about 65 Latin characters.
      */
     layout = gtk_label_get_layout(GTK_LABEL(beval->balloonLabel));
-#  ifdef PANGO_WRAP_WORD_CHAR
+#   ifdef PANGO_WRAP_WORD_CHAR
     pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
-#  else
+#   else
     pango_layout_set_wrap(layout, PANGO_WRAP_WORD);
-#  endif
+#   endif
     pango_layout_set_width(layout,
 	    // try to come up with some reasonable width
 	    PANGO_SCALE * CLAMP(gui.num_cols * gui.char_width,
@@ -962,11 +1084,11 @@ drawBalloon(BalloonEval *beval)
 		MAX(20, screen_w - 20)));
 
     // Calculate the balloon's width and height.
-#  if GTK_CHECK_VERSION(3,0,0)
+#   if GTK_CHECK_VERSION(3,0,0)
     gtk_widget_get_preferred_size(beval->balloonShell, &requisition, NULL);
-#  else
+#   else
     gtk_widget_size_request(beval->balloonShell, &requisition);
-#  endif
+#   endif
 
     // Compute position of the balloon area
     gdk_window_get_origin(gtk_widget_get_window(beval->target), &x, &y);
@@ -986,16 +1108,17 @@ drawBalloon(BalloonEval *beval)
 	    MAX(0, screen_y + screen_h - requisition.height));
 
     // Show the balloon
-#  if GTK_CHECK_VERSION(3,0,0)
+#   if GTK_CHECK_VERSION(3,0,0)
     gtk_window_move(GTK_WINDOW(beval->balloonShell), x, y);
-#  else
+#   else
     gtk_widget_set_uposition(beval->balloonShell, x, y);
-#  endif
+#   endif
     gtk_widget_show(beval->balloonShell);
 
     beval->showState = ShS_SHOWING;
     gui_mch_update();
 }
+#  endif
 
 /*
  * Undraw a balloon.
@@ -1004,7 +1127,11 @@ drawBalloon(BalloonEval *beval)
 undrawBalloon(BalloonEval *beval)
 {
     if (beval->balloonShell != NULL)
+#  ifdef USE_GTK4
+	gtk_popover_popdown(GTK_POPOVER(beval->balloonShell));
+#  else
 	gtk_widget_hide(beval->balloonShell);
+#  endif
     beval->showState = ShS_NEUTRAL;
 }
 
@@ -1023,6 +1150,29 @@ cancelBalloon(BalloonEval *beval)
     beval->showState = ShS_NEUTRAL;
 }
 
+#  ifdef USE_GTK4
+    static void
+createBalloonEvalWindow(BalloonEval *beval)
+{
+    GtkWidget *popover = gtk_popover_new();
+    beval->balloonShell = popover;
+
+    gtk_widget_set_parent(beval->balloonShell, beval->target);
+    gtk_popover_set_has_arrow(GTK_POPOVER(popover), FALSE);
+    gtk_popover_set_position(GTK_POPOVER(popover), GTK_POS_BOTTOM);
+    // Don't make popover grab focus
+    gtk_popover_set_autohide(GTK_POPOVER(popover), FALSE);
+
+    beval->balloonLabel = gtk_label_new(NULL);
+
+    gtk_label_set_wrap(GTK_LABEL(beval->balloonLabel), FALSE);
+    gtk_label_set_justify(GTK_LABEL(beval->balloonLabel), GTK_JUSTIFY_LEFT);
+    gtk_label_set_xalign(GTK_LABEL(beval->balloonLabel), 0.5);
+    gtk_label_set_yalign(GTK_LABEL(beval->balloonLabel), 0.5);
+
+    gtk_popover_set_child(GTK_POPOVER(popover), beval->balloonLabel);
+}
+#  else
     static void
 createBalloonEvalWindow(BalloonEval *beval)
 {
@@ -1034,35 +1184,36 @@ createBalloonEvalWindow(BalloonEval *beval)
     gtk_widget_set_name(beval->balloonShell, "gtk-tooltips");
     gtk_container_set_border_width(GTK_CONTAINER(beval->balloonShell), 4);
 
-#  if GTK_CHECK_VERSION(3,0,0)
+#   if GTK_CHECK_VERSION(3,0,0)
     g_signal_connect(G_OBJECT(beval->balloonShell), "draw",
-		     G_CALLBACK(balloon_draw_event_cb), NULL);
-#  else
+	    G_CALLBACK(balloon_draw_event_cb), NULL);
+#   else
     gtk_signal_connect((GtkObject*)(beval->balloonShell), "expose_event",
-		       GTK_SIGNAL_FUNC(balloon_expose_event_cb), NULL);
-#  endif
+	    GTK_SIGNAL_FUNC(balloon_expose_event_cb), NULL);
+#   endif
     beval->balloonLabel = gtk_label_new(NULL);
 
     gtk_label_set_line_wrap(GTK_LABEL(beval->balloonLabel), FALSE);
     gtk_label_set_justify(GTK_LABEL(beval->balloonLabel), GTK_JUSTIFY_LEFT);
-#  if GTK_CHECK_VERSION(3,16,0)
+#   if GTK_CHECK_VERSION(3,16,0)
     gtk_label_set_xalign(GTK_LABEL(beval->balloonLabel), 0.5);
     gtk_label_set_yalign(GTK_LABEL(beval->balloonLabel), 0.5);
-#  elif GTK_CHECK_VERSION(3,14,0)
+#   elif GTK_CHECK_VERSION(3,14,0)
     GValue align_val = G_VALUE_INIT;
     g_value_init(&align_val, G_TYPE_FLOAT);
     g_value_set_float(&align_val, 0.5);
     g_object_set_property(G_OBJECT(beval->balloonLabel), "xalign", &align_val);
     g_object_set_property(G_OBJECT(beval->balloonLabel), "yalign", &align_val);
     g_value_unset(&align_val);
-#  else
+#   else
     gtk_misc_set_alignment(GTK_MISC(beval->balloonLabel), 0.5f, 0.5f);
-#  endif
+#   endif
     gtk_widget_set_name(beval->balloonLabel, "vim-balloon-label");
     gtk_widget_show(beval->balloonLabel);
 
     gtk_container_add(GTK_CONTAINER(beval->balloonShell), beval->balloonLabel);
 }
+#  endif
 
 # else // !FEAT_GUI_GTK
 
diff --git a/src/gui_gtk4.c b/src/gui_gtk4.c
index c3c6f6cc69..4874b2f626 100644
--- a/src/gui_gtk4.c
+++ b/src/gui_gtk4.c
@@ -29,6 +29,13 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include "gui_gtk4_f.h"
+#include "gui_gtk4_cb.h"
+#ifdef USE_GTK4_SNAPSHOT
+# include "gui_gtk4_da.h"
+#endif
+#ifdef FEAT_TOOLBAR
+# include "gui_gtk4_tb.h"
+#endif
 
 /*
  * Geometry string parser, replacing XParseGeometry to remove X11 dependency.
@@ -264,14 +271,15 @@ modifiers_gdk2vim(guint state)
 static GtkWidget *vbox;		// the main vertical box
 
 // Forward declarations for event callbacks
+#ifndef USE_GTK4_SNAPSHOT
 static void draw_event(GtkDrawingArea *area, cairo_t *cr, int width, int height, gpointer data);
+#endif
 static gboolean key_press_event(GtkEventControllerKey *controller, guint keyval, guint keycode, GdkModifierType state, gpointer data);
 static void key_release_event(GtkEventControllerKey *controller, guint keyval, guint keycode, GdkModifierType state, gpointer data);
 static void button_press_event(GtkGestureClick *gesture, int n_press, double x, double y, gpointer data);
 static void button_release_event(GtkGestureClick *gesture, int n_press, double x, double y, gpointer data);
 static void motion_notify_event(GtkEventControllerMotion *controller, double x, double y, gpointer data);
 static void enter_notify_event(GtkEventControllerMotion *controller, double x, double y, gpointer data);
-static void leave_notify_event(GtkEventControllerMotion *controller, gpointer data);
 static gboolean scroll_event(GtkEventControllerScroll *controller, double dx, double dy, gpointer data);
 static void focus_in_event(GtkEventControllerFocus *controller, gpointer data);
 static void focus_out_event(GtkEventControllerFocus *controller, gpointer data);
@@ -282,17 +290,24 @@ static gboolean menubar_popover_closed_hook(GSignalInvocationHint *ihint, guint
 static gboolean drop_cb(GtkDropTarget *target, const GValue *value, double x, double y, gpointer data);
 #endif
 #ifdef FEAT_GUI_TABLINE
+static void tabline_enter_cb(GtkEventController *controller, double x, double y, void *udata);
 static void on_select_tab(GtkNotebook *notebook, gpointer *page, gint idx, gpointer data);
 static void on_tab_reordered(GtkNotebook *notebook, gpointer *page, gint idx, gpointer data);
+static GMenu *create_tabline_popup_menu(GActionGroup **agroup_store);
+static void tabline_menu_press_event(GtkGestureClick *gesture, int n_press, double x, double y, GtkWidget *popover);
 #endif
 static void mainwin_destroy_cb(GObject *object, gpointer data);
 static gboolean delete_event_cb(GtkWindow *window, gpointer data);
 static void mainwin_fullscreened_cb(GObject *obj, GParamSpec *pspec, gpointer user_data);
+#ifndef USE_GTK4_SNAPSHOT
 static void drawarea_realize_cb(GtkWidget *widget, gpointer data);
+#endif
 static void drawarea_unrealize_cb(GtkWidget *widget, gpointer data);
+#ifndef USE_GTK4_SNAPSHOT
 static void drawarea_resize_cb(GtkDrawingArea *area, int width, int height, gpointer data);
 static void drawarea_scale_factor_cb(GObject *object, GParamSpec *pspec, gpointer data);
 static cairo_surface_t *create_backing_surface(int width, int height);
+#endif
 static void clipboard_changed_cb(GdkClipboard *clipboard, gpointer user_data);
 #ifdef FEAT_MENU
 static void show_menubar_popover(void);
@@ -438,9 +453,9 @@ gui_mch_init_check(void)
 gui_mch_init(void)
 {
     // Allocate GdkRGBA color structs.
-    gui.fgcolor = g_new(GdkRGBA, 1);
-    gui.bgcolor = g_new(GdkRGBA, 1);
-    gui.spcolor = g_new(GdkRGBA, 1);
+    gui.fgcolor = g_new0(GdkRGBA, 1);
+    gui.bgcolor = g_new0(GdkRGBA, 1);
+    gui.spcolor = g_new0(GdkRGBA, 1);
 
     gui.def_norm_pixel = 0x00000000;	// black
     gui.def_back_pixel = 0x00ffffff;	// white
@@ -496,10 +511,11 @@ gui_mch_init(void)
 #endif
 
 #ifdef FEAT_TOOLBAR
-    gui.toolbar = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+    gui.toolbar = vim_toolbar_new();
     gtk_widget_set_name(gui.toolbar, "vim-toolbar");
     gtk_widget_set_visible(gui.toolbar, FALSE);
     gtk_box_append(GTK_BOX(vbox), gui.toolbar);
+    vim_toolbar_set_style(VIM_TOOLBAR(gui.toolbar), toolbar_flags, tbis_flags);
 #endif
 
 #ifdef FEAT_GUI_TABLINE
@@ -514,6 +530,47 @@ gui_mch_init(void)
 		     G_CALLBACK(on_select_tab), NULL);
     g_signal_connect(G_OBJECT(gui.tabline), "page-reordered",
 		     G_CALLBACK(on_tab_reordered), NULL);
+
+    {
+	GtkEventController *mcontroller = gtk_event_controller_motion_new();
+
+	g_signal_connect(mcontroller, "enter",
+		G_CALLBACK(tabline_enter_cb), NULL);
+
+	// Make sure that tabline_enter_cb() is always called before
+	// tabpage_enter_cb().
+	gtk_event_controller_set_propagation_phase(
+		mcontroller, GTK_PHASE_CAPTURE);
+	gtk_widget_add_controller(gui.tabline, mcontroller);
+    }
+
+    // Create right click popup menu for tabline
+    {
+	GtkGesture	*click;
+	GActionGroup	*agroup;
+	GMenu		*menu;
+	GtkWidget	*popover;
+
+	click = gtk_gesture_click_new();
+	menu = create_tabline_popup_menu(&agroup);
+	popover = gtk_popover_menu_new_from_model(G_MENU_MODEL(menu));
+	g_object_unref(menu);
+
+	gtk_widget_set_parent(popover, gui.tabline);
+	g_object_set_data(G_OBJECT(gui.tabline), "menu", popover);
+	gtk_widget_insert_action_group(gui.tabline, "tabline", agroup);
+	g_object_unref(agroup);
+
+	gtk_popover_set_has_arrow(GTK_POPOVER(popover), FALSE);
+	gtk_popover_set_position(GTK_POPOVER(popover), GTK_POS_BOTTOM);
+
+	// Listen for anny mouse button
+	gtk_gesture_single_set_button(GTK_GESTURE_SINGLE(click), 0);
+
+	g_signal_connect_object(click, "pressed",
+		G_CALLBACK(tabline_menu_press_event), popover, G_CONNECT_DEFAULT);
+	gtk_widget_add_controller(gui.tabline, GTK_EVENT_CONTROLLER(click));
+    }
 #endif
 
     // The form widget manages absolute positioning of scrollbars and the draw
@@ -525,25 +582,31 @@ gui_mch_init(void)
     gtk_box_append(GTK_BOX(vbox), gui.formwin);
 
     // The drawing area for the editor content.
+#ifdef USE_GTK4_SNAPSHOT
+    gui.drawarea = vim_draw_area_new();
+#else
     gui.drawarea = gtk_drawing_area_new();
     gui.surface = NULL;
+#endif
     gtk_widget_set_focusable(gui.drawarea, TRUE);
     gtk_widget_set_vexpand(gui.drawarea, TRUE);
     gtk_widget_set_hexpand(gui.drawarea, TRUE);
     vim_form_put(VIM_FORM(gui.formwin), gui.drawarea, 0, 0);
 
+#ifndef USE_GTK4_SNAPSHOT
     // Set up drawing.
     gtk_drawing_area_set_draw_func(GTK_DRAWING_AREA(gui.drawarea),
 	    (GtkDrawingAreaDrawFunc)draw_event, NULL, NULL);
 
-    g_signal_connect(G_OBJECT(gui.drawarea), "realize",
-		     G_CALLBACK(drawarea_realize_cb), NULL);
-    g_signal_connect(G_OBJECT(gui.drawarea), "unrealize",
-		     G_CALLBACK(drawarea_unrealize_cb), NULL);
     g_signal_connect(G_OBJECT(gui.drawarea), "resize",
 		     G_CALLBACK(drawarea_resize_cb), NULL);
     g_signal_connect(G_OBJECT(gui.drawarea), "notify::scale-factor",
 		     G_CALLBACK(drawarea_scale_factor_cb), NULL);
+    g_signal_connect(G_OBJECT(gui.drawarea), "realize",
+		     G_CALLBACK(drawarea_realize_cb), NULL);
+#endif
+    g_signal_connect(G_OBJECT(gui.drawarea), "unrealize",
+		     G_CALLBACK(drawarea_unrealize_cb), NULL);
 
     // Set up event controllers.
     {
@@ -574,8 +637,6 @@ gui_mch_init(void)
 			 G_CALLBACK(motion_notify_event), NULL);
 	g_signal_connect(motion, "enter",
 			 G_CALLBACK(enter_notify_event), NULL);
-	g_signal_connect(motion, "leave",
-			 G_CALLBACK(leave_notify_event), NULL);
 	gtk_widget_add_controller(gui.drawarea, motion);
     }
 
@@ -627,9 +688,13 @@ gui_mch_init(void)
 		    G_CALLBACK(clipboard_changed_cb), &clip_plus);
     }
 
+    gui.regular_provider = vim_content_provider_new(&clip_plus);
+    gui.primary_provider = vim_content_provider_new(&clip_star);
+
     return OK;
 }
 
+#ifndef USE_GTK4_SNAPSHOT
 /*
  * Called when the foreground or background color has been changed.
  */
@@ -646,11 +711,14 @@ surface_fill_bg(void)
 	cairo_destroy(cr);
     }
 }
+#endif
 
     void
 gui_mch_new_colors(void)
 {
+#ifndef USE_GTK4_SNAPSHOT
     surface_fill_bg();
+#endif
     if (gui.drawarea != NULL && gtk_widget_get_realized(gui.drawarea))
 	gtk_widget_queue_draw(gui.drawarea);
 }
@@ -740,7 +808,18 @@ gui_mch_open(void)
 gui_mch_exit(int rc UNUSED)
 {
     if (gui.mainwin != NULL)
+    {
+#ifdef FEAT_GUI_TABLINE
+	// Must unparent popover menu for tabline or we will get warning
+	gtk_widget_unparent(g_object_get_data(G_OBJECT(gui.tabline), "menu"));
+#endif
+#ifdef FEAT_BEVAL_GUI
+	// Make sure to destroy popover used for balloon eval, or we will get a
+	// warning from GTK that the draw area still has children left.
+	gui_mch_destroy_beval_area(balloonEval);
+#endif
 	gtk_window_destroy(GTK_WINDOW(gui.mainwin));
+    }
 }
 
     int
@@ -898,7 +977,12 @@ gui_mch_enable_menu(int showit)
 gui_mch_show_toolbar(int showit)
 {
     if (gui.toolbar != NULL)
+    {
 	gtk_widget_set_visible(gui.toolbar, showit);
+	if (showit)
+	    vim_toolbar_set_style(VIM_TOOLBAR(gui.toolbar),
+		    toolbar_flags, tbis_flags);
+    }
 }
 #endif
 
@@ -1352,6 +1436,23 @@ gui_mch_get_rgb(guicolor_T pixel)
  * ============================================================
  */
 
+#ifdef USE_GTK4_SNAPSHOT
+    void
+gui_gtk4_update_size(void)
+{
+    vim_draw_area_set_size(VIM_DRAW_AREA(gui.drawarea),
+	    gui.num_rows, gui.num_cols);
+}
+
+# ifdef FEAT_NETBEANS_INTG
+    cairo_t *
+gui_gtk4_get_multisign_context(int x, int y, int w, int h)
+{
+    return vim_draw_area_get_multisign_cairo(
+	    VIM_DRAW_AREA(gui.drawarea), x, y, w, h);
+}
+# endif
+#else // USE_GTK4_SNAPSHOT
 static void set_cairo_source_from_pixel(cairo_t *cr, guicolor_T pixel);
 
     static void
@@ -1410,10 +1511,15 @@ create_backing_surface(int width, int height)
     cairo_surface_set_device_scale(surf, (double)scale, (double)scale);
     return surf;
 }
+#endif // !USE_GTK4_SNAPSHOT
 
     void
 gui_mch_clear_block(int row1, int col1, int row2, int col2)
 {
+#ifdef USE_GTK4_SNAPSHOT
+    vim_draw_area_clear_block(VIM_DRAW_AREA(gui.drawarea), row1,
+	    col1, row2, col2);
+#else
     cairo_t *cr;
 
     if (gui.surface == NULL)
@@ -1427,6 +1533,7 @@ gui_mch_clear_block(int row1, int col1, int row2, int col2)
 	    (row2 - row1 + 1) * gui.char_height);
     cairo_fill(cr);
     cairo_destroy(cr);
+#endif
 
     if (gui.drawarea != NULL)
 	gtk_widget_queue_draw(gui.drawarea);
@@ -1435,6 +1542,9 @@ gui_mch_clear_block(int row1, int col1, int row2, int col2)
     void
 gui_mch_clear_all(void)
 {
+#ifdef USE_GTK4_SNAPSHOT
+    vim_draw_area_clear(VIM_DRAW_AREA(gui.drawarea));
+#else
     cairo_t *cr;
 
     if (gui.surface == NULL)
@@ -1444,11 +1554,144 @@ gui_mch_clear_all(void)
     set_cairo_source_from_pixel(cr, gui.back_pixel);
     cairo_paint(cr);
     cairo_destroy(cr);
+#endif
+
+    if (gui.drawarea != NULL)
+	gtk_widget_queue_draw(gui.drawarea);
+}
+
+#ifdef FEAT_IMAGE_GDK
+    void
+gui_gtk4_remove_image(win_T *wp)
+{
+    vim_draw_area_remove_image(VIM_DRAW_AREA(gui.drawarea), wp->w_id);
+}
+
+    void
+gui_mch_free_popup_image(win_T *wp)
+{
+    if (wp->w_popup_image_texture != NULL)
+	g_clear_object(&wp->w_popup_image_texture);
+}
+
+/*
+ * If "wp->w_popup_image_texture" is NULL or "force" is TRUE, then create the
+ * cached GdkTexture object.
+ */
+    static void
+maybe_set_image_texture(win_T *wp, gboolean force)
+{
+    GdkMemoryFormat fmt;
+    size_t	    stride;
+    GdkTexture	    *texture;
+    GBytes	    *bytes;
+    size_t	    size;
+
+    if (!force && wp->w_popup_image_texture != NULL)
+	return;
+
+    if (wp->w_popup_image_alpha)
+    {
+	fmt = GDK_MEMORY_A8R8G8B8;
+	size = wp->w_popup_image_w * wp->w_popup_image_h * 4;
+	stride = wp->w_popup_image_w * 4;
+    }
+    else
+    {
+	fmt = GDK_MEMORY_R8G8B8;
+	size = wp->w_popup_image_w * wp->w_popup_image_h * 3;
+	stride = wp->w_popup_image_w * 3;
+    }
+
+    bytes = g_bytes_new(wp->w_popup_image_data, size);
+    texture = gdk_memory_texture_new(wp->w_popup_image_w,
+	    wp->w_popup_image_h, fmt, bytes, stride);
+    g_bytes_unref(bytes);
+
+    if (wp->w_popup_image_texture != NULL)
+	g_object_unref(wp->w_popup_image_texture);
+    wp->w_popup_image_texture = texture;
+}
+
+    bool
+gui_mch_update_popup_image_pixels(win_T *wp)
+{
+    if (wp->w_popup_image_texture == NULL || wp->w_popup_image_data == NULL)
+	return false;
+    maybe_set_image_texture(wp, TRUE);
+    return true;
+}
+
+    void
+gui_mch_draw_popup_image(
+	win_T	*wp,
+	int	 row,
+	int	 col,
+	int	 src_x,
+	int	 src_y,
+	int	 draw_w,
+	int	 draw_h)
+{
+    if (wp->w_popup_image_data == NULL
+	    || wp->w_popup_image_w <= 0 || wp->w_popup_image_h <= 0
+	    || draw_w <= 0 || draw_h <= 0)
+	return;
+
+    maybe_set_image_texture(wp, FALSE);
+    if (gui.drawarea != NULL)
+    {
+	vim_draw_area_add_image(VIM_DRAW_AREA(gui.drawarea),
+		wp->w_popup_image_texture, row, col, src_x, src_y,
+		draw_w, draw_h, wp->w_zindex, wp->w_id);
+
+	gtk_widget_queue_draw(gui.drawarea);
+    }
+}
+#endif
+
+#ifdef FEAT_IMAGE_CAIRO
+    void
+gui_mch_free_popup_image(win_T *wp)
+{
+    cairo_popup_image_free(wp);
+}
+
+    bool
+gui_mch_update_popup_image_pixels(win_T *wp)
+{
+    return cairo_popup_image_update(wp);
+}
+
+    void
+gui_mch_draw_popup_image(
+	win_T	*wp,
+	int	 row,
+	int	 col,
+	int	 src_x,
+	int	 src_y,
+	int	 draw_w,
+	int	 draw_h)
+{
+    int x, y;
+
+    if (wp->w_popup_image_data == NULL
+	    || wp->w_popup_image_w <= 0 || wp->w_popup_image_h <= 0
+	    || draw_w <= 0 || draw_h <= 0
+	    || gui.surface == NULL
+	    )
+	return;
+
+    x = FILL_X(col);
+    y = FILL_Y(row);
+    cairo_popup_image_paint(wp, gui.surface, x, y,
+					    src_x, src_y, draw_w, draw_h);
 
     if (gui.drawarea != NULL)
 	gtk_widget_queue_draw(gui.drawarea);
 }
+#endif // FEAT_IMAGE_CAIRO
 
+#ifndef USE_GTK4_SNAPSHOT
     static void
 surface_copy_rect(int dest_x, int dest_y,
 	int src_x, int src_y,
@@ -1475,10 +1718,16 @@ surface_copy_rect(int dest_x, int dest_y,
     cairo_destroy(cr);
     cairo_surface_destroy(tmp);
 }
+#endif
 
     void
 gui_mch_delete_lines(int row, int num_lines)
 {
+#ifdef USE_GTK4_SNAPSHOT
+    vim_draw_area_move_block(VIM_DRAW_AREA(gui.drawarea),
+	    row, row + num_lines, gui.scroll_region_bot,
+	    gui.scroll_region_left, gui.scroll_region_right);
+#else
     int ncols = gui.scroll_region_right - gui.scroll_region_left + 1;
     int nrows = gui.scroll_region_bot - row + 1;
     int src_nrows = nrows - num_lines;
@@ -1487,6 +1736,7 @@ gui_mch_delete_lines(int row, int num_lines)
 	    FILL_X(gui.scroll_region_left), FILL_Y(row),
 	    FILL_X(gui.scroll_region_left), FILL_Y(row + num_lines),
 	    gui.char_width * ncols + 1, gui.char_height * src_nrows);
+#endif
     gui_clear_block(
 	    gui.scroll_region_bot - num_lines + 1, gui.scroll_region_left,
 	    gui.scroll_region_bot, gui.scroll_region_right);
@@ -1497,6 +1747,11 @@ gui_mch_delete_lines(int row, int num_lines)
     void
 gui_mch_insert_lines(int row, int num_lines)
 {
+#ifdef USE_GTK4_SNAPSHOT
+    vim_draw_area_move_block(VIM_DRAW_AREA(gui.drawarea),
+	    row + num_lines, row, gui.scroll_region_bot - num_lines,
+	    gui.scroll_region_left, gui.scroll_region_right);
+#else
     int ncols = gui.scroll_region_right - gui.scroll_region_left + 1;
     int nrows = gui.scroll_region_bot - row + 1;
     int src_nrows = nrows - num_lines;
@@ -1505,6 +1760,7 @@ gui_mch_insert_lines(int row, int num_lines)
 	    FILL_X(gui.scroll_region_left), FILL_Y(row + num_lines),
 	    FILL_X(gui.scroll_region_left), FILL_Y(row),
 	    gui.char_width * ncols + 1, gui.char_height * src_nrows);
+#endif
     gui_clear_block(
 	    row, gui.scroll_region_left,
 	    row + num_lines - 1, gui.scroll_region_right);
@@ -1515,6 +1771,10 @@ gui_mch_insert_lines(int row, int num_lines)
     void
 gui_mch_draw_hollow_cursor(guicolor_T color)
 {
+#ifdef USE_GTK4_SNAPSHOT
+    gui_mch_set_fg_color(color);
+    vim_draw_area_set_hollow_cursor(VIM_DRAW_AREA(gui.drawarea));
+#else
     cairo_t *cr;
     int i = 1;
 
@@ -1534,6 +1794,7 @@ gui_mch_draw_hollow_cursor(guicolor_T color)
 	    i * gui.char_width - 1, gui.char_height - 1);
     cairo_stroke(cr);
     cairo_destroy(cr);
+#endif
 
     gtk_widget_queue_draw(gui.drawarea);
 }
@@ -1541,6 +1802,10 @@ gui_mch_draw_hollow_cursor(guicolor_T color)
     void
 gui_mch_draw_part_cursor(int w, int h, guicolor_T color)
 {
+#ifdef USE_GTK4_SNAPSHOT
+    gui_mch_set_fg_color(color);
+    vim_draw_area_set_part_cursor(VIM_DRAW_AREA(gui.drawarea), w, h);
+#else
     cairo_t *cr;
 
     if (gui.surface == NULL)
@@ -1552,13 +1817,14 @@ gui_mch_draw_part_cursor(int w, int h, guicolor_T color)
 	    gui.fgcolor->red, gui.fgcolor->green,
 	    gui.fgcolor->blue, gui.fgcolor->alpha);
     cairo_rectangle(cr,
-#ifdef FEAT_RIGHTLEFT
+# ifdef FEAT_RIGHTLEFT
 	    CURSOR_BAR_RIGHT ? FILL_X(gui.col + 1) - w :
-#endif
+# endif
 	    FILL_X(gui.col), FILL_Y(gui.row) + gui.char_height - h,
 	    w, h);
     cairo_fill(cr);
     cairo_destroy(cr);
+#endif
 
     gtk_widget_queue_draw(gui.drawarea);
 }
@@ -1567,8 +1833,10 @@ gui_mch_draw_part_cursor(int w, int h, guicolor_T color)
 gui_mch_flash(int msec)
 {
     // Invert the screen, wait, then invert back
+#ifndef USE_GTK4_SNAPSHOT
     if (gui.surface == NULL)
 	return;
+#endif
 
     gui_mch_invert_rectangle(0, 0, (int)Rows - 1, (int)Columns - 1);
     gui_mch_flush();
@@ -1579,6 +1847,9 @@ gui_mch_flash(int msec)
     void
 gui_mch_invert_rectangle(int r, int c, int nr, int nc)
 {
+#ifdef USE_GTK4_SNAPSHOT
+    vim_draw_area_invert_block(VIM_DRAW_AREA(gui.drawarea), r, c, nr, nc);
+#else
     cairo_t *cr;
 
     if (gui.surface == NULL)
@@ -1592,6 +1863,7 @@ gui_mch_invert_rectangle(int r, int c, int nr, int nc)
 	    (nc + 1) * gui.char_width, (nr + 1) * gui.char_height);
     cairo_fill(cr);
     cairo_destroy(cr);
+#endif
 
     gtk_widget_queue_draw(gui.drawarea);
 }
@@ -1869,9 +2141,6 @@ motion_notify_event(GtkEventControllerMotion *controller UNUSED,
 enter_notify_event(GtkEventControllerMotion *controller UNUSED,
 	double x UNUSED, double y UNUSED, gpointer data UNUSED)
 {
-    if (blink_state == BLINK_NONE)
-	gui_mch_start_blink();
-
     prev_mouse_x = x;
     prev_mouse_y = y;
 
@@ -1880,14 +2149,6 @@ enter_notify_event(GtkEventControllerMotion *controller UNUSED,
 	gtk_widget_grab_focus(gui.drawarea);
 }
 
-    static void
-leave_notify_event(GtkEventControllerMotion *controller UNUSED,
-	gpointer data UNUSED)
-{
-    if (blink_state != BLINK_NONE)
-	gui_mch_stop_blink(TRUE);
-}
-
     static gboolean
 scroll_event(GtkEventControllerScroll *controller UNUSED,
 	double dx UNUSED, double dy, gpointer data UNUSED)
@@ -1927,18 +2188,24 @@ scroll_event(GtkEventControllerScroll *controller UNUSED,
 focus_in_event(GtkEventControllerFocus *controller UNUSED,
 	gpointer data UNUSED)
 {
-    gui_focus_change(TRUE);
-    if (blink_state == BLINK_NONE)
-	gui_mch_start_blink();
+    if (gtk_window_is_active(GTK_WINDOW(gui.mainwin)))
+    {
+	gui_focus_change(TRUE);
+	if (blink_state == BLINK_NONE)
+	    gui_mch_start_blink();
+    }
 }
 
     static void
 focus_out_event(GtkEventControllerFocus *controller UNUSED,
 	gpointer data UNUSED)
 {
-    gui_focus_change(FALSE);
-    if (blink_state != BLINK_NONE)
-	gui_mch_stop_blink(TRUE);
+    if (!gtk_window_is_active(GTK_WINDOW(gui.mainwin)))
+    {
+	gui_focus_change(FALSE);
+	if (blink_state != BLINK_NONE)
+	    gui_mch_stop_blink(TRUE);
+    }
 }
 
 #ifdef FEAT_MENU
@@ -1983,6 +2250,7 @@ menubar_popover_closed_hook(GSignalInvocationHint *ihint UNUSED,
 }
 #endif
 
+#ifndef USE_GTK4_SNAPSHOT
     static void
 drawarea_realize_cb(GtkWidget *widget UNUSED, gpointer data UNUSED)
 {
@@ -2009,6 +2277,7 @@ drawarea_realize_cb(GtkWidget *widget UNUSED, gpointer data UNUSED)
 
     gui_mch_new_colors();
 }
+#endif
 
     static void
 drawarea_unrealize_cb(GtkWidget *widget UNUSED, gpointer data UNUSED)
@@ -2016,13 +2285,16 @@ drawarea_unrealize_cb(GtkWidget *widget UNUSED, gpointer data UNUSED)
 #ifdef FEAT_XIM
     im_shutdown();
 #endif
+#ifndef USE_GTK4_SNAPSHOT
     if (gui.surface != NULL)
     {
 	cairo_surface_destroy(gui.surface);
 	gui.surface = NULL;
     }
+#endif
 }
 
+#ifndef USE_GTK4_SNAPSHOT
 // Debounced resize: drawarea_resize_cb only resizes the backing surface
 // (preserving old content) and (re)arms a short timeout. The actual
 // gui_resize_shell() runs from drawarea_resize_apply_cb once the user has
@@ -2142,6 +2414,7 @@ drawarea_scale_factor_cb(GObject *object UNUSED,
     if (gui.in_use)
 	redraw_all_later(UPD_CLEAR);
 }
+#endif
 
 #ifdef FEAT_DND
 /*
@@ -2535,7 +2808,9 @@ gui_mch_menu_grey(vimmenu_T *menu, int grey)
     void
 gui_mch_menu_hidden(vimmenu_T *menu, int hidden)
 {
-    if (menu->id == 0)
+    // GMenu-based menu items have no real widget, only the (GtkWidget *)1
+    // marker; they cannot be toggled via the widget API.
+    if (menu->id == NULL || menu->id == (GtkWidget *)1)
 	return;
 
     if (hidden)
@@ -2585,6 +2860,28 @@ gui_mch_showing_tabline(void)
 }
 
 static int ignore_tabline_evt = FALSE;
+// Page hovered over in tab line, zero indicates none
+static int tabpage_hover = 0;
+
+    static void
+tabpage_enter_cb(
+	GtkEventController  *controller UNUSED,
+	double		    x UNUSED,
+	double		    y UNUSED,
+	void		    *udata)
+{
+    tabpage_hover = GPOINTER_TO_INT(udata);
+}
+
+    static void
+tabline_enter_cb(
+	GtkEventController  *controller UNUSED,
+	double		    x UNUSED,
+	double		    y UNUSED,
+	void		    *udata UNUSED)
+{
+    tabpage_hover = 0;
+}
 
     void
 gui_mch_update_tabline(void)
@@ -2605,6 +2902,10 @@ gui_mch_update_tabline(void)
 
     for (tp = first_tabpage; tp != NULL; tp = tp->tp_next, ++nr)
     {
+	GtkNotebookPage	    *page_widget;
+	GtkWidget	    *tab_widget;
+	GtkEventController  *mcontroller;
+
 	if (tp == curtab)
 	    curtabidx = nr;
 
@@ -2626,9 +2927,18 @@ gui_mch_update_tabline(void)
 		    page, TRUE);
 	}
 
-	event_box = gtk_notebook_get_tab_label(GTK_NOTEBOOK(gui.tabline), page);
-	g_object_set_data(G_OBJECT(event_box), "tab_num",
+	// Attach motion event controller to detect which tab page is currently
+	// hovered over.
+	page_widget = gtk_notebook_get_page(GTK_NOTEBOOK(gui.tabline), page);
+	mcontroller = gtk_event_controller_motion_new();
+	g_signal_connect(mcontroller, "enter", G_CALLBACK(tabpage_enter_cb),
 		GINT_TO_POINTER(tab_num));
+	gtk_event_controller_set_propagation_phase(
+		mcontroller, GTK_PHASE_CAPTURE);
+	g_object_get(page_widget, "tab", &tab_widget, NULL);
+	gtk_widget_add_controller(tab_widget, mcontroller);
+
+	event_box = gtk_notebook_get_tab_label(GTK_NOTEBOOK(gui.tabline), page);
 	label = gtk_widget_get_first_child(event_box);
 	get_tabline_label(tp, FALSE);
 	labeltext = CONVERT_TO_UTF8(NameBuff);
@@ -2690,6 +3000,96 @@ on_tab_reordered(
     else
 	tabpage_move(idx);
 }
+
+/*
+ * Handle selecting an item in the tab line popup menu.
+ */
+    static void
+tabline_menu_action_cb(
+	GSimpleAction	*action UNUSED,
+	GVariant	*parameter UNUSED,
+	void		*udata)
+{
+    send_tabline_menu_event(tabpage_hover, GPOINTER_TO_INT(udata));
+}
+
+    static void
+add_tabline_menu_item(
+	GMenu	    *gmenu,
+	GActionMap  *amap,
+	const char  *name,
+	const char  *action,
+	int	    resp)
+{
+    GSimpleAction *act = g_simple_action_new(action, NULL);
+    char detailed[32];
+
+    g_signal_connect(act, "activate", G_CALLBACK(tabline_menu_action_cb),
+	    GINT_TO_POINTER(resp));
+    g_action_map_add_action(amap, G_ACTION(act));
+    g_object_unref(act);
+
+    vim_snprintf(detailed, sizeof(detailed), "tabline.%s", action);
+    g_menu_append(gmenu, name, detailed);
+}
+
+/*
+ * Create a menu for the tab line.
+ */
+    static GMenu *
+create_tabline_popup_menu(GActionGroup **agroup_store)
+{
+    GMenu		*gmenu = g_menu_new();
+    GSimpleActionGroup	*agroup = g_simple_action_group_new();
+
+    add_tabline_menu_item(gmenu, G_ACTION_MAP(agroup),
+	    _("Close Tab"), "close-tab", TABLINE_MENU_CLOSE);
+    add_tabline_menu_item(gmenu, G_ACTION_MAP(agroup),
+	    _("New Tab"), "new-tab", TABLINE_MENU_NEW);
+    add_tabline_menu_item(gmenu, G_ACTION_MAP(agroup),
+	    _("Open Tab..."), "open-tab", TABLINE_MENU_OPEN);
+
+    *agroup_store = G_ACTION_GROUP(agroup);
+    return gmenu;
+}
+
+    static void
+tabline_menu_press_event(
+	GtkGestureClick *gesture,
+	int		n_press UNUSED,
+	double		x,
+	double		y,
+	GtkWidget	*popover)
+{
+    guint but;
+
+    but = gtk_gesture_single_get_current_button(GTK_GESTURE_SINGLE(gesture));
+    if (but == GDK_BUTTON_SECONDARY)
+    {
+	// Right mouse button pressed, popup menu
+	GdkRectangle rect;
+	rect.x = x;
+	rect.y = y;
+	rect.width = 1;
+	rect.height = 1;
+
+	gtk_popover_set_pointing_to(GTK_POPOVER(popover), &rect);
+	gtk_popover_popup(GTK_POPOVER(popover));
+    }
+    else if (but == GDK_BUTTON_PRIMARY)
+    {
+	if (tabpage_hover == 0)
+	    // Click after all tabs moves to next tab page.  When "x" is
+	    // small guess it's the left button.
+	    send_tabline_event(x < 50 ? -1 : 0);
+    }
+    else if (but == GDK_BUTTON_MIDDLE)
+    {
+	if (tabpage_hover != 0)
+	    // Middle mouse click on tabpage label closes that tab.
+	    send_tabline_menu_event(tabpage_hover, TABLINE_MENU_CLOSE);
+    }
+}
 #endif
 
 /*
@@ -2705,6 +3105,16 @@ on_tab_reordered(
     void
 gui_mch_drawsign(int row, int col, int typenr)
 {
+# ifdef USE_GTK4_SNAPSHOT
+    GdkTexture *sign;
+
+    sign = (GdkTexture *)sign_get_image(typenr);
+    if (sign == NULL)
+	return;
+
+    vim_draw_area_add_sign(VIM_DRAW_AREA(gui.drawarea), sign,
+	    row, col, SIGN_WIDTH, SIGN_HEIGHT);
+# else
     GdkPixbuf	*sign;
     cairo_t	*cr;
     int		width, height;
@@ -2739,6 +3149,7 @@ gui_mch_drawsign(int row, int col, int typenr)
 
     cairo_paint(cr);
     cairo_destroy(cr);
+# endif
 
     gtk_widget_queue_draw(gui.drawarea);
 }
@@ -2748,12 +3159,21 @@ gui_mch_register_sign(char_u *signfile)
 {
     if (signfile[0] != NUL && signfile[0] != '-' && gui.in_use)
     {
-	GdkPixbuf   *sign;
-	GError	    *error = NULL;
+	GError *error = NULL;
+# ifdef USE_GTK4_SNAPSHOT
+	GdkTexture  *sign;
+
+	sign = gdk_texture_new_from_filename((const char *)signfile,
+							    &error);
+	if (sign != NULL)
+	    return sign;
+# else
+	GdkPixbuf *sign;
 
 	sign = gdk_pixbuf_new_from_file((const char *)signfile, &error);
 	if (error == NULL)
 	    return sign;
+# endif
 
 	semsg("E255: %s", error->message);
 	g_error_free(error);
@@ -2909,6 +3329,7 @@ setup_zero_width_cluster(PangoItem *item, PangoGlyphInfo *glyph,
 	glyph->geometry.x_offset = -width + MAX(0, width - ink_rect.width) / 2;
 }
 
+#ifndef USE_GTK4_SNAPSHOT
 /*
  * Draw a single glyph string segment: background, foreground, and fake bold.
  */
@@ -2994,6 +3415,7 @@ draw_under(int flags, int row, int col, int cells, cairo_t *cr)
 	cairo_stroke(cr);
     }
 }
+#endif
 
 /*
  * Draw a string of characters on the screen.
@@ -3010,15 +3432,24 @@ gui_gtk_draw_string_ext(
 	int	flags,
 	int	force_pango)
 {
-    GdkRectangle	area;
     PangoGlyphString	*glyphs;
     int			column_offset = 0;
     int			i;
+#ifdef USE_GTK4_SNAPSHOT
+    gboolean		s_alloced = FALSE;
+#else
+    GdkRectangle	area;
     cairo_t		*cr;
+#endif
 
-    if (gui.text_context == NULL || gui.surface == NULL)
+    if (gui.text_context == NULL
+#ifndef USE_GTK4_SNAPSHOT
+	    || gui.surface == NULL
+#endif
+	    )
 	return len;
 
+#ifndef USE_GTK4_SNAPSHOT
     // Restrict all drawing to the current screen line.
     area.x = gui.border_offset;
     area.y = FILL_Y(row);
@@ -3028,6 +3459,7 @@ gui_gtk_draw_string_ext(
     cr = cairo_create(gui.surface);
     cairo_rectangle(cr, area.x, area.y, area.width, area.height);
     cairo_clip(cr);
+#endif
 
     glyphs = pango_glyph_string_new();
 
@@ -3052,7 +3484,12 @@ gui_gtk_draw_string_ext(
 	    glyphs->log_clusters[i] = i;
 	}
 
+#ifdef USE_GTK4_SNAPSHOT
+	vim_draw_area_add_glyphs(VIM_DRAW_AREA(gui.drawarea), row, col, len,
+		flags, gui.ascii_font, glyphs);
+#else
 	draw_glyph_string(row, col, len, flags, gui.ascii_font, glyphs, cr);
+#endif
 
 	column_offset = len;
     }
@@ -3068,8 +3505,17 @@ not_ascii:;
 	// Safety check: pango crashes with invalid utf-8.
 	if (!utf_valid_string(s, s + len))
 	{
+#ifdef USE_GTK4_SNAPSHOT
+	    // vim_draw_area_add_glyphs() also handles under decorations. Make
+	    // "str" a string of spaces so that under decorations are still
+	    // applied.
+	    s = g_malloc(len);
+	    memset(s, ' ', len);
+	    s_alloced = TRUE;
+#else
 	    column_offset = len;
 	    goto skipitall;
+#endif
 	}
 
 	cluster_width = PANGO_SCALE * gui.char_width;
@@ -3161,8 +3607,14 @@ not_ascii:;
 		}
 	    }
 
+#ifdef USE_GTK4_SNAPSHOT
+	    vim_draw_area_add_glyphs(VIM_DRAW_AREA(gui.drawarea),
+		    row, col + column_offset, item_cells,
+		    flags, item->analysis.font, glyphs);
+#else
 	    draw_glyph_string(row, col + column_offset, item_cells,
 			      flags, item->analysis.font, glyphs, cr);
+#endif
 
 	    pango_item_free(item);
 
@@ -3172,12 +3624,17 @@ not_ascii:;
 	pango_attr_list_unref(attr_list);
     }
 
+#ifdef USE_GTK4_SNAPSHOT
+    if (s_alloced)
+	g_free(s);
+#else
 skipitall:
     draw_under(flags, row, col, column_offset, cr);
+    cairo_destroy(cr);
+#endif
 
     pango_glyph_string_free(glyphs);
 
-    cairo_destroy(cr);
 
     if (gui.drawarea != NULL)
 	gtk_widget_queue_draw(gui.drawarea);
@@ -3207,7 +3664,11 @@ gui_gtk_draw_string(int row, int col, char_u *s, int len, int flags)
     int		is_utf8;
     char_u	backup_ch;
 
-    if (gui.text_context == NULL || gui.surface == NULL)
+    if (gui.text_context == NULL
+#ifndef USE_GTK4_SNAPSHOT
+	    || gui.surface == NULL
+#endif
+	    )
 	return len;
 
     if (output_conv.vc_type != CONV_NONE)
@@ -3544,11 +4005,11 @@ get_menu_tool_height(void)
 }
 
 /*
- * Get the GdkClipboard for the given Clipboard_T.
+ * Get the GdkClipboard and GdkContentProvider for the given Clipboard_T.
  * clip_star (*) uses PRIMARY, clip_plus (+) uses CLIPBOARD.
  */
     static GdkClipboard *
-gtk4_get_clipboard(Clipboard_T *cbd)
+gtk4_get_clipboard(Clipboard_T *cbd, GdkContentProvider **provider)
 {
     GdkDisplay *display;
 
@@ -3560,64 +4021,80 @@ gtk4_get_clipboard(Clipboard_T *cbd)
 	return NULL;
 
     if (cbd == &clip_plus)
+    {
+	if (provider != NULL)
+	    *provider = gui.regular_provider;
 	return gdk_display_get_clipboard(display);
+    }
     else
+    {
+	if (provider != NULL)
+	    *provider = gui.primary_provider;
 	return gdk_display_get_primary_clipboard(display);
+    }
 }
 
 typedef struct {
     Clipboard_T *cbd;
     gboolean	done;
+    gboolean	abandoned;	// requester timed out, callback owns "crd"
 } ClipReadData;
 
 /*
- * Callback for gdk_clipboard_read_text_async().
+ * Callback for gdk_clipboard_read_async().
  */
     static void
-clip_read_text_cb(GObject *source, GAsyncResult *result, gpointer user_data)
-{
-    GdkClipboard	*clipboard = GDK_CLIPBOARD(source);
-    ClipReadData	*crd = (ClipReadData *)user_data;
-    Clipboard_T		*cbd = crd->cbd;
-    char		*text;
-    GError		*error = NULL;
-
-    text = gdk_clipboard_read_text_finish(clipboard, result, &error);
-    if (text != NULL)
+clip_read_cb(GdkClipboard *cb, GAsyncResult *result, ClipReadData *crd)
+{
+    Clipboard_T	    *cbd = crd->cbd;
+    GError	    *error = NULL;
+    GInputStream    *in_stream;
+    const char	    *mime_type;
+    GByteArray	    *arr;
+    static char	    buf[512];
+    ssize_t	    r;
+    char_u	    *actual, *final;
+    long	    len;
+    int		    motion_type = MAUTO;
+    char_u	    *tofree = NULL;
+
+    in_stream = gdk_clipboard_read_finish(cb, result, &mime_type, &error);
+    if (in_stream == NULL)
     {
-	char_u	*tmpbuf = NULL;
-	char_u	*p;
-	int	len;
-	int	motion_type = MAUTO;
+	g_error_free(error);
+	goto exit;
+    }
 
-	len = (int)STRLEN(text);
+    arr = g_byte_array_new();
 
-	// Convert from UTF-8 to 'encoding' if needed.
-	if (input_conv.vc_type != CONV_NONE)
-	{
-	    tmpbuf = string_convert(&input_conv, (char_u *)text, &len);
-	    if (tmpbuf != NULL)
-		p = tmpbuf;
-	    else
-		p = (char_u *)text;
-	}
-	else
-	    p = (char_u *)text;
-
-	// Chop off any trailing NUL bytes.
-	while (len > 0 && p[len - 1] == NUL)
-	    --len;
+    while ((r = g_input_stream_read(in_stream, buf, 512, NULL, NULL)) > 0)
+	g_byte_array_append(arr, (uint8_t *)buf, r);
 
-	clip_yank_selection(motion_type, p, (long)len, cbd);
-	vim_free(tmpbuf);
-	g_free(text);
-    }
-    else
+    if (r == -1)
     {
-	if (error != NULL)
-	    g_error_free(error);
+	g_byte_array_free(arr, TRUE);
+	goto exit;
     }
-    crd->done = TRUE;
+    assert(r == 0);
+
+    len = (long)arr->len;
+    actual = final = g_byte_array_free(arr, FALSE);
+
+    if (!crd->abandoned && clip_convert_data(&final, &len, &motion_type,
+	    STRCMP(mime_type, VIM_MIMETYPE_NAME) == 0,
+	    STRCMP(mime_type, VIMENC_MIMETYPE_NAME) == 0, &tofree) == OK)
+	clip_yank_selection(motion_type, final, len, cbd);
+    g_free(actual);
+    vim_free(tofree);
+
+exit:
+    if (in_stream != NULL)
+	g_object_unref(in_stream);
+    // free "crd" if the requester gave up, else mark the read complete
+    if (crd->abandoned)
+	vim_free(crd);
+    else
+	crd->done = TRUE;
 }
 
 /*
@@ -3626,79 +4103,56 @@ clip_read_text_cb(GObject *source, GAsyncResult *result, gpointer user_data)
     void
 clip_mch_request_selection(Clipboard_T *cbd)
 {
+    static const char	*mimes_no_html[] = {
+	VIMENC_MIMETYPE_NAME,
+	VIM_MIMETYPE_NAME,
+	"text/plain;charset=utf-8",
+	"text/plain",
+	NULL
+    };
     GdkClipboard	*clipboard;
-    ClipReadData	crd;
+    ClipReadData	*crd;
     time_t		start;
 
-    clipboard = gtk4_get_clipboard(cbd);
+    clipboard = gtk4_get_clipboard(cbd, NULL);
     if (clipboard == NULL)
 	return;
 
-    crd.cbd = cbd;
-    crd.done = FALSE;
-    gdk_clipboard_read_text_async(clipboard, NULL, clip_read_text_cb, &crd);
+    // Heap-allocate: on a timeout this returns before the read completes,
+    // so "crd" must outlive this stack frame.
+    crd = ALLOC_ONE(ClipReadData);
+    if (crd == NULL)
+	return;
+    crd->cbd = cbd;
+    crd->done = FALSE;
+    crd->abandoned = FALSE;
+
+    gdk_clipboard_read_async(
+	    clipboard, clip_html ? supported_mimes : mimes_no_html,
+	    G_PRIORITY_HIGH, NULL, (GAsyncReadyCallback)clip_read_cb, crd);
 
     // Spin until the async callback fires, with a 3-second wall-clock
     // timeout as a safety net.
     start = time(NULL);
-    while (!crd.done && time(NULL) < start + 3)
+    while (!crd->done && time(NULL) < start + 3)
 	g_main_context_iteration(NULL, TRUE);
+
+    if (crd->done)
+	vim_free(crd);
+    else
+	// timed out: hand ownership to the callback, which frees "crd"
+	crd->abandoned = TRUE;
 }
 
 static int in_clipboard_set = FALSE;
 
 /*
- * Send the current selection to the clipboard.
+ * Send the current selection to the clipboard. Do nothing for because we
+ * subclass GdkContentProvider which will provide the data only when needed.
  */
     void
-clip_mch_set_selection(Clipboard_T *cbd)
+clip_mch_set_selection(Clipboard_T *cbd UNUSED)
 {
-    GdkClipboard	*clipboard;
-    char_u		*str = NULL;
-    long_u		len;
-    int			motion_type;
-
-    clipboard = gtk4_get_clipboard(cbd);
-    if (clipboard == NULL)
-	return;
-
-    // Get the selection text from the register.
-    clip_get_selection(cbd);
-    motion_type = clip_convert_selection(&str, &len, cbd);
-    if (motion_type < 0 || str == NULL)
-	return;
-
-    // Convert from 'encoding' to UTF-8 if needed.
-    if (output_conv.vc_type != CONV_NONE)
-    {
-	char_u	*conv_str;
-	int	conv_len = (int)len;
-
-	conv_str = string_convert(&output_conv, str, &conv_len);
-	if (conv_str != NULL)
-	{
-	    vim_free(str);
-	    str = conv_str;
-	    len = conv_len;
-	}
-    }
-
-    // Ensure NUL-terminated string for GTK.
-    {
-	char_u *nul_str = alloc(len + 1);
-
-	if (nul_str != NULL)
-	{
-	    mch_memmove(nul_str, str, len);
-	    nul_str[len] = NUL;
-	    in_clipboard_set = TRUE;
-	    gdk_clipboard_set_text(clipboard, (const char *)nul_str);
-	    in_clipboard_set = FALSE;
-	    vim_free(nul_str);
-	}
-    }
-
-    vim_free(str);
 }
 
     static void
@@ -3714,13 +4168,23 @@ clipboard_changed_cb(GdkClipboard *clipboard, gpointer user_data)
 }
 
 /*
- * Own the selection.  In GTK4, ownership is implicit when content is set
- * on the clipboard.  Return OK to indicate we can own it.
+ * Own the selection.
  */
     int
-clip_mch_own_selection(Clipboard_T *cbd UNUSED)
+clip_mch_own_selection(Clipboard_T *cbd)
 {
-    return OK;
+    GdkContentProvider	*cp;
+    GdkClipboard	*cb = gtk4_get_clipboard(cbd, &cp);
+    int			ret;
+
+    if (cb == NULL)
+	return FAIL;
+
+    in_clipboard_set = TRUE;
+    ret = gdk_clipboard_set_content(cb, cp);
+    in_clipboard_set = FALSE;
+
+    return ret ? OK : FAIL;
 }
 
 /*
@@ -3732,49 +4196,16 @@ clip_mch_lose_selection(Clipboard_T *cbd)
 {
     GdkClipboard *clipboard;
 
-    clipboard = gtk4_get_clipboard(cbd);
+    clipboard = gtk4_get_clipboard(cbd, NULL);
     if (clipboard == NULL)
 	return;
 
-    // Only release ownership if we still own it.  Otherwise we would
-    // clobber another application's clipboard content with NULL, which
-    // happens when this is called from clipboard_changed_cb after a
-    // foreign app took the selection.
+    // Only release ownership if we still own it. We don't want to clear the
+    // current selection when we aren't actually the source.
     if (gdk_clipboard_is_local(clipboard))
 	gdk_clipboard_set_content(clipboard, NULL);
 }
 
-// Balloon eval - use GTK4 tooltip
-    void
-gui_mch_post_balloon(BalloonEval *beval UNUSED, char_u *mesg)
-{
-    if (mesg != NULL && gui.drawarea != NULL)
-    {
-	char_u *text = CONVERT_TO_UTF8(mesg);
-	gtk_widget_set_tooltip_text(gui.drawarea, (const char *)text);
-	CONVERT_TO_UTF8_FREE(text);
-    }
-    else if (gui.drawarea != NULL)
-	gtk_widget_set_tooltip_text(gui.drawarea, NULL);
-}
-
-    BalloonEval *
-gui_mch_create_beval_area(void *target UNUSED, char_u *mesg UNUSED,
-	void (*mesgCB)(BalloonEval *, int) UNUSED, void *clientData UNUSED)
-{
-    return NULL;
-}
-
-    void
-gui_mch_enable_beval_area(BalloonEval *beval UNUSED)
-{
-}
-
-    void
-gui_mch_disable_beval_area(BalloonEval *beval UNUSED)
-{
-}
-
 // GTK4 does not have gtk_main_level/gtk_main_quit.
 // Provide compatibility stubs using a simple flag.
     guint
@@ -3928,16 +4359,15 @@ create_toolbar_icon(vimmenu_T *menu)
 	expand_env(menu->iconfile, buf, MAXPATHL);
 	if (vim_fexists(buf))
 	{
-	    GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file_at_scale(
-		    (const char *)buf, 24, 24, TRUE, NULL);
-	    if (pixbuf != NULL)
+	    GdkTexture *texture = gdk_texture_new_from_filename(
+		    (const char *)buf, NULL);
+
+	    if (texture != NULL)
 	    {
-		GdkTexture *texture =
-			gdk_texture_new_for_pixbuf(pixbuf);
 		image = gtk_image_new_from_paintable(
 			GDK_PAINTABLE(texture));
+		gtk_widget_set_size_request(image, 24, 24);
 		g_object_unref(texture);
-		g_object_unref(pixbuf);
 	    }
 	}
     }
@@ -4051,7 +4481,7 @@ gui_mch_add_menu(vimmenu_T *menu, int idx UNUSED)
 }
 
     void
-gui_mch_add_menu_item(vimmenu_T *menu, int idx UNUSED)
+gui_mch_add_menu_item(vimmenu_T *menu, int idx)
 {
     vimmenu_T *parent = menu->parent;
 
@@ -4060,32 +4490,32 @@ gui_mch_add_menu_item(vimmenu_T *menu, int idx UNUSED)
     {
 	if (menu_is_separator(menu->name))
 	{
-	    GtkWidget *sep = gtk_separator_new(GTK_ORIENTATION_VERTICAL);
-	    gtk_box_append(GTK_BOX(gui.toolbar), sep);
-	    menu->id = sep;
+	    menu->id =
+		vim_toolbar_insert_separator(VIM_TOOLBAR(gui.toolbar), idx);
 	}
 	else
 	{
 	    GtkWidget	*btn;
 	    GtkWidget	*icon;
+	    char_u	*text;
 	    char_u	*tooltip;
 
-	    icon = create_toolbar_icon(menu);
-	    btn = gtk_button_new();
-	    gtk_button_set_child(GTK_BUTTON(btn), icon);
-	    gtk_widget_set_focusable(btn, FALSE);
-	    gtk_widget_add_css_class(btn, "flat");
-
+	    text    = CONVERT_TO_UTF8(menu->dname);
 	    tooltip = CONVERT_TO_UTF8(menu->strings[MENU_INDEX_TIP]);
-	    if (tooltip != NULL && utf_valid_string(tooltip, NULL))
-		gtk_widget_set_tooltip_text(btn, (const gchar *)tooltip);
-	    CONVERT_TO_UTF8_FREE(tooltip);
+	    if (tooltip != NULL && !utf_valid_string(tooltip, NULL))
+		CONVERT_TO_UTF8_FREE(tooltip);
+
+	    icon = create_toolbar_icon(menu);
+	    btn = vim_toolbar_insert_button(VIM_TOOLBAR(gui.toolbar),
+		    icon, (const char *)text, idx);
+	    gtk_widget_set_tooltip_text(btn, (const gchar *)tooltip);
 
 	    g_signal_connect(btn, "clicked",
 		    G_CALLBACK(toolbar_button_clicked_cb), menu);
 
-	    gtk_box_append(GTK_BOX(gui.toolbar), btn);
 	    menu->id = btn;
+	    CONVERT_TO_UTF8_FREE(text);
+	    CONVERT_TO_UTF8_FREE(tooltip);
 	}
 	return;
     }
@@ -4102,7 +4532,8 @@ gui_mch_add_menu_item(vimmenu_T *menu, int idx UNUSED)
 	{
 	    // GMenu doesn't have real separators; use a section
 	    GMenu *section = g_menu_new();
-	    g_menu_append_section(parent_menu, NULL, G_MENU_MODEL(section));
+	    g_menu_insert_section(parent_menu, idx, NULL,
+		    G_MENU_MODEL(section));
 	    g_object_unref(section);
 	    menu->id = NULL;
 	}
@@ -4131,7 +4562,7 @@ gui_mch_add_menu_item(vimmenu_T *menu, int idx UNUSED)
 
 	    label = CONVERT_TO_UTF8(menu->dname);
 	    vim_snprintf(detailed, sizeof(detailed), "menu.%s", action_name);
-	    g_menu_append(parent_menu, (const char *)label, detailed);
+	    g_menu_insert(parent_menu, idx, (const char *)label, detailed);
 	    CONVERT_TO_UTF8_FREE(label);
 
 	    menu->id = (GtkWidget *)1;  // non-NULL marker
@@ -4149,8 +4580,17 @@ gui_mch_toggle_tearoffs(int enable UNUSED)
 }
 
     void
-gui_mch_menu_set_tip(vimmenu_T *menu UNUSED)
+gui_mch_menu_set_tip(vimmenu_T *menu)
 {
+    char_u *tooltip;
+
+    if (menu->id == NULL || menu->parent == NULL || gui.toolbar == NULL)
+	return;
+
+    tooltip = CONVERT_TO_UTF8(menu->strings[MENU_INDEX_TIP]);
+    if (tooltip != NULL && utf_valid_string(tooltip, NULL))
+	gtk_widget_set_tooltip_text(menu->id, (const char *)tooltip);
+    CONVERT_TO_UTF8_FREE(tooltip);
 }
 
 /*
@@ -4226,10 +4666,9 @@ gui_mch_destroy_menu(vimmenu_T *menu)
     // For toolbar buttons and separators, remove from the toolbar box.
     if (menu->id != NULL && menu->id != (GtkWidget *)1)
     {
-	GtkWidget *parent_widget = gtk_widget_get_parent(menu->id);
-
-	if (parent_widget != NULL)
-	    gtk_box_remove(GTK_BOX(parent_widget), menu->id);
+	vim_toolbar_remove(VIM_TOOLBAR(gui.toolbar), menu->id);
+	menu->id = NULL;
+	return;
     }
     menu->id = NULL;
 
@@ -4634,97 +5073,270 @@ gui_mch_browsedir(char_u *title, char_u *initdir)
  * ============================================================
  */
 
-typedef struct {
-    int		response;
-    gboolean	done;
-} AlertDialogData;
+/*
+ * Split up button_string into individual button labels by inserting NUL bytes.
+ * Also replace the Vim-style mnemonic accelerator prefix '&' with '_'.
+ * "button_string" is duplicated; caller must free the duplicated string via
+ * *tofree.
+ */
+    static char **
+split_button_string(char_u *button_string, int *n_buttons, char **tofree)
+{
+    char	    **array;
+    char_u	    *p;
+    unsigned int    count = 1;
+
+    button_string = (char_u *)g_strdup((const char *)button_string);
+
+    for (p = button_string; *p != NUL; ++p)
+	if (*p == DLG_BUTTON_SEP)
+	    ++count;
+
+    array = g_malloc_n(count, sizeof(char *));
+    count = 0;
+
+    if (array != NULL)
+    {
+	array[count++] = (char *)button_string;
+	for (p = button_string; *p != NUL; )
+	{
+	    if (*p == DLG_BUTTON_SEP)
+	    {
+		*p++ = NUL;
+		array[count++] = (char *)p;
+	    }
+	    else if (*p == DLG_HOTKEY_CHAR)
+		*p++ = '_';
+	    else
+		MB_PTR_ADV(p);
+	}
+    }
+
+    *tofree = (char *)button_string;
+    *n_buttons = count;
+    return array;
+}
+
+/*
+ * Convert VIM_GENERIC, VIM_ERROR, etc into an icon name. Returns NULL for
+ * VIM_GENERIC.
+ */
+    static const char *
+dialog_type_to_icon(int type)
+{
+    switch (type)
+    {
+	case VIM_ERROR:
+	    return "dialog-error-symbolic";
+	case VIM_WARNING:
+	    return "dialog-warning-symbolic";
+	case VIM_INFO:
+	    return "dialog-information-symbolic";
+	case VIM_QUESTION:
+	    return "dialog-question-symbolic";
+	default:
+	    break;
+    }
+    return NULL;
+}
+
+// Data associated with each button in the dialog
+typedef struct
+{
+    int		but_idx;
+    int		*response;
+    gboolean	*done;
+} DialogButtonState;
 
     static void
-alert_dialog_cb(GObject *source, GAsyncResult *res, gpointer data)
+dialog_button_clicked_cb(GtkButton *button, DialogButtonState *state)
+{
+    *state->response = state->but_idx;
+    *state->done = TRUE;
+}
+
+    static gboolean
+dialog_key_pressed_cb(
+	GtkEventControllerKey	*controller,
+	guint			keyval,
+	guint			keycode,
+	GdkModifierType		state,
+	gboolean		*done)
+{
+    if (keyval == GDK_KEY_Escape)
+    {
+	*done = TRUE;
+	return TRUE;
+    }
+    return FALSE;
+}
+
+    static gboolean
+dialog_close_request_cb(GtkWindow *win, gboolean *win_closed)
 {
-    AlertDialogData *add = (AlertDialogData *)data;
-    add->response = gtk_alert_dialog_choose_finish(
-		    GTK_ALERT_DIALOG(source), res, NULL);
-    add->done = TRUE;
+    *win_closed = TRUE;
+    return FALSE;
 }
 
     int
 gui_mch_dialog(
-	int	type UNUSED,
+	int	type,
 	char_u	*title,
 	char_u	*message,
 	char_u	*buttons,
-	int	dfltbutton,
-	char_u	*textfield UNUSED,
+	int	def_but,
+	char_u	*textfield,
 	int	ex_cmd UNUSED)
 {
-    GtkAlertDialog	*dlg;
-    AlertDialogData	add;
-    char_u		*p;
-    char_u		*buf = NULL;
-    int			butcount = 0;
-    int			i;
-    const char		*btn_labels[64];
-    char_u		*btn_conv[64];
+    GtkWindow		*win = GTK_WINDOW(gtk_window_new());
+    GtkWidget		*vertbox;
+    GtkWidget		*message_box;
+    const char		*icon_name;
+    GtkWidget		*icon;
+    GtkWidget		*label;
+    GtkWidget		*entry = NULL;
+    char_u		*utf8_title;
+    char_u		*utf8_message;
+    GtkEventController *key_controller;
+    DialogButtonState	*but_states = NULL;
+    char		*tofree = NULL;
+    int			response = -1;
+    gboolean		done = FALSE;
+    gboolean		win_closed = FALSE;
+
+    utf8_title = CONVERT_TO_UTF8(title);
+    if (utf8_title != NULL)
+	gtk_window_set_title(win, (const char *)utf8_title);
+    CONVERT_TO_UTF8_FREE(utf8_title);
+
+    gtk_window_set_transient_for(win, GTK_WINDOW(gui.mainwin));
+    gtk_window_set_modal(win, TRUE);
+    gtk_window_set_default_size(win, 300, -1);
+    gtk_window_set_destroy_with_parent(win, TRUE);
+    g_signal_connect(win, "close-request",
+	    G_CALLBACK(dialog_close_request_cb), &win_closed);
+
+    // Create main vertical layout container
+    vertbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 16);
+    gtk_window_set_child(win, vertbox);
+    gtk_widget_set_margin_top(vertbox, 24);
+    gtk_widget_set_margin_bottom(vertbox, 24);
+    gtk_widget_set_margin_start(vertbox, 12);
+    gtk_widget_set_margin_end(vertbox, 12);
 
-    title = CONVERT_TO_UTF8(title);
-    message = CONVERT_TO_UTF8(message);
+    // Add the message label
+    message_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
+    gtk_widget_set_halign(message_box, GTK_ALIGN_CENTER);
+    gtk_box_append(GTK_BOX(vertbox), message_box);
 
-    // Parse button labels from the "&Yes\n&No\n&Cancel" format
-    if (buttons != NULL)
+    // If type is not VIM_GENERIC, add an icon to make the dialog look nicer :)
+    icon_name = dialog_type_to_icon(type);
+    if (icon_name != NULL)
     {
-	buf = vim_strsave(buttons);
-	if (buf != NULL)
-	{
-	    p = buf;
-	    while (*p != NUL && butcount < 63)
-	    {
-		char_u *start = p;
-		while (*p != NUL && *p != '\n')
-		    ++p;
-		if (*p == '\n')
-		    *p++ = NUL;
-		// Skip '&' mnemonic marker
-		if (*start == '&')
-		    ++start;
-		btn_conv[butcount] = CONVERT_TO_UTF8(start);
-		btn_labels[butcount] = (const char *)btn_conv[butcount];
-		butcount++;
-	    }
-	}
+	icon = gtk_image_new_from_icon_name(icon_name);
+	gtk_image_set_icon_size(GTK_IMAGE(icon), GTK_ICON_SIZE_LARGE);
+	gtk_box_append(GTK_BOX(message_box), icon);
     }
-    btn_labels[butcount] = NULL;
 
-    dlg = gtk_alert_dialog_new("%s", message ? (char *)message : "");
-    if (title != NULL)
-	gtk_alert_dialog_set_detail(dlg, (const char *)title);
-    gtk_alert_dialog_set_buttons(dlg, btn_labels);
-    gtk_alert_dialog_set_modal(dlg, TRUE);
+    utf8_message = CONVERT_TO_UTF8(message);
+    label = gtk_label_new((const char *)utf8_message);
+    CONVERT_TO_UTF8_FREE(utf8_message);
+    gtk_label_set_wrap(GTK_LABEL(label), TRUE);
+    gtk_label_set_max_width_chars(GTK_LABEL(label), 40);
+    gtk_box_append(GTK_BOX(message_box), label);
+
+    // Close the dialog when the <Esc> key is pressed. the GTK3 GUI also allows
+    // mnemonics without <Alt> key, but that behaviour comes from GTK+ 1.2 (from
+    // 1999!), so most users probably don't care...
+    key_controller = gtk_event_controller_key_new();
+    g_signal_connect(key_controller, "key-pressed",
+	    G_CALLBACK(dialog_key_pressed_cb), &done);
+    gtk_widget_add_controller(GTK_WIDGET(win), key_controller);
+
+    if (textfield != NULL)
+    {
+	// Add text entry so user can enter text
+	char_u *utf8_text = CONVERT_TO_UTF8(textfield);
+
+	entry = gtk_entry_new();
+
+	if (utf8_text != NULL)
+	    gtk_editable_set_text(GTK_EDITABLE(entry), (const char *)utf8_text);
+	else
+	    gtk_editable_set_text(GTK_EDITABLE(entry), "");
+	CONVERT_TO_UTF8_FREE(utf8_text);
+
+	// Make it so that pressing enter key will activate "def_but" button
+	// (which is set as the default widget).
+	gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
+	gtk_box_append(GTK_BOX(vertbox), entry);
+    }
+
+    if (buttons != NULL)
+    {
+	GtkWidget   *but_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
+	char	    **buttons_arr; // Note that array is allocated, not strings
+	int	    n_buttons;
+
+	gtk_widget_set_halign(but_box, GTK_ALIGN_CENTER);
+	gtk_box_set_homogeneous(GTK_BOX(but_box), TRUE);
+	gtk_box_append(GTK_BOX(vertbox), but_box);
 
-    if (dfltbutton > 0 && dfltbutton <= butcount)
-	gtk_alert_dialog_set_default_button(dlg, dfltbutton - 1);
-    if (butcount > 0)
-	gtk_alert_dialog_set_cancel_button(dlg, butcount - 1);
+	buttons_arr = split_button_string(buttons, &n_buttons, &tofree);
 
-    add.response = -1;
-    add.done = FALSE;
+	but_states = g_malloc_n(n_buttons, sizeof(DialogButtonState));
 
-    gtk_alert_dialog_choose(dlg, GTK_WINDOW(gui.mainwin), NULL,
-	    alert_dialog_cb, &add);
+	for (int i = 0; i < n_buttons; i++)
+	{
+	    char_u		*but_label;
+	    GtkWidget		*but;
+	    DialogButtonState	*but_state = but_states + i;
+
+	    but_label = CONVERT_TO_UTF8((char_u *)buttons_arr[i]);
+	    if (but_label == NULL)
+		continue;
+
+	    but = gtk_button_new_with_mnemonic((char *)but_label);
+	    if (i == def_but - 1)
+		gtk_window_set_default_widget(win, but);
+	    gtk_box_append(GTK_BOX(but_box), but);
+	    CONVERT_TO_UTF8_FREE(but_label);
+
+	    but_state->but_idx = i;
+	    but_state->response = &response;
+	    but_state->done = &done;
+
+	    g_signal_connect(but, "clicked",
+		    G_CALLBACK(dialog_button_clicked_cb), but_state);
+	}
+	g_free(buttons_arr);
+    }
 
-    while (!add.done)
+    gtk_window_present(win);
+
+    while (!done && !win_closed)
 	g_main_context_iteration(NULL, TRUE);
 
-    g_object_unref(dlg);
+    if (done)
+    {
+	if (textfield != NULL)
+	{
+	    // Get the text the user entered
+	    char_u *text;
 
-    for (i = 0; i < butcount; i++)
-	CONVERT_TO_UTF8_FREE(btn_conv[i]);
-    vim_free(buf);
-    CONVERT_TO_UTF8_FREE(title);
-    CONVERT_TO_UTF8_FREE(message);
+	    text = (char_u *)gtk_editable_get_text(GTK_EDITABLE(entry));
+	    text = CONVERT_FROM_UTF8(text);
+	    vim_strncpy(textfield, text, IOSIZE - 1);
+	    CONVERT_FROM_UTF8_FREE(text);
+	}
+
+	gtk_window_destroy(win);
+    }
+    g_free(but_states);
+    g_free(tofree);
 
-    // GTK returns 0-based index, Vim wants 1-based
-    return add.response >= 0 ? add.response + 1 : 0;
+    // Vim buttons are indexed starting from one.
+    return response == -1 ? 0 : response + 1;
 }
 
 /*
@@ -5069,7 +5681,6 @@ print_draw_page_cb(
     linenr_T	    lnum;
     linenr_T	    first;
     linenr_T	    last;
-    int		    page_line;
     double	    y;
 
     cr = gtk_print_context_get_cairo_context(context);
@@ -5080,9 +5691,8 @@ print_draw_page_cb(
 	last = pd->last_line;
 
     y = 0;
-    page_line = 0;
 
-    for (lnum = first; lnum <= last; ++lnum, ++page_line)
+    for (lnum = first; lnum <= last; ++lnum)
     {
 	char_u		*line;
 	PangoLayout	*layout;
diff --git a/src/gui_gtk4_cb.c b/src/gui_gtk4_cb.c
new file mode 100644
index 0000000000..e627ebeda8
--- /dev/null
+++ b/src/gui_gtk4_cb.c
@@ -0,0 +1,198 @@
+/* vi:set ts=8 sts=4 sw=4 noet:
+ *
+ * VIM - Vi IMproved		by Bram Moolenaar
+ *
+ * Do ":help uganda"  in Vim to read copying and usage conditions.
+ * Do ":help credits" in Vim to see a list of people who contributed.
+ * See README.txt for an overview of the Vim source code.
+ */
+
+#include "vim.h"
+#include <gtk/gtk.h>
+#include "gui_gtk4_cb.h"
+
+struct _VimContentProvider
+{
+    GdkContentProvider parent;
+
+    // Clipboard this content provider is associated with.
+    Clipboard_T *cbd;
+};
+
+// Note that order is important, mime types placed first have the highest
+// priority for GTK when looking what mime type to receive from.
+//
+// NOTE: GTK4 only supports conforming mime types, meaning formats like
+// "_VIMENC_TEXT" will not work. See
+// https://gitlab.gnome.org/GNOME/gtk/-/work_items/4087
+// and
+// https://discourse.gnome.org/t/gtk4-clipboard-does-not-provide-contents-using-custom-mime-type-without-character/6858
+// To get around this, add a new VIM*_MIMETYPE_NAME conforming mime type.
+const char *supported_mimes[] = {
+    VIMENC_MIMETYPE_NAME,
+    VIM_MIMETYPE_NAME,
+    "text/html",
+    "text/plain;charset=utf-8",
+    "text/plain",
+    NULL // gdk_clipboard_read_async expects array to be NULL terminated.
+};
+#define SUPPORTED_MIMES_LEN (ARRAY_LENGTH(supported_mimes) - 1)
+
+G_DEFINE_TYPE(VimContentProvider, vim_content_provider, GDK_TYPE_CONTENT_PROVIDER)
+
+static GdkContentFormats *vim_content_provider_ref_formats(GdkContentProvider *cp);
+static void vim_content_provider_write_mime_type_async(GdkContentProvider *cp, const char *mime_type, GOutputStream *stream, int io_priority, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
+static gboolean vim_content_provider_write_mime_type_finish(GdkContentProvider *cp, GAsyncResult *result, GError **error);
+
+    static void
+vim_content_provider_class_init(VimContentProviderClass *class)
+{
+    GdkContentProviderClass *cp_class = GDK_CONTENT_PROVIDER_CLASS(class);
+
+    cp_class->ref_formats = vim_content_provider_ref_formats;
+    cp_class->write_mime_type_async = vim_content_provider_write_mime_type_async;
+    cp_class->write_mime_type_finish = vim_content_provider_write_mime_type_finish;
+}
+
+    static void
+vim_content_provider_init(VimContentProvider *self)
+{
+}
+
+    GdkContentProvider *
+vim_content_provider_new(Clipboard_T *cbd)
+{
+    VimContentProvider *vcp = g_object_new(VIM_TYPE_CONTENT_PROVIDER, NULL);
+
+    vcp->cbd = cbd;
+
+    return GDK_CONTENT_PROVIDER(vcp);
+}
+
+    static GdkContentFormats *
+vim_content_provider_ref_formats(GdkContentProvider *cp UNUSED)
+{
+    // We support text formats + our own Vim specific mime types. Also expose
+    // html if user specified 'html' in 'clipboard' option.
+    GdkContentFormatsBuilder *builder = gdk_content_formats_builder_new();
+
+    for (int i = 0; i < SUPPORTED_MIMES_LEN; i++)
+    {
+	if (STRCMP(supported_mimes[i], "text/html") == 0 && !clip_html)
+	    continue;
+	gdk_content_formats_builder_add_mime_type(builder, supported_mimes[i]);
+    }
+    return gdk_content_formats_builder_free_to_formats(builder);
+}
+
+static void
+vim_content_provider_write_mime_type_done (
+	GObject		*stream,
+	GAsyncResult	*result,
+	GTask		*task)
+{
+    GError *error = NULL;
+
+    if (!g_output_stream_write_all_finish (G_OUTPUT_STREAM (stream),
+		result, NULL, &error))
+	g_task_return_error (task, error);
+    else
+	g_task_return_boolean (task, TRUE);
+    g_object_unref (task);
+}
+
+    static void
+vim_content_provider_write_mime_type_async(
+	GdkContentProvider  *cp,
+	const char	    *mime_type,
+	GOutputStream	    *stream,
+	int		    io_priority,
+	GCancellable	    *cancellable,
+	GAsyncReadyCallback callback,
+	void		    *udata)
+{
+    VimContentProvider	*self = VIM_CONTENT_PROVIDER(cp);
+    Clipboard_T		*cbd = self->cbd;
+    int			motion_type;
+    long_u		length;
+    char_u		*string;
+    int			offset = 0;
+    bool		is_vim, is_vimenc;
+    GTask		*task;
+    gboolean		have_mime = FALSE;
+
+    task = g_task_new (self, cancellable, callback, udata);
+    g_task_set_priority (task, io_priority);
+    g_task_set_source_tag (task, vim_content_provider_write_mime_type_async);
+
+    if (STRCMP(mime_type, "text/html") == 0 && !clip_html)
+    {
+	g_task_return_new_error(
+		task, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+		"HTML not supported");
+	g_object_unref(task);
+	return;
+    }
+
+    // Check if we actually support the mime type
+    for (int i = 0; i < (int)SUPPORTED_MIMES_LEN; i++)
+	if (STRCMP(supported_mimes[i], mime_type) == 0)
+	{
+	    have_mime = TRUE;
+	    break;
+	}
+
+    if (!have_mime)
+    {
+	g_task_return_new_error(
+		task, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+		"Cannot provide contents as '%s'", mime_type);
+	g_object_unref(task);
+	return;
+    }
+
+    // Add the required stuff for our own specific formats.
+    is_vimenc = STRCMP(mime_type, VIMENC_MIMETYPE_NAME) == 0;
+    is_vim = STRCMP(mime_type, VIM_MIMETYPE_NAME) == 0;
+
+    if (is_vimenc)
+	offset += 2 + STRLEN(p_enc);
+    else if (is_vim)
+	offset += 1;
+
+    clip_get_selection(cbd);
+    motion_type = clip_convert_selection_offset(&string, &length, offset, cbd);
+
+    if (motion_type < 0)
+    {
+	g_task_return_new_error(
+		task, G_IO_ERROR, G_IO_ERROR_FAILED, "Error converting data");
+	g_object_unref(task);
+	return;
+    }
+
+    if (is_vimenc)
+    {
+	string[0] = (char_u)motion_type;
+	// Use vim_strncpy for safer copying
+	vim_strncpy(string + 1, p_enc, STRLEN(p_enc));
+    }
+    else if (is_vim)
+	string[0] = (char_u)motion_type;
+
+    // "string" is allocated using vim's allocation functions
+    g_task_set_task_data(task, string, vim_free);
+
+    g_output_stream_write_all_async(
+	    stream, string, length, io_priority, cancellable,
+	    (GAsyncReadyCallback)vim_content_provider_write_mime_type_done, task);
+}
+
+    static gboolean
+vim_content_provider_write_mime_type_finish(
+	GdkContentProvider  *cp,
+	GAsyncResult	    *result,
+	GError		    **error)
+{
+  return g_task_propagate_boolean (G_TASK (result), error);
+}
diff --git a/src/gui_gtk4_cb.h b/src/gui_gtk4_cb.h
new file mode 100644
index 0000000000..d7f9ec5e55
--- /dev/null
+++ b/src/gui_gtk4_cb.h
@@ -0,0 +1,23 @@
+/* vi:set ts=8 sts=4 sw=4 noet:
+ *
+ * VIM - Vi IMproved		by Bram Moolenaar
+ *
+ * Do ":help uganda"  in Vim to read copying and usage conditions.
+ * Do ":help credits" in Vim to see a list of people who contributed.
+ * See README.txt for an overview of the Vim source code.
+ */
+
+#ifndef GUI_GTK4_CB_H
+#define GUI_GTK4_CB_H
+
+#include "vim.h"
+#include <gtk/gtk.h>
+
+#define VIM_TYPE_CONTENT_PROVIDER (vim_content_provider_get_type())
+G_DECLARE_FINAL_TYPE(VimContentProvider, vim_content_provider, VIM, CONTENT_PROVIDER, GdkContentProvider)
+
+extern const char *supported_mimes[];
+
+GdkContentProvider *vim_content_provider_new(Clipboard_T *cbd);
+
+#endif
diff --git a/src/gui_gtk4_da.c b/src/gui_gtk4_da.c
new file mode 100644
index 0000000000..34dad93a61
--- /dev/null
+++ b/src/gui_gtk4_da.c
@@ -0,0 +1,1600 @@
+/* vi:set ts=8 sts=4 sw=4 noet:
+ *
+ * VIM - Vi IMproved		by Bram Moolenaar
+ *
+ * Do ":help uganda"  in Vim to read copying and usage conditions.
+ * Do ":help credits" in Vim to see a list of people who contributed.
+ * See README.txt for an overview of the Vim source code.
+ */
+
+#include "vim.h"
+
+#ifdef USE_GTK4_SNAPSHOT
+
+#include <gtk/gtk.h>
+#include "gui_gtk4_da.h"
+
+#define DRAW_NODE_DIRTY 1   // Draw node is dirty
+#define DRAW_NODE_NOBG 2    // Don't create background node
+#define DRAW_NODE_NOINK 4   // Draw node has no ink
+#define DRAW_NODE_UNDER 8   // Has under decorations (for convenience)
+#define DRAW_NODE_CLIP 16   // Text node should be clipped to draw node bounds.
+
+typedef struct
+{
+    int refcount;
+
+    PangoGlyphInfo  *glyphs;
+    int		    n_glyphs;
+    char_u	    dnode_flags; // DRAW_NODE_* flags
+    GskRenderNode   *node;  // This is either a text node, or a container node
+			    // (if there is more than one node).
+
+    PangoFont	*font;
+    GdkRGBA	fg_color;
+    GdkRGBA	bg_color;
+    GdkRGBA	sp_color;
+    int		flags;	    // DRAW_* flags
+
+    int start_col;
+    int n_cells;
+} DrawNode;
+
+#define END_COL(dn) ((dn)->start_col + (dn)->n_cells - 1)
+#define HAS_INK(r) ((r)->width != 0 || (r)->height != 0)
+
+/*
+ * Each cell holds its own reference to a draw node if any. A draw node may span
+ * multiple cells, which represents how many cells it takes up on screen.
+ */
+typedef struct
+{
+    DrawNode	*dnode;	// May be NULL
+    gboolean	invert; // If this cell is inverted
+} DrawCell;
+
+#ifdef FEAT_IMAGE_GDK
+/*
+ * Struct containing information about an image. This is designed to map well
+ * with how Vim handles the kitty graphics protocol.
+ */
+typedef struct
+{
+    int id;
+    int zindex;
+    GskRenderNode *node; // Cached clip node, which has the texture node as its
+			 // child. May be NULL
+} DrawImage;
+#endif
+
+struct _VimDrawArea
+{
+    GtkWidget parent;
+
+    DrawCell	*cells; // May be NULL, always check!
+    int         n_rows;
+    int		n_cols;
+
+    int		resize_count;
+
+    // Used for hollow and part style cursors. For the block cursor, that is
+    // simply rendered as a cell using vim_draw_area_add_glyphs(). May be NULL.
+    GskRenderNode *cursor_node;
+
+#if defined(FEAT_SIGN_ICONS)
+    // Queue of sign icon render nodes. Icons at the end of the queue are drawn
+    // ontop of earlier ones.
+    GQueue *signs;
+#endif
+
+#ifdef FEAT_NETBEANS_INTG
+    // Cairo render node for multi sign indicator for Netbeans. May be NULL
+    GskRenderNode *multisign_node;
+#endif
+
+#ifdef FEAT_IMAGE_GDK
+    // Queue of DrawImage structs. Sorted in ascending order of zindex, so that
+    // images with a higher zindex are rendered over ones with lower zindex.
+    GQueue *images;
+#endif
+};
+
+#define GET_ROW(da, n) ((da)->cells + (da)->n_cols * (n))
+
+G_DEFINE_TYPE(VimDrawArea, vim_draw_area, GTK_TYPE_WIDGET)
+
+#ifdef FEAT_IMAGE_GDK
+static void draw_image_free(DrawImage *dimg);
+#endif
+static void vim_draw_area_snapshot(GtkWidget *widget, GtkSnapshot *snapshot);
+static void vim_draw_area_size_allocate(GtkWidget *widget, int width, int height, int baseline);
+
+    static void
+vim_draw_area_finalize(GObject *obj)
+{
+    VimDrawArea *self = VIM_DRAW_AREA(obj);
+
+    // "multisign_node" and "cursor_node" will be freed in
+    // vim_draw_area_clear_block().
+    vim_draw_area_clear(self);
+
+    g_free(self->cells);
+#ifdef FEAT_SIGN_ICONS
+    // vim_draw_area_clear_block() should have removed all the sign icons
+    assert(g_queue_is_empty(self->signs));
+    g_queue_free(self->signs);
+#endif
+#ifdef FEAT_IMAGE_GDK
+    g_queue_free_full(self->images, (GDestroyNotify)draw_image_free);
+#endif
+
+    G_OBJECT_CLASS(vim_draw_area_parent_class)->finalize(obj);
+}
+
+    static void
+vim_draw_area_class_init(VimDrawAreaClass *class)
+{
+    GtkWidgetClass  *widget_class = GTK_WIDGET_CLASS(class);
+    GObjectClass    *obj_class = G_OBJECT_CLASS(class);
+
+    widget_class->snapshot = vim_draw_area_snapshot;
+    widget_class->size_allocate = vim_draw_area_size_allocate;
+
+    obj_class->finalize = vim_draw_area_finalize;
+
+}
+
+    static void
+vim_draw_area_init(VimDrawArea *self)
+{
+#ifdef FEAT_SIGN_ICONS
+    self->signs = g_queue_new();
+#endif
+#ifdef FEAT_IMAGE_GDK
+    self->images = g_queue_new();
+#endif
+}
+
+    GtkWidget *
+vim_draw_area_new(void)
+{
+    return g_object_new(VIM_TYPE_DRAW_AREA, NULL);
+}
+
+/*
+ * Set the size of the draw area to "rows" and "cols".
+ */
+    void
+vim_draw_area_set_size(VimDrawArea *self, int rows, int cols)
+{
+    if (self->cells != NULL && self->n_rows == rows && self->n_cols == cols)
+	return;
+    if (rows == 0 || cols == 0)
+	return;
+
+    vim_draw_area_clear(self);
+
+    self->n_rows = rows;
+    self->n_cols = cols;
+    self->cells = g_realloc_n(self->cells, rows * cols, sizeof(DrawCell));
+    memset(self->cells, 0, rows * (sizeof(DrawCell) * cols));
+    self->resize_count++;
+}
+
+    static void
+node_unref(GskRenderNode *node)
+{
+    if (node != NULL)
+	gsk_render_node_unref(node);
+}
+
+/*
+ * Return TRUE if "glyphs" take up space (not entirely whitespace).
+ */
+    static gboolean
+glyphs_has_ink(PangoFont *font, const PangoGlyphInfo *glyphs, int n_glyphs)
+{
+    for (int i = 0; i < n_glyphs; i++)
+    {
+	PangoRectangle glyph_ink;
+
+	pango_font_get_glyph_extents (font, glyphs[i].glyph, &glyph_ink, NULL);
+
+	if (HAS_INK(&glyph_ink))
+	    return TRUE;
+    }
+    return FALSE;
+}
+
+/*
+ * Realloc "glyphs" to "n_glyphs" and return the new reallocated pointer.
+ */
+    static PangoGlyphInfo *
+glyphs_resize(PangoGlyphInfo *glyphs, int n_glyphs)
+{
+    return g_realloc_n(glyphs, n_glyphs, sizeof(PangoGlyphInfo));
+}
+
+/*
+ * Return TRUE if "bg" is the same as the default background color.
+ */
+    static gboolean
+color_is_default_bg(const GdkRGBA *bg)
+{
+    guicolor_T bgc = ((guicolor_T)(bg->red * 255) << 16)
+	| ((guicolor_T)(bg->green * 255) << 8)
+	|  (guicolor_T)(bg->blue * 255);
+    return bgc == gui.back_pixel;
+}
+
+/*
+ * Convert the given cell offset into an index in the "glyphs" array.
+ */
+    static int
+cell_offset_to_glyph(const PangoGlyphInfo *glyphs, int n_glyphs, int cell_offset)
+{
+    int cells_seen = 0;
+
+    for (int i = 0; i < n_glyphs; i++)
+    {
+	const PangoGlyphInfo *glyph = glyphs + i;
+
+	if (cells_seen >= cell_offset)
+	    return i;
+
+	cells_seen += glyph->geometry.width / (gui.char_width * PANGO_SCALE);
+    }
+    return n_glyphs;
+}
+
+/*
+ * Create a new under decoration node with the given flags. Returns NULL if no
+ * under decorations are needed.
+ */
+    static GskRenderNode *
+create_under_decor_node(
+	int		row,
+	int		start_col,
+	int		n_cells,
+	int		flags,
+	const GdkRGBA	*fg_color,
+	const GdkRGBA   *sp_color)
+{
+    GskRenderNode   *nodes[3];
+    int		    n_nodes = 0;
+    GskRenderNode   *container;
+
+    if (flags & DRAW_UNDERL)
+	nodes[n_nodes++] = gsk_color_node_new(fg_color,
+		&GRAPHENE_RECT_INIT(FILL_X(start_col),
+		    FILL_Y(row + 1) - 1,
+		    FILL_X(start_col + n_cells) - FILL_X(start_col), 1));
+
+    if (flags & DRAW_STRIKE)
+	nodes[n_nodes++] = gsk_color_node_new(fg_color,
+		&GRAPHENE_RECT_INIT(FILL_X(start_col),
+		    FILL_Y(row) + (int)(gui.char_height / 2),
+		    FILL_X(start_col + n_cells) - FILL_X(start_col), 1));
+
+    if (flags & DRAW_UNDERC)
+    {
+	int             y = FILL_Y(row + 1) - 1; // Top of underneath line,
+						 // upwards by one pixel.
+	int             x_start = FILL_X(start_col);
+	int             x_end = FILL_X(start_col + n_cells);
+
+	// GskPath was added in GSK 4.14, otherwise use cairo
+#if GTK_CHECK_VERSION(4, 14, 0)
+	GskPathBuilder	*builder;
+	GskPath		*path;
+	GskStroke	*stroke;
+	GskRenderNode	*color_node;
+	graphene_rect_t bounds;
+
+	const int	half_wave = 4;  // Half-cycle width (e.g., 4px up, 4px
+					// down)
+	const int	amplitude = 2;	// Peak height from baseline
+	int		toggle = -1;    // Start by pulling up (-Y is up in GTK)
+
+	builder = gsk_path_builder_new();
+	gsk_path_builder_move_to(builder, x_start, y);
+
+	// Each cycle contains two quadratic bezier curves, one going up and one
+	// going down.
+	for (int x = x_start; x < x_end; x += half_wave)
+	{
+	    int current_half = half_wave;
+	    if (x + current_half > x_end)
+	    {
+		current_half = x_end - x;
+	    }
+
+	    // The control point sits exactly halfway horizontally through the arc
+	    int cp_x = x + (current_half / 2);
+	    int cp_y = y + (toggle * amplitude);
+	    int end_x = x + current_half;
+
+	    gsk_path_builder_quad_to(builder, cp_x, cp_y, end_x, y);
+
+	    toggle = -toggle; // Flip direction for the next half-wave
+	}
+
+	path = gsk_path_builder_free_to_path(builder);
+	stroke = gsk_stroke_new(1.0f);
+
+	gsk_path_get_stroke_bounds (path, stroke, &bounds);
+	color_node = gsk_color_node_new(sp_color, &bounds);
+
+	nodes[n_nodes++] = gsk_stroke_node_new(color_node, path, stroke);
+	gsk_stroke_free(stroke);
+	gsk_path_unref(path);
+	gsk_render_node_unref(color_node);
+#else
+	static const int    val[8] = {1, 0, 0, 0, 1, 2, 2, 2};
+	cairo_t		    *cr;
+	GskRenderNode	    *node;
+
+	node = gsk_cairo_node_new(
+		&GRAPHENE_RECT_INIT(x_start, y - 3, x_end - x_start, 5));
+	cr = gsk_cairo_node_get_draw_context(node);
+
+	cairo_set_line_width(cr, 1.0);
+	cairo_set_source_rgba(cr, sp_color->red, sp_color->green,
+		sp_color->blue, sp_color->alpha);
+
+	cairo_move_to(cr, x_start + 1, y - 2 + 0.5);
+
+	for (int i = x_start + 1; i < x_end; ++i)
+	{
+	    int offset = val[i % 8];
+	    cairo_line_to(cr, i, y - offset + 0.5);
+	}
+
+	cairo_stroke(cr);
+	cairo_destroy(cr);
+	nodes[n_nodes++] = node;
+#endif
+    }
+
+    if (n_nodes == 0)
+	return NULL;
+    if (n_nodes == 1)
+	return nodes[0];
+
+    container = gsk_container_node_new(nodes, n_nodes);
+    for (int i = 0; i < n_nodes; i++)
+	// Container node takes its own reference to each.
+	gsk_render_node_unref(nodes[i]);
+    return container;
+}
+
+/*
+ * Create a new draw node with a reference count of 1. Note that this may be
+ * NULL if creating a new draw node is not necessary.
+ */
+    static DrawNode *
+draw_node_new(
+	PangoFont		*font,
+	const PangoGlyphInfo	*glyphs,
+	int			n_glyphs,
+	const GdkRGBA		*bg_color,
+	const GdkRGBA		*fg_color,
+	const GdkRGBA		*sp_color,
+	int			flags,
+	int			start_col,
+	int			n_cells)
+{
+    DrawNode	*dnode;
+    gboolean	has_ink = glyphs_has_ink(font, glyphs, n_glyphs);
+    gboolean	is_def_bg = color_is_default_bg(bg_color);
+    gboolean	has_under = flags & (DRAW_UNDERL | DRAW_UNDERC | DRAW_STRIKE);
+
+    // If there is no ink to be displayed, and the background color is the same
+    // as the default background color (the color that will be displayed behind
+    // everything), then there is no point in creating a new draw node.
+    if (!has_ink && !has_under && (flags & DRAW_TRANSP || is_def_bg))
+	return NULL;
+
+    dnode = g_new0(DrawNode, 1);
+
+    dnode->refcount = 1;
+
+    dnode->glyphs = g_memdup2(glyphs, sizeof(PangoGlyphInfo) * n_glyphs);
+    dnode->n_glyphs = n_glyphs;
+    dnode->dnode_flags |= DRAW_NODE_DIRTY;
+    if (is_def_bg || flags & DRAW_TRANSP)
+	dnode->dnode_flags |= DRAW_NODE_NOBG;
+    if (!has_ink)
+	dnode->dnode_flags |= DRAW_NODE_NOINK;
+    if (has_under)
+	dnode->dnode_flags |= DRAW_NODE_UNDER;
+
+    dnode->font = g_object_ref(font);
+    dnode->bg_color = *bg_color;
+    dnode->fg_color = *fg_color;
+    dnode->sp_color = *sp_color;
+    dnode->flags = flags;
+
+    dnode->start_col = start_col;
+    dnode->n_cells = n_cells;
+
+    return dnode;
+}
+
+    static DrawNode *
+draw_node_ref(DrawNode *dnode)
+{
+    dnode->refcount++;
+    return dnode;
+}
+
+    static void
+draw_node_unref(DrawNode *dnode)
+{
+    if (dnode != NULL && --dnode->refcount <= 0)
+    {
+	g_free(dnode->glyphs);
+	node_unref(dnode->node);
+	g_object_unref(dnode->font);
+	g_free(dnode);
+    }
+}
+
+/*
+ * Dirty the draw node. This will remove the render node if any, and mark it to
+ * have a new render node created for it on the next snapshot vfunc call.
+ * Returns TRUE if draw node is not necessary anymore.
+ */
+    static gboolean
+draw_node_make_dirty(DrawNode *dnode)
+{
+    int flags = dnode->dnode_flags;
+
+    g_clear_pointer(&dnode->node, gsk_render_node_unref);
+    dnode->dnode_flags |= DRAW_NODE_DIRTY;
+
+    return (flags & DRAW_NODE_NOINK) && !(flags & (DRAW_NODE_UNDER))
+	&& flags & DRAW_NODE_NOBG;
+}
+
+    static DrawNode *
+draw_node_copy(DrawNode *dnode)
+{
+    DrawNode *copy = draw_node_new(
+	    dnode->font, dnode->glyphs, dnode->n_glyphs,
+	    &dnode->bg_color, &dnode->fg_color, &dnode->sp_color,
+	    dnode->flags, dnode->start_col, dnode->n_cells
+	    );
+
+    // "copy" should never be NULL, so we don't need to check for NULL.
+    if (unlikely(dnode->dnode_flags & DRAW_NODE_CLIP))
+	copy->dnode_flags |= DRAW_NODE_CLIP;
+
+    return copy;
+}
+
+/*
+ * Split the draw node at the given cell offset in place (exclusive). If
+ * "keep_left" is TRUE, then keep the left halve (discard right halve), and vice
+ * versa. This will dirty the draw node.
+ *
+ * Returns TRUE if the new split draw node is not necessary anymore (see
+ * draw_node_new()), otherwise FALSE.
+ */
+    static gboolean
+draw_node_split(DrawNode *dnode, int cell_offset, gboolean keep_left)
+{
+    int		glyph_offset;
+    gboolean	split = TRUE;
+    gboolean	clip = FALSE;
+
+    glyph_offset = cell_offset_to_glyph(dnode->glyphs,
+	    dnode->n_glyphs, cell_offset);
+
+    // Some fonts emulate ligatures by having spacer glyphs followed by a glyph
+    // that contains all the ink. If we tried splitting this type of ligature,
+    // then one side will incorrectly be empty.
+    //
+    // To handle this case, always clip the draw node so that the extra ink does
+    // not bleed out. If we are keeping the left side, then do not split,
+    // because we want to keep the glyph with all the ink. If we are keeping the
+    // right side, then we can split because the glyph with the ink will be on
+    // the right side always anyways.
+    for (int i = glyph_offset; i < dnode->n_glyphs; i++)
+    {
+	PangoRectangle ink;
+
+	pango_font_get_glyph_extents(dnode->font, dnode->glyphs[i].glyph,
+		&ink, NULL);
+
+	if (HAS_INK(&ink))
+	{
+	    if (ink.x < 0)
+	    {
+		split = !keep_left;
+		clip = TRUE;
+	    }
+	    break;
+	}
+    }
+
+    if (unlikely(clip))
+	dnode->dnode_flags |= DRAW_NODE_CLIP;
+
+    if (keep_left)
+    {
+	if (likely(split))
+	    dnode->n_glyphs = glyph_offset;
+	dnode->n_cells = cell_offset;
+    }
+    else
+    {
+	if (likely(split))
+	{
+	    // If this results in zero, then glyphs_has_ink() will return FALSE
+	    // so it is fine.
+	    dnode->n_glyphs -= glyph_offset;
+	    // Shift glyphs after offset to beginning
+	    memmove(dnode->glyphs, dnode->glyphs + glyph_offset,
+		    sizeof(PangoGlyphInfo) * dnode->n_glyphs);
+	}
+
+	dnode->n_cells -= cell_offset;
+	dnode->start_col += cell_offset;
+    }
+
+    if (likely(split))
+    {
+	dnode->glyphs = glyphs_resize(dnode->glyphs, dnode->n_glyphs);
+
+	// Recheck if new split glyphs has ink
+	if (glyphs_has_ink(dnode->font, dnode->glyphs, dnode->n_glyphs))
+	    dnode->dnode_flags &= ~DRAW_NODE_NOINK;
+	else
+	    dnode->dnode_flags |= DRAW_NODE_NOINK;
+    }
+
+    return draw_node_make_dirty(dnode);
+}
+
+/*
+ * If "dnode" is dirty, create a new render node for it at the given row and
+ * store it, then undirty it.
+ */
+    static void
+draw_node_render(DrawNode *dnode, int row, VimDrawArea *da)
+{
+    GskRenderNode	*nodes[3];
+    int			n_nodes = 0;
+    GskRenderNode	*decor_node;
+
+    if (!(dnode->dnode_flags & DRAW_NODE_DIRTY))
+	return;
+
+    if (!(dnode->dnode_flags & DRAW_NODE_NOBG))
+    {
+	int width = dnode->n_cells * gui.char_width;
+	int bleed = gtk_widget_get_width(GTK_WIDGET(da)) - FILL_X(da->n_cols);
+
+	// If this draw node touches the end of the draw area. Bleed its
+	// background to the right if the space the draw area covers is slightly
+	// bigger than its actual visible area (that all cells cover). This just
+	// makes things like status bars look a bit nicer
+	if (END_COL(dnode) == da->n_cols - 1 && bleed > 0)
+	    width += bleed;
+
+	nodes[n_nodes++] = gsk_color_node_new(&dnode->bg_color,
+		&GRAPHENE_RECT_INIT(FILL_X(dnode->start_col), FILL_Y(row),
+		    width, gui.char_height));
+    }
+
+    if (!(dnode->dnode_flags & DRAW_NODE_NOINK))
+    {
+	GskRenderNode	    *text_node;
+	PangoGlyphString    glyphs_str;
+
+	// gsk_text_node_new() only uses the "glyphs" field, don't need to worry
+	// about the "log_clusters" array.
+	glyphs_str.glyphs = dnode->glyphs;
+	glyphs_str.num_glyphs = dnode->n_glyphs;
+	text_node = gsk_text_node_new(dnode->font, &glyphs_str, &dnode->fg_color,
+		&GRAPHENE_POINT_INIT(TEXT_X(dnode->start_col), TEXT_Y(row)));
+	// Should never be NULL since we check beforehand if there is ink.
+	assert(text_node != NULL);
+
+	if (dnode->dnode_flags & DRAW_NODE_CLIP)
+	{
+	    GskRenderNode *old = text_node;
+
+	    text_node = gsk_clip_node_new(text_node,
+		    &GRAPHENE_RECT_INIT(FILL_X(dnode->start_col), FILL_Y(row),
+			dnode->n_cells * gui.char_width, gui.char_height));
+	    gsk_render_node_unref(old);
+	    assert(text_node != NULL);
+	}
+
+	nodes[n_nodes++] = text_node;
+    }
+
+    decor_node = create_under_decor_node(row, dnode->start_col, dnode->n_cells,
+	    dnode->flags, &dnode->fg_color, &dnode->sp_color);
+    if (decor_node != NULL)
+	nodes[n_nodes++] = decor_node;
+
+    // Should never be zero
+    assert(n_nodes > 0);
+
+    if (likely(n_nodes == 1))
+	dnode->node = nodes[0];
+    else
+    {
+	dnode->node = gsk_container_node_new(nodes, n_nodes);
+	// gsk_container_node_new() takes its own reference
+	for (int i = 0; i < n_nodes; i++)
+	    gsk_render_node_unref(nodes[i]);
+    }
+
+    dnode->dnode_flags &= ~DRAW_NODE_DIRTY;
+}
+
+/*
+ * Returns true if "dnode" matches "font" + "flags" in terms of
+ * color/visual attributes.
+ */
+    static gboolean
+draw_node_match(DrawNode *dnode, PangoFont *font, int flags)
+{
+    if (dnode->flags != flags)
+	return FALSE;
+
+    if (!(flags & DRAW_TRANSP)
+	    && !gdk_rgba_equal(&dnode->bg_color, gui.bgcolor))
+	return FALSE;
+
+    if (!gdk_rgba_equal(&dnode->fg_color, gui.fgcolor))
+	return FALSE;
+
+    // Special color is only used for undercurls
+    if (flags & DRAW_UNDERC && !gdk_rgba_equal(&dnode->sp_color, gui.spcolor))
+	return FALSE;
+
+    // This may not work all the time, but creating two PangoFontDescription
+    // each time to compare equality seems slow...
+    return dnode->font == font;
+}
+
+/*
+ * Append or prepend the given glyphs to the draw node. If "start" is TRUE, then
+ * prepend, otherwise append. This will invalidate the draw node. Note that
+ * prepending does not update "start_col" or "n_cells".
+ */
+    static void
+draw_node_extend(
+	DrawNode		*dnode,
+	const PangoGlyphInfo	*glyphs,
+	int			n_glyphs,
+	bool			start)
+{
+    dnode->glyphs = glyphs_resize(dnode->glyphs, dnode->n_glyphs + n_glyphs);
+
+    if (start)
+    {
+	// Move the existing glyphs forward first
+	memmove(dnode->glyphs + n_glyphs, dnode->glyphs,
+		dnode->n_glyphs * sizeof(PangoGlyphInfo));
+	memcpy(dnode->glyphs, glyphs, n_glyphs * sizeof(PangoGlyphInfo));
+    }
+    else
+	memcpy(dnode->glyphs + dnode->n_glyphs, glyphs,
+		n_glyphs * sizeof(PangoGlyphInfo));
+
+    dnode->n_glyphs += n_glyphs;
+
+    if (glyphs_has_ink(dnode->font, dnode->glyphs, dnode->n_glyphs))
+	dnode->dnode_flags &= ~DRAW_NODE_NOINK;
+    else
+	dnode->dnode_flags |= DRAW_NODE_NOINK;
+    (void)draw_node_make_dirty(dnode);
+}
+
+/*
+ * Set the given cell to the draw node (which may be NULL), adding a new
+ * reference to it.
+ */
+    static void
+draw_cell_set(DrawCell *dcell, DrawNode *dnode)
+{
+    draw_node_unref(dcell->dnode);
+    dcell->dnode = dnode == NULL ? NULL : draw_node_ref(dnode);
+    dcell->invert = FALSE;
+}
+
+/*
+ * Set the cells between "col1" and "col2" (inclusive) to "dnode" (which may be
+ * NULL).
+ */
+    static void
+draw_row_fill(DrawCell *drow, int col1, int col2, DrawNode *dnode)
+{
+    for (int c = col1; c <= col2; c++)
+	draw_cell_set(drow + c, dnode);
+}
+
+/*
+ * Same as draw_row_fill(), but also handle truncating/splitting any draw nodes
+ * that overlap onto the set region. If "split" is TRUE, then only
+ * truncating/splitting is done.
+ *
+ * If "copy" is TRUE, then "dnode" is ignored and instead any draw nodes in the
+ * region that overlap outside of it are copied and clipped in addition to
+ * truncating draw nodes outside the region.
+ */
+    static void
+draw_row_set(
+	DrawCell    *drow,
+	int	    col1,
+	int	    col2,
+	DrawNode    *dnode,
+	gboolean    copy,
+	gboolean    split)
+{
+    DrawNode	*ldnode = drow[col1].dnode;
+    DrawNode	*rdnode = drow[col2].dnode;
+    DrawNode	*new_dnode = NULL;
+
+    if (ldnode != NULL && ldnode == rdnode
+	    && (ldnode->start_col != col1 || END_COL(ldnode) > col2))
+    {
+	// Region in completely inside a single draw node. Truncate the existing
+	// draw node, and create a new draw node to be used as the right split.
+	if (END_COL(ldnode) > col2)
+	{
+	    rdnode = draw_node_copy(ldnode);
+	    draw_row_fill(drow, col2 + 1, END_COL(rdnode), rdnode);
+	    draw_node_unref(rdnode);
+	}
+	else
+	    // "ldnode" does not extend past "col2", no point in creating a new
+	    // draw node on the right.
+	    rdnode = NULL;
+
+	if (copy)
+	    // Make another copy for the new draw node inside the set region.
+	    // Must fill it in the row after, since "ldnode" may be unreferenced
+	    // fully.
+	    new_dnode = draw_node_copy(ldnode);
+    }
+
+    if (ldnode != NULL && ldnode->start_col != col1)
+    {
+	if (copy && new_dnode == NULL)
+	{
+	    // Make a copy for the right halve.
+	    DrawNode *new_right = draw_node_copy(ldnode);
+
+	    if (draw_node_split(new_right,  col1 - ldnode->start_col, FALSE))
+		g_clear_pointer(&new_right, draw_node_unref);
+	    draw_row_fill(drow, col1, END_COL(ldnode), new_right);
+	    draw_node_unref(new_right);
+	}
+
+	// Leftmost draw node overlaps onto region, split it and discard right
+	// halve.
+	if (draw_node_split(ldnode, col1 - ldnode->start_col, TRUE))
+	    // Draw node is not necessary anymore, clear it from the row.
+	    draw_row_fill(drow, ldnode->start_col, col1 - 1, NULL);
+    }
+    if (rdnode != NULL && END_COL(rdnode) > col2)
+    {
+	if (copy && new_dnode == NULL)
+	{
+	    // Make a copy for the left halve.
+	    DrawNode *new_left = draw_node_copy(rdnode);
+
+	    if (draw_node_split(new_left,  col2 - rdnode->start_col + 1, TRUE))
+		g_clear_pointer(&new_left, draw_node_unref);
+	    draw_row_fill(drow, rdnode->start_col, col2, new_left);
+	    draw_node_unref(new_left);
+	}
+
+	// Rightmost draw node overlaps onto region, split it and discard left
+	// halve.
+	if (draw_node_split(rdnode, col2 - rdnode->start_col + 1, FALSE))
+	    draw_row_fill(drow, col2 + 1, END_COL(rdnode), NULL);
+    }
+
+    if (copy)
+    {
+	if (new_dnode != NULL)
+	{
+	    if (draw_node_split(new_dnode, col1 - new_dnode->start_col, FALSE)
+		    || draw_node_split(new_dnode,
+			col2 - new_dnode->start_col + 1, TRUE))
+		g_clear_pointer(&new_dnode, draw_node_unref);
+
+	    draw_row_fill(drow, col1, col2, new_dnode);
+	    draw_node_unref(new_dnode);
+	}
+    }
+    else if (!split)
+	draw_row_fill(drow, col1, col2, dnode);
+}
+
+/*
+ * Move the cells between "col1" and "col2" from "src" to "dest", overwriting
+ * the existing cells. This will handle clipping any draw nodes.
+ */
+    static void
+draw_row_move_to(DrawCell *dest_row, DrawCell *src_row, int col1, int col2)
+{
+    int move_size = (col2 - col1 + 1) * sizeof(DrawCell);
+
+    // Make sure that we free/truncate any draw nodes before we overwrite
+    // them.
+    draw_row_set(dest_row, col1, col2, NULL, FALSE, FALSE);
+
+    // Make sure that draw nodes at the "col1" and "col2" of "src_row" are
+    // clipped so that they all fit in the region being moved.
+    draw_row_set(src_row, col1, col2, NULL, TRUE, FALSE);
+
+    memmove(dest_row + col1, src_row + col1, move_size);
+
+    // Dirty the moved cells
+    for (int c = col1; c <= col2;)
+	if (dest_row[c].dnode != NULL)
+	{
+	    (void)draw_node_make_dirty(dest_row[c].dnode);
+	    c += dest_row[c].dnode->n_cells;
+	}
+	else
+	    c++;
+
+    // NULL the draw nodes so we don't double unreference.
+    memset(src_row + col1, 0, (col2 - col1 + 1) * sizeof(DrawCell));
+}
+
+/*
+ * Should be called after modifying draw nodes within the given region.
+ */
+static void
+vim_draw_area_check_bounds(
+	VimDrawArea *self,
+	int	    row1,
+	int	    row2,
+	int	    col1,
+	int	    col2)
+{
+#if defined(FEAT_SIGN_ICONS) || defined(FEAT_NETBEANS_INTG)
+    graphene_rect_t bounds = GRAPHENE_RECT_INIT(
+	    FILL_X(col1), FILL_Y(row1),
+	    gui.char_width * (col2 - col1 + 1),
+	    gui.char_height * (row2 - row1 + 1));
+#endif
+
+    if (self->cursor_node != NULL)
+	// Check if cursor node is within the the updated region. If so, then
+	// remove the render node. This only applies to the part and hollow
+	// cursor, the block cursor will be cleared in draw_row_make_space().
+	if (gui.row >= row1 && gui.row <= row2
+		&& gui.col >= col1 && gui.col <= col2)
+	    g_clear_pointer(&self->cursor_node, gsk_render_node_unref);
+
+#ifdef FEAT_SIGN_ICONS
+    // Clear any sign icons within the modified block if any
+    for (GList *s = self->signs->head; s != NULL;)
+    {
+	GList		*next = s->next;
+	graphene_rect_t rect;
+
+	gsk_render_node_get_bounds(s->data, &rect);
+
+	if (graphene_rect_contains_rect(&bounds, &rect))
+	{
+	    // Keep going in case there are multiple sign icons within this
+	    // block.
+	    gsk_render_node_unref(s->data);
+	    g_queue_delete_link(self->signs, s);
+	}
+	s = next;
+    }
+#endif
+#ifdef FEAT_NETBEANS_INTG
+    // Remove multi sign indicator if it is within the modified region.
+    if (self->multisign_node != NULL)
+    {
+	graphene_rect_t rect;
+
+	gsk_render_node_get_bounds(self->multisign_node, &rect);
+	if (graphene_rect_contains_rect(&bounds, &rect))
+	    g_clear_pointer(&self->multisign_node, gsk_render_node_unref);
+    }
+#endif
+}
+
+/*
+ * Add the glyph string starting at column "col" in row "row". This will handle
+ * any background colours, fake bold, and under decorations. This does not queue
+ * a redraw for the widget.
+ */
+    void
+vim_draw_area_add_glyphs(
+	VimDrawArea *self,
+	int row,
+	int col,
+	int num_cells,
+	int flags,
+	PangoFont *font,
+	PangoGlyphString *glyphs)
+{
+    DrawCell	*drow;
+    DrawNode	*dnode = NULL;
+    int		end_col = col + num_cells - 1;
+
+    if (unlikely(self->cells == NULL
+		|| row >= self->n_rows
+		|| col >= self->n_cols
+		|| col + num_cells > self->n_cols))
+	return;
+
+    drow = GET_ROW(self, row);
+
+    draw_row_set(drow, col, end_col, NULL, FALSE, TRUE);
+
+    // Check if leftmost draw node (if any) has the same visual
+    // attributes/colours as the glyph string being added. If so, then just
+    // extend that draw node with the new glyphs.
+    if (col > 0)
+    {
+	DrawNode *ldnode = drow[col - 1].dnode;
+
+	// Don't want to try merging draw nodes that are clipped, because the
+	// glyphs in them may not match one to one with the actual bounds of the
+	// draw node.
+	if (ldnode != NULL && !(ldnode->dnode_flags & DRAW_NODE_CLIP)
+		&& draw_node_match(ldnode, font, flags))
+	{
+	    draw_node_extend(ldnode, glyphs->glyphs, glyphs->num_glyphs, FALSE);
+	    draw_row_fill(drow, col, end_col, ldnode);
+	    ldnode->n_cells += num_cells;
+	    dnode = ldnode;
+	}
+    }
+
+    // Check if we can use the existing draw node on the right. If so, then shift
+    // "rdnode" to the "col", and extend it. If we merged the left draw node, then
+    // instead extend it normally and unreference the right draw node.
+    if (col + num_cells < self->n_cols)
+    {
+	DrawNode *rdnode = drow[col + num_cells].dnode;
+
+	if (rdnode != NULL && !(rdnode->dnode_flags & DRAW_NODE_CLIP)
+		&& draw_node_match(rdnode, font, flags))
+	{
+	    if (dnode != NULL)
+	    {
+		assert(rdnode->start_col == col + num_cells);
+		draw_node_extend(dnode, rdnode->glyphs, rdnode->n_glyphs, FALSE);
+		dnode->n_cells += rdnode->n_cells;
+		draw_row_fill(drow, rdnode->start_col, END_COL(rdnode), dnode);
+	    }
+	    else
+	    {
+		draw_node_extend(rdnode, glyphs->glyphs, glyphs->num_glyphs, TRUE);
+		draw_row_fill(drow, col, end_col, rdnode);
+		rdnode->start_col = col;
+		rdnode->n_cells += num_cells;
+		dnode = rdnode;
+	    }
+	}
+    }
+
+    if (dnode != NULL)
+	return;
+
+    dnode = draw_node_new(
+	    font, glyphs->glyphs, glyphs->num_glyphs, gui.bgcolor,
+	    gui.fgcolor, gui.spcolor, flags, col, num_cells
+	    );
+    draw_row_fill(drow, col, end_col, dnode);
+    draw_node_unref(dnode);
+
+    vim_draw_area_check_bounds(self, row, row, col, col + num_cells - 1);
+}
+
+/*
+ * Clear out the block with the given bounds (inclusive).
+ */
+    void
+vim_draw_area_clear_block(
+	VimDrawArea	*self,
+	int		row1,
+	int		col1,
+	int		row2,
+	int		col2)
+{
+    if (unlikely(self->cells == NULL
+		|| row1 >= self->n_rows
+		|| col1 >= self->n_cols
+		|| row2 >= self->n_rows
+		|| col2 >= self->n_cols))
+	return;
+
+    for (int r = row1; r <= row2; r++)
+	draw_row_set(GET_ROW(self, r), col1, col2, NULL, FALSE, FALSE);
+
+    vim_draw_area_check_bounds(self, row1, row2, col1, col2);
+}
+
+/*
+ * Clear out the entire draw area
+ */
+    void
+vim_draw_area_clear(VimDrawArea *self)
+{
+    vim_draw_area_clear_block(self, 0, 0, self->n_rows - 1, self->n_cols - 1);
+}
+
+/*
+ * Move the given rows between "row1" and "row2", within the column "col1" and
+ * "col2" (making a rectangle region), to the row "to". The previous region that
+ * was moved is cleared.
+ */
+    void
+vim_draw_area_move_block(
+	VimDrawArea *self,
+	int	    to,
+	int	    row1,
+	int	    row2,
+	int	    col1,
+	int	    col2)
+{
+
+    int		    offset = row2 - row1;
+#if defined(FEAT_SIGN_ICONS) || defined(FEAT_NETBEANS_INTG)
+    graphene_rect_t bounds = GRAPHENE_RECT_INIT(
+	    FILL_X(col1), FILL_Y(row1),
+	    gui.char_width * (col2 - col1 + 1),
+	    gui.char_height * (row2 - row1 + 1));
+    graphene_rect_t clear_rect;
+#endif
+
+    if (unlikely(self->cells == NULL
+		|| row1 >= self->n_rows
+		|| row2 >= self->n_rows
+		|| to >= self->n_rows
+		|| col1 >= self->n_cols
+		|| col2 >= self->n_cols))
+	return;
+
+    assert(row2 >= row1);
+    assert(col2 >= col1);
+    assert(row1 != to);
+
+    if (row1 > to)
+    {
+	// "row1" is below "to", start moving rows starting at "row1". Rows are
+	// being shifted upwards.
+	for (int o = 0; o <= offset; o++)
+	    draw_row_move_to(GET_ROW(self, to + o), GET_ROW(self, row1 + o),
+		    col1, col2);
+    }
+    else
+    {
+	// "row1" is above "to", must start moving rows starting at "row2". Rows
+	// are being shifted downwards.
+	for (int o = offset; o >= 0; o--)
+	    if (to + o >= self->n_rows)
+		// "src_row" is being "moved" off the screen, no need to move
+		// it physically.
+		gui_clear_block(row1 + o, col1, row1 + o, col2);
+	    else
+		draw_row_move_to(GET_ROW(self, to + o), GET_ROW(self, row1 + o),
+			col1, col2);
+    }
+
+    // Do not call vim_draw_area_check_bounds(), because we moved cells, not
+    // modified them.
+
+#if defined(FEAT_SIGN_ICONS) || defined(FEAT_NETBEANS_INTG)
+    if (row1 > to)
+	clear_rect = GRAPHENE_RECT_INIT(
+		FILL_X(col1), FILL_Y(to),
+		gui.char_width * (col2 - col1 + 1),
+		gui.char_height * (row1 - to));
+    else
+	clear_rect = GRAPHENE_RECT_INIT(
+		FILL_X(col1), FILL_Y(row2 + 1),
+		gui.char_width * (col2 - col1 + 1),
+		gui.char_height * (to - row1));
+#endif
+
+#ifdef FEAT_SIGN_ICONS
+    // Move sign icons if they are in the moved region
+    for (GList *s = self->signs->head; s != NULL;)
+    {
+	GList           *next = s->next;
+	GskRenderNode   *node = s->data;
+	graphene_rect_t  rect;
+
+	gsk_render_node_get_bounds(node, &rect);
+
+	// Check if icon moved off screen, if so then remove it.
+	if (graphene_rect_contains_rect(&clear_rect, &rect))
+	{
+	    gsk_render_node_unref(s->data);
+	    g_queue_delete_link(self->signs, s);
+	    s = next;
+	    continue;
+	}
+
+	if (graphene_rect_contains_rect(&bounds, &rect))
+	{
+	    GdkTexture    *texture;
+	    GskRenderNode *new;
+	    float          new_y;
+
+	    texture = gsk_texture_scale_node_get_texture(node);
+	    new_y = graphene_rect_get_y(&rect) - graphene_rect_get_y(&bounds);
+	    new_y += FILL_Y(to);
+
+	    if (new_y >= 0 && new_y < gtk_widget_get_height(GTK_WIDGET(self)))
+	    {
+		rect.origin.y = new_y;
+		new = gsk_texture_scale_node_new(texture, &rect,
+			GSK_SCALING_FILTER_TRILINEAR);
+		gsk_render_node_unref(node);
+		s->data = new;
+	    }
+	    else
+	    {
+		gsk_render_node_unref(s->data);
+		g_queue_delete_link(self->signs, s);
+	    }
+	}
+	s = next;
+    }
+#endif
+#ifdef FEAT_NETBEANS_INTG
+    // Move multisign indicator node if needed
+    if (self->multisign_node != NULL)
+    {
+	graphene_rect_t rect;
+
+	gsk_render_node_get_bounds(self->multisign_node, &rect);
+
+	if (graphene_rect_contains_rect(&clear_rect, &rect))
+	    g_clear_pointer(&self->multisign_node, gsk_render_node_unref);
+	else if (graphene_rect_contains_rect(&bounds, &rect))
+	{
+	    float new_y =
+		graphene_rect_get_y(&rect) - graphene_rect_get_y(&bounds);
+
+	    new_y += FILL_Y(to);
+
+	    if (new_y >= 0 && new_y < gtk_widget_get_height(GTK_WIDGET(self)))
+	    {
+		cairo_surface_t *surface;
+		GskRenderNode   *new;
+		cairo_t         *cr;
+
+		surface = gsk_cairo_node_get_surface(self->multisign_node);
+		rect.origin.y = new_y;
+		new = gsk_cairo_node_new(&rect);
+		cr = gsk_cairo_node_get_draw_context(new);
+		cairo_set_source_surface(cr, surface, 0, 0);
+		cairo_paint(cr);
+		cairo_destroy(cr);
+
+		gsk_render_node_unref(self->multisign_node);
+		self->multisign_node = new;
+	    }
+	    else
+		g_clear_pointer(&self->multisign_node, gsk_render_node_unref);
+	}
+    }
+#endif
+}
+
+/*
+ * Draw a hollow cursor at the cursor position using the current foreground
+ * color. Note that this does not queue a redraw
+ */
+    void
+vim_draw_area_set_hollow_cursor(VimDrawArea *self)
+{
+    GskRoundedRect	outline;
+    int			i = 1;
+    static const float	border[4] = {1.0f, 1.0f, 1.0f, 1.0f};
+    const GdkRGBA color[4] = {
+	*gui.fgcolor, *gui.fgcolor,
+	*gui.fgcolor, *gui.fgcolor
+    } ;
+
+    // Double cursor width if double width character
+    if (mb_lefthalve(gui.row, gui.col))
+	i = 2;
+
+    gsk_rounded_rect_init_from_rect(&outline,
+	    &GRAPHENE_RECT_INIT(FILL_X(gui.col), FILL_Y(gui.row),
+		i * gui.char_width, gui.char_height),
+	    0.0f);
+
+    node_unref(self->cursor_node);
+    self->cursor_node = gsk_border_node_new(&outline, border, color);
+}
+
+/*
+ * Draw a part cursor with width "w" and height "h". Note that this does not
+ * queue a redraw
+ */
+    void
+vim_draw_area_set_part_cursor(VimDrawArea *self, int w, int h)
+{
+    node_unref(self->cursor_node);
+    self->cursor_node = gsk_color_node_new(gui.fgcolor,
+	    &GRAPHENE_RECT_INIT(
+#ifdef FEAT_RIGHTLEFT
+		CURSOR_BAR_RIGHT ? FILL_X(gui.col + 1) - w :
+#endif
+		FILL_X(gui.col), FILL_Y(gui.row) + gui.char_height - h,
+		w, h));
+}
+
+/*
+ * Invert the rectangle in the draw area.
+ */
+    void
+vim_draw_area_invert_block(
+	VimDrawArea	*self,
+	int		row,
+	int		col,
+	int		nrows,
+	int		ncols)
+{
+    if (unlikely(self->cells == NULL
+		|| row >= self->n_rows
+		|| col >= self->n_cols
+		|| row + nrows - 1 >= self->n_rows
+		|| col + ncols - 1 >= self->n_cols))
+	return;
+
+    for (int r = row; r < row + nrows; r++)
+    {
+	DrawCell *drow = GET_ROW(self, r);
+
+	for (int c = col; c < col + ncols; c++)
+	{
+	    DrawCell *dcell = drow + c;
+
+	    dcell->invert = !dcell->invert;
+	}
+    }
+}
+
+#if defined(FEAT_SIGN_ICONS)
+/*
+ * Add a sign texture at the given row and column, and scale it to "width" and
+ * "height".
+ */
+    void
+vim_draw_area_add_sign(
+	VimDrawArea *self,
+	GdkTexture *sign,
+	int row,
+	int col,
+	int width,
+	int height)
+{
+    GskRenderNode   *node;
+
+    if (unlikely(self->cells == NULL
+		|| row >= self->n_rows
+		|| col >= self->n_cols))
+	return;
+
+    node = gsk_texture_scale_node_new(sign,
+	    &GRAPHENE_RECT_INIT(FILL_X(col), FILL_Y(row), width, height),
+	    GSK_SCALING_FILTER_TRILINEAR);
+    if (node == NULL)
+	return;
+    g_queue_push_tail(self->signs, node);
+}
+#endif
+
+#ifdef FEAT_NETBEANS_INTG
+    cairo_t *
+vim_draw_area_get_multisign_cairo(VimDrawArea *self, int x, int y, int w, int h)
+{
+    node_unref(self->multisign_node);
+    self->multisign_node = gsk_cairo_node_new(
+	    &GRAPHENE_RECT_INIT( x, y, w, h));
+    return gsk_cairo_node_get_draw_context(self->multisign_node);
+}
+#endif
+
+#ifdef FEAT_IMAGE_GDK
+
+/*
+ * Get the draw image with the given id, return NULL if not exists.
+ */
+    static GList *
+vim_draw_area_get_image(VimDrawArea *self, int id)
+{
+    for (GList *s = self->images->head; s != NULL; s = s->next)
+    {
+	DrawImage *sdimg = s->data;
+
+	if (sdimg->id == id)
+	    return s;
+    }
+    return NULL;
+}
+
+/*
+ * Queue the given image to the correct position in the queue using its zindex.
+ */
+    static void
+vim_draw_area_queue_image(VimDrawArea *self, GList *link)
+{
+    DrawImage *dimg = link->data;
+
+    for (GList *s = self->images->head; s != NULL; s = s->next)
+    {
+	DrawImage *sdimg = s->data;
+
+	if (sdimg->zindex >= dimg->zindex)
+	{
+	    g_queue_insert_before_link(self->images, s, link);
+	    return;
+	}
+    }
+    // Queue is empty or image has new highest zindex
+    g_queue_push_tail_link(self->images, link);
+}
+
+/*
+ * Add an image at the given row and column with the specified zindex and id.
+ * (src_x, src_y, draw_w, draw_h) describe which pixel sub-rect of the source
+ * texture should be drawn. If there is an image that has the same id, then it
+ * is re-rendered with the new texture. If zindex of an image changed, then the
+ * queue will be updated accordingly.
+ */
+    void
+vim_draw_area_add_image(
+	VimDrawArea *self,
+	GdkTexture  *image,
+	int	    row,
+	int	    col,
+	int	    src_x,
+	int	    src_y,
+	int	    draw_w,
+	int	    draw_h,
+	int	    zindex,
+	int	    id)
+{
+    GskRenderNode   *node, *old;
+    int		    w, h;
+    graphene_rect_t clip;
+    GList	    *link;
+    DrawImage	    *dimg;
+
+    if (unlikely(self->cells == NULL
+		|| row >= self->n_rows
+		|| col >= self->n_cols))
+	return;
+
+    w = gdk_texture_get_width(image);
+    h = gdk_texture_get_height(image);
+
+    node = gsk_texture_node_new(image,
+	    &GRAPHENE_RECT_INIT(FILL_X(col) - src_x, FILL_Y(row) - src_y,
+		w, h));
+
+    if (node != NULL)
+    {
+	graphene_rect_init(&clip, FILL_X(col), FILL_Y(row), draw_w, draw_h);
+
+	old = node;
+	node = gsk_clip_node_new(node, &clip);
+	gsk_render_node_unref(old);
+    }
+
+    link = vim_draw_area_get_image(self, id);
+    if (link == NULL)
+    {
+	dimg = g_new(DrawImage, 1);
+
+	dimg->id = id;
+	dimg->zindex = zindex;
+	dimg->node = node;
+
+	link = g_list_alloc();
+	link->data = dimg;
+    }
+    else
+    {
+	dimg = link->data;
+
+	gsk_render_node_unref(dimg->node);
+	dimg->node = node;
+
+	if (dimg->zindex == zindex)
+	    return;
+	else
+	{
+	    dimg->zindex = zindex;
+	    g_queue_unlink(self->images, link);
+	}
+    }
+
+    vim_draw_area_queue_image(self, link);
+}
+
+    static void
+draw_image_free(DrawImage *dimg)
+{
+    gsk_render_node_unref(dimg->node);
+    g_free(dimg);
+}
+
+/*
+ * Remove the image with the given id if it exists
+ */
+    void
+vim_draw_area_remove_image(VimDrawArea *self, int id)
+{
+    GList *link = vim_draw_area_get_image(self, id);
+
+    if (link == NULL)
+	return;
+
+    draw_image_free(link->data);
+    g_queue_delete_link(self->images, link);
+}
+#endif
+
+    static void
+flush_invert_ga(garray_T *invert_ga, int row, int start, int len)
+{
+    if (ga_grow(invert_ga, 1) == OK)
+    {
+	graphene_rect_t *arr = (graphene_rect_t *)invert_ga->ga_data;
+
+	graphene_rect_init(arr + invert_ga->ga_len++,
+		FILL_X(start), FILL_Y(row),
+		len * gui.char_width, gui.char_height);
+    }
+}
+
+    static void
+vim_draw_area_snapshot(GtkWidget *widget, GtkSnapshot *snapshot)
+{
+    VimDrawArea		    *self = VIM_DRAW_AREA(widget);
+    int			    height, width;
+    static const GdkRGBA    white = {1, 1, 1, 1};
+    garray_T		    invert_ga;
+
+    gui_mch_set_bg_color(gui.back_pixel);
+    height = gtk_widget_get_height(widget);
+    width = gtk_widget_get_width(widget);
+
+    if (self->cells == NULL)
+    {
+	gtk_snapshot_append_color(snapshot, gui.bgcolor,
+		&GRAPHENE_RECT_INIT(0, 0, width, height));
+	return;
+    }
+
+    // For inverted cells, we first build an array of bounds that represent
+    // blocks of inverted cells. Then we apply a white color to each of those
+    // bounds and then finish the blend.
+    gtk_snapshot_push_blend(snapshot, GSK_BLEND_MODE_DIFFERENCE);
+    ga_init2(&invert_ga, sizeof(graphene_rect_t), 8);
+
+    gtk_snapshot_append_color(snapshot, gui.bgcolor,
+	    &GRAPHENE_RECT_INIT(0, 0, width, height));
+
+    for (int r = 0; r < self->n_rows; r++)
+    {
+	DrawCell    *drow = GET_ROW(self, r);
+	int	    inv_len = 0;
+	int	    inv_start;
+
+	for (int c = 0; c < self->n_cols; c++)
+	{
+	    DrawCell	*dcell = drow + c;
+	    DrawNode	*dnode = dcell->dnode;
+
+	    // Batch inverted cells as single row rectangles.
+	    if (dcell->invert)
+	    {
+		if (inv_len == 0)
+		    inv_start = c;
+		inv_len++;
+	    }
+	    else if (!dcell->invert && inv_len > 0)
+	    {
+		flush_invert_ga(&invert_ga, r, inv_start, inv_len);
+		inv_len = 0;
+	    }
+
+	    if (dnode == NULL)
+		continue;
+
+	    if (dnode->start_col == c)
+	    {
+		draw_node_render(dnode, r, self);
+		assert(dnode->node != NULL);
+		gtk_snapshot_append_node(snapshot, dnode->node);
+	    }
+	}
+	// Flush trailing inverted blocks at end of row loop
+	if (inv_len > 0)
+	    flush_invert_ga(&invert_ga, r, inv_start, inv_len);
+    }
+
+#ifdef FEAT_SIGN_ICONS
+    // Order of where the sign icon should be placed shouldn't matter,
+    // since caller will add whitespace padding in the region it covers.
+    // Probably should put it behind cursor though.
+    for (GList *s = self->signs->head; s != NULL; s = s->next)
+	gtk_snapshot_append_node(snapshot, s->data);
+#endif
+
+    if (self->cursor_node != NULL)
+	gtk_snapshot_append_node(snapshot, self->cursor_node);
+
+    gtk_snapshot_pop(snapshot);
+    for (int i = 0; i < invert_ga.ga_len; i++)
+    {
+	graphene_rect_t *rect = &((graphene_rect_t *)invert_ga.ga_data)[i];
+	gtk_snapshot_append_color(snapshot, &white, rect);
+    }
+    gtk_snapshot_pop(snapshot);
+    ga_clear(&invert_ga);
+
+#ifdef FEAT_IMAGE_GDK
+    // Draw images after any possible inversions
+    for (GList *s = self->images->head; s != NULL; s = s->next)
+    {
+	DrawImage *dimg = s->data;
+
+	if (dimg->node != NULL)
+	    gtk_snapshot_append_node(snapshot, dimg->node);
+    }
+#endif
+}
+
+    static void
+vim_draw_area_size_allocate(
+	GtkWidget   *widget,
+	int	    width,
+	int	    height,
+	int	    baseline UNUSED)
+{
+    VimDrawArea *self = VIM_DRAW_AREA(widget);
+    int		old_count = self->resize_count;
+
+    gui_resize_shell(width, height);
+
+    if (old_count == self->resize_count)
+    {
+	// Number of columns or rows hasn't changed. However still re render the
+	// draw nodes at the right edge of the draw area, so that they can
+	// update their background bleed (see draw_node_render()).
+	for (int r = 0; r < self->n_rows; r++)
+	{
+	    DrawCell *dcell = &GET_ROW(self, r)[self->n_cols - 1];
+
+	    if (dcell->dnode != NULL)
+	    {
+		(void)draw_node_make_dirty(dcell->dnode);
+		draw_node_render(dcell->dnode, r, self);
+	    }
+	}
+    }
+
+    return;
+}
+
+#endif // USE_GTK4_SNAPSHOT
diff --git a/src/gui_gtk4_da.h b/src/gui_gtk4_da.h
new file mode 100644
index 0000000000..100d1dba06
--- /dev/null
+++ b/src/gui_gtk4_da.h
@@ -0,0 +1,38 @@
+/* vi:set ts=8 sts=4 sw=4 noet:
+ *
+ * VIM - Vi IMproved		by Bram Moolenaar
+ *
+ * Do ":help uganda"  in Vim to read copying and usage conditions.
+ * Do ":help credits" in Vim to see a list of people who contributed.
+ * See README.txt for an overview of the Vim source code.
+ */
+
+#ifndef GUI_GTK4_DRAW_AREA_H
+#define GUI_GTK4_DRAW_AREA_H
+
+#include "vim.h"
+
+#ifdef USE_GTK4_SNAPSHOT
+
+# include <gtk/gtk.h>
+
+# define VIM_TYPE_DRAW_AREA (vim_draw_area_get_type())
+G_DECLARE_FINAL_TYPE(VimDrawArea, vim_draw_area, VIM, DRAW_AREA, GtkWidget)
+
+GtkWidget *vim_draw_area_new(void);
+void vim_draw_area_set_size(VimDrawArea *self, int rows, int cols);
+void vim_draw_area_add_glyphs(VimDrawArea *self, int row, int col, int num_cells, int flags, PangoFont *font, PangoGlyphString *glyphs);
+void vim_draw_area_clear_block(VimDrawArea *self, int row1, int col1, int row2, int col2);
+void vim_draw_area_clear(VimDrawArea *self);
+void vim_draw_area_move_block(VimDrawArea *self, int to, int row1, int row2, int col1, int col2);
+void vim_draw_area_set_hollow_cursor(VimDrawArea *self);
+void vim_draw_area_set_part_cursor(VimDrawArea *self, int w, int h);
+void vim_draw_area_invert_block(VimDrawArea *self, int row, int col, int nrows, int ncols);
+void vim_draw_area_add_sign(VimDrawArea *self, GdkTexture *sign, int row, int col, int width, int height);
+cairo_t *vim_draw_area_get_multisign_cairo(VimDrawArea *self, int x, int y, int w, int h);
+void vim_draw_area_add_image(VimDrawArea *self, GdkTexture  *image, int row, int col, int src_x, int src_y, int draw_w, int draw_h, int zindex, int id);
+void vim_draw_area_remove_image(VimDrawArea *self, int id);
+
+#endif
+
+#endif
diff --git a/src/gui_gtk4_f.c b/src/gui_gtk4_f.c
index 14ff85f625..52941874fb 100644
--- a/src/gui_gtk4_f.c
+++ b/src/gui_gtk4_f.c
@@ -69,7 +69,7 @@ vim_form_dispose(GObject *obj)
     static void
 vim_form_class_init(VimFormClass *class)
 {
-    GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(class);
+    GtkWidgetClass  *widget_class = GTK_WIDGET_CLASS(class);
     GObjectClass    *obj_class = G_OBJECT_CLASS(class);
 
     widget_class->snapshot = vim_form_snapshot;
@@ -254,17 +254,35 @@ vim_form_size_allocate(
     static void
 vim_form_measure(
 	GtkWidget	*widget UNUSED,
-	GtkOrientation	orientation UNUSED,
+	GtkOrientation	orientation,
 	int		for_size UNUSED,
 	int		*minimum,
 	int		*natural,
 	int		*minimum_baseline,
 	int		*natural_baseline)
 {
-    *minimum = 1;
-    *natural = 1;
-    *minimum_baseline = -1;
-    *natural_baseline = -1;
+    if (orientation == GTK_ORIENTATION_VERTICAL)
+    {
+	// Set minimum height of form widget to 4 rows.
+	if (minimum != NULL)
+	    *minimum  = gui.char_height * 4;
+	if (natural != NULL)
+	    *natural = gui.char_height * 4;
+    }
+    else
+    {
+	// Set minimum width of form widget to 20 columns. Any less and the draw
+	// area seems to glitch out...
+	if (minimum != NULL)
+	    *minimum  = gui.char_width * 20;
+	if (natural != NULL)
+	    *natural = gui.char_width * 20;
+    }
+
+    if (minimum_baseline != NULL)
+	*minimum_baseline = -1;
+    if (natural_baseline != NULL)
+	*natural_baseline = -1;
 }
 
 
diff --git a/src/gui_gtk4_tb.c b/src/gui_gtk4_tb.c
new file mode 100644
index 0000000000..79682cfb13
--- /dev/null
+++ b/src/gui_gtk4_tb.c
@@ -0,0 +1,483 @@
+/* vi:set ts=8 sts=4 sw=4 noet:
+ *
+ * VIM - Vi IMproved		by Bram Moolenaar
+ *
+ * Do ":help uganda"  in Vim to read copying and usage conditions.
+ * Do ":help credits" in Vim to see a list of people who contributed.
+ * See README.txt for an overview of the Vim source code.
+ */
+
+#include "vim.h"
+
+#ifdef FEAT_TOOLBAR
+
+#include <gtk/gtk.h>
+#include "gui_gtk4_tb.h"
+
+/*
+ * GTK4 removed GtkToolbar, so this is our version of it.
+ */
+struct _VimToolbar
+{
+    GtkWidget parent;
+
+    int style; // TOOLBAR_* flags
+    int iconsize; // TBIS_* values
+
+    GList *items;
+
+    GtkWidget	*root;
+    GtkWidget	*strip;
+
+    GtkWidget	*overflow_btn;
+    GtkWidget	*overflow_box;
+};
+
+G_DEFINE_TYPE(VimToolbar, vim_toolbar, GTK_TYPE_WIDGET)
+
+static void vim_toolbar_size_allocate(GtkWidget *widget, int width, int height, int baseline);
+static void vim_toolbar_measure(GtkWidget *widget, GtkOrientation orientation, int for_size, int *minimum, int *natural, int *minimum_baseline, int *natural_baseline);
+
+    static void
+vim_toolbar_dispose(GObject *object)
+{
+    VimToolbar *self = VIM_TOOLBAR(object);
+
+    g_clear_list(&self->items, g_object_unref);
+    g_clear_pointer(&self->root, gtk_widget_unparent);
+
+    G_OBJECT_CLASS(vim_toolbar_parent_class)->dispose(object);
+}
+
+    static void
+vim_toolbar_class_init(VimToolbarClass *class)
+{
+    GtkWidgetClass  *widget_class = GTK_WIDGET_CLASS(class);
+    GObjectClass    *obj_class = G_OBJECT_CLASS(class);
+
+    widget_class->size_allocate = vim_toolbar_size_allocate;
+    widget_class->measure = vim_toolbar_measure;
+
+    obj_class->dispose = vim_toolbar_dispose;
+
+    gtk_widget_class_set_css_name(widget_class, "toolbar");
+}
+
+    static void
+vim_toolbar_init(VimToolbar *self)
+{
+    GtkWidget *popover;
+
+    self->style = TOOLBAR_ICONS | TOOLBAR_TOOLTIPS;
+    self->iconsize = TBIS_MEDIUM;
+
+    self->root = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
+    gtk_widget_set_parent(self->root, GTK_WIDGET(self));
+
+    self->strip = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+    gtk_widget_set_hexpand(self->strip, TRUE);
+    gtk_widget_set_halign(self->strip, GTK_ALIGN_START);
+    gtk_widget_set_overflow(self->strip, GTK_OVERFLOW_HIDDEN);
+    gtk_box_append(GTK_BOX(self->root), self->strip);
+
+    self->overflow_btn = gtk_menu_button_new();
+    gtk_widget_set_hexpand(self->overflow_btn, FALSE);
+    gtk_widget_set_halign(self->overflow_btn, GTK_ALIGN_END);
+    gtk_widget_add_css_class(self->overflow_btn, "flat");
+    gtk_box_append(GTK_BOX(self->root), self->overflow_btn);
+    g_object_set_data(G_OBJECT(self->overflow_btn),
+	    "toolbar-width", GINT_TO_POINTER(-1));
+
+    popover = gtk_popover_new();
+    self->overflow_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
+    gtk_popover_set_child(GTK_POPOVER(popover), self->overflow_box);
+    gtk_popover_set_has_arrow(GTK_POPOVER(popover), FALSE);
+
+    gtk_menu_button_set_popover(GTK_MENU_BUTTON(self->overflow_btn), popover);
+}
+
+    GtkWidget *
+vim_toolbar_new(void)
+{
+    return g_object_new(VIM_TYPE_TOOLBAR, NULL);
+}
+
+/*
+ * Inser the widget at the given index, then queue a size allocate to check for
+ * overflowing items.
+ */
+    static void
+vim_toolbar_insert(VimToolbar *self, GtkWidget *widget, int idx)
+{
+    GtkWidget	*cur_child = gtk_widget_get_first_child(self->strip);
+    int		i = 0;
+
+    while (cur_child != NULL && i != idx - 1)
+    {
+	cur_child = gtk_widget_get_next_sibling(cur_child);
+	i++;
+    }
+
+    gtk_box_insert_child_after(GTK_BOX(self->strip), widget, cur_child);
+    self->items = g_list_insert(self->items, g_object_ref(widget), idx);
+    gtk_widget_queue_allocate(GTK_WIDGET(self));
+}
+
+/*
+ * Update "btn" according to "style" and "iconsize".
+ */
+    static void
+set_button_style(GtkWidget *btn, int style, int iconsize, gboolean invalidate)
+{
+    GtkWidget *box;
+    GtkWidget *icon;
+    GtkWidget *label;
+
+    if (GTK_IS_SEPARATOR(btn))
+	return;
+
+    box = gtk_button_get_child(GTK_BUTTON(btn));
+    if (style & TOOLBAR_HORIZ)
+    {
+	gtk_orientable_set_orientation(GTK_ORIENTABLE(box),
+		GTK_ORIENTATION_HORIZONTAL);
+	gtk_box_set_spacing(GTK_BOX(box), 8);
+    }
+    else
+    {
+	gtk_orientable_set_orientation(GTK_ORIENTABLE(box),
+		GTK_ORIENTATION_VERTICAL);
+	gtk_box_set_spacing(GTK_BOX(box), 4);
+    }
+
+    gtk_widget_set_has_tooltip(btn, style & TOOLBAR_TOOLTIPS);
+
+    icon = g_object_get_data(G_OBJECT(btn), "icon");
+    if (icon != NULL)
+    {
+	if (style & TOOLBAR_ICONS)
+	{
+	    GtkIconSize size;
+
+	    switch (iconsize)
+	    {
+		case TBIS_TINY:
+		case TBIS_SMALL:
+		case TBIS_MEDIUM:
+		    size = GTK_ICON_SIZE_NORMAL;
+		    break;
+		case TBIS_LARGE:
+		case TBIS_HUGE:
+		case TBIS_GIANT:
+		    size = GTK_ICON_SIZE_LARGE;
+		    break;
+		default:
+		    size = GTK_ICON_SIZE_NORMAL;
+		    break;
+	    }
+	    gtk_image_set_icon_size(GTK_IMAGE(icon), size);
+	    gtk_widget_set_visible(icon, TRUE);
+	}
+	else
+	    gtk_widget_set_visible(icon, FALSE);
+    }
+
+    label = g_object_get_data(G_OBJECT(btn), "label");
+    if (label != NULL)
+	gtk_widget_set_visible(label, style & TOOLBAR_TEXT);
+
+    // Used to cache width in toolbar ("self->strip"). -1 means not calculated
+    // yet.
+    if (invalidate)
+	g_object_set_data(G_OBJECT(btn), "toolbar-width", GINT_TO_POINTER(-1));
+}
+
+/*
+ * Always close overflow popover when button is clicked.
+ */
+    static void
+button_clicked(GtkWidget *widget UNUSED, VimToolbar *self)
+{
+    gtk_menu_button_popdown(GTK_MENU_BUTTON(self->overflow_btn));
+    // Bring focus to drawarea, popping overflow menu down does not change
+    // focus.
+    gtk_widget_grab_focus(gui.drawarea);
+    gui_mch_flush();
+}
+
+/*
+ * Add a new toolbar button at the given index and return the widget. "icon" and
+ * "text" may be NULL..
+ */
+    GtkWidget *
+vim_toolbar_insert_button(
+	VimToolbar  *self,
+	GtkWidget   *icon,
+	const char  *text,
+	int	    idx)
+{
+    GtkWidget *btn = gtk_button_new();
+    GtkWidget *box;
+
+    gtk_widget_add_css_class(btn, "flat");
+    box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+
+    gtk_button_set_child(GTK_BUTTON(btn), box);
+
+    if (icon != NULL)
+    {
+	gtk_widget_set_valign (icon, GTK_ALIGN_CENTER);
+	gtk_widget_set_vexpand (icon, TRUE);
+	gtk_box_append(GTK_BOX(box), icon);
+	g_object_set_data(G_OBJECT(btn), "icon", icon);
+    }
+    if (text != NULL)
+    {
+	GtkWidget *label = gtk_label_new(text);
+
+	gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+	gtk_widget_set_vexpand (label, TRUE);
+	gtk_box_append(GTK_BOX(box), label);
+	g_object_set_data(G_OBJECT(btn), "label", label);
+    }
+
+    set_button_style(btn, self->style, self->iconsize, TRUE);
+
+    g_signal_connect_object(btn, "clicked",
+	    G_CALLBACK(button_clicked), self, G_CONNECT_DEFAULT);
+
+    vim_toolbar_insert(self, btn, idx);
+    return btn;
+}
+
+/*
+ * Insert a toolbar separator at the given index and return the widget.
+ */
+    GtkWidget *
+vim_toolbar_insert_separator(VimToolbar *self, int idx)
+{
+    GtkWidget *sep = gtk_separator_new(GTK_ORIENTATION_VERTICAL);
+
+    g_object_set_data(G_OBJECT(sep), "toolbar-width", GINT_TO_POINTER(-1));
+    vim_toolbar_insert(self, sep, idx);
+    return sep;
+}
+
+/*
+ * Update the style and iconsize of the toolbar
+ */
+    void
+vim_toolbar_set_style(VimToolbar *self, int style, int iconsize)
+{
+    GtkWidget *cur_child = gtk_widget_get_first_child(self->strip);
+
+    if (style == self->style && self->iconsize == iconsize)
+	return;
+
+    self->style = style;
+    self->iconsize = iconsize;
+
+    while (cur_child != NULL)
+    {
+	if (!GTK_IS_SEPARATOR(cur_child))
+	    set_button_style(cur_child, style, iconsize, TRUE);
+	cur_child = gtk_widget_get_next_sibling(cur_child);
+    }
+
+    cur_child = gtk_widget_get_first_child(self->overflow_box);
+    while (cur_child != NULL)
+    {
+	if (!GTK_IS_SEPARATOR(cur_child))
+	    set_button_style(cur_child, style, iconsize, TRUE);
+	cur_child = gtk_widget_get_next_sibling(cur_child);
+    }
+    // Sizes may have changed
+    gtk_widget_queue_allocate(GTK_WIDGET(self));
+}
+
+/*
+ * Remove the item from the toolbar.
+ */
+    void
+vim_toolbar_remove(VimToolbar *self, GtkWidget *item)
+{
+    gtk_box_remove(GTK_BOX(self->strip),item);
+    self->items = g_list_remove(self->items, item);
+    g_object_unref(item);
+    gtk_widget_queue_allocate(GTK_WIDGET(self));
+}
+
+/*
+ * If "overflow" is TRUE, then move "item" from the toolbar to the overflow, and
+ * vice versa.
+ */
+    static void
+vim_toolbar_move_item_to(
+	VimToolbar  *self,
+	GtkWidget   *item,
+	gboolean    overflow)
+{
+    GtkBox *from, *to;
+
+    to = overflow ? GTK_BOX(self->overflow_box) : GTK_BOX(self->strip);
+    if (gtk_widget_get_parent(item) == GTK_WIDGET(to))
+	return;
+
+    from = overflow ? GTK_BOX(self->strip) : GTK_BOX(self->overflow_box);
+
+    gtk_box_remove(from, item);
+    gtk_box_append(to, item);
+
+    if (GTK_IS_SEPARATOR(item))
+	gtk_widget_set_visible(item, !overflow);
+    else
+    {
+	if (overflow)
+	{
+	    int style = self->style;
+
+	    // Force set these flags for the overflow menu, to mimic what GTK3
+	    // GtkToolbar does.
+	    style |= TOOLBAR_HORIZ;
+	    style |= TOOLBAR_TEXT;
+	    style |= TOOLBAR_ICONS;
+	    set_button_style(item, style, self->iconsize, FALSE);
+	}
+	else
+	    set_button_style(item, self->style, self->iconsize, FALSE);
+    }
+}
+
+    static int
+get_item_width(GtkWidget *item)
+{
+    int toolbar_width = -1;
+
+    // Always use cached width for item, because width in overflow menu is
+    // different (GtkBox is in horizontal layout). Also use it for separators,
+    // since if its not visible, then width is zero.
+    toolbar_width = GPOINTER_TO_INT(
+	    g_object_get_data(G_OBJECT(item), "toolbar-width"));
+
+    if (toolbar_width == -1)
+    {
+	GtkRequisition min_req, nat_req;
+	gtk_widget_get_preferred_size(item, &min_req, &nat_req);
+	toolbar_width = MAX(min_req.width, nat_req.width);
+
+	// Save width for later
+	g_object_set_data(G_OBJECT(item),
+		"toolbar-width", GINT_TO_POINTER(toolbar_width));
+    }
+    return toolbar_width;
+}
+
+    static void
+vim_toolbar_size_allocate(
+	GtkWidget   *widget,
+	int	    width,
+	int	    height,
+	int	    baseline)
+{
+    VimToolbar	    *self = VIM_TOOLBAR(widget);
+    GtkAllocation   alloc;
+    int		    used = 0;
+    int		    avail;
+    GList	    *overflow_ele = NULL;
+    GtkWidget	    *child;
+
+    avail = width - get_item_width(self->overflow_btn);
+
+    for (GList *ele = self->items; ele != NULL; ele = ele->next)
+    {
+	GtkWidget   *item = ele->data;
+	int	    toolbar_width = get_item_width(item);
+
+	if (used + toolbar_width > avail)
+	{
+	    overflow_ele = ele;
+	    break;
+	}
+	else
+	    vim_toolbar_move_item_to(self, item, FALSE);
+	used += toolbar_width;
+    }
+
+    if (overflow_ele != NULL)
+    {
+	int	    remaining = width - used;
+	gboolean    need_overflow_btn = FALSE;
+
+	// Move all items in the overflow to the toolbar, so we can add them
+	// in the correct order back again. Also check if the overflow button is
+	// still needed (can fit all toolbar items by disabling it).
+	while ((child = gtk_widget_get_first_child(self->overflow_box))
+		!= NULL)
+	    vim_toolbar_move_item_to(self, child, FALSE);
+
+	for (GList *ele = overflow_ele; ele != NULL; ele = ele->next)
+	{
+	    remaining -= get_item_width(ele->data);
+	    if (remaining < 0)
+	    {
+		need_overflow_btn = TRUE;
+		break;
+	    }
+	}
+
+	if (need_overflow_btn)
+	    for (; overflow_ele != NULL; overflow_ele = overflow_ele->next)
+		vim_toolbar_move_item_to(self, overflow_ele->data, TRUE);
+	gtk_widget_set_visible(self->overflow_btn, need_overflow_btn);
+    }
+    else
+	gtk_widget_set_visible(self->overflow_btn, FALSE);
+
+    alloc.x = alloc.y = 0;
+    alloc.width = width;
+    alloc.height = height;
+
+    gtk_widget_size_allocate(self->root, &alloc, baseline);
+}
+
+    static void
+vim_toolbar_measure(
+	GtkWidget	*widget,
+	GtkOrientation	orientation,
+	int		for_size,
+	int		*min,
+	int		*nat,
+	int		*min_baseline,
+	int		*nat_baseline)
+{
+    VimToolbar	*self = VIM_TOOLBAR(widget);
+    int		strip_min = 0, strip_nat = 0;
+    int		obtn_min = 0, obtn_nat = 0;
+
+    gtk_widget_measure(self->strip, orientation, for_size,
+	    &strip_min, &strip_nat, NULL, NULL);
+    gtk_widget_measure(self->overflow_btn, orientation, for_size,
+	    &obtn_min, &obtn_nat, NULL, NULL);
+
+    if (orientation == GTK_ORIENTATION_HORIZONTAL)
+    {
+	if (min != NULL)
+	    *min = obtn_min;
+	if (nat != NULL)
+	    *nat = strip_nat + obtn_nat;
+    }
+    else
+    {
+	if (min != NULL)
+	    *min = MAX(strip_min, obtn_min);
+	if (nat != NULL)
+	    *nat = MAX(strip_nat, obtn_nat);
+    }
+
+    if (min_baseline != NULL)
+	*min_baseline = -1;
+    if (nat_baseline != NULL)
+	*nat_baseline = -1;
+}
+
+#endif // FEAT_TOOLBAR
diff --git a/src/gui_gtk4_tb.h b/src/gui_gtk4_tb.h
new file mode 100644
index 0000000000..541bd983eb
--- /dev/null
+++ b/src/gui_gtk4_tb.h
@@ -0,0 +1,32 @@
+/* vi:set ts=8 sts=4 sw=4 noet:
+ *
+ * VIM - Vi IMproved		by Bram Moolenaar
+ *
+ * Do ":help uganda"  in Vim to read copying and usage conditions.
+ * Do ":help credits" in Vim to see a list of people who contributed.
+ * See README.txt for an overview of the Vim source code.
+ */
+
+#ifndef GUI_GTK4_TB_H
+#define GUI_GTK4_TB_H
+
+#include "vim.h"
+
+#ifdef FEAT_TOOLBAR
+
+# include <gtk/gtk.h>
+
+# define VIM_TYPE_TOOLBAR (vim_toolbar_get_type())
+G_DECLARE_FINAL_TYPE(VimToolbar, vim_toolbar, VIM, TOOLBAR, GtkWidget)
+
+typedef struct _VimToolbarItem VimToolbarItem;
+
+GtkWidget *vim_toolbar_new(void);
+GtkWidget *vim_toolbar_insert_button(VimToolbar *self, GtkWidget *icon, const char *text, int idx);
+GtkWidget *vim_toolbar_insert_separator(VimToolbar *self, int idx);
+void vim_toolbar_set_style(VimToolbar *self, int style, int iconsize);
+void vim_toolbar_remove(VimToolbar *self, GtkWidget *item);
+
+#endif
+
+#endif
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 8b57eef088..bf16d3e07f 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -98,7 +98,9 @@ enum
     TARGET_TEXT_URI_LIST,
     TARGET_TEXT_PLAIN,
     TARGET_TEXT_PLAIN_UTF8,
+    TARGET_VIM_MT,
     TARGET_VIM,
+    TARGET_VIMENC_MT,
     TARGET_VIMENC
 };
 
@@ -110,6 +112,8 @@ static const GtkTargetEntry selection_targets[] =
 {
     {VIMENC_ATOM_NAME,	0, TARGET_VIMENC},
     {VIM_ATOM_NAME,	0, TARGET_VIM},
+    {VIMENC_MIMETYPE_NAME,  0, TARGET_VIMENC_MT},
+    {VIM_MIMETYPE_NAME,	    0, TARGET_VIM_MT},
     {"text/html",	0, TARGET_HTML},
     {"UTF8_STRING",	0, TARGET_UTF8_STRING},
     {"COMPOUND_TEXT",	0, TARGET_COMPOUND_TEXT},
@@ -163,6 +167,10 @@ static GdkAtom html_atom = GDK_NONE;
 static GdkAtom utf8_string_atom = GDK_NONE;
 static GdkAtom vim_atom = GDK_NONE;	// Vim's own special selection format
 static GdkAtom vimenc_atom = GDK_NONE;	// Vim's extended selection format
+static GdkAtom vim_mt_atom = GDK_NONE;	// Vim's own special selection format
+					// (in mime type format)
+static GdkAtom vimenc_mt_atom = GDK_NONE;	// Vim's extended selection
+						// format (in mime type format)
 
 /*
  * Keycodes recognized by vim.
@@ -806,7 +814,7 @@ scale_factor_event(GtkWidget *widget,
     gtk_window_get_size(GTK_WINDOW(gui.mainwin), &w, &h);
     gui.surface = gdk_window_create_similar_surface(
 	    gtk_widget_get_window(widget),
-	    CAIRO_CONTENT_COLOR_ALPHA,
+	    CAIRO_CONTENT_COLOR,
 	    w, h);
 
     int	    usable_height = h;
@@ -1452,12 +1460,14 @@ selection_received_cb(GtkWidget		*widget UNUSED,
 	return;
     }
 
-    if (gtk_selection_data_get_data_type(data) == vim_atom)
+    if (gtk_selection_data_get_data_type(data) == vim_atom
+	    || gtk_selection_data_get_data_type(data) == vim_mt_atom)
     {
 	motion_type = *text++;
 	--len;
     }
-    else if (gtk_selection_data_get_data_type(data) == vimenc_atom)
+    else if (gtk_selection_data_get_data_type(data) == vimenc_atom
+	    || gtk_selection_data_get_data_type(data) == vimenc_mt_atom)
     {
 	char_u		*enc;
 	vimconv_T	conv;
@@ -1562,6 +1572,8 @@ selection_get_cb(GtkWidget	    *widget UNUSED,
 	    && info != (guint)TARGET_UTF8_STRING
 	    && info != (guint)TARGET_VIMENC
 	    && info != (guint)TARGET_VIM
+	    && info != (guint)TARGET_VIMENC_MT
+	    && info != (guint)TARGET_VIM_MT
 	    && info != (guint)TARGET_COMPOUND_TEXT
 	    && info != (guint)TARGET_TEXT_PLAIN
 	    && info != (guint)TARGET_TEXT_PLAIN_UTF8
@@ -1579,7 +1591,7 @@ selection_get_cb(GtkWidget	    *widget UNUSED,
     // (Not that pasting 2G of text is ever going to work, but... ;-)
     length = MIN(tmplen, (long_u)(G_MAXINT - 1));
 
-    if (info == (guint)TARGET_VIM)
+    if (info == (guint)TARGET_VIM || info == (guint)TARGET_VIM_MT)
     {
 	tmpbuf = alloc(length + 1);
 	if (tmpbuf != NULL)
@@ -1591,7 +1603,10 @@ selection_get_cb(GtkWidget	    *widget UNUSED,
 	++length;
 	vim_free(string);
 	string = tmpbuf;
-	type = vim_atom;
+	if (info == (guint)TARGET_VIM)
+	    type = vim_atom;
+	else
+	    type = vim_mt_atom;
     }
 
     else if (info == (guint)TARGET_HTML)
@@ -1635,7 +1650,7 @@ selection_get_cb(GtkWidget	    *widget UNUSED,
 	}
 	return;
     }
-    else if (info == (guint)TARGET_VIMENC)
+    else if (info == (guint)TARGET_VIMENC || info == (guint)TARGET_VIMENC_MT)
     {
 	int l = STRLEN(p_enc);
 
@@ -1650,7 +1665,10 @@ selection_get_cb(GtkWidget	    *widget UNUSED,
 	    vim_free(string);
 	    string = tmpbuf;
 	}
-	type = vimenc_atom;
+	if (info == (guint)TARGET_VIMENC)
+	    type = vimenc_atom;
+	else
+	    type = vimenc_mt_atom;
     }
 
     // gtk_selection_data_set_text() handles everything for us.  This is
@@ -2882,7 +2900,7 @@ drawarea_realize_cb(GtkWidget *widget, gpointer data UNUSED)
 #if GTK_CHECK_VERSION(3,0,0)
     gui.surface = gdk_window_create_similar_surface(
 	    gtk_widget_get_window(widget),
-	    CAIRO_CONTENT_COLOR_ALPHA,
+	    CAIRO_CONTENT_COLOR,
 	    gtk_widget_get_allocated_width(widget),
 	    gtk_widget_get_allocated_height(widget));
 #else
@@ -3017,7 +3035,7 @@ drawarea_configure_event_cb(GtkWidget	      *widget,
 
     gui.surface = gdk_window_create_similar_surface(
 	    gtk_widget_get_window(widget),
-	    CAIRO_CONTENT_COLOR_ALPHA,
+	    CAIRO_CONTENT_COLOR,
 	    event->width, event->height);
 
     gtk_widget_queue_draw(widget);
@@ -4131,6 +4149,8 @@ gui_mch_init(void)
      */
     vim_atom = gdk_atom_intern(VIM_ATOM_NAME, FALSE);
     vimenc_atom = gdk_atom_intern(VIMENC_ATOM_NAME, FALSE);
+    vim_mt_atom = gdk_atom_intern(VIM_MIMETYPE_NAME, FALSE);
+    vimenc_mt_atom = gdk_atom_intern(VIMENC_MIMETYPE_NAME, FALSE);
     clip_star.gtk_sel_atom = GDK_SELECTION_PRIMARY;
     clip_plus.gtk_sel_atom = gdk_atom_intern("CLIPBOARD", FALSE);
 
@@ -6981,6 +7001,60 @@ gui_mch_clear_all(void)
 	gui_gtk_window_clear(gtk_widget_get_window(gui.drawarea));
 }
 
+#ifdef FEAT_IMAGE_CAIRO
+/*
+ * Thin GTK wrappers around the shared cairo backend in src/cairo.c.
+ * The heavy lifting (surface build / pixel conversion / composite)
+ * is generic Cairo code so a future GTK4 port can reuse the same
+ * src/cairo.c without copy-pasting.
+ */
+    void
+gui_mch_free_popup_image(win_T *wp)
+{
+    cairo_popup_image_free(wp);
+}
+
+    bool
+gui_mch_update_popup_image_pixels(win_T *wp)
+{
+    return cairo_popup_image_update(wp);
+}
+
+    void
+gui_mch_draw_popup_image(
+	win_T	*wp,
+	int	 row,
+	int	 col,
+	int	 src_x,
+	int	 src_y,
+	int	 draw_w,
+	int	 draw_h)
+{
+    int x, y;
+
+    if (wp->w_popup_image_data == NULL
+	    || wp->w_popup_image_w <= 0 || wp->w_popup_image_h <= 0
+	    || draw_w <= 0 || draw_h <= 0
+# if GTK_CHECK_VERSION(3,0,0)
+	    || gui.surface == NULL
+# endif
+       )
+	return;
+
+    x = FILL_X(col);
+    y = FILL_Y(row);
+# if GTK_CHECK_VERSION(3,0,0)
+    cairo_popup_image_paint(wp, gui.surface, x, y,
+	    src_x, src_y, draw_w, draw_h);
+    if (gui.drawarea != NULL)
+	gtk_widget_queue_draw_area(gui.drawarea, x, y, draw_w, draw_h);
+# else
+    cairo_popup_image_paint(wp, gui.drawarea->window, x, y,
+	    src_x, src_y, draw_w, draw_h);
+# endif
+}
+#endif // FEAT_IMAGE_CAIRO
+
 #if !GTK_CHECK_VERSION(3,0,0)
 /*
  * Redraw any text revealed by scrolling up/down.
diff --git a/src/gui_w32.c b/src/gui_w32.c
index 724266aebb..077ca9c1f7 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -25,6 +25,10 @@
 
 #include "vim.h"
 
+#if defined(FEAT_IMAGE_GDI)
+void update_popup_images_rect(int left, int top, int right, int bottom);
+#endif
+
 #if defined(FEAT_DIRECTX)
 # include "gui_dwrite.h"
 #endif
@@ -2728,6 +2732,207 @@ gui_mch_clear_block(
     clear_rect(&rc);
 }
 
+#ifdef FEAT_IMAGE_GDI
+/*
+ * Convert the popup's RGB(A) pixel buffer into a 32-bit BGRX buffer.
+ * "dst" must be large enough for iw * ih * 4 bytes.  When has_alpha is
+ * true, the source has 4 bytes per pixel and the alpha channel is
+ * flattened onto the GUI window background colour (pre-multiplied blend).
+ */
+    static bool
+upload_popup_image_pixels(char_u *dst, char_u *src, int iw, int ih,
+								bool has_alpha)
+{
+    int		y, x;
+    int		stride = iw * 4;
+    int		src_bpp = has_alpha ? 4 : 3;
+    COLORREF	bg = has_alpha ? gui_mch_get_rgb(gui.back_pixel) : 0;
+    int		bg_r = GetRValue(bg);
+    int		bg_g = GetGValue(bg);
+    int		bg_b = GetBValue(bg);
+
+    if (dst == NULL || src == NULL || iw <= 0 || ih <= 0)
+	return false;
+
+    for (y = 0; y < ih; y++)
+    {
+	char_u *s = src + (size_t)y * iw * src_bpp;
+	char_u *d = dst + (size_t)y * stride;
+
+	for (x = 0; x < iw; x++)
+	{
+	    if (has_alpha)
+	    {
+		int a = s[3];
+
+		if (a == 255)
+		{
+		    d[0] = s[2];
+		    d[1] = s[1];
+		    d[2] = s[0];
+		}
+		else if (a == 0)
+		{
+		    d[0] = (char_u)bg_b;
+		    d[1] = (char_u)bg_g;
+		    d[2] = (char_u)bg_r;
+		}
+		else
+		{
+		    d[0] = (char_u)((s[2] * a + bg_b * (255 - a)) / 255);
+		    d[1] = (char_u)((s[1] * a + bg_g * (255 - a)) / 255);
+		    d[2] = (char_u)((s[0] * a + bg_r * (255 - a)) / 255);
+		}
+	    }
+	    else
+	    {
+		d[0] = s[2];	// B
+		d[1] = s[1];	// G
+		d[2] = s[0];	// R
+	    }
+	    d[3] = 0;
+	    s += src_bpp;
+	    d += 4;
+	}
+    }
+    return true;
+}
+
+/*
+ * Build a top-down 32-bit DIB section for the popup's RGB buffer and cache
+ * both the bitmap and a memory DC on the window for fast BitBlt redraws.
+ */
+    static bool
+build_popup_image_hbitmap(win_T *wp)
+{
+    int		iw = wp->w_popup_image_w;
+    int		ih = wp->w_popup_image_h;
+    char_u	*src = wp->w_popup_image_data;
+    BITMAPINFO	bmi;
+    HBITMAP	hbm;
+    HDC		mem_dc;
+    void	*bits = NULL;
+
+    if (src == NULL || iw <= 0 || ih <= 0 || s_hdc == NULL)
+	return false;
+
+    CLEAR_FIELD(bmi);
+    bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+    bmi.bmiHeader.biWidth = iw;
+    bmi.bmiHeader.biHeight = -ih;	// top-down
+    bmi.bmiHeader.biPlanes = 1;
+    bmi.bmiHeader.biBitCount = 32;
+    bmi.bmiHeader.biCompression = BI_RGB;
+
+    hbm = CreateDIBSection(s_hdc, &bmi, DIB_RGB_COLORS, &bits, NULL, 0);
+    if (hbm == NULL)
+	return false;
+
+    mem_dc = CreateCompatibleDC(s_hdc);
+    if (mem_dc == NULL)
+    {
+	DeleteObject(hbm);
+	return false;
+    }
+
+    SelectObject(mem_dc, hbm);
+    if (!upload_popup_image_pixels((char_u *)bits, src, iw, ih,
+						    wp->w_popup_image_alpha))
+    {
+	DeleteDC(mem_dc);
+	DeleteObject(hbm);
+	return false;
+    }
+
+    wp->w_popup_image_hbitmap = (void *)hbm;
+    wp->w_popup_image_hdc = (void *)mem_dc;
+    wp->w_popup_image_bits = bits;
+    return true;
+}
+
+/*
+ * Release any HBITMAP cached on this popup window.
+ */
+    void
+gui_mch_free_popup_image(win_T *wp)
+{
+    if (wp->w_popup_image_hdc != NULL)
+    {
+	DeleteDC((HDC)wp->w_popup_image_hdc);
+	wp->w_popup_image_hdc = NULL;
+    }
+    if (wp->w_popup_image_hbitmap != NULL)
+    {
+	DeleteObject((HBITMAP)wp->w_popup_image_hbitmap);
+	wp->w_popup_image_hbitmap = NULL;
+    }
+    wp->w_popup_image_bits = NULL;
+}
+
+    bool
+gui_mch_update_popup_image_pixels(win_T *wp)
+{
+    if (wp->w_popup_image_hbitmap == NULL
+	    || wp->w_popup_image_bits == NULL
+	    || wp->w_popup_image_data == NULL)
+	return false;
+
+    return upload_popup_image_pixels((char_u *)wp->w_popup_image_bits,
+	    wp->w_popup_image_data,
+	    wp->w_popup_image_w, wp->w_popup_image_h,
+	    wp->w_popup_image_alpha);
+}
+
+/*
+ * Paint the popup image cached in "wp" onto the GUI canvas.
+ * (row, col) is the top-left text cell of the image area inside the popup
+ * (i.e. inside borders and padding).  The image is drawn at native pixel
+ * size starting at FILL_X(col), FILL_Y(row); the popup auto-sizes itself
+ * to a cell box that fully encloses the image, so any leftover slack is
+ * already filled by the popup background.
+ *
+ * The DIB section is built once on first paint and BitBlt'd thereafter.
+ */
+    void
+gui_mch_draw_popup_image(
+	win_T	*wp,
+	int	 row,
+	int	 col,
+	int	 src_x,
+	int	 src_y,
+	int	 draw_w,
+	int	 draw_h)
+{
+    if (wp->w_popup_image_data == NULL || s_hdc == NULL
+	    || wp->w_popup_image_w <= 0 || wp->w_popup_image_h <= 0
+	    || draw_w <= 0 || draw_h <= 0)
+	return;
+
+    if (wp->w_popup_image_hbitmap == NULL
+	    && !build_popup_image_hbitmap(wp))
+	return;
+
+# if defined(FEAT_DIRECTX)
+    // Commit any pending DirectWrite output so popup text and borders are on
+    // s_hdc before we blit on top.
+    if (IS_ENABLE_DIRECTX())
+	DWriteContext_Flush(s_dwc);
+# endif
+
+    if (wp->w_popup_image_hdc == NULL)
+	return;
+
+    // BitBlt only the visible sub-rect: src offset (src_x, src_y) into the
+    // cached DIB, size (draw_w, draw_h) pixels.  The caller (popupwin.c)
+    // computes these from popup_compute_clip() so a "clipwindow" popup that
+    // overhangs its host window does not paint past the host's content edge.
+    BitBlt(s_hdc,
+	    FILL_X(col), FILL_Y(row),
+	    draw_w, draw_h,
+	    (HDC)wp->w_popup_image_hdc, src_x, src_y, SRCCOPY);
+}
+#endif
+
 /*
  * Clear the whole text window.
  */
@@ -3468,6 +3673,10 @@ _OnPaint(
 	gui_redraw(ps.rcPaint.left, ps.rcPaint.top,
 		ps.rcPaint.right - ps.rcPaint.left + 1,
 		ps.rcPaint.bottom - ps.rcPaint.top + 1);
+#if defined(FEAT_IMAGE_GDI)
+	update_popup_images_rect(ps.rcPaint.left, ps.rcPaint.top,
+		ps.rcPaint.right, ps.rcPaint.bottom);
+#endif
     }
 
     EndPaint(hwnd, &ps);
@@ -8904,11 +9113,11 @@ gui_mch_register_sign(char_u *signfile)
     {
 	int do_load = 1;
 
-	if (!STRICMP(ext, ".bmp"))
+	if (STRICMP(ext, ".bmp") == 0)
 	    sign.uType =  IMAGE_BITMAP;
-	else if (!STRICMP(ext, ".ico"))
+	else if (STRICMP(ext, ".ico") == 0)
 	    sign.uType =  IMAGE_ICON;
-	else if (!STRICMP(ext, ".cur") || !STRICMP(ext, ".ani"))
+	else if (STRICMP(ext, ".cur") == 0 || STRICMP(ext, ".ani") == 0)
 	    sign.uType =  IMAGE_CURSOR;
 	else
 	    do_load = 0;
@@ -8918,7 +9127,7 @@ gui_mch_register_sign(char_u *signfile)
 		    gui.char_width * 2, gui.char_height,
 		    LR_LOADFROMFILE | LR_CREATEDIBSECTION);
 # ifdef FEAT_XPM_W32
-	if (!STRICMP(ext, ".xpm"))
+	if (STRICMP(ext, ".xpm") == 0)
 	{
 	    sign.uType = IMAGE_XPM;
 	    LoadXpmImage((char *)signfile, (HBITMAP *)&sign.hImage,
diff --git a/src/hardcopy.c b/src/hardcopy.c
index 2eb63ea588..10c3beb8f1 100644
--- a/src/hardcopy.c
+++ b/src/hardcopy.c
@@ -1959,7 +1959,7 @@ prt_open_resource(struct prt_ps_resource_S *resource)
 prt_check_resource(struct prt_ps_resource_S *resource, char_u *version)
 {
     // Version number m.n should match, the revision number does not matter
-    if (STRNCMP(resource->version, version, STRLEN(version)))
+    if (STRNCMP(resource->version, version, STRLEN(version)) != 0)
     {
 	semsg(_(e_str_resource_file_has_wrong_version),
 		resource->name);
diff --git a/src/highlight.c b/src/highlight.c
index d38b30a8a2..4b21146267 100644
--- a/src/highlight.c
+++ b/src/highlight.c
@@ -3407,10 +3407,8 @@ hl_blend_attr(int char_attr, int popup_attr, int blend, int blend_fg UNUSED)
     attrentry_T *char_aep = NULL;
     attrentry_T *popup_aep;
     attrentry_T new_en;
+    attrentry_T tmp_en;
 
-    // If both attrs are 0, return 0
-    if (char_attr == 0 && popup_attr == 0)
-	return 0;
     if (blend >= 100 && blend_fg)
 	return char_attr;  // Fully transparent for both fg and bg
 
@@ -3431,46 +3429,62 @@ hl_blend_attr(int char_attr, int popup_attr, int blend, int blend_fg UNUSED)
 		new_en.ae_attr = char_attr;
 	}
 
-	if (popup_attr > HL_ALL)
+	// initialize an empty entry if no highlight set for popup
+	if (popup_attr <= HL_ALL)
 	{
+	    CLEAR_FIELD(tmp_en);
+	    tmp_en.ae_u.gui.fg_color = INVALCOLOR;
+	    tmp_en.ae_u.gui.bg_color = INVALCOLOR;
+	    tmp_en.ae_u.gui.sp_color = INVALCOLOR;
+	    // preserve attributes other than color
+	    tmp_en.ae_attr = popup_attr;
+	    popup_aep = &tmp_en;
+
+	    popup_aep->ae_u.gui.bg_color = fallback_bg_rgb;
+	}
+	else
 	    popup_aep = syn_gui_attr2entry(popup_attr);
-	    if (popup_aep != NULL)
+
+	if (popup_aep != NULL)
+	{
+	    guicolor_T popup_bg_rgb = popup_aep->ae_u.gui.bg_color;
+	    if (COLOR_INVALID(popup_bg_rgb))
+		popup_bg_rgb = fallback_bg_rgb;
+
+	    if (blend_fg)
 	    {
-		if (blend_fg)
+		// blend_fg=TRUE: fade underlying text toward popup bg.
 		{
-		    // blend_fg=TRUE: fade underlying text toward popup bg.
-		    if (popup_aep->ae_u.gui.bg_color != INVALCOLOR)
-		    {
-			int base_fg = fallback_fg_rgb;
-			if (char_aep != NULL
-				&& char_aep->ae_u.gui.fg_color != INVALCOLOR)
-			    base_fg = char_aep->ae_u.gui.fg_color;
-			new_en.ae_u.gui.fg_color = blend_colors(
-				popup_aep->ae_u.gui.bg_color, base_fg, blend);
-		    }
-		}
-		else
-		{
-		    // blend_fg=FALSE: popup text is opaque.  Replace the
-		    // underlying cell's attribute flags, fg and special
-		    // color with the popup's, so the underlying syntax
-		    // highlighting and any decoration (textprop undercurl,
-		    // ...) do not bleed through.
-		    new_en.ae_attr = popup_aep->ae_attr;
-		    new_en.ae_u.gui.fg_color = popup_aep->ae_u.gui.fg_color;
-		    new_en.ae_u.gui.sp_color = popup_aep->ae_u.gui.sp_color;
-		}
-		// Blend background color: blend popup bg toward underlying bg
-		if (popup_aep->ae_u.gui.bg_color != INVALCOLOR)
-		{
-		    guicolor_T underlying_bg = fallback_bg_rgb;
-		    if (char_aep != NULL)
-			underlying_bg = char_aep->ae_u.gui.bg_color;
-		    new_en.ae_u.gui.bg_color = blend_colors(
-			    popup_aep->ae_u.gui.bg_color,
-			    underlying_bg, blend);
+		    int base_fg = fallback_fg_rgb;
+		    if (char_aep != NULL
+			    && char_aep->ae_u.gui.fg_color != INVALCOLOR)
+			base_fg = char_aep->ae_u.gui.fg_color;
+		    new_en.ae_u.gui.fg_color = blend_colors(
+			    popup_bg_rgb, base_fg, blend);
 		}
 	    }
+	    else
+	    {
+		// blend_fg=FALSE: popup text is opaque.  Replace the
+		// underlying cell's attribute flags, fg and special
+		// color with the popup's, so the underlying syntax
+		// highlighting and any decoration (textprop undercurl,
+		// ...) do not bleed through.
+		new_en.ae_attr = popup_aep->ae_attr;
+		// fallback correctly to Normal fg color if fg_color == INVALCOLOR
+		new_en.ae_u.gui.fg_color = popup_aep->ae_u.gui.fg_color;
+		new_en.ae_u.gui.sp_color = popup_aep->ae_u.gui.sp_color;
+	    }
+	    // Blend background color: blend popup bg toward underlying bg
+	    {
+		guicolor_T underlying_bg = fallback_bg_rgb;
+		if (char_aep != NULL
+			&& !COLOR_INVALID(char_aep->ae_u.gui.bg_color))
+		    underlying_bg = char_aep->ae_u.gui.bg_color;
+		new_en.ae_u.gui.bg_color = blend_colors(
+			popup_bg_rgb,
+			underlying_bg, blend);
+	    }
 	}
 	return get_attr_entry(&gui_attr_table, &new_en);
     }
@@ -3494,130 +3508,151 @@ hl_blend_attr(int char_attr, int popup_attr, int blend, int blend_fg UNUSED)
 		new_en.ae_attr = char_attr;
 	}
 
-	if (popup_attr > HL_ALL)
+	// initialize an empty entry if no highlight set for popup
+	if (popup_attr <= HL_ALL)
 	{
+	    CLEAR_FIELD(tmp_en);
+#ifdef FEAT_TERMGUICOLORS
+	    tmp_en.ae_u.cterm.fg_rgb = INVALCOLOR;
+	    tmp_en.ae_u.cterm.ul_rgb = INVALCOLOR;
+	    // allow blending with termguicolors
+	    tmp_en.ae_u.cterm.bg_rgb = fallback_bg_rgb;
+#endif
+	    // preserve attributes other than color
+	    tmp_en.ae_attr = popup_attr;
+	    popup_aep = &tmp_en;
+
+	    // allow blending with notermguicolors
+	    popup_aep->ae_u.cterm.bg_color = cterm_normal_bg_color;
+	}
+	else
 	    popup_aep = syn_cterm_attr2entry(popup_attr);
-	    if (popup_aep != NULL)
+
+	if (popup_aep != NULL)
+	{
+	    guicolor_T popup_bg_rgb = INVALCOLOR;
+#ifdef FEAT_TERMGUICOLORS
+	    // Fall back to cterm color converted to RGB when gui color is not set.
+	    popup_bg_rgb = popup_aep->ae_u.cterm.bg_rgb;
+	    if (COLOR_INVALID(popup_bg_rgb)
+		    && popup_aep->ae_u.cterm.bg_color > 0)
+		popup_bg_rgb = cterm_color_to_rgb(
+			popup_aep->ae_u.cterm.bg_color);
+#endif
+	    // assign default color if guibg and ctermbg are not set for popup
+	    if (COLOR_INVALID(popup_bg_rgb)
+		    && popup_aep->ae_u.cterm.bg_color == 0)
+		popup_bg_rgb = fallback_bg_rgb;
+
+	    if (!blend_fg)
 	    {
-		if (!blend_fg)
-		{
-		    // blend_fg=FALSE: popup text is opaque.  Replace the
-		    // underlying cell's attribute flags, fg and underline
-		    // color with the popup's, so the underlying syntax
-		    // highlighting and any decoration (textprop undercurl,
-		    // ...) do not bleed through.  When the popup has no fg
-		    // (e.g. "guifg=NONE") fall back to Normal's fg so the
-		    // text is still readable instead of taking on whatever
-		    // the underlying cell happened to have.
-		    new_en.ae_attr = popup_aep->ae_attr;
-		    if (popup_aep->ae_u.cterm.fg_color > 0)
-			new_en.ae_u.cterm.fg_color =
-				    popup_aep->ae_u.cterm.fg_color;
-		    else if (cterm_normal_fg_color > 0)
-			new_en.ae_u.cterm.fg_color = cterm_normal_fg_color;
-		    else
-			new_en.ae_u.cterm.fg_color = 16;  // white-ish
-		    new_en.ae_u.cterm.ul_color = popup_aep->ae_u.cterm.ul_color;
+		// blend_fg=FALSE: popup text is opaque.  Replace the
+		// underlying cell's attribute flags, fg and underline
+		// color with the popup's, so the underlying syntax
+		// highlighting and any decoration (textprop undercurl,
+		// ...) do not bleed through.  When the popup has no fg
+		// (e.g. "guifg=NONE") fall back to Normal's fg so the
+		// text is still readable instead of taking on whatever
+		// the underlying cell happened to have.
+		new_en.ae_attr = popup_aep->ae_attr;
+		if (popup_aep->ae_u.cterm.fg_color > 0)
+		    new_en.ae_u.cterm.fg_color =
+			popup_aep->ae_u.cterm.fg_color;
+		else if (cterm_normal_fg_color > 0)
+		    new_en.ae_u.cterm.fg_color = cterm_normal_fg_color;
+		else
+		    // black-ish or white-ish
+		    new_en.ae_u.cterm.fg_color = (*p_bg == 'l') ? 1 : 16;
+		new_en.ae_u.cterm.ul_color = popup_aep->ae_u.cterm.ul_color;
 #ifdef FEAT_TERMGUICOLORS
-		    new_en.ae_u.cterm.ul_rgb = popup_aep->ae_u.cterm.ul_rgb;
+		new_en.ae_u.cterm.ul_rgb = popup_aep->ae_u.cterm.ul_rgb;
 #endif
-		}
-		else
-		{
-		    // blend_fg=TRUE: fade underlying fg toward popup bg in
-		    // the 256-color palette.  Used when the popup is over a
-		    // cell rendered with cterm colors (no termguicolors RGB).
-		    int under_fg = (char_aep != NULL)
-				    ? char_aep->ae_u.cterm.fg_color : 0;
-		    guicolor_T under_fg_rgb = INVALCOLOR;
-		    guicolor_T popup_bg_rgb = INVALCOLOR;
+	    }
+	    else
+	    {
+		// blend_fg=TRUE: fade underlying fg toward popup bg in
+		// the 256-color palette.  Used when the popup is over a
+		// cell rendered with cterm colors (no termguicolors RGB).
+		int under_fg = (char_aep != NULL)
+		    ? char_aep->ae_u.cterm.fg_color : 0;
+		guicolor_T under_fg_rgb = INVALCOLOR;
 #ifdef FEAT_TERMGUICOLORS
-		    if (char_aep != NULL)
-			under_fg_rgb = char_aep->ae_u.cterm.fg_rgb;
-		    popup_bg_rgb = popup_aep->ae_u.cterm.bg_rgb;
+		if (char_aep != NULL)
+		    under_fg_rgb = char_aep->ae_u.cterm.fg_rgb;
 #endif
-		    new_en.ae_u.cterm.fg_color = blend_cterm_colors(
-			    popup_aep->ae_u.cterm.bg_color, popup_bg_rgb,
-			    under_fg, under_fg_rgb, fallback_fg_rgb, blend);
-		}
-		// Approximate cterm bg by blending with the underlying bg
-		// in the 256-color palette and mapping to the nearest entry.
-		{
-		    int under_bg = (char_aep != NULL)
-				    ? char_aep->ae_u.cterm.bg_color : 0;
-		    guicolor_T under_bg_rgb = INVALCOLOR;
-		    guicolor_T popup_bg_rgb = INVALCOLOR;
+		new_en.ae_u.cterm.fg_color = blend_cterm_colors(
+			popup_aep->ae_u.cterm.bg_color, popup_bg_rgb,
+			under_fg, under_fg_rgb, fallback_fg_rgb, blend);
+	    }
+	    // Approximate cterm bg by blending with the underlying bg
+	    // in the 256-color palette and mapping to the nearest entry.
+	    {
+		int under_bg = (char_aep != NULL)
+		    ? char_aep->ae_u.cterm.bg_color : 0;
+		guicolor_T under_bg_rgb = INVALCOLOR;
 #ifdef FEAT_TERMGUICOLORS
-		    if (char_aep != NULL)
-			under_bg_rgb = char_aep->ae_u.cterm.bg_rgb;
-		    popup_bg_rgb = popup_aep->ae_u.cterm.bg_rgb;
+		if (char_aep != NULL)
+		    under_bg_rgb = char_aep->ae_u.cterm.bg_rgb;
 #endif
-		    new_en.ae_u.cterm.bg_color = blend_cterm_colors(
-			    popup_aep->ae_u.cterm.bg_color, popup_bg_rgb,
-			    under_bg, under_bg_rgb, fallback_bg_rgb, blend);
-		}
+		new_en.ae_u.cterm.bg_color = blend_cterm_colors(
+			popup_aep->ae_u.cterm.bg_color, popup_bg_rgb,
+			under_bg, under_bg_rgb, fallback_bg_rgb, blend);
+	    }
 #ifdef FEAT_TERMGUICOLORS
-		// Blend RGB colors for termguicolors mode.
-		// Fall back to cterm color converted to RGB when
-		// gui color is not set.
+	    // Blend RGB colors for termguicolors mode.
+	    // Fall back to cterm color converted to RGB when
+	    // gui color is not set.
+	    {
+		guicolor_T popup_fg = popup_aep->ae_u.cterm.fg_rgb;
+
+		if (COLOR_INVALID(popup_fg)
+			&& popup_aep->ae_u.cterm.fg_color > 0)
+		    popup_fg = cterm_color_to_rgb(
+			    popup_aep->ae_u.cterm.fg_color);
+
+		if (blend_fg)
 		{
-		    guicolor_T popup_bg = popup_aep->ae_u.cterm.bg_rgb;
-		    guicolor_T popup_fg = popup_aep->ae_u.cterm.fg_rgb;
-
-		    if (COLOR_INVALID(popup_bg)
-				    && popup_aep->ae_u.cterm.bg_color > 0)
-			popup_bg = cterm_color_to_rgb(
-					popup_aep->ae_u.cterm.bg_color);
-		    if (COLOR_INVALID(popup_fg)
-				    && popup_aep->ae_u.cterm.fg_color > 0)
-			popup_fg = cterm_color_to_rgb(
-					popup_aep->ae_u.cterm.fg_color);
-
-		    if (blend_fg)
-		    {
-			// blend_fg=TRUE: fade underlying text toward popup bg.
-			if (popup_bg != INVALCOLOR)
-			{
-			    int base_fg = fallback_fg_rgb;
-			    // CTERMCOLOR is a sentinel meaning "use the cterm
-			    // color"; treat it as no underlying color so it is
-			    // not blended in as a real near-white pixel.
-			    if (char_aep != NULL
-				    && !COLOR_INVALID(char_aep->ae_u.cterm.fg_rgb))
-				base_fg = char_aep->ae_u.cterm.fg_rgb;
-			    new_en.ae_u.cterm.fg_rgb = blend_colors(
-				    popup_bg, base_fg, blend);
-			}
-		    }
-		    else
-		    {
-			// blend_fg=FALSE: popup text is opaque.  Replace fg
-			// with popup's so the underlying syntax highlighting
-			// fg does not bleed.  ae_attr was already set above
-			// for this branch.  When the popup has no fg fall
-			// back to Normal's fg, then to white, so the text
-			// stays readable instead of rendering as default
-			// (which can be black on dark themes).
-			if (!COLOR_INVALID(popup_fg))
-			    new_en.ae_u.cterm.fg_rgb = popup_fg;
-			else if (!COLOR_INVALID(cterm_normal_fg_gui_color))
-			    new_en.ae_u.cterm.fg_rgb = cterm_normal_fg_gui_color;
-			else
-			    new_en.ae_u.cterm.fg_rgb = fallback_fg_rgb;
-		    }
-		    if (popup_bg != INVALCOLOR)
+		    // blend_fg=TRUE: fade underlying text toward popup bg.
+		    if (popup_bg_rgb != INVALCOLOR)
 		    {
-			// Blend popup bg toward underlying bg
-			guicolor_T underlying_bg = fallback_bg_rgb;
+			int base_fg = fallback_fg_rgb;
+			// CTERMCOLOR is a sentinel meaning "use the cterm
+			// color"; treat it as no underlying color so it is
+			// not blended in as a real near-white pixel.
 			if (char_aep != NULL
-				&& !COLOR_INVALID(char_aep->ae_u.cterm.bg_rgb))
-			    underlying_bg = char_aep->ae_u.cterm.bg_rgb;
-			new_en.ae_u.cterm.bg_rgb = blend_colors(
-				popup_bg, underlying_bg, blend);
+				&& !COLOR_INVALID(char_aep->ae_u.cterm.fg_rgb))
+			    base_fg = char_aep->ae_u.cterm.fg_rgb;
+			new_en.ae_u.cterm.fg_rgb = blend_colors(
+				popup_bg_rgb, base_fg, blend);
 		    }
 		}
-#endif
+		else
+		{
+		    // blend_fg=FALSE: popup text is opaque.  Replace fg with
+		    // popup's so the underlying syntax highlighting fg does
+		    // not bleed.  ae_attr was already set above for this
+		    // branch.  When the popup has no fg fall back to Normal's
+		    // fg, then to white, so the text stays readable instead of
+		    // rendering as default (which can be black on dark themes).
+		    if (!COLOR_INVALID(popup_fg))
+			new_en.ae_u.cterm.fg_rgb = popup_fg;
+		    else if (!COLOR_INVALID(cterm_normal_fg_gui_color))
+			new_en.ae_u.cterm.fg_rgb = cterm_normal_fg_gui_color;
+		    else
+			new_en.ae_u.cterm.fg_rgb = fallback_fg_rgb;
+		}
+		if (popup_bg_rgb != INVALCOLOR)
+		{
+		    // Blend popup bg toward underlying bg
+		    guicolor_T underlying_bg = fallback_bg_rgb;
+		    if (char_aep != NULL
+			    && !COLOR_INVALID(char_aep->ae_u.cterm.bg_rgb))
+			underlying_bg = char_aep->ae_u.cterm.bg_rgb;
+		    new_en.ae_u.cterm.bg_rgb = blend_colors(
+			    popup_bg_rgb, underlying_bg, blend);
+		}
 	    }
+#endif
 	}
 	return get_attr_entry(&cterm_attr_table, &new_en);
     }
diff --git a/src/insexpand.c b/src/insexpand.c
index c5f908485b..c8f22de67d 100644
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -187,6 +187,7 @@ static linenr_T	  compl_lnum = 0;           // lnum where the completion start
 static colnr_T	  compl_col = 0;	    // column where the text starts
 					    // that is being completed
 static colnr_T	  compl_ins_end_col = 0;
+static colnr_T	  compl_longest_end_col = 0;  // end of 'longest' inserted text
 static string_T	  compl_orig_text = {NULL, 0};  // text as it was before
 					    // completion started
 static int	  compl_cont_mode = 0;
@@ -359,7 +360,7 @@ int ctrl_x_mode_omni(void)
     { return ctrl_x_mode == CTRL_X_OMNI; }
 int ctrl_x_mode_spell(void)
     { return ctrl_x_mode == CTRL_X_SPELL; }
-static int ctrl_x_mode_eval(void)
+int ctrl_x_mode_eval(void)
     { return ctrl_x_mode == CTRL_X_EVAL; }
 int ctrl_x_mode_line_or_eval(void)
     { return ctrl_x_mode == CTRL_X_WHOLE_LINE || ctrl_x_mode == CTRL_X_EVAL; }
@@ -1051,6 +1052,33 @@ ins_compl_equal(compl_T *match, char_u *str, int len)
     return STRNCMP(match->cp_str.string, str, (size_t)len) == 0;
 }
 
+/*
+ * Like ins_compl_equal(), but ignore case in the 'longest'-inserted part of
+ * the leader, so CTRL-N and CTRL-P filter the same way.
+ */
+    static int
+ins_compl_equal_sc(compl_T *match, char_u *str, int len)
+{
+    int	typed = compl_length;
+    int	longest_end = (compl_get_longest && compl_longest_end_col > compl_col)
+			    ? (int)(compl_longest_end_col - compl_col) : typed;
+
+    if ((match->cp_flags & (CP_EQUAL | CP_ICASE)) || longest_end <= typed)
+	return ins_compl_equal(match, str, len);
+
+    if ((int)match->cp_str.length < len)
+	return FALSE;
+
+    for (int i = 0; i < len; ++i)
+    {
+	if (i >= typed && i < longest_end
+		? TOLOWER_LOC(match->cp_str.string[i]) != TOLOWER_LOC(str[i])
+		: match->cp_str.string[i] != str[i])
+	    return FALSE;
+    }
+    return TRUE;
+}
+
 /*
  * when len is -1 mean use whole length of p otherwise part of p
  */
@@ -1687,14 +1715,15 @@ ins_compl_build_pum(void)
 
 	leader = get_leader_for_startcol(compl, TRUE);
 
-	// Apply 'smartcase' behavior during normal mode
-	if (ctrl_x_mode_normal() && !p_inf && leader->string
-		&& !ignorecase(leader->string) && !cot_fuzzy())
+	// Apply 'smartcase': judge case from compl_orig_text, not the leader
+	// which 'longest' may fill with uppercase the user never typed.
+	if (ctrl_x_mode_normal() && !p_inf && compl_orig_text.string
+		&& !ignorecase(compl_orig_text.string) && !cot_fuzzy())
 	    compl->cp_flags &= ~CP_ICASE;
 
 	if (!match_at_original_text(compl)
 		&& (leader->string == NULL
-		    || ins_compl_equal(compl, leader->string,
+		    || ins_compl_equal_sc(compl, leader->string,
 			(int)leader->length)
 		    || (cot_fuzzy() && compl->cp_score != FUZZY_SCORE_NONE)))
 	{
@@ -2285,6 +2314,7 @@ ins_compl_clear(void)
     compl_matches = 0;
     compl_selected_item = -1;
     compl_ins_end_col = 0;
+    compl_longest_end_col = 0;
     compl_curr_win = NULL;
     compl_curr_buf = NULL;
     VIM_CLEAR_STRING(compl_pattern);
@@ -3852,7 +3882,7 @@ set_completion(colnr_T startcol, list_T *list)
     int compl_no_select = (cur_cot_flags & COT_NOSELECT) != 0;
 
     // If already doing completions stop it.
-    if (ctrl_x_mode_not_default())
+    if (compl_started || ctrl_x_mode_not_default())
 	ins_compl_prep(' ');
     ins_compl_clear();
     ins_compl_free();
@@ -4521,6 +4551,7 @@ ins_compl_longest_insert(char_u *prefix)
 {
     ins_compl_delete();
     ins_compl_insert_bytes(prefix + get_compl_len(), -1);
+    compl_longest_end_col = curwin->w_cursor.col;
     ins_redraw(FALSE);
 }
 
@@ -5809,13 +5840,13 @@ find_common_prefix(size_t *prefix_len, int curbuf_only)
 	string_T *leader = get_leader_for_startcol(compl, TRUE);
 
 	// Apply 'smartcase' behavior during normal mode
-	if (ctrl_x_mode_normal() && !p_inf && leader->string
-		&& !ignorecase(leader->string))
+	if (ctrl_x_mode_normal() && !p_inf && compl_orig_text.string
+		&& !ignorecase(compl_orig_text.string))
 	    compl->cp_flags &= ~CP_ICASE;
 
 	if (!match_at_original_text(compl)
 		&& (leader->string == NULL
-		    || ins_compl_equal(compl, leader->string,
+		    || ins_compl_equal_sc(compl, leader->string,
 			(int)leader->length)))
 	{
 	    // Limit number of items from each source if max_items is set.
diff --git a/src/kitty.c b/src/kitty.c
new file mode 100644
index 0000000000..2b46b1454c
--- /dev/null
+++ b/src/kitty.c
@@ -0,0 +1,264 @@
+/* vi:set ts=8 sts=4 sw=4 noet:
+ *
+ * VIM - Vi IMproved	by Bram Moolenaar
+ *
+ * Do ":help uganda"  in Vim to read copying and usage conditions.
+ * Do ":help credits" in Vim to see a list of people who contributed.
+ * See README.txt for an overview of the Vim source code.
+ */
+
+/*
+ * kitty.c: encode an RGB(A) image into a kitty graphics protocol
+ *	    APC sequence, by Yasuhiro Matsumoto.
+ *	    The popup's image bytes are sent in 4096-byte chunks of base64
+ *	    inside `\e_G...;<chunk>\e\\` envelopes.
+ *	    Spec: https://sw.kovidgoyal.net/kitty/graphics-protocol/
+ *	    No external dependency; the base64 alphabet is inlined here.
+ */
+
+#include "vim.h"
+
+#if defined(FEAT_IMAGE_KITTY) || defined(PROTO)
+
+static const char_u kitty_b64_table[] =
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+/*
+ * Append a NUL-terminated string to "ga".  Returns OK / FAIL so the caller
+ * can abort on allocation failure (unlike ga_concat(), which silently no-ops
+ * and would leave a truncated, invalid kitty APC sequence behind).
+ */
+    static int
+kitty_ga_concat(garray_T *ga, const char_u *s)
+{
+    int	    len = (int)STRLEN(s);
+
+    if (len == 0)
+	return OK;
+    if (ga_grow(ga, len) == FAIL)
+	return FAIL;
+    mch_memmove((char_u *)ga->ga_data + ga->ga_len, s, (size_t)len);
+    ga->ga_len += len;
+    return OK;
+}
+
+/*
+ * Append base64-encoded bytes from "src[len]" to growarray "ga".
+ * Returns OK / FAIL so the caller can propagate OOM.
+ */
+    static int
+kitty_b64_append(garray_T *ga, char_u *src, long len)
+{
+    long    i;
+    long    out_len = ((len + 2) / 3) * 4;
+    char_u  *dst;
+
+    if (out_len == 0)
+	return OK;
+    if (ga_grow(ga, (int)out_len) == FAIL)
+	return FAIL;
+    dst = (char_u *)ga->ga_data + ga->ga_len;
+    for (i = 0; i < len; i += 3)
+    {
+	unsigned a = src[i];
+	unsigned b = (i + 1 < len) ? src[i + 1] : 0;
+	unsigned c = (i + 2 < len) ? src[i + 2] : 0;
+	unsigned triple = (a << 16) | (b << 8) | c;
+
+	*dst++ = kitty_b64_table[(triple >> 18) & 0x3f];
+	*dst++ = kitty_b64_table[(triple >> 12) & 0x3f];
+	*dst++ = (i + 1 < len)
+			    ? kitty_b64_table[(triple >> 6) & 0x3f] : '=';
+	*dst++ = (i + 2 < len)
+			    ? kitty_b64_table[triple & 0x3f]	    : '=';
+    }
+    ga->ga_len += (int)out_len;
+    return OK;
+}
+
+/*
+ * Encode an RGB(A) image into a kitty graphics protocol APC sequence.
+ * Returns a malloced char_u* containing the full sequence
+ * (one or more `\e_G...\e\\` envelopes), or NULL on OOM.
+ *
+ * The sequence is emitted with `a=T` (transmit + display), `q=2` (no
+ * status responses), `f=24` for RGB or `f=32` for RGBA, and chunked
+ * via `m=1`/`m=0` so the per-envelope payload stays under kitty's
+ * 4096-byte limit.  When "id" is non-zero it is sent as `i=<id>` so
+ * the resulting placement can later be removed via kitty_delete().
+ * "zindex" is sent as `z=<zindex>` so overlapping placements stack in
+ * popup zindex order no matter in which order they were (re)created.
+ */
+    char_u *
+kitty_encode(image_rgb_T *img, int id, int zindex)
+{
+    garray_T	ga;
+    long	pix_bytes;
+    long	payload_len;
+    long	b64_total;
+    long	offset = 0;
+    int		fmt;
+    int		first = TRUE;
+    char_u	hdr[80];
+
+    if (img == NULL || img->data == NULL || img->width <= 0 || img->height <= 0)
+	return NULL;
+
+    pix_bytes = img->has_alpha ? 4 : 3;
+    payload_len = (long)img->width * img->height * pix_bytes;
+    b64_total = ((payload_len + 2) / 3) * 4;
+    fmt = img->has_alpha ? 32 : 24;
+
+    ga_init2(&ga, 1, (int)b64_total + 256);
+
+    // Emit one envelope per 4096 base64 chars.  The first envelope
+    // carries the full geometry/format header; later envelopes only
+    // need the chunk-continuation marker `m=`.
+    while (offset < b64_total)
+    {
+	long	this_chunk = b64_total - offset;
+	int	more;
+
+	if (this_chunk > 4096)
+	    this_chunk = 4096;
+	more = (offset + this_chunk < b64_total);
+
+	if (first)
+	{
+	    if (id != 0)
+		vim_snprintf((char *)hdr, sizeof(hdr),
+			"\033_Ga=T,f=%d,s=%d,v=%d,i=%d,z=%d,q=2,m=%d;",
+			fmt, img->width, img->height, id, zindex,
+			more ? 1 : 0);
+	    else
+		vim_snprintf((char *)hdr, sizeof(hdr),
+			"\033_Ga=T,f=%d,s=%d,v=%d,z=%d,q=2,m=%d;",
+			fmt, img->width, img->height, zindex, more ? 1 : 0);
+	    first = FALSE;
+	}
+	else
+	{
+	    vim_snprintf((char *)hdr, sizeof(hdr),
+		    "\033_Gm=%d;", more ? 1 : 0);
+	}
+	if (kitty_ga_concat(&ga, hdr) == FAIL)
+	    goto fail;
+
+	// Encode the matching slice of the source bytes.  Each base64
+	// chunk consumes (this_chunk / 4) base64 quartets, which means
+	// (this_chunk * 3 / 4) source bytes.
+	{
+	    long	src_offset = offset * 3 / 4;
+	    long	src_len = this_chunk * 3 / 4;
+
+	    if (src_offset + src_len > payload_len)
+		src_len = payload_len - src_offset;
+	    if (kitty_b64_append(&ga, img->data + src_offset, src_len) == FAIL)
+		goto fail;
+	}
+
+	if (kitty_ga_concat(&ga, (char_u *)"\033\\") == FAIL)
+	    goto fail;
+
+	offset += this_chunk;
+    }
+
+    if (ga_append(&ga, NUL) == FAIL)
+	goto fail;
+    return (char_u *)ga.ga_data;
+
+fail:
+    ga_clear(&ga);
+    return NULL;
+}
+
+/*
+ * Shared tail of the kitty-graphics-support probe (see popup_kitty_probe()
+ * in popupwin.c for the UNIX side and mch_kitty_probe() in os_win32.c for
+ * the Windows console side).  "buf[n]" holds the raw, NUL-terminated bytes
+ * read back from the terminal after sending the `\e_Gi=31...a=q` query
+ * followed by the DA1 (`\e[c`) sentinel.
+ *
+ * Push everything except the kitty (APC \e_G...\e\\) and DA1 (\e[?...c)
+ * response chunks back into the input buffer so user keystrokes typed
+ * during the probe are not swallowed.  Scan the buffer linearly, emitting
+ * any byte that is not inside a recognised response range.
+ *
+ * Returns TRUE when the buffer contains the positive "_Gi=31;OK" reply.
+ */
+    int
+kitty_probe_parse(char *buf, int n)
+{
+    int i = 0;
+    int seg_start = 0;
+
+    while (i < n)
+    {
+	int response_end = -1;
+
+	if (buf[i] == '\033' && i + 1 < n)
+	{
+	    if (buf[i + 1] == '_')
+	    {
+		// Kitty APC reply: scan to terminating ESC '\\'.
+		int j;
+		for (j = i + 2; j + 1 < n; ++j)
+		    if (buf[j] == '\033' && buf[j + 1] == '\\')
+		    {
+			response_end = j + 2;
+			break;
+		    }
+	    }
+	    else if (buf[i + 1] == '[' && i + 2 < n && buf[i + 2] == '?')
+	    {
+		// DA1 reply: ESC [ ? ... c (the '?' distinguishes the
+		// primary device-attributes answer from an arrow key
+		// sequence like ESC [ A that the user might have typed).
+		int j;
+		for (j = i + 3; j < n; ++j)
+		    if (buf[j] == 'c')
+		    {
+			response_end = j + 1;
+			break;
+		    }
+	    }
+	}
+	if (response_end > 0)
+	{
+	    if (i > seg_start)
+		add_to_input_buf((char_u *)(buf + seg_start), i - seg_start);
+	    i = response_end;
+	    seg_start = i;
+	}
+	else
+	    ++i;
+    }
+    if (n > seg_start)
+	add_to_input_buf((char_u *)(buf + seg_start), n - seg_start);
+
+    // A positive kitty reply contains the literal "_Gi=31;OK".
+    return strstr(buf, "_Gi=31;OK") != NULL;
+}
+
+/*
+ * Build a kitty "delete image" APC sequence for the placement created
+ * by kitty_encode() with the matching `id`.  The caller must
+ * vim_free() the returned buffer.  Returns NULL on OOM or id <= 0.
+ *
+ * Sequence: `\e_Ga=d,i=<id>,q=2\e\\`
+ *	a=d  -> action: delete
+ *	i=   -> image id (target placement)
+ *	q=2  -> suppress status reply
+ */
+    char_u *
+kitty_delete(int id)
+{
+    char_u  buf[40];
+
+    if (id <= 0)
+	return NULL;
+    vim_snprintf((char *)buf, sizeof(buf), "\033_Ga=d,i=%d,q=2\033\\", id);
+    return vim_strsave(buf);
+}
+
+#endif // FEAT_IMAGE_KITTY || PROTO
diff --git a/src/main.c b/src/main.c
index 562b1d4dad..3dbc9c9e67 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1101,6 +1101,13 @@ common_init_2(mparm_T *paramp)
     gui.dofork = true;		    // default is to use fork()
 #endif
 
+#ifdef FEAT_CLIENTSERVER_BACKENDS
+    /*
+     * Check the $VIM_CLIENTSERVER env before we handle the --clientserver arg
+     */
+    check_clientserver_method_env();
+#endif
+
     /*
      * Do a first scan of the arguments in "argv[]":
      *   -display or --display
@@ -2118,7 +2125,11 @@ parse_command_name(mparm_T *parmp)
     }
 
     // "gvim" starts the GUI.  Also accept "Gvim" for MS-Windows.
-    if (TOLOWER_ASC(initstr[0]) == 'g')
+    if (TOLOWER_ASC(initstr[0]) == 'g'
+# ifdef VIMDLL
+	    || mch_is_gui_executable()
+# endif
+       )
     {
 	main_start_gui();
 # ifdef FEAT_GUI
diff --git a/src/map.c b/src/map.c
index 0d9a7f88c6..e3d9faad33 100644
--- a/src/map.c
+++ b/src/map.c
@@ -660,20 +660,26 @@ do_map(
 		// vi-compatible way.
 		if (has_mbyte)
 		{
-		    int	first, last;
-		    int	same = -1;
+		    int		first, last;
+		    int		same = -1;
+		    char_u	keys_unescaped[MAXMAPLEN + 1];
+		    size_t	keys_unescaped_len;
 
-		    first = vim_iswordp(keys);
+		    mch_memmove(keys_unescaped, keys, (size_t)(len + 1));
+		    keys_unescaped_len = vim_unescape_csi(keys_unescaped);
+		    p = keys_unescaped;
+
+		    first = vim_iswordp(p);
 		    last = first;
-		    p = keys + (*mb_ptr2len)(keys);
+		    MB_PTR_ADV(p);
 		    n = 1;
-		    while (p < keys + len)
+		    while (p < keys_unescaped + keys_unescaped_len)
 		    {
 			++n;			// nr of (multi-byte) chars
 			last = vim_iswordp(p);	// type of last char
 			if (same == -1 && last != first)
 			    same = n - 1;	// count of same char type
-			p += (*mb_ptr2len)(p);
+			MB_PTR_ADV(p);
 		    }
 		    if (last && n > 2 && same >= 0 && same < n - 1)
 		    {
@@ -1548,7 +1554,7 @@ ExpandMappings(
 
 	while (ptr2 < ptr3)
 	{
-	    if (STRCMP(*ptr1, *ptr2))
+	    if (STRCMP(*ptr1, *ptr2) != 0)
 		*++ptr1 = *ptr2++;
 	    else
 	    {
@@ -1681,15 +1687,14 @@ check_abbr(
 		if (qe != NULL)
 		{
 		    q = qe;
-		    vim_unescape_csi(q);
-		    qlen = (int)STRLEN(q);
+		    qlen = (int)vim_unescape_csi(q);
 		}
 	    }
 
 	    // find entries with right mode and keys
 	    match =    (mp->m_mode & State)
 		    && qlen == len
-		    && !STRNCMP(q, ptr, (size_t)len);
+		    && STRNCMP(q, ptr, (size_t)len) == 0;
 	    if (q != mp->m_keys)
 		vim_free(q);
 	    if (match)
@@ -1902,8 +1907,9 @@ vim_strsave_escape_csi(char_u *p)
 /*
  * Remove escaping from CSI and K_SPECIAL characters.  Reverse of
  * vim_strsave_escape_csi().  Works in-place.
+ * Returns the number of bytes in the unescaped string.
  */
-    void
+    size_t
 vim_unescape_csi(char_u *p)
 {
     char_u	*s = p, *d = p;
@@ -1925,6 +1931,7 @@ vim_unescape_csi(char_u *p)
 	    *d++ = *s++;
     }
     *d = NUL;
+    return (size_t)(d - p);
 }
 
 /*
diff --git a/src/memline.c b/src/memline.c
index 51b09cc1ca..4ad09f43a5 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -3808,6 +3808,11 @@ adjust_text_props_for_delete(
 		uint16_t pc;
 
 		mch_memmove(&pc, text + textlen, PROP_COUNT_SIZE);
+		if (!text_prop_count_valid(pc, (size_t)(line_size - (long)textlen)))
+		{
+		    internal_error("text property count too large");
+		    return;
+		}
 		this_props_len = pc * (int)sizeof(textprop_T);
 	    }
 
@@ -4046,6 +4051,8 @@ ml_delete_int(buf_T *buf, linenr_T lnum, int flags)
 	mch_memmove(&pc, textprop_save, PROP_COUNT_SIZE);
 	props_data = textprop_save + PROP_COUNT_SIZE;
 	props_bytes = pc * (int)sizeof(textprop_T);
+	if (!text_prop_count_valid(pc, (size_t)textprop_len))
+	    props_bytes = 0;
 
 	// Adjust text properties in the line above and below.
 	if (lnum > 1)
diff --git a/src/message.c b/src/message.c
index 75da61e312..43a035b23d 100644
--- a/src/message.c
+++ b/src/message.c
@@ -174,7 +174,7 @@ msg_attr_keep(
 	    || (*s != '<'
 		&& last_msg_hist != NULL
 		&& last_msg_hist->msg != NULL
-		&& STRCMP(s, last_msg_hist->msg)))
+		&& STRCMP(s, last_msg_hist->msg) != 0))
 	add_msg_hist((char_u *)s, -1, attr);
 
 #ifdef FEAT_EVAL
@@ -1912,14 +1912,15 @@ str2special_save(
     char_u  *str,
     int	    replace_spaces,	// TRUE to replace " " with "<Space>".
 				// used for the lhs of mapping and keytrans().
-    int	    replace_lt)		// TRUE to replace "<" with "<lt>".
+    int	    replace_others)	// TRUE to replace "<" with "<lt>",
+				// "|" with "<Bar>", "\" with "<Bslash>".
 {
     garray_T	ga;
     char_u	*p = str;
 
     ga_init2(&ga, 1, 40);
     while (*p != NUL)
-	ga_concat(&ga, str2special(&p, replace_spaces, replace_lt));
+	ga_concat(&ga, str2special(&p, replace_spaces, replace_others));
     ga_append(&ga, NUL);
     return (char_u *)ga.ga_data;
 }
@@ -1936,7 +1937,8 @@ str2special(
     char_u	**sp,
     int		replace_spaces,	// TRUE to replace " " with "<Space>".
 				// used for the lhs of mapping and keytrans().
-    int		replace_lt)	// TRUE to replace "<" with "<lt>".
+    int		replace_others)	// TRUE to replace "<" with "<lt>",
+				// "|" with "<Bar>", "\" with "<Bslash>".
 {
     int			c;
     static char_u	buf[7];
@@ -2004,7 +2006,7 @@ str2special(
     if (special
 	|| c < ' '
 	|| (replace_spaces && c == ' ')
-	|| (replace_lt && c == '<'))
+	|| (replace_others && (c == '<' || c == '|' || c == '\\')))
 	return get_special_key_name(c, modifiers);
     buf[0] = c;
     buf[1] = NUL;
diff --git a/src/misc1.c b/src/misc1.c
index ce4db318d4..434eb12f99 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -316,7 +316,7 @@ get_last_leader_offset(char_u *line, char_u **flags)
 		for (off = (len2 > i ? i : len2); off > 0 && off + len1 > len2;)
 		{
 		    --off;
-		    if (!STRNCMP(string + off, com_leader, len2 - off))
+		    if (STRNCMP(string + off, com_leader, len2 - off) == 0)
 		    {
 			if (i - off < lower_check_bound)
 			    lower_check_bound = i - off;
diff --git a/src/mouse.c b/src/mouse.c
index c520f6c58c..5296c76222 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -1416,6 +1416,62 @@ ins_mousescroll(int dir)
     }
 }
 
+#if defined(FEAT_PROP_POPUP) || defined(PROTO)
+/*
+ * Command-line mode implementation for scrolling in direction "dir", which is
+ * one of the MSCR_ values.  Scrolls the completion info popup when the mouse
+ * pointer is on top of it.
+ * Returns TRUE when the info popup was scrolled.
+ */
+    int
+cmdline_mousescroll(int dir)
+{
+    cmdarg_T	cap;
+    oparg_T	oa;
+
+    CLEAR_FIELD(cap);
+    clear_oparg(&oa);
+    cap.oap = &oa;
+    cap.arg = dir;
+
+    switch (dir)
+    {
+	case MSCR_UP:	 cap.cmdchar = K_MOUSEUP; break;
+	case MSCR_DOWN:	 cap.cmdchar = K_MOUSEDOWN; break;
+	case MSCR_LEFT:	 cap.cmdchar = K_MOUSELEFT; break;
+	case MSCR_RIGHT: cap.cmdchar = K_MOUSERIGHT; break;
+    }
+
+    if (mouse_row < 0 || mouse_col < 0)
+	return FALSE;
+
+    int	    row = mouse_row;
+    int	    col = mouse_col;
+    win_T   *wp;
+
+    // Only scroll when the mouse is on top of the info popup.
+    wp = mouse_find_win(&row, &col, FIND_POPUP);
+    if (wp == NULL || !WIN_IS_POPUP(wp) || !(wp->w_popup_flags & POPF_INFO)
+							|| !wp->w_has_scrollbar)
+	return FALSE;
+
+    win_T   *old_curwin = curwin;
+
+    curwin = wp;
+    curbuf = wp->w_buffer;
+    // Call the common mouse scroll function shared with other modes.
+    do_mousescroll(&cap);
+    curwin = old_curwin;
+    curbuf = curwin->w_buffer;
+
+    // Cmdline mode doesn't normally call update_screen(), so redraw the
+    // completion popup menu, which also repaints the info popup.
+    if (cmdline_pum_active())
+	cmdline_pum_display();
+    return TRUE;
+}
+#endif
+
 /*
  * Return TRUE if "c" is a mouse key.
  */
diff --git a/src/move.c b/src/move.c
index 14271240fd..ec5936b489 100644
--- a/src/move.c
+++ b/src/move.c
@@ -431,22 +431,15 @@ update_topline(void)
 	    // If we weren't very close to begin with, we scroll to put the
 	    // cursor in the middle of the window.  Otherwise put the cursor
 	    // near the top of the window.
-	    if (n >= halfheight)
-	    {
-		if (eof_pressure)
-		    scroll_cursor_halfway(TRUE, TRUE);
-		else
-		    scroll_cursor_halfway(FALSE, FALSE);
-	    }
+	    int min_scroll = scrolljump_value();
+	    if (eof_pressure)
+		scroll_cursor_halfway(TRUE, TRUE);
+	    else if (n >= halfheight && min_scroll < halfheight)
+		scroll_cursor_halfway(FALSE, FALSE);
 	    else
 	    {
-		if (eof_pressure)
-		    scroll_cursor_halfway(TRUE, TRUE);
-		else
-		{
-		    scroll_cursor_top(scrolljump_value(), FALSE);
-		    check_botline = TRUE;
-		}
+		scroll_cursor_top(min_scroll, FALSE);
+		check_botline = TRUE;
 	    }
 	}
 
diff --git a/src/netbeans.c b/src/netbeans.c
index 20aae0d3ae..04d835fd77 100644
--- a/src/netbeans.c
+++ b/src/netbeans.c
@@ -3105,21 +3105,25 @@ netbeans_draw_multisign_indicator(int row)
     if (!NETBEANS_OPEN)
 	return;
 
+    x = 0;
+    y = row * gui.char_height + 2;
+
 # if GTK_CHECK_VERSION(3,0,0)
+#  ifdef USE_GTK4_SNAPSHOT
+    cr = gui_gtk4_get_multisign_context(x, y, 5, gui.char_height);
+#  else
     cr = cairo_create(gui.surface);
+#  endif
     cairo_set_source_rgba(cr,
 	    gui.fgcolor->red, gui.fgcolor->green, gui.fgcolor->blue,
 	    gui.fgcolor->alpha);
 # endif
 
-    x = 0;
-    y = row * gui.char_height + 2;
-
     for (i = 0; i < gui.char_height - 3; i++)
 # if GTK_CHECK_VERSION(3,0,0)
 	cairo_rectangle(cr, x+2, y++, 1, 1);
 # else
-	gdk_draw_point(drawable, gui.text_gc, x+2, y++);
+    gdk_draw_point(drawable, gui.text_gc, x+2, y++);
 # endif
 
 # if GTK_CHECK_VERSION(3,0,0)
diff --git a/src/normal.c b/src/normal.c
index ba053ff1e9..80d06d6e3f 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -4622,6 +4622,30 @@ nv_brackets(cmdarg_T *cap)
 	clearopbeep(cap->oap);
 }
 
+/*
+ * Return true when 'comments' defines a C-style line ("//") or block comment.
+ * This is when "%" should skip matching parens in comments, like the "="
+ * operator does.
+ */
+    static bool
+buf_has_cstyle_comments(void)
+{
+    char_u	*list;
+    char_u	part_buf[COM_MAX_LEN];	// buffer for one 'comments' part
+
+    for (list = curbuf->b_p_com; *list; )
+    {
+	char_u	*string;
+
+	(void)copy_option_part(&list, part_buf, COM_MAX_LEN, ",");
+	string = vim_strchr(part_buf, ':');	// flags and comment leader
+	if (string != NULL && string[1] == '/'
+				    && (string[2] == '/' || string[2] == '*'))
+	    return true;
+    }
+    return false;
+}
+
 /*
  * Handle Normal mode "%" command.
  */
@@ -4661,9 +4685,23 @@ nv_percent(cmdarg_T *cap)
     }
     else		    // "%" : go to matching paren
     {
+	int	flags = 0;
+
+	// Skip matching parens inside C-style comments, like the "=" operator
+	// does, but not when "%" is in 'cpoptions' (Vi-compatible) or the
+	// cursor sits in a line comment (so a match there can still be found).
+	if (vim_strchr(p_cpo, CPO_MATCH) == NULL && buf_has_cstyle_comments())
+	{
+	    int	comment_col = check_linecomment(ml_get_curline());
+
+	    if (comment_col == MAXCOL
+			   || curwin->w_cursor.col < (colnr_T)comment_col)
+		flags = FM_SKIPCOMM;
+	}
+
 	cap->oap->motion_type = MCHAR;
 	cap->oap->use_reg_one = TRUE;
-	if ((pos = findmatch(cap->oap, NUL)) == NULL)
+	if ((pos = findmatchlimit(cap->oap, NUL, flags, 0)) == NULL)
 	    clearopbeep(cap->oap);
 	else
 	{
diff --git a/src/os_mswin.c b/src/os_mswin.c
index bfd0f1a386..edaa03d4f7 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -575,6 +575,12 @@ mch_set_shellsize(void)
  */
     void
 mch_new_shellsize(void)
+{
+    // never used
+}
+
+    void
+mch_calc_cell_size(struct cellsize *cs_out UNUSED)
 {
     // never used
 }
diff --git a/src/os_unix.c b/src/os_unix.c
index 4b9b804e2f..ec6fdffaa9 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -4412,6 +4412,103 @@ mch_get_shellsize(void)
     return OK;
 }
 
+/*
+ * Synchronously ask the terminal for its window pixel dimensions via the
+ * xterm CSI 14 t query and parse the CSI 4 ; H ; W t response.  Returns OK
+ * and fills *win_w and *win_h on success.  Returns FAIL on any error
+ * (non-tty, no response within ~200ms, malformed reply).
+ *
+ * Any bytes that arrive before / after the response (e.g. the user typed
+ * something while we were probing) are forwarded to the regular input
+ * buffer via add_to_input_buf() so keystrokes are not swallowed.
+ */
+    static int
+query_terminal_pixel_size(int *win_w, int *win_h)
+{
+    struct termios old_t, new_t;
+    int		fd_in = read_cmd_fd;
+    int		fd_out = 1;
+    char	buf[64];
+    int		n = 0;
+    char	*p, *semi, *end, *rest;
+    char	*resp_end;
+    long	hpx, wpx;
+    ssize_t	r;
+    int		ret = FAIL;
+
+    if (!isatty(fd_in) || !isatty(fd_out))
+	return FAIL;
+    if (tcgetattr(fd_in, &old_t) != 0)
+	return FAIL;
+    new_t = old_t;
+    new_t.c_lflag &= ~(ICANON | ECHO);
+    new_t.c_cc[VMIN] = 0;
+    new_t.c_cc[VTIME] = 2;	    // 200ms grace per read()
+    if (tcsetattr(fd_in, TCSANOW, &new_t) != 0)
+	return FAIL;
+
+    if (write(fd_out, "\033[14t", 5) != 5)
+    {
+	tcsetattr(fd_in, TCSANOW, &old_t);
+	return FAIL;
+    }
+
+    while (n < (int)sizeof(buf) - 1)
+    {
+	char c;
+
+	r = read(fd_in, &c, 1);
+	if (r != 1)
+	    break;
+	buf[n++] = c;
+	if (c == 't')
+	    break;
+    }
+    buf[n] = 0;
+    tcsetattr(fd_in, TCSANOW, &old_t);
+
+    // expected: ESC [ 4 ; H ; W t
+    p = (char *)vim_strchr((char_u *)buf, '\033');
+    if (p != NULL && p[1] == '[' && p[2] == '4' && p[3] == ';')
+    {
+	char *q = p + 4;
+
+	semi = (char *)vim_strchr((char_u *)q, ';');
+	end = semi != NULL ? (char *)vim_strchr((char_u *)semi, 't') : NULL;
+	if (end != NULL)
+	{
+	    hpx = strtol(q, &rest, 10);
+	    if (rest == semi && hpx > 0 && hpx <= INT_MAX)
+	    {
+		wpx = strtol(semi + 1, &rest, 10);
+		if (rest == end && wpx > 0 && wpx <= INT_MAX)
+		{
+		    *win_w = (int)wpx;
+		    *win_h = (int)hpx;
+		    ret = OK;
+		}
+	    }
+	}
+    }
+
+    // Push back bytes that were not part of the response, so any keystrokes
+    // typed during the probe do not get lost.  On a failed parse, everything
+    // in buf is treated as foreign input.
+    if (ret == OK)
+    {
+	resp_end = end + 1;	    // one past the matched 't'
+	if (p > buf)
+	    add_to_input_buf((char_u *)buf, (int)(p - buf));
+	if (resp_end < buf + n)
+	    add_to_input_buf((char_u *)resp_end,
+				    (int)((buf + n) - resp_end));
+    }
+    else if (n > 0)
+	add_to_input_buf((char_u *)buf, n);
+
+    return ret;
+}
+
 /*
  * Try to get the current terminal cell size.
  * On failure, returns -1x-1
@@ -4440,9 +4537,47 @@ mch_calc_cell_size(struct cellsize *cs_out)
    int x_cell_size = ws.ws_xpixel / ws.ws_col;
    int y_cell_size = ws.ws_ypixel / ws.ws_row;
 
+   // many terminals leave ws_xpixel/ws_ypixel zero; ask via CSI 14 t.
+   // Cache the resulting *cell* size (cell px is invariant under window
+   // resize as long as the font size stays the same -- caching the raw
+   // window pixel size and re-dividing by ws_col/ws_row would produce
+   // garbage after a resize).
+   if (x_cell_size <= 0 || y_cell_size <= 0)
+   {
+	static int csi14_state = -1;	    // -1 unknown, 0 fail, 1 ok
+	static int csi14_cell_x = 0;
+	static int csi14_cell_y = 0;
+
+	if (csi14_state == 1)
+	{
+	    x_cell_size = csi14_cell_x;
+	    y_cell_size = csi14_cell_y;
+	}
+	else if (csi14_state == -1)
+	{
+	    int wpx, hpx;
+
+	    csi14_state = 0;
+	    if (query_terminal_pixel_size(&wpx, &hpx) == OK
+				    && wpx / ws.ws_col > 0
+				    && hpx / ws.ws_row > 0)
+	    {
+		x_cell_size = wpx / ws.ws_col;
+		y_cell_size = hpx / ws.ws_row;
+		csi14_state = 1;
+		csi14_cell_x = x_cell_size;
+		csi14_cell_y = y_cell_size;
+# ifdef FEAT_EVAL
+		ch_log(NULL, "Got cell pixel size via CSI 14 t: %d x %d",
+						    x_cell_size, y_cell_size);
+# endif
+	    }
+	}
+   }
+
    // calculate current tty's pixel
-   cs_out->cs_xpixel = x_cell_size;
-   cs_out->cs_ypixel = y_cell_size;
+   cs_out->cs_xpixel = x_cell_size > 0 ? x_cell_size : -1;
+   cs_out->cs_ypixel = y_cell_size > 0 ? y_cell_size : -1;
 
 # ifdef FEAT_EVAL
    ch_log(NULL, "Got cell pixel size with TIOCGWINSZ: %d x %d", x_cell_size, y_cell_size);
@@ -4468,31 +4603,30 @@ mch_report_winsize(int fd, int rows, int cols)
 
     ws.ws_col = cols;
     ws.ws_row = rows;
+    // Pixel sizes are best-effort; the child can query its own terminal
+    // when needed.  Avoid calling mch_calc_cell_size() here -- on
+    // terminals that do not report pixel sizes via TIOCGWINSZ, the
+    // CSI 14 t fallback would synchronously block term_start() for up
+    // to 200ms each time, perturbing timing-sensitive screendump tests
+    // that fork a child Vim.  Setting 0 matches the pre-image-popup
+    // behaviour and is what TIOCSWINSZ does when the kernel cannot
+    // populate the field anyway.
+    ws.ws_xpixel = 0;
+    ws.ws_ypixel = 0;
 
-    // calculate and set tty pixel size
-    struct cellsize cs;
 #if defined(FEAT_GUI) && defined(FEAT_GUI_MACVIM)
     if (gui.in_use)
     {
+	// calculate and set tty pixel size
+	struct cellsize cs;
 	gui_mch_calc_cell_size(&cs);
+	if (cs.cs_xpixel != -1)
+	{
+	    ws.ws_xpixel = cols * cs.cs_xpixel;
+	    ws.ws_ypixel = rows * cs.cs_ypixel;
+	}
     }
-    else
 #endif
-    {
-	mch_calc_cell_size(&cs);
-    }
-
-    if (cs.cs_xpixel == -1)
-    {
-	// failed get pixel size.
-	ws.ws_xpixel = 0;
-	ws.ws_ypixel = 0;
-    }
-    else
-    {
-	ws.ws_xpixel = cols * cs.cs_xpixel;
-	ws.ws_ypixel = rows * cs.cs_ypixel;
-    }
 
     retval = ioctl(tty_fd, TIOCSWINSZ, &ws);
     ch_log(NULL, "ioctl(TIOCSWINSZ) %s", retval == 0 ? "success" : "failed");
diff --git a/src/os_unix.h b/src/os_unix.h
index a507392277..476c9c21c3 100644
--- a/src/os_unix.h
+++ b/src/os_unix.h
@@ -122,6 +122,11 @@ typedef void (*sighandler_T) SIGPROTOARG;
 # define MAXNAMLEN NAME_MAX	    // for Linux before .99p3
 #endif
 
+#if defined(__sun)
+# undef MAXNAMLEN
+# define MAXNAMLEN 255
+#endif
+
 /*
  * Note: if MAXNAMLEN has the wrong value, you will get error messages
  *	 for not being able to open the swap file.
diff --git a/src/os_win32.c b/src/os_win32.c
index 31fa169a5a..5e11de231c 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -4681,6 +4681,313 @@ mch_set_winsize_now(void)
     }
     suppress_winsize = 0;
 }
+
+/*
+ * Synchronously ask the terminal for its window pixel dimensions via the
+ * xterm CSI 14 t query and parse the CSI 4 ; H ; W t response.  Returns OK
+ * and fills *win_w and *win_h on success.  Returns FAIL on any error
+ * (no console handles, no response within ~200ms, malformed reply).
+ *
+ * Used as a fallback for ConPTY-hosted terminals (Windows Terminal, VS Code,
+ * ...) where GetCurrentConsoleFontEx() returns dwFontSize = (0, *) because
+ * the pty stub does not own a font.  Real terminals (mintty, Windows
+ * Terminal recent builds, WezTerm, ...) reply to CSI 14 t with their
+ * rendered window pixel size.
+ */
+    static int
+query_terminal_pixel_size_w32(int *win_w, int *win_h)
+{
+    HANDLE	hOut = g_hConOut;
+    HANDLE	hIn = g_hConIn;
+    DWORD	mode_in_old = 0;
+    int		restored = 0;
+    DWORD	nWritten = 0;
+    char	buf[64];
+    int		n = 0;
+    DWORD	deadline;
+    char	*p, *semi, *end;
+    int		hpx, wpx;
+
+    if (hOut == INVALID_HANDLE_VALUE || hIn == INVALID_HANDLE_VALUE)
+	return FAIL;
+
+    if (GetConsoleMode(hIn, &mode_in_old))
+    {
+	DWORD mode_new = mode_in_old;
+
+	// Read raw bytes; deliver xterm response as VT input.
+	mode_new &= ~(ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT
+						    | ENABLE_PROCESSED_INPUT);
+	mode_new |= ENABLE_VIRTUAL_TERMINAL_INPUT;
+	if (SetConsoleMode(hIn, mode_new))
+	    restored = 1;
+    }
+
+    if (!WriteFile(hOut, "\033[14t", 5, &nWritten, NULL) || nWritten != 5)
+    {
+	if (restored)
+	    SetConsoleMode(hIn, mode_in_old);
+	return FAIL;
+    }
+
+    deadline = GetTickCount() + 200;
+    while (n < (int)sizeof(buf) - 1)
+    {
+	DWORD		now = GetTickCount();
+	DWORD		remaining;
+	INPUT_RECORD	ir;
+	DWORD		count = 0;
+
+	if ((int)(deadline - now) <= 0)
+	    break;
+	remaining = deadline - now;
+
+	if (WaitForSingleObject(hIn, remaining) != WAIT_OBJECT_0)
+	    break;
+	if (!ReadConsoleInputW(hIn, &ir, 1, &count) || count != 1)
+	    break;
+	if (ir.EventType != KEY_EVENT
+		|| !ir.Event.KeyEvent.bKeyDown
+		|| ir.Event.KeyEvent.uChar.AsciiChar == 0)
+	    continue;
+	buf[n++] = ir.Event.KeyEvent.uChar.AsciiChar;
+	if (buf[n - 1] == 't')
+	    break;
+    }
+    buf[n] = 0;
+
+    if (restored)
+	SetConsoleMode(hIn, mode_in_old);
+
+    // expected: ESC [ 4 ; H ; W t
+    p = (char *)vim_strchr((char_u *)buf, '\033');
+    if (p == NULL || p[1] != '[' || p[2] != '4' || p[3] != ';')
+	return FAIL;
+    p += 4;
+    semi = (char *)vim_strchr((char_u *)p, ';');
+    if (semi == NULL)
+	return FAIL;
+    end = (char *)vim_strchr((char_u *)semi, 't');
+    if (end == NULL)
+	return FAIL;
+    {
+	varnumber_T	v;
+
+	// 0 = recognise decimal only.
+	vim_str2nr((char_u *)p, NULL, NULL, 0, &v, NULL, 0, FALSE, NULL);
+	hpx = (int)v;
+	vim_str2nr((char_u *)(semi + 1), NULL, NULL, 0, &v, NULL, 0,
+								  FALSE, NULL);
+	wpx = (int)v;
+    }
+    if (hpx <= 0 || wpx <= 0)
+	return FAIL;
+
+    *win_w = wpx;
+    *win_h = hpx;
+    return OK;
+}
+
+/*
+ * Try to get the current terminal cell size in pixels.
+ *
+ * Strategy:
+ *   1. GetCurrentConsoleFontEx() — works on the legacy conhost, where the
+ *      console owns the font and returns real cell metrics.
+ *   2. CSI 14 t / window-size-in-cells fallback — for ConPTY hosts
+ *      (Windows Terminal, VS Code, ...) where GetCurrentConsoleFontEx()
+ *      returns a zero or default-stub font size.  The result is cached
+ *      so the synchronous probe is paid at most once per session.
+ *
+ * On failure, sets cs_xpixel and cs_ypixel to -1.
+ */
+    void
+mch_calc_cell_size(struct cellsize *cs_out)
+{
+    CONSOLE_FONT_INFOEX cfi;
+    static int		csi14_state = -1;	// -1 unknown, 0 fail, 1 ok
+    static int		csi14_cell_x = 0;
+    static int		csi14_cell_y = 0;
+
+    cs_out->cs_xpixel = -1;
+    cs_out->cs_ypixel = -1;
+
+# ifdef VIMDLL
+    if (gui.in_use)
+	return;
+# endif
+    if (g_hConOut == INVALID_HANDLE_VALUE)
+	return;
+
+    cfi.cbSize = sizeof(cfi);
+    if (GetCurrentConsoleFontEx(g_hConOut, FALSE, &cfi)
+	    && cfi.dwFontSize.X > 0 && cfi.dwFontSize.Y > 0)
+    {
+	cs_out->cs_xpixel = cfi.dwFontSize.X;
+	cs_out->cs_ypixel = cfi.dwFontSize.Y;
+	return;
+    }
+
+    // ConPTY fallback: ask the host terminal via CSI 14 t and divide by
+    // the current window cell count to get cell pixel size.  Cache the
+    // result -- cell pixel size is invariant under window resize so long
+    // as the font size stays the same; caching the raw window pixel size
+    // would go stale after a resize.
+    if (csi14_state == 1)
+    {
+	cs_out->cs_xpixel = csi14_cell_x;
+	cs_out->cs_ypixel = csi14_cell_y;
+	return;
+    }
+    if (csi14_state == 0)
+	return;
+
+    csi14_state = 0;
+    {
+	CONSOLE_SCREEN_BUFFER_INFO csbi;
+	int wpx, hpx, cols, rows;
+
+	if (!GetConsoleScreenBufferInfo(g_hConOut, &csbi))
+	    return;
+	cols = csbi.srWindow.Right - csbi.srWindow.Left + 1;
+	rows = csbi.srWindow.Bottom - csbi.srWindow.Top + 1;
+	if (cols <= 0 || rows <= 0)
+	    return;
+
+	if (query_terminal_pixel_size_w32(&wpx, &hpx) != OK)
+	    return;
+	if (wpx / cols <= 0 || hpx / rows <= 0)
+	    return;
+
+	csi14_cell_x = wpx / cols;
+	csi14_cell_y = hpx / rows;
+	csi14_state = 1;
+	cs_out->cs_xpixel = csi14_cell_x;
+	cs_out->cs_ypixel = csi14_cell_y;
+    }
+}
+
+# if defined(FEAT_IMAGE_KITTY) || defined(PROTO)
+/*
+ * Synchronously probe the host terminal for kitty graphics protocol
+ * support.  Windows console counterpart of popup_kitty_probe() in
+ * popupwin.c: sends the same
+ *	\e_Gi=31,s=1,v=1,a=q,t=d,f=24;AAAA\e\\\e[c
+ * query (kitty answer + DA1 sentinel) and feeds the reply to the shared
+ * kitty_probe_parse().  The reply is read from the console input handle
+ * with ENABLE_VIRTUAL_TERMINAL_INPUT set, the same technique as
+ * query_terminal_pixel_size_w32() above.
+ *
+ * Returns TRUE on a positive `_Gi=31;OK` response.  Missing handles,
+ * a non-VT console and timeouts (~500ms) all yield FALSE.
+ */
+    int
+mch_kitty_probe(void)
+{
+    HANDLE	hOut = g_hConOut;
+    HANDLE	hIn = g_hConIn;
+    DWORD	mode_in_old = 0;
+    int		restored = 0;
+    DWORD	nWritten = 0;
+    char	buf[256];
+    int		n = 0;
+    DWORD	deadline;
+    DWORD	da1_deadline;
+    static const char	query[] =
+		    "\033_Gi=31,s=1,v=1,a=q,t=d,f=24;AAAA\033\\\033[c";
+
+#  ifdef VIMDLL
+    if (gui.in_use)
+	return FALSE;
+#  endif
+    if (hOut == INVALID_HANDLE_VALUE || hIn == INVALID_HANDLE_VALUE)
+	return FALSE;
+    // Without VT output processing the query would be echoed onto the
+    // legacy console as raw text, and the kitty APC image sequences could
+    // not reach a terminal anyway.
+    if (!vtp_working)
+	return FALSE;
+
+    if (GetConsoleMode(hIn, &mode_in_old))
+    {
+	DWORD mode_new = mode_in_old;
+
+	// Read raw bytes; deliver the terminal responses as VT input.
+	mode_new &= ~(ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT
+						| ENABLE_PROCESSED_INPUT);
+	mode_new |= ENABLE_VIRTUAL_TERMINAL_INPUT;
+	if (SetConsoleMode(hIn, mode_new))
+	    restored = 1;
+    }
+
+    if (!WriteFile(hOut, query, sizeof(query) - 1, &nWritten, NULL)
+	    || nWritten != sizeof(query) - 1)
+    {
+	if (restored)
+	    SetConsoleMode(hIn, mode_in_old);
+	return FALSE;
+    }
+
+    // Read until the kitty reply lands or we time out.  Unlike the UNIX
+    // probe, the DA1 reply cannot serve as a hard "no kitty support"
+    // sentinel here: under ConPTY the DA1 answer is generated by conhost
+    // itself, while the kitty APC query has to round-trip through the
+    // attached terminal (possibly over ssh), so the DA1 answer usually
+    // arrives first.  Treat DA1 as "wrap up soon" instead and keep
+    // reading for a short grace period after it.
+    deadline = GetTickCount() + 500;
+    da1_deadline = 0;		    // 0: DA1 reply not seen yet
+    while (n < (int)sizeof(buf) - 1)
+    {
+	DWORD		now = GetTickCount();
+	DWORD		until = deadline;
+	INPUT_RECORD	ir;
+	DWORD		count = 0;
+
+	if (da1_deadline != 0 && (int)(da1_deadline - until) < 0)
+	    until = da1_deadline;
+	if ((int)(until - now) <= 0)
+	    break;
+	if (WaitForSingleObject(hIn, until - now) != WAIT_OBJECT_0)
+	    break;
+	if (!ReadConsoleInputW(hIn, &ir, 1, &count) || count != 1)
+	    break;
+	if (ir.EventType != KEY_EVENT
+		|| !ir.Event.KeyEvent.bKeyDown
+		|| ir.Event.KeyEvent.uChar.AsciiChar == 0)
+	    continue;
+	buf[n++] = ir.Event.KeyEvent.uChar.AsciiChar;
+	buf[n] = NUL;
+	// Stop as soon as the kitty APC reply is complete (terminated by
+	// ESC \) -- positive or negative, nothing later changes the verdict.
+	if (n >= 2 && buf[n - 1] == '\\' && buf[n - 2] == '\033'
+		&& strstr(buf, "_Gi=31;") != NULL)
+	    break;
+	// DA1 reply ends with a primary 'c' that is preceded by '?';
+	// once seen, allow a little more time for a passthrough kitty
+	// reply, then give up.
+	if (da1_deadline == 0
+		&& buf[n - 1] == 'c' && n >= 3 && buf[n - 2] != '\033')
+	{
+	    int i;
+
+	    for (i = n - 2; i > 0; --i)
+		if (buf[i] == '?' && buf[i - 1] == '[')
+		    break;
+	    if (i > 0)
+		da1_deadline = GetTickCount() + 250;
+	}
+    }
+    buf[n] = NUL;
+
+    if (restored)
+	SetConsoleMode(hIn, mode_in_old);
+
+    // Filter the probe responses out of the read-back bytes (pushing user
+    // keystrokes back into the input buffer) and check for a positive reply.
+    return kitty_probe_parse(buf, n);
+}
+# endif
 #endif
 
     static BOOL
diff --git a/src/po/it.po b/src/po/it.po
index 8da30e86bf..e73c41209e 100644
--- a/src/po/it.po
+++ b/src/po/it.po
@@ -7,7 +7,7 @@
 # Every remark is very welcome...
 # Ogni commento è benvenuto...
 #
-# Traduzione fatta in ambiebte Linux, usnado una tastiera italiana.
+# Traduzione fatta in ambiebte Linux, usando una tastiera italiana.
 # Le parole inglesi presenti nel testo sono sempre al singolare.
 # I nomi delle opzioni sono quasi sempre lasciati in inglese.
 # I nomi dei modi di Vim sono lasciati in inglese.
@@ -15,8 +15,8 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: vim-dev@vim.org\n"
-"POT-Creation-Date: 2026-05-21 07:38+0200\n"
-"PO-Revision-Date: 2026-05-21 08:20+0100\n"
+"POT-Creation-Date: 2026-06-19 15:17+0200\n"
+"PO-Revision-Date: 2026-06-19 16:30+0100\n"
 "Last-Translator: Antonio Colombo <azc100@gmail.com>\n"
 "Language-Team: Italian\n"
 "Language: it\n"
@@ -269,9 +269,6 @@ msgstr ": Invio fallito. Tento di eseguire localmente\n"
 msgid "%d of %d edited"
 msgstr "%d di %d elaborato"
 
-msgid "Socket server not online:Send expression failed"
-msgstr "Server di socket non online: Invio di espressione fallito."
-
 msgid "No display: Send expression failed.\n"
 msgstr "Nessun display: Invio di espressione fallito.\n"
 
@@ -998,6 +995,15 @@ msgstr "Sostituisci Tutto"
 msgid "_Close"
 msgstr "_Chiudi"
 
+msgid "Close Tab"
+msgstr "Chiudi Scheda"
+
+msgid "New Tab"
+msgstr "Nuova Scheda"
+
+msgid "Open Tab..."
+msgstr "Apri scheda..."
+
 msgid "Direction:"
 msgstr "Direzione:"
 
@@ -1013,9 +1019,6 @@ msgstr "Chiudi scheda"
 msgid "New tab"
 msgstr "Nuova scheda"
 
-msgid "Open Tab..."
-msgstr "Apri scheda..."
-
 msgid "Vim: Main window unexpectedly destroyed\n"
 msgstr "Vim: Finestra principale distrutta inaspettatamente\n"
 
@@ -1796,8 +1799,10 @@ msgstr "-X\t\t\tNon connetterti a server X"
 msgid "-Y\t\t\tDo not connect to Wayland compositor"
 msgstr "-Y\t\t\tNon connetterti a compositore Wayland"
 
-msgid "--clientserver <socket|x11> Backend for clientserver communication"
-msgstr "--clientserver <socket|x11> Server per comunicazione client/server"
+msgid ""
+"--clientserver <socket|x11|mswin> Backend for clientserver communication"
+msgstr ""
+"--clientserver <socket|x11|mswin> Server per comunicazione client/server"
 
 msgid "--remote <files>\tEdit <files> in a Vim server if possible"
 msgstr "--remote <file>\tApri <file> in un server Vim se possibile"
@@ -2721,10 +2726,6 @@ msgstr "XSMP osservazione connessione ICE fallita"
 msgid "XSMP SmcOpenConnection failed: %s"
 msgstr "XSMP SmcOpenConnection fallita: %s"
 
-#, c-format
-msgid "Failed creating socket directory: %s"
-msgstr "Creazione di directory di socket fallita: %s"
-
 msgid "At line"
 msgstr "Alla riga"
 
@@ -3004,6 +3005,10 @@ msgstr " (NON TROVATO)"
 msgid " (not supported)"
 msgstr " (non supportata)"
 
+#, c-format
+msgid "Failed creating socket directory: %s"
+msgstr "Creazione di directory di socket fallita: %s"
+
 #, c-format
 msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
 msgstr "Avviso: Non trovo lista parole \"%s_%s.spl\" o \"%s_ascii.spl\""
@@ -3715,6 +3720,9 @@ msgstr ""
 msgid "without GUI."
 msgstr "senza GUI."
 
+msgid "with GTK4 GUI (hwaccel)."
+msgstr "con GUI GTK4 (hwaccel)."
+
 msgid "with GTK4 GUI."
 msgstr "con GUI GTK4."
 
@@ -7137,8 +7145,9 @@ msgstr "E911: Uso di un Job come un Numero-a-virgola-mobile"
 
 msgid ""
 "E912: Cannot use ch_evalexpr()/ch_sendexpr() with a raw, nl or blob channel"
-msgstr "E912: Impossibile usare ch_evalexpr()/ch_sendexpr con un canale "
-"grezzo o nl o blob"
+msgstr ""
+"E912: Impossibile usare ch_evalexpr()/ch_sendexpr con un canale grezzo o nl "
+"o blob"
 
 msgid "E913: Using a Channel as a Number"
 msgstr "E913: Uso di un Canale come un Numero"
@@ -8821,7 +8830,7 @@ msgstr ""
 "\"%s\""
 
 msgid "E1378: Static member not supported in an interface"
-msgstr "E1378: Membro statico non supportato in un'Interfaccia"
+msgstr "E1378: Elemento statico non supportato in un'Interfaccia"
 
 msgid "E1379: Protected variable not supported in an interface"
 msgstr "E1379: Variabile protetta non supportata in un'Interfaccia"
@@ -8918,6 +8927,10 @@ msgstr "E1404: Impossibile usare \"Abstract\" in un'Interfaccia"
 msgid "E1405: Class \"%s\" cannot be used as a value"
 msgstr "E1405: Impossibile usare Classe \"%s\" come valore"
 
+#, c-format
+msgid "E1406: Public and protected member have the same name: %s and _%s"
+msgstr "E1406: Elemento pubblico e protetto con nome uguale: %s e _%s"
+
 msgid "E1407: Cannot use a Typealias as a variable or value"
 msgstr "E1407: Impossibile usare Typealias come variabile o valore"
 
@@ -9289,24 +9302,22 @@ msgid "E1562: Diff anchors cannot be used with hidden diff windows"
 msgstr ""
 "E1562: Punti di ancoraggio Diff non disponibili per finestre Diff nascoste"
 
-msgid "E1563: Socket path is too big"
-msgstr "E1563: Il percorso al socket è troppo lungo"
-
-msgid "E1564: Socket name cannot have slashes in it without being a path"
-msgstr "E1564: Il nome del socket non può contenere barre se non è un percorso"
+msgid "E1564: Socket name '%s' cannot have slashes in it without being a path"
+msgstr "E1564: Il nome socket '%s' non può contenere barre se non è un percorso"
 
 msgid "E1565: Socket server is not online, call remote_startserver() first"
 msgstr ""
 "E1565: Il server di socket non è online, chiamare prima remote_startserver()"
 
-#, c-format
-msgid "E1566: Failed connecting to socket %s: %s"
-msgstr "E1566: Connessione al socket %s: %s fallita"
+msgid "E1566: Failed connecting to socket '%s'"
+msgstr "E1566: Connessione fallita al socket '%s'"
 
-msgid "E1567: Cannot start socket server, socket path is unavailable"
+msgid ""
+"E1567: Socket server protocol version mismatch, check what Vim version you "
+"are using"
 msgstr ""
-"E1567: Non posso far partire il server di socket, percorso di socket non "
-"disponibile"
+"E1567: Versione protocollo server socket non corripondente, controllare "
+"versione di Vim in uso"
 
 #, c-format
 msgid "E1568: OSC command response timed out: %.*s"
@@ -9344,6 +9355,12 @@ msgstr "E1576: Il puntatore nel file di tag non dev'essere un URL"
 msgid "E1577: Invalid format string, only one \"%s\" is allowed"
 msgstr "E1577: Stringa di formato non valida, solo un \"%s\" è consentito"
 
+msgid "E1578: Too many postponed prefixes and/or compound flags"
+msgstr "E1578: Troppi suffissi finali e/o flag composti"
+
+msgid "E1579: -completeopt=escape cannot be used with -nargs=_"
+msgstr "E1579: -completeopt=escape non consentito con -nargs=_"
+
 #. type of cmdline window or 0
 #. result of cmdline window or 0
 #. buffer of cmdline window or NULL
@@ -10906,8 +10923,7 @@ msgstr ""
 
 msgid "only allow safe options to be set from a modeline"
 msgstr ""
-"consentire solo impostazione di opzioni non pericolose tramite "
-"modeline"
+"consentire solo impostazione di opzioni non pericolose tramite modeline"
 
 msgid "number of lines to check for modelines"
 msgstr "numero di righe da controllare per modeline"
@@ -11470,4 +11486,4 @@ msgstr "Siete pregati di salvare prima il buffer."
 
 msgid "You discovered the command-line window! You can close it with \":q\"."
 msgstr ""
-"Questa è la finestra della riga-di-comando! Si può chiudere con \":q\"."
+"Avete trovato la finestra della riga-di-comando! Si può chiudere con \":q\"."
diff --git a/src/po/vim.pot b/src/po/vim.pot
index 00c192a621..b185a51444 100644
--- a/src/po/vim.pot
+++ b/src/po/vim.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim\n"
 "Report-Msgid-Bugs-To: vim-dev@vim.org\n"
-"POT-Creation-Date: 2026-05-23 19:49+0000\n"
+"POT-Creation-Date: 2026-06-16 19:21+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -956,6 +956,15 @@ msgstr ""
 msgid "_Close"
 msgstr ""
 
+msgid "Close Tab"
+msgstr ""
+
+msgid "New Tab"
+msgstr ""
+
+msgid "Open Tab..."
+msgstr ""
+
 msgid "Direction:"
 msgstr ""
 
@@ -971,9 +980,6 @@ msgstr ""
 msgid "New tab"
 msgstr ""
 
-msgid "Open Tab..."
-msgstr ""
-
 msgid "Vim: Main window unexpectedly destroyed\n"
 msgstr ""
 
@@ -3460,6 +3466,9 @@ msgstr ""
 msgid "without GUI."
 msgstr ""
 
+msgid "with GTK4 GUI (hwaccel)."
+msgstr ""
+
 msgid "with GTK4 GUI."
 msgstr ""
 
@@ -8883,6 +8892,9 @@ msgstr ""
 msgid "E1578: Too many postponed prefixes and/or compound flags"
 msgstr ""
 
+msgid "E1579: -completeopt=escape cannot be used with -nargs=_"
+msgstr ""
+
 #. type of cmdline window or 0
 #. result of cmdline window or 0
 #. buffer of cmdline window or NULL
diff --git a/src/popupwin.c b/src/popupwin.c
index 87ea44de50..d3d27a2e17 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -55,6 +55,7 @@ typedef struct {
     int		blend;
     int		flags;
     int		zindex;
+    char_u	*title;
     char_u	*scrollbar_highlight;
     char_u	*thumb_highlight;
     char_u	*border_highlight[4];
@@ -116,6 +117,12 @@ static void redraw_under_popup_area(int winrow, int wincol, int height,
 	int width, int leftoff);
 static void redraw_overlapped_opacity_popups(int winrow, int wincol,
 	int height, int width, int leftoff, int zindex);
+#ifdef FEAT_IMAGE_KITTY
+static void popup_image_clear_kitty(win_T *wp);
+#endif
+#ifdef FEAT_IMAGE
+static bool popup_image_composites_frames(void);
+#endif
 
 /*
  * Get option value for "key", which is "line" or "col".
@@ -808,8 +815,13 @@ apply_general_options(win_T *wp, dict_T *dict)
     str = dict_get_string(dict, "title", FALSE);
     if (str != NULL)
     {
-	vim_free(wp->w_popup_title);
-	wp->w_popup_title = vim_strsave(str);
+	char_u	*title = vim_strsave(str);
+
+	if (title != NULL)
+	{
+	    vim_free(wp->w_popup_title);
+	    wp->w_popup_title = title;
+	}
     }
 
     nr = dict_get_bool(dict, "wrap", -1);
@@ -914,6 +926,214 @@ apply_general_options(win_T *wp, dict_T *dict)
 	    semsg(_(e_invalid_value_for_argument_str_str), "close", tv_get_string(&di->di_tv));
     }
 
+#ifdef FEAT_IMAGE
+    di = dict_find(dict, (char_u *)"image", -1);
+    if (di != NULL && di->di_tv.v_type == VAR_DICT
+				    && di->di_tv.vval.v_dict != NULL)
+    {
+	dict_T	    *idict = di->di_tv.vval.v_dict;
+	dictitem_T  *id;
+	int	     iw;
+	int	     ih;
+
+	// An empty dict (`#{image: {}}`) is the documented sentinel for
+	// "remove a previously set image".  Free the pixel buffer, the
+	// terminal-side cached escape sequence, and any GUI-side cache so
+	// the cells the image was covering get repainted on the next redraw.
+	if (dict_len(idict) == 0)
+	{
+	    if (wp->w_popup_image_data != NULL
+		    || wp->w_popup_image_w > 0 || wp->w_popup_image_h > 0)
+	    {
+# ifdef FEAT_IMAGE_KITTY
+		popup_image_clear_kitty(wp);
+# endif
+# ifdef FEAT_IMAGE_GDK
+		if (gui.in_use)
+		    gui_gtk4_remove_image(wp);
+# endif
+		VIM_CLEAR(wp->w_popup_image_data);
+		wp->w_popup_image_w = 0;
+		wp->w_popup_image_h = 0;
+		wp->w_popup_image_alpha = FALSE;
+		wp->w_popup_image_px_dirty = false;
+# ifdef FEAT_IMAGE_SIXEL
+		VIM_CLEAR(wp->w_popup_image_seq);
+		wp->w_popup_image_seq_w = 0;
+		wp->w_popup_image_seq_h = -1;
+		wp->w_popup_image_seq_crop_x = 0;
+		wp->w_popup_image_seq_crop_y = 0;
+		wp->w_popup_image_seq_cells_w = 0;
+		wp->w_popup_image_seq_cells_h = 0;
+		wp->w_popup_image_emit_valid = false;
+# endif
+# if defined(FEAT_IMAGE_GDI) || defined(FEAT_IMAGE_CAIRO) || defined(FEAT_IMAGE_GDK)
+#  ifdef FEAT_GUI
+		if (gui.in_use)
+		    gui_mch_free_popup_image(wp);
+#  endif
+# endif
+		redraw_win_later(wp, UPD_NOT_VALID);
+		if (must_redraw < UPD_NOT_VALID)
+		    must_redraw = UPD_NOT_VALID;
+	    }
+	    goto image_done;
+	}
+
+	id = dict_find(idict, (char_u *)"data", -1);
+	iw = (int)dict_get_number(idict, "width");
+	ih = (int)dict_get_number(idict, "height");
+
+	if (id != NULL && id->di_tv.v_type == VAR_BLOB
+				&& id->di_tv.vval.v_blob != NULL
+				&& iw > 0 && ih > 0)
+	{
+	    blob_T  *b = id->di_tv.vval.v_blob;
+	    long     blen = blob_len(b);
+	    // 64-bit to avoid iw * ih * 4 overflow on a 32-bit long
+	    varnumber_T	 npixels = (varnumber_T)iw * ih;
+	    int	     has_alpha = (blen == npixels * 4);
+
+	    if (has_alpha || blen == npixels * 3)
+	    {
+		// Detect "same-size image swap": replacing the pixel buffer
+		// without changing the popup's pixel dimensions or pixel
+		// format.  In that case the cached device bitmap can be
+		// refreshed in place and the popup's screen cells stay valid
+		// (the image will be re-blitted on top by popup_emit_image),
+		// so a UPD_VALID redraw is enough -- no need to repaint every
+		// cell under the image like UPD_NOT_VALID would.
+		int same_size_update = (wp->w_popup_image_data != NULL
+			&& wp->w_popup_image_w == iw
+			&& wp->w_popup_image_h == ih
+			&& wp->w_popup_image_alpha == has_alpha);
+
+		if (same_size_update)
+		    mch_memmove(wp->w_popup_image_data, b->bv_ga.ga_data,
+							    (size_t)blen);
+		else
+		{
+		    VIM_CLEAR(wp->w_popup_image_data);
+		    wp->w_popup_image_data = vim_memsave(b->bv_ga.ga_data,
+							    (size_t)blen);
+		    wp->w_popup_image_w = iw;
+		    wp->w_popup_image_h = ih;
+		    wp->w_popup_image_alpha = has_alpha;
+		}
+		// The next redraw must clear the previously emitted frame
+		// before re-emitting; see popup_invalidate_prev_image_rect().
+		wp->w_popup_image_px_dirty = true;
+# ifdef FEAT_IMAGE_SIXEL
+		VIM_CLEAR(wp->w_popup_image_seq);
+		wp->w_popup_image_seq_h = -1;
+# endif
+# ifdef FEAT_IMAGE_KITTY
+		wp->w_popup_image_emit_valid = false;
+# endif
+		if (wp->w_popup_image_data != NULL)
+		{
+# if defined(FEAT_IMAGE_GDI) || defined(FEAT_IMAGE_CAIRO) || defined(FEAT_IMAGE_GDK)
+		    bool updated_in_place = false;
+
+#  ifdef FEAT_GUI
+		    if (gui.in_use && same_size_update)
+			updated_in_place =
+				gui_mch_update_popup_image_pixels(wp);
+#  endif
+		    if (!updated_in_place)
+			gui_mch_free_popup_image(wp);
+# endif
+
+		    // Sixel encoding for the terminal backend is deferred to
+		    // popup_adjust_position(), where the final winrow is
+		    // known and the image can be cropped if it would
+		    // otherwise reach the bottom of the screen and trigger
+		    // sixel-induced terminal scrolling.
+
+		    // Same-size pixel swap keeps the popup cell contents valid.
+		    // Only the image overlay needs refreshing, which happens from
+		    // update_popup_images() at the end of redraw and from the
+		    // targeted GUI repair paths for cursor/WM_PAINT damage.
+		    // Exception: an RGBA frame swap on a backend that
+		    // composites onto the previous emit needs the popup's
+		    // text rows redrawn so the cells under the image are
+		    // repainted before the re-emit, clearing the previous
+		    // frame; see popup_invalidate_prev_image_rect().
+		    redraw_win_later(wp, same_size_update
+			    && !(has_alpha && popup_image_composites_frames())
+			    ? UPD_VALID : UPD_NOT_VALID);
+		    if (must_redraw < UPD_VALID)
+			must_redraw = UPD_VALID;
+
+		    if (!same_size_update)
+		    {
+			// First image, or dimensions changed: auto-size the
+			// popup cell box so the image fits.  Cell pixel
+			// dimensions come from the terminal or the GUI
+			// font; fall back to a typical 8x16.  An explicit
+			// minwidth/maxwidth/minheight/maxheight on the dict
+			// takes precedence so users can shape the popup
+			// around the image (e.g. add room for a caption).
+# if defined(UNIX) || defined(MSWIN) || defined(VMS) || defined(AMIGA)
+			{
+			    int		cx = 8, cy = 16;
+			    int		cw, ch;
+
+#  ifdef FEAT_GUI
+			    if (gui.in_use)
+			    {
+				if (gui.char_width > 0)
+				    cx = gui.char_width;
+				if (gui.char_height > 0)
+				    cy = gui.char_height;
+			    }
+			    else
+#  endif
+			    {
+				struct cellsize cs;
+
+				cs.cs_xpixel = -1;
+				cs.cs_ypixel = -1;
+#  if defined(UNIX) || defined(MSWIN)
+				mch_calc_cell_size(&cs);
+#  endif
+				if (cs.cs_xpixel > 0 && cs.cs_ypixel > 0)
+				{
+				    cx = cs.cs_xpixel;
+				    cy = cs.cs_ypixel;
+				}
+			    }
+			    cw = (iw + cx - 1) / cx;
+			    ch = (ih + cy - 1) / cy;
+			    if (dict_find(dict, (char_u *)"minwidth", -1)
+								== NULL)
+				wp->w_minwidth = cw;
+			    if (dict_find(dict, (char_u *)"maxwidth", -1)
+								== NULL)
+				wp->w_maxwidth = cw;
+			    if (dict_find(dict, (char_u *)"minheight", -1)
+								== NULL)
+				wp->w_minheight = ch;
+			    if (dict_find(dict, (char_u *)"maxheight", -1)
+								== NULL)
+				wp->w_maxheight = ch;
+			}
+# endif
+		    }
+		}
+	    }
+	    else
+	    {
+		semsg(_(e_invalid_value_for_argument_str_str), "image",
+				"data length must equal width*height*3 or width*height*4");
+		return FAIL;
+	    }
+	}
+image_done:
+	;
+    }
+#endif
+
     str = dict_get_string(dict, "highlight", FALSE);
     if (str != NULL)
     {
@@ -975,16 +1195,25 @@ apply_general_options(win_T *wp, dict_T *dict)
 		    str = tv_get_string(&li->li_tv);
 		    if (*str != NUL)
 		    {
-			vim_free(wp->w_border_highlight[i]);
-			wp->w_border_highlight[i] = vim_strsave(str);
+			char_u	*hl = vim_strsave(str);
+
+			if (hl != NULL)
+			{
+			    vim_free(wp->w_border_highlight[i]);
+			    wp->w_border_highlight[i] = hl;
+			}
 		    }
 		}
 		if (list->lv_len == 1 && wp->w_border_highlight[0] != NULL)
 		    for (i = 1; i < 4; ++i)
 		    {
-			vim_free(wp->w_border_highlight[i]);
-			wp->w_border_highlight[i] =
-					vim_strsave(wp->w_border_highlight[0]);
+			char_u	*hl = vim_strsave(wp->w_border_highlight[0]);
+
+			if (hl != NULL)
+			{
+			    vim_free(wp->w_border_highlight[i]);
+			    wp->w_border_highlight[i] = hl;
+			}
 		    }
 	    }
 	}
@@ -1514,6 +1743,358 @@ popup_compute_clip(win_T *wp, popup_clip_T *cl)
     cl->eff_width = cl->eff_left_extra + w + cl->eff_right_extra;
 }
 
+#ifdef FEAT_IMAGE_SIXEL
+/*
+ * Re-encode the popup's sixel image so its pixel rows fit above the bottom of
+ * the screen.  Many sixel-capable terminals scroll the screen when an image
+ * is rendered such that its bottom pixel row reaches the last visible row,
+ * because the sixel sequence advances the cursor below the image.  We avoid
+ * that by leaving one cell row of margin and cropping the image height to
+ * match.  The cached sequence is keyed by the resulting pixel height so the
+ * encoder is only invoked when the geometry actually changes.
+ */
+# if defined(FEAT_IMAGE_KITTY) && defined(UNIX)
+#  include <termios.h>
+#  include <unistd.h>
+/*
+ * Active terminal-capability probe for kitty graphics protocol.
+ *
+ *   send: \e_Gi=31,s=1,v=1,a=q,t=d,f=24;AAAA\e\\\e[c
+ *	  ^^^^ kitty query ^^^^                       ^^^^ DA1 sentinel
+ *
+ * The kitty spec [1] says the terminal will respond with
+ *	`\e_Gi=31;OK\e\\` (or an `_Gi=31;<error>\e\\`)
+ * to the kitty query, followed by its own `\e[?...c` answer to DA1.
+ * We send DA1 as a sentinel: any conforming terminal must reply, so
+ * we have a guaranteed point at which to stop reading; if the kitty
+ * reply did not arrive before then, kitty is not supported.
+ *
+ * Returns true on a positive `OK` response.  Network/permission errors
+ * and timeouts are treated as "not supported".
+ *
+ * [1] https://sw.kovidgoyal.net/kitty/graphics-protocol/
+ *	   #querying-support-and-available-transmission-mediums
+ */
+    static bool
+popup_kitty_probe(void)
+{
+    struct termios	old_t, new_t;
+    int			fd_in = read_cmd_fd;
+    int			fd_out = 1;
+    char		buf[256];
+    int			n = 0;
+    static const char	query[] =
+		    "\033_Gi=31,s=1,v=1,a=q,t=d,f=24;AAAA\033\\\033[c";
+    ssize_t		r;
+
+    if (!isatty(fd_in) || !isatty(fd_out))
+	return false;
+    if (tcgetattr(fd_in, &old_t) != 0)
+	return false;
+    new_t = old_t;
+    new_t.c_lflag &= ~(ICANON | ECHO);
+    new_t.c_cc[VMIN]  = 0;
+    new_t.c_cc[VTIME] = 3;	    // 300ms grace per read()
+    if (tcsetattr(fd_in, TCSANOW, &new_t) != 0)
+	return false;
+
+    if (write(fd_out, query, sizeof(query) - 1) != sizeof(query) - 1)
+    {
+	tcsetattr(fd_in, TCSANOW, &old_t);
+	return false;
+    }
+
+    // Read until the DA1 reply (`\e[?...c`) lands or we time out.
+    while (n < (int)sizeof(buf) - 1)
+    {
+	char c;
+
+	r = read(fd_in, &c, 1);
+	if (r != 1)
+	    break;
+	buf[n++] = c;
+	// DA1 reply ends with a primary 'c' that is preceded by '?';
+	// stop once we have seen it, regardless of where in the buffer.
+	if (c == 'c' && n >= 3 && buf[n - 2] != '\033')
+	{
+	    int i;
+	    for (i = n - 2; i > 0; --i)
+		if (buf[i] == '?' && buf[i - 1] == '[')
+		    break;
+	    if (i > 0)
+		break;
+	}
+    }
+    buf[n] = NUL;
+    tcsetattr(fd_in, TCSANOW, &old_t);
+
+    // Filter the probe responses out of the read-back bytes (pushing user
+    // keystrokes back into the input buffer) and check for a positive reply.
+    return kitty_probe_parse(buf, n);
+}
+# endif
+
+/*
+ * Pick a terminal image backend.  Cached on first call.  Returns
+ * IMAGE_BACKEND_KITTY when the host terminal advertises kitty graphics
+ * support via an active `\e_Gi=31...a=q` probe followed by `\e[c`
+ * (see popup_kitty_probe for UNIX, mch_kitty_probe in os_win32.c for the
+ * Windows console), otherwise IMAGE_BACKEND_SIXEL.  The probe works
+ * regardless of $TERM, vendor env vars, or terminal name, so it
+ * handles Konsole, WSL-from-Ghostty, ssh, and any future terminal that
+ * adopts the protocol.
+ */
+    static int
+popup_image_backend(void)
+{
+    static int detected = -1;
+
+    if (detected != -1)
+	return detected;
+
+    detected = IMAGE_BACKEND_SIXEL;
+
+# if defined(FEAT_IMAGE_KITTY) && defined(UNIX)
+    // Ask the terminal whether it speaks kitty.  Costs one round-trip
+    // (~300ms worst case) on first call.
+    if (popup_kitty_probe())
+	detected = IMAGE_BACKEND_KITTY;
+# elif defined(FEAT_IMAGE_KITTY) && defined(MSWIN)
+    // Same probe, but reading the reply needs Windows console plumbing
+    // (console handles, VT input mode) that lives in os_win32.c.
+    if (mch_kitty_probe())
+	detected = IMAGE_BACKEND_KITTY;
+# endif
+    return detected;
+}
+
+    static void
+popup_encode_image(win_T *wp)
+{
+    image_rgb_T		si;
+    int			target_w, target_h;
+    int			backend;
+    int			cell_x = 8;
+    int			cell_y = 16;
+    int			crop_top_px, crop_bot_px;
+    int			crop_left_px, crop_right_px;
+    popup_clip_T	cl;
+    char_u		*crop_buf = NULL;
+
+    if (wp->w_popup_image_data == NULL
+	    || wp->w_popup_image_w <= 0 || wp->w_popup_image_h <= 0)
+	return;
+# ifdef FEAT_GUI
+    // The GUI backend renders the image from the device bitmap, not from a
+    // terminal escape sequence -- skip the encoder entirely in that case.
+    if (gui.in_use)
+	return;
+# endif
+
+    backend = popup_image_backend();
+
+# if defined(UNIX) || defined(MSWIN) || defined(VMS) || defined(AMIGA)
+    {
+	struct cellsize cs;
+
+	cs.cs_xpixel = -1;
+	cs.cs_ypixel = -1;
+#  if defined(UNIX) || defined(MSWIN)
+	mch_calc_cell_size(&cs);
+#  endif
+	if (cs.cs_xpixel > 0)
+	    cell_x = cs.cs_xpixel;
+	if (cs.cs_ypixel > 0)
+	    cell_y = cs.cs_ypixel;
+    }
+# endif
+
+    // For "clipwindow" popups, crop the image to the portion that lies inside
+    // the host window.  popup_compute_clip() turns topoff/bottomoff/leftclip/
+    // rightclip into per-edge content-row counts (border/padding consumed
+    // first); convert those to source pixels via the cell size.
+    popup_compute_clip(wp, &cl);
+    crop_top_px = cl.clip_top_content * cell_y;
+    crop_bot_px = cl.clip_bot_content * cell_y;
+    crop_left_px = cl.clip_left_content * cell_x;
+    crop_right_px = cl.clip_right_content * cell_x;
+
+    target_w = wp->w_popup_image_w - crop_left_px - crop_right_px;
+    target_h = wp->w_popup_image_h - crop_top_px - crop_bot_px;
+    if (target_w <= 0 || target_h <= 0)
+    {
+	VIM_CLEAR(wp->w_popup_image_seq);
+	wp->w_popup_image_seq_h = 0;
+	wp->w_popup_image_emit_valid = false;
+	return;
+    }
+
+    {
+	int img_top_row;
+	win_T *cw;
+
+	img_top_row = wp->w_winrow + wp->w_popup_border[0]
+				+ wp->w_popup_padding[0] + cl.clip_top_content;
+
+	// For "clipwindow" popups, confine the image to the host window's
+	// content rectangle so the image's last (partially-filled) cell
+	// cannot bleed onto the host's status line.  popup_compute_clip()
+	// only crops in whole cells, so an image whose pixel height is not
+	// a multiple of cell_y can still overhang by a few pixels when the
+	// overflow is absorbed by the popup's border/padding.  Applies to
+	// both sixel and kitty.
+	cw = popup_get_clipwin(wp);
+	if (cw != NULL)
+	{
+	    int host_avail = cw->w_winrow + cw->w_height - img_top_row;
+	    int host_avail_h = host_avail > 0 ? host_avail * cell_y : 0;
+
+	    if (target_h > host_avail_h)
+		target_h = host_avail_h;
+	}
+
+	if (backend != IMAGE_BACKEND_KITTY)
+	{
+	    // Reserve the bottom-most cell row to keep the sixel image away
+	    // from the edge that triggers scrolling on terminals with sixel-
+	    // scrolling enabled.  Kitty has no such scroll trigger.
+	    int sixel_cells = Rows - 1 - img_top_row;
+	    int sixel_cap = sixel_cells > 0 ? sixel_cells * cell_y : 0;
+
+	    if (target_h > sixel_cap)
+		target_h = sixel_cap;
+	    // Sixel emits in 6-pixel bands; an unaligned target_h leaves the
+	    // last band partial.  P2=1 keeps unset bits transparent, but some
+	    // terminals still advance the sixel raster by a full band,
+	    // painting up to 5 extra pixels onto the next cell row.  Round
+	    // down to a multiple of 6 so the rendered height matches the
+	    // requested pixel count exactly and never spills onto a status
+	    // line below.
+	    target_h -= target_h % 6;
+	}
+    }
+    if (target_h <= 0)
+    {
+	VIM_CLEAR(wp->w_popup_image_seq);
+	wp->w_popup_image_seq_h = 0;
+	wp->w_popup_image_emit_valid = false;
+	return;
+    }
+    if (wp->w_popup_image_seq != NULL
+	    && wp->w_popup_image_seq_w == target_w
+	    && wp->w_popup_image_seq_h == target_h
+	    && wp->w_popup_image_seq_crop_x == crop_left_px
+	    && wp->w_popup_image_seq_crop_y == crop_top_px
+	    && wp->w_popup_image_seq_zindex == wp->w_zindex)
+	return;	    // already encoded for this geometry and zindex
+
+    VIM_CLEAR(wp->w_popup_image_seq);
+    wp->w_popup_image_emit_valid = false;
+
+    // The sixel/kitty encoders read data tightly packed as width*height
+    // pixels.  When the source row width changes (left or right clipped),
+    // or when rows must be skipped from the top, build a contiguous cropped
+    // buffer.  A pure bottom crop (target_h reduced, full source width) can
+    // reuse the source buffer as-is.
+    if (crop_left_px > 0 || crop_right_px > 0 || crop_top_px > 0)
+    {
+	size_t	bpp = wp->w_popup_image_alpha ? 4 : 3;
+	size_t	src_stride = (size_t)wp->w_popup_image_w * bpp;
+	size_t	dst_stride = (size_t)target_w * bpp;
+	int	y;
+
+	crop_buf = alloc((size_t)target_h * dst_stride);
+	if (crop_buf == NULL)
+	{
+	    wp->w_popup_image_seq_h = -1;
+	    return;
+	}
+	for (y = 0; y < target_h; y++)
+	    mch_memmove(crop_buf + y * dst_stride,
+		    wp->w_popup_image_data
+			+ (crop_top_px + y) * src_stride
+			+ crop_left_px * bpp,
+		    dst_stride);
+	si.data = crop_buf;
+    }
+    else
+    {
+	si.data = wp->w_popup_image_data;
+    }
+    si.width = target_w;
+    si.height = target_h;
+    si.has_alpha = wp->w_popup_image_alpha;
+# ifdef FEAT_IMAGE_KITTY
+    if (backend == IMAGE_BACKEND_KITTY)
+	// Use the popup's window-id as the kitty image id so that
+	// popup_image_clear_kitty() can target the placement when the
+	// popup is later hidden or closed.
+	wp->w_popup_image_seq = kitty_encode(&si, wp->w_id, wp->w_zindex);
+    else
+# endif
+	wp->w_popup_image_seq = sixel_encode(&si);
+
+    vim_free(crop_buf);
+
+    if (wp->w_popup_image_seq != NULL)
+    {
+	wp->w_popup_image_seq_w = target_w;
+	wp->w_popup_image_seq_h = target_h;
+	wp->w_popup_image_seq_crop_x = crop_left_px;
+	wp->w_popup_image_seq_crop_y = crop_top_px;
+	wp->w_popup_image_seq_cells_w = (target_w + cell_x - 1) / cell_x;
+	wp->w_popup_image_seq_cells_h = (target_h + cell_y - 1) / cell_y;
+	wp->w_popup_image_seq_zindex = wp->w_zindex;
+    }
+    else
+    {
+	wp->w_popup_image_seq_h = -1;
+	wp->w_popup_image_seq_cells_w = 0;
+	wp->w_popup_image_seq_cells_h = 0;
+    }
+}
+#endif
+
+#ifdef FEAT_IMAGE
+/*
+ * Return TRUE when the active image backend composites a new frame on top
+ * of the previously emitted one instead of replacing it: sixel uses P2=1
+ * transparency (unpainted pixels keep their previous on-screen contents)
+ * and cairo paints with OPERATOR_OVER.  For an RGBA image this leaves the
+ * previous frame visible under the new frame's transparent pixels, so the
+ * cells underneath must be repainted between frame swaps.  Kitty replaces
+ * the whole placement and GDI blits with SRCCOPY; neither leaves residue.
+ */
+    static bool
+popup_image_composites_frames(void)
+{
+# ifdef FEAT_GUI
+    if (gui.in_use)
+    {
+#  ifdef FEAT_IMAGE_CAIRO
+	// Cairo paints the image with OPERATOR_OVER onto gui.surface, so
+	// a swapped-in RGBA frame needs the cells repainted underneath.
+	// The surface is composed off-screen before it is exposed, so the
+	// repaint cannot flicker there.
+	return true;
+#  elif defined(FEAT_IMAGE_GDI) || defined(FEAT_IMAGE_GDK)
+	// GDI blits with SRCCOPY: a full replace, no residue. GDK uses retained
+	// render nodes, so there is no blitting in the first place.
+	return false;
+#  endif
+    }
+# endif
+# ifdef FEAT_IMAGE_SIXEL
+    // Sixel P2=1 transparency: unpainted pixels keep their previous
+    // on-screen contents, so the cells under the image must be repainted
+    // between frame swaps.  Kitty replaces the whole placement.
+    return popup_image_backend() == IMAGE_BACKEND_SIXEL;
+# else
+    return false;
+# endif
+}
+#endif
+
 // Snapshot of the popup window geometry that update_popups() temporarily
 // mutates so that win_update() draws within the host-window clip rectangle.
 // Saved before the clip is applied, restored after win_update() returns so
@@ -1808,7 +2389,37 @@ popup_adjust_position(win_T *wp)
 		prop_above_top = true;
 	    else
 	    {
-		popup_hide_for_textprop(wp);
+		if ((wp->w_popup_flags & POPF_HIDDEN) == 0)
+		{
+#ifdef FEAT_IMAGE_KITTY
+		    // Kitty placements need to be deleted explicitly before
+		    // the popup goes hidden -- see popup_hide().
+		    popup_image_clear_kitty(wp);
+#endif
+#ifdef FEAT_IMAGE_GDK
+		    if (gui.in_use)
+			gui_gtk4_remove_image(wp);
+#endif
+		    popup_hide_for_textprop(wp);
+		    if (wp->w_winrow + popup_height(wp) >= cmdline_row)
+			clear_cmdline = TRUE;
+#ifdef FEAT_IMAGE
+		    // Force a full redraw of every window plus a popup
+		    // mask rebuild so the cells previously covered by the
+		    // popup are re-emitted.  Without this, screen_line()
+		    // may skip cells whose ScreenLines content is
+		    // unchanged, leaving stale sixel image pixels on the
+		    // terminal until the cell is rewritten.  Only needed
+		    // for image popups; ordinary popups are handled by
+		    // the regular popup_mask path on the next redraw.
+		    if (wp->w_popup_image_data != NULL)
+		    {
+			redraw_all_later(UPD_NOT_VALID);
+			status_redraw_all();
+			popup_mask_refresh = TRUE;
+		    }
+#endif
+		}
 		return;
 	    }
 	}
@@ -2321,10 +2932,35 @@ popup_adjust_position(win_T *wp)
     // leaving stray decorations behind.
     if (popup_compute_clipwindow_offsets(wp))
     {
+	if ((wp->w_popup_flags & POPF_HIDDEN) == 0)
+	{
+#ifdef FEAT_IMAGE_KITTY
+	    // delete the kitty placement before hiding, like popup_hide()
+	    popup_image_clear_kitty(wp);
+#endif
+#ifdef FEAT_IMAGE_GDK
+	    if (gui.in_use)
+		gui_gtk4_remove_image(wp);
+#endif
+#ifdef FEAT_IMAGE
+	    if (wp->w_popup_image_data != NULL)
+	    {
+		redraw_all_later(UPD_NOT_VALID);
+		status_redraw_all();
+		popup_mask_refresh = TRUE;
+	    }
+#endif
+	}
 	popup_hide_for_textprop(wp);
 	return;
     }
 
+#ifdef FEAT_IMAGE_SIXEL
+    // Final winrow is now known: encode (or re-encode) the sixel image so it
+    // fits within the screen and does not trigger sixel-scroll on terminals.
+    popup_encode_image(wp);
+#endif
+
     wp->w_popup_last_changedtick = CHANGEDTICK(wp->w_buffer);
     if (win_valid(wp->w_popup_prop_win))
     {
@@ -3645,6 +4281,18 @@ popup_hide(win_T *wp)
 
     popup_save_area(wp, &old_area);
 
+#ifdef FEAT_IMAGE_KITTY
+    // Sixel pixels disappear when the cells underneath are redrawn, but
+    // a kitty placement persists until explicitly deleted -- send the
+    // delete APC before hiding so the image goes away with the popup.
+    popup_image_clear_kitty(wp);
+#endif
+#ifdef FEAT_IMAGE_GDK
+    if (gui.in_use)
+	// Same reason as above for kitty. GdkTexture's are retained and
+	// rendered until they are removed.
+	gui_gtk4_remove_image(wp);
+#endif
     wp->w_popup_flags |= POPF_HIDDEN;
     // Do not decrement b_nwindows, we still reference the buffer.
     if (wp->w_winrow + popup_height(wp) >= cmdline_row)
@@ -3841,6 +4489,14 @@ popup_free(win_T *wp)
 
     popup_save_area(wp, &old_area);
 
+#ifdef FEAT_IMAGE_KITTY
+    // Remove the kitty placement before win_free_popup() invalidates wp.
+    popup_image_clear_kitty(wp);
+#endif
+#ifdef FEAT_IMAGE_GDK
+    if (gui.in_use)
+	gui_gtk4_remove_image(wp);
+#endif
     sign_undefine_by_name(popup_get_sign_name(wp), FALSE);
     wp->w_buffer->b_locked = FALSE;
     if (wp->w_winrow + popup_height(wp) >= cmdline_row)
@@ -4007,6 +4663,7 @@ popup_save_style(win_T *wp, popup_style_snapshot_T *style)
     style->blend = wp->w_popup_blend;
     style->flags = wp->w_popup_flags;
     style->zindex = wp->w_zindex;
+    style->title = wp->w_popup_title;
     style->scrollbar_highlight = wp->w_scrollbar_highlight;
     style->thumb_highlight = wp->w_thumb_highlight;
     for (i = 0; i < 4; i++)
@@ -4023,6 +4680,7 @@ popup_style_changed(win_T *wp, popup_style_snapshot_T *style)
 
     if (style->firstline != wp->w_firstline
 	    || style->flags != wp->w_popup_flags
+	    || style->title != wp->w_popup_title
 	    || style->scrollbar_highlight != wp->w_scrollbar_highlight
 	    || style->thumb_highlight != wp->w_thumb_highlight)
 	return true;
@@ -4474,6 +5132,9 @@ f_popup_setoptions(typval_T *argvars, typval_T *rettv UNUSED)
     int		need_redraw = FALSE;
     int		need_reposition = FALSE;
 
+    if (check_secure())
+	return;
+
     if (in_vim9script()
 	    && (check_for_number_arg(argvars, 0) == FAIL
 		|| check_for_dict_arg(argvars, 1) == FAIL))
@@ -4787,6 +5448,69 @@ f_popup_getoptions(typval_T *argvars, typval_T *rettv)
 	dict_add_number(dict, "textpropwin", wp->w_popup_prop_win->w_id);
 	dict_add_number(dict, "textpropid", wp->w_popup_prop_id);
     }
+#ifdef FEAT_IMAGE
+    if (wp->w_popup_image_data != NULL
+	    && wp->w_popup_image_w > 0 && wp->w_popup_image_h > 0)
+    {
+	// Return a dict with a fresh copy of the pixel buffer.  The popup
+	// keeps the original; the caller owns the returned blob, so freeing
+	// the popup does not invalidate it (and vice versa).
+	long	    blen = (long)wp->w_popup_image_w
+			* wp->w_popup_image_h
+			* (wp->w_popup_image_alpha ? 4 : 3);
+	dict_T	    *idict = dict_alloc();
+	blob_T	    *b = blob_alloc();
+	dictitem_T  *item = NULL;
+	int	    ok = idict != NULL && b != NULL && blen > 0;
+
+	if (ok)
+	{
+	    b->bv_ga.ga_data = vim_memsave(wp->w_popup_image_data,
+							    (size_t)blen);
+	    if (b->bv_ga.ga_data == NULL)
+		ok = FALSE;
+	    else
+	    {
+		b->bv_ga.ga_len = (int)blen;
+		b->bv_ga.ga_maxlen = (int)blen;
+	    }
+	}
+	if (ok)
+	{
+	    item = dictitem_alloc((char_u *)"data");
+	    if (item == NULL)
+		ok = FALSE;
+	    else
+	    {
+		item->di_tv.v_type = VAR_BLOB;
+		item->di_tv.vval.v_blob = b;
+		++b->bv_refcount;
+		if (dict_add(idict, item) == FAIL)
+		{
+		    // dictitem_free() already freed the blob
+		    dictitem_free(item);
+		    b = NULL;
+		    ok = FALSE;
+		}
+	    }
+	}
+	if (ok)
+	{
+	    dict_add_number(idict, "width", wp->w_popup_image_w);
+	    dict_add_number(idict, "height", wp->w_popup_image_h);
+	    dict_add_number(idict, "alpha", wp->w_popup_image_alpha != 0);
+	    if (dict_add_dict(dict, "image", idict) == FAIL)
+		ok = FALSE;
+	}
+	if (!ok)
+	{
+	    if (b != NULL && b->bv_refcount == 0)
+		blob_free(b);
+	    if (idict != NULL && idict->dv_refcount == 0)
+		dict_unref(idict);
+	}
+    }
+#endif
     dict_add_string(dict, "title", wp->w_popup_title);
     dict_add_number(dict, "wrap", wp->w_p_wrap);
     dict_add_number(dict, "drag", (wp->w_popup_flags & POPF_DRAG) != 0);
@@ -6007,6 +6731,480 @@ fill_opacity_padding(
 		    start_col, end_col);
 }
 
+#ifdef FEAT_IMAGE
+# if defined(FEAT_IMAGE_GDI) || defined(FEAT_IMAGE_CAIRO) || defined(FEAT_IMAGE_GDK)
+/*
+ * Apply "clipwindow" cropping to a popup image about to be drawn by the GUI.
+ * On entry "*row"/"*col" are the popup's logical content top-left (cell
+ * coords); on return they point at the *visible* top-left after any top/left
+ * clip is accounted for, and "*src_x"/"*src_y"/"*draw_w"/"*draw_h" describe
+ * which pixel sub-rect of the source bitmap should be blitted.  Draw height
+ * is also clamped to the host window's content rectangle so a bottom-clip
+ * cannot bleed onto the host's status line.
+ */
+    static void
+popup_image_gui_clip(
+	win_T	*wp,
+	int	*row,
+	int	*col,
+	int	*src_x,
+	int	*src_y,
+	int	*draw_w,
+	int	*draw_h)
+{
+    popup_clip_T    cl;
+    int		    cell_x = gui.char_width > 0 ? gui.char_width : 8;
+    int		    cell_y = gui.char_height > 0 ? gui.char_height : 16;
+    win_T	    *cw;
+
+    popup_compute_clip(wp, &cl);
+    *row += cl.clip_top_content;
+    *col += cl.clip_left_content;
+    *src_x = cl.clip_left_content * cell_x;
+    *src_y = cl.clip_top_content * cell_y;
+    *draw_w = wp->w_popup_image_w - *src_x - cl.clip_right_content * cell_x;
+    *draw_h = wp->w_popup_image_h - *src_y - cl.clip_bot_content * cell_y;
+
+    // popup_compute_clipwindow_offsets() rounds overflow to whole cells, so
+    // the image's last cell can still spill remaining pixels past the host
+    // content edge.  Clamp draw_h to the host's available pixel height.
+    cw = popup_get_clipwin(wp);
+    if (cw != NULL)
+    {
+	int host_avail = cw->w_winrow + cw->w_height - *row;
+	int max_h;
+
+	if (host_avail < 0)
+	    host_avail = 0;
+	max_h = host_avail * cell_y;
+	if (*draw_h > max_h)
+	    *draw_h = max_h;
+    }
+
+    if (*draw_w < 0)
+	*draw_w = 0;
+    if (*draw_h < 0)
+	*draw_h = 0;
+}
+# endif
+
+/*
+ * If the popup's image was emitted on the previous redraw and its rectangle
+ * is about to change (move or resize), zero out ScreenLines / ScreenAttrs
+ * for the cells in that previous rectangle.
+ *
+ * Without this, screen_fill() at the body / padding / border phase below
+ * compares the desired char+attr against what is already in ScreenLines and
+ * skips the write when they match.  That is the common case when a cell that
+ * was popup body (' '+popup_attr) flips to top padding (' '+popup_attr) --
+ * nothing is sent to the terminal (sixel/kitty) or painted onto gui.surface
+ * (GDI/Cairo), so the previously drawn image pixels stay on screen as
+ * residue.  The padding is the only edge where this matters in practice:
+ * borders use a non-space character, so screen_fill never skips them.
+ * Invalidating ScreenLines forces the next screen_fill / screen_puts to emit,
+ * which overwrites the image pixels with the space cell.
+ *
+ * No-ops when there is no previous emit (cells_w/h == 0) and when the
+ * rectangle is unchanged (the prior image pixels still match the cell the
+ * popup intends to draw).
+ */
+# if defined(FEAT_IMAGE_SIXEL) || defined(FEAT_IMAGE_KITTY) \
+	|| defined(FEAT_IMAGE_GDI) || defined(FEAT_IMAGE_CAIRO) \
+	|| defined(FEAT_IMAGE_GDK)
+    static void
+popup_invalidate_prev_image_rect(win_T *wp, popup_clip_T *cl)
+{
+    int old_row, old_col, old_cells_w, old_cells_h;
+    int new_row, new_col, new_cells_w, new_cells_h;
+    int rr;
+
+#  if !(defined(FEAT_IMAGE_SIXEL) || defined(FEAT_IMAGE_KITTY))
+    (void)cl;	// only the terminal branch reads cl
+#  endif
+    if (wp->w_popup_image_data == NULL)
+	return;
+    old_cells_w = wp->w_popup_image_emit_cells_w;
+    old_cells_h = wp->w_popup_image_emit_cells_h;
+    if (old_cells_w <= 0 || old_cells_h <= 0)
+	return;
+
+    // popup_emit_image() positions the image with this same formula.  Skip
+    // the invalidation when nothing about the destination rectangle has
+    // changed, so a stationary popup doesn't churn through screen_fill+image
+    // re-emit on every redraw cycle.
+#  if (defined(FEAT_GUI) && (defined(FEAT_IMAGE_GDI) || defined(FEAT_IMAGE_CAIRO))) \
+    || defined(FEAT_IMAGE_GDK)
+    if (gui.in_use)
+    {
+	int src_x, src_y, draw_w, draw_h;
+	int cell_x = gui.char_width > 0 ? gui.char_width : 8;
+	int cell_y = gui.char_height > 0 ? gui.char_height : 16;
+
+	new_row = wp->w_winrow + wp->w_popup_border[0]
+						    + wp->w_popup_padding[0];
+	new_col = wp->w_wincol + wp->w_popup_border[3]
+						    + wp->w_popup_padding[3];
+	popup_image_gui_clip(wp, &new_row, &new_col,
+					    &src_x, &src_y, &draw_w, &draw_h);
+	new_cells_w = (draw_w + cell_x - 1) / cell_x;
+	new_cells_h = (draw_h + cell_y - 1) / cell_y;
+    }
+#  endif
+#  if defined(FEAT_IMAGE_SIXEL) || defined(FEAT_IMAGE_KITTY)
+#   if defined(FEAT_GUI) && (defined(FEAT_IMAGE_GDI) || defined(FEAT_IMAGE_CAIRO)) \
+    || defined(FEAT_IMAGE_GDK)
+    else
+#   endif
+    {
+	new_row = wp->w_winrow + wp->w_popup_border[0] + wp->w_popup_padding[0]
+							+ cl->clip_top_content;
+	new_col = wp->w_wincol + wp->w_popup_border[3] + wp->w_popup_padding[3]
+							+ cl->clip_left_content;
+	new_cells_w = wp->w_popup_image_seq_cells_w;
+	new_cells_h = wp->w_popup_image_seq_cells_h;
+    }
+#  endif
+
+    old_row = wp->w_popup_image_emit_row;
+    old_col = wp->w_popup_image_emit_col;
+    if (new_row == old_row && new_col == old_col
+	    && new_cells_w == old_cells_w && new_cells_h == old_cells_h)
+    {
+	bool need_clear = false;
+
+	// Unchanged rectangle: normally the previous emit still matches what
+	// the popup is about to draw and nothing needs invalidating.
+	// Exception: the pixel buffer was swapped (animation frame) and the
+	// image has an alpha channel.  Sixel uses P2=1 transparency
+	// (unpainted pixels keep their previous on-screen contents) and
+	// cairo composites with OPERATOR_OVER, so the previous frame would
+	// stay visible under the new frame's transparent pixels.  Repaint
+	// the cells underneath so the residue is cleared before the new
+	// frame is emitted.  Kitty replaces the whole placement and GDI
+	// blits with SRCCOPY; neither leaves residue.
+	if (wp->w_popup_image_px_dirty && wp->w_popup_image_alpha)
+	    need_clear = popup_image_composites_frames();
+	if (!need_clear)
+	    return;
+#  if defined(FEAT_IMAGE_SIXEL) || defined(FEAT_IMAGE_KITTY)
+	// Make the repaint-then-re-emit atomic on terminals that support
+	// synchronized updates, so the background never shows through
+	// between animation frames.  Closed right after this popup's
+	// image is re-emitted in update_popups().
+	term_set_sync_output(TERM_SYNC_OUTPUT_ENABLE);
+#  endif
+    }
+
+    for (rr = old_row; rr < old_row + old_cells_h; ++rr)
+    {
+	int off_base;
+	int cc;
+
+	if (rr < 0 || rr >= screen_Rows)
+	    continue;
+	off_base = LineOffset[rr];
+	for (cc = old_col; cc < old_col + old_cells_w; ++cc)
+	{
+	    int off;
+
+	    if (cc < 0 || cc >= screen_Columns)
+		continue;
+	    off = off_base + cc;
+	    ScreenLines[off] = ' ';
+	    if (enc_utf8 && ScreenLinesUC != NULL)
+		ScreenLinesUC[off] = 0;
+	    ScreenAttrs[off] = -1;
+	}
+    }
+}
+# endif
+
+/*
+ * Paint one popup's image (if any).  In GUI mode the cached device bitmap
+ * is BitBlt'd onto the canvas; in terminal mode the cached sixel DCS
+ * sequence is emitted.
+ */
+    static void
+popup_emit_image(win_T *wp)
+{
+    int row, col;
+
+    if (wp->w_popup_image_data == NULL)
+	return;
+    // Do not re-emit the sixel for a hidden popup.  update_popup_images()
+    // walks every popup unconditionally; without this guard the image is
+    // re-blitted at its last position even after the popup has been
+    // hidden (e.g. its textprop anchor scrolled out of the host window),
+    // leaving the image stuck on screen until the cell is overwritten.
+    if (wp->w_popup_flags & POPF_HIDDEN)
+	return;
+    row = wp->w_winrow + wp->w_popup_border[0] + wp->w_popup_padding[0];
+    col = wp->w_wincol + wp->w_popup_border[3] + wp->w_popup_padding[3];
+
+# if defined(FEAT_IMAGE_GDI) || defined(FEAT_IMAGE_CAIRO) || defined(FEAT_IMAGE_GDK)
+    if (gui.in_use)
+    {
+	int src_x, src_y, draw_w, draw_h;
+	int cell_x = gui.char_width > 0 ? gui.char_width : 8;
+	int cell_y = gui.char_height > 0 ? gui.char_height : 16;
+
+	popup_image_gui_clip(wp, &row, &col,
+				    &src_x, &src_y, &draw_w, &draw_h);
+	if (row < 0 || col < 0 || draw_w <= 0 || draw_h <= 0)
+	    return;
+	gui_mch_draw_popup_image(wp, row, col,
+					    src_x, src_y, draw_w, draw_h);
+
+	// Remember where the image was painted on gui.surface so the next
+	// redraw can invalidate ScreenLines/ScreenAttrs for cells that move
+	// out from under the image (e.g. body -> top padding when the popup
+	// moves).  Otherwise screen_fill() sees the same ' '+popup_attr
+	// already in ScreenLines and skips the paint, leaving image pixels
+	// visible in the padding.
+	wp->w_popup_image_emit_row = row;
+	wp->w_popup_image_emit_col = col;
+	wp->w_popup_image_emit_cells_w = (draw_w + cell_x - 1) / cell_x;
+	wp->w_popup_image_emit_cells_h = (draw_h + cell_y - 1) / cell_y;
+	wp->w_popup_image_px_dirty = false;
+	return;
+    }
+# endif
+# if defined(FEAT_IMAGE_SIXEL) || defined(FEAT_IMAGE_KITTY)
+#  ifdef FEAT_GUI
+    // GUI builds without a GUI image backend (e.g. Motif) reach here when
+    // gui.in_use is true; emitting sixel/kitty escape sequences via out_str()
+    // would print them as raw text on the GUI canvas, so bail out.
+    if (gui.in_use)
+	return;
+#  endif
+    if (wp->w_popup_image_seq == NULL)
+	return;
+    // For "clipwindow" popups the encoded sequence already covers only the
+    // visible (cropped) sub-image, so emit it at the visible top-left corner
+    // -- the original top-left can be above/left of the host window (negative
+    // row/col) when the popup is partially scrolled past the host edge.
+    {
+	popup_clip_T cl;
+
+	popup_compute_clip(wp, &cl);
+	row += cl.clip_top_content;
+	col += cl.clip_left_content;
+    }
+    if (row < 0 || col < 0)
+	return;
+#  ifdef FEAT_IMAGE_KITTY
+    // A kitty placement persists on the terminal and is drawn above the
+    // text layer, so when it is already showing at this position there is
+    // nothing to repair: skip the (potentially multi-MB) retransmission.
+    // The flag is reset when the image is re-encoded, the placement is
+    // deleted, or the terminal screen is cleared.
+    if (popup_image_backend() == IMAGE_BACKEND_KITTY
+	    && wp->w_popup_image_emit_valid
+	    && wp->w_popup_image_emit_row == row
+	    && wp->w_popup_image_emit_col == col)
+	return;
+#  endif
+    // Hide the cursor across the move + image emit, then restore it to
+    // the current text-cursor position before showing it; otherwise the
+    // cursor can briefly flicker below its scrolled-to position because
+    // the next setcursor() from the redraw loop only happens later.
+    // screen_start() forces the following windgoto to be absolute --
+    // both sixel and kitty leave the real cursor below the image while
+    // vim still thinks it is at the image origin, so the relative-move
+    // optimisation would otherwise place the cursor on the line just
+    // after the image.
+    out_str((char_u *)"\033[?25l");
+    term_windgoto(row, col);
+    out_str(wp->w_popup_image_seq);
+    screen_start();
+    setcursor_mayforce(TRUE);
+    out_str((char_u *)"\033[?25h");
+    out_flush();
+
+    // The sixel bytes just painted over every cell of the emitted rectangle,
+    // including cells that a higher zindex popup draws on top of this image.
+    // Invalidate those cells in ScreenLines so the higher popup's draw,
+    // later in this same update_popups() walk, actually rewrites them to
+    // the terminal instead of skipping them as unchanged.  Not needed for
+    // kitty, where the placement is layered by its z= value instead.
+#  ifdef FEAT_IMAGE_KITTY
+    if (popup_image_backend() != IMAGE_BACKEND_KITTY)
+#  endif
+    {
+	for (int rr = row; rr < row + wp->w_popup_image_seq_cells_h; ++rr)
+	{
+	    if (rr < 0 || rr >= screen_Rows)
+		continue;
+
+	    int off_base = LineOffset[rr];
+
+	    for (int cc = col; cc < col + wp->w_popup_image_seq_cells_w; ++cc)
+	    {
+		if (cc < 0 || cc >= screen_Columns)
+		    continue;
+		if (popup_mask[rr * screen_Columns + cc] <= wp->w_zindex)
+		    continue;
+
+		int off = off_base + cc;
+
+		ScreenLines[off] = ' ';
+		if (enc_utf8 && ScreenLinesUC != NULL)
+		    ScreenLinesUC[off] = 0;
+		ScreenAttrs[off] = -1;
+	    }
+	}
+    }
+
+    // Remember where the image was emitted so the next redraw can invalidate
+    // ScreenLines/ScreenAttrs for cells that move out from under the image
+    // (e.g. body -> top padding when the clip shrinks).  Otherwise screen_fill
+    // sees the same ' '+popup_attr already in ScreenLines and skips the
+    // terminal write, leaving sixel pixels visible in the padding.
+    wp->w_popup_image_emit_row = row;
+    wp->w_popup_image_emit_col = col;
+    wp->w_popup_image_emit_cells_w = wp->w_popup_image_seq_cells_w;
+    wp->w_popup_image_emit_cells_h = wp->w_popup_image_seq_cells_h;
+    wp->w_popup_image_emit_valid = true;
+    wp->w_popup_image_px_dirty = false;
+# endif
+}
+
+# ifdef FEAT_IMAGE_KITTY
+/*
+ * Send a kitty `a=d,i=<id>` APC to remove the placement made for "wp"
+ * by an earlier kitty_encode().  Called when the popup goes away (via
+ * popup_hide / popup_close / textprop scrolling out of view), because
+ * unlike sixel pixels -- which the next text overwrite clears -- kitty
+ * placements persist until explicitly deleted.
+ */
+    static void
+popup_image_clear_kitty(win_T *wp)
+{
+    char_u  *seq;
+
+#  ifdef FEAT_GUI
+    if (gui.in_use)
+	return;
+#  endif
+    if (wp == NULL || wp->w_popup_image_data == NULL || wp->w_id <= 0)
+	return;
+    if (popup_image_backend() != IMAGE_BACKEND_KITTY)
+	return;
+    seq = kitty_delete(wp->w_id);
+    if (seq == NULL)
+	return;
+    out_str(seq);
+    out_flush();
+    vim_free(seq);
+    wp->w_popup_image_emit_valid = false;
+}
+# endif
+
+# if defined(FEAT_IMAGE_SIXEL) || defined(FEAT_IMAGE_KITTY)
+/*
+ * Called after the terminal screen has been cleared: kitty deletes
+ * placements that intersect the erased area, so the cached "already on
+ * screen" state no longer holds and the next popup_emit_image() must
+ * retransmit.
+ */
+    void
+popup_images_invalidate(void)
+{
+    win_T	*wp;
+    tabpage_T	*tp;
+
+    FOR_ALL_POPUPWINS(wp)
+	wp->w_popup_image_emit_valid = false;
+    FOR_ALL_TABPAGES(tp)
+	FOR_ALL_POPUPWINS_IN_TAB(tp, wp)
+	    wp->w_popup_image_emit_valid = false;
+}
+# endif
+
+/*
+ * Re-paint every popup's image after the rest of the screen update has
+ * settled.  Only needed for the GUI, where the cursor redraw and other
+ * late blits paint directly onto the canvas and can damage the images.
+ * Walk the popups in zindex order, lowest first, so that where images
+ * overlap the higher zindex popup's image ends up on top.
+ * In terminal mode there is nothing to repair: everything drawn after
+ * update_popups() goes through ScreenLines writers that respect
+ * popup_mask, so the images emitted there are still intact.  Re-emitting
+ * here would instead paint a lower zindex image over the cells of a
+ * higher zindex popup drawn on top of it.
+ */
+# if defined(FEAT_IMAGE_GDI) || defined(FEAT_IMAGE_CAIRO) \
+    || defined(FEAT_IMAGE_GDK)
+    void
+update_popup_images(void)
+{
+    win_T   *wp;
+
+    if (!gui.in_use)
+	return;
+    popup_reset_handled(POPUP_HANDLED_5);
+    while ((wp = find_next_popup(TRUE, POPUP_HANDLED_5)) != NULL)
+	popup_emit_image(wp);
+}
+# endif
+
+# ifdef FEAT_IMAGE_GDI
+    static void
+popup_maybe_emit_image_rect(
+	win_T	*wp,
+	int	 left,
+	int	 top,
+	int	 right,
+	int	 bottom)
+{
+    int row, col;
+    int img_left, img_top, img_right, img_bottom;
+    int src_x, src_y, draw_w, draw_h;
+
+    if (!gui.in_use || wp->w_popup_image_data == NULL
+	    || wp->w_popup_image_w <= 0 || wp->w_popup_image_h <= 0)
+	return;
+
+    row = wp->w_winrow + wp->w_popup_border[0] + wp->w_popup_padding[0];
+    col = wp->w_wincol + wp->w_popup_border[3] + wp->w_popup_padding[3];
+
+    popup_image_gui_clip(wp, &row, &col,
+				    &src_x, &src_y, &draw_w, &draw_h);
+    if (row < 0 || col < 0 || draw_w <= 0 || draw_h <= 0)
+	return;
+
+    img_left = FILL_X(col);
+    img_top = FILL_Y(row);
+    img_right = img_left + draw_w;
+    img_bottom = img_top + draw_h;
+    if (img_right <= left || right <= img_left
+	    || img_bottom <= top || bottom <= img_top)
+	return;
+
+    gui_mch_draw_popup_image(wp, row, col, src_x, src_y, draw_w, draw_h);
+}
+
+/*
+ * Re-paint popup images that overlap a GUI paint rectangle.  Used by the
+ * Windows GUI WM_PAINT path, where gui_redraw() restores text cells but does
+ * not know about popup image overlays.
+ */
+    void
+update_popup_images_rect(int left, int top, int right, int bottom)
+{
+    win_T   *wp;
+
+    if (!gui.in_use)
+	return;
+
+    FOR_ALL_POPUPWINS(wp)
+	popup_maybe_emit_image_rect(wp, left, top, right, bottom);
+    FOR_ALL_POPUPWINS_IN_TAB(curtab, wp)
+	popup_maybe_emit_image_rect(wp, left, top, right, bottom);
+}
+# endif
+#endif
+
 /*
  * Update popup windows.  They are drawn on top of normal windows.
  * "win_update" is called for each popup window, lowest zindex first.
@@ -6074,6 +7272,16 @@ update_popups(void (*win_update)(win_T *wp))
 	// before any code below reads cl again).
 	popup_compute_clip(wp, &cl);
 
+#if defined(FEAT_IMAGE) && (defined(FEAT_IMAGE_SIXEL) || defined(FEAT_IMAGE_KITTY) \
+		|| defined(FEAT_IMAGE_GDI) || defined(FEAT_IMAGE_CAIRO) \
+		|| defined(FEAT_IMAGE_GDK))
+	// Clear ScreenLines under the previous image-emit rectangle so the
+	// body/padding/border draws below actually paint over the cells even
+	// when the desired char+attr matches what was already there.  See the
+	// comment on popup_invalidate_prev_image_rect() for the padding case.
+	popup_invalidate_prev_image_rect(wp, &cl);
+#endif
+
 	override_success = push_highlight_overrides(wp->w_hl, wp->w_hl_len);
 
 	// This drawing uses the zindex of the popup window, so that it's on
@@ -6598,6 +7806,30 @@ update_popups(void (*win_update)(win_T *wp))
 	// Undo the topoff shift applied before drawing the borders so the
 	// next iteration sees the popup's logical winrow.
 	wp->w_winrow -= wp->w_popup_topoff;
+
+#ifdef FEAT_IMAGE
+	// Emit the popup image right after this popup's decorations land in
+	// ScreenLines.  Popups are walked in zindex order, so a higher
+	// zindex popup drawn later paints its cells over this image where
+	// they overlap, and its own image lands on top of those again:
+	// correct layering at cell granularity.  This is the only emit pass
+	// in terminal mode; update_popup_images() at the end of redraw is a
+	// GUI-only repair.
+	// The topoff shift is undone above so popup_emit_image() sees the
+	// popup's logical winrow.  Otherwise the clip-top adjustment
+	// overshoots by topoff and the image lands below its correct row.
+# ifdef FEAT_GUI
+	if (!gui.in_use)
+# endif
+	{
+	    popup_emit_image(wp);
+# if defined(FEAT_IMAGE_SIXEL) || defined(FEAT_IMAGE_KITTY)
+	    // Close the synchronized-update block a residue clear for this
+	    // popup may have opened in popup_invalidate_prev_image_rect().
+	    term_set_sync_output(TERM_SYNC_OUTPUT_DISABLE);
+# endif
+	}
+#endif
     }
 
 #ifdef FEAT_PROP_POPUP
@@ -6702,6 +7934,40 @@ popup_find_info_window(void)
 }
 #endif
 
+/*
+ * Scroll the completion info popup one line (by_page false) or one page
+ * (by_page true); "dir" negative scrolls up, positive down.
+ * Returns true when an info popup was found.
+ */
+    bool
+popup_scroll_info(int dir, bool by_page)
+{
+#ifdef FEAT_QUICKFIX
+    win_T	*wp = popup_find_info_window();
+    int		by;
+    linenr_T	new_topline;
+
+    if (wp == NULL)
+	return false;
+
+    by = by_page ? (wp->w_height > 2 ? wp->w_height - 1 : 1) : 1;
+    new_topline = wp->w_topline + (dir < 0 ? -by : by);
+    if (new_topline < 1)
+	new_topline = 1;
+    if (new_topline > wp->w_buffer->b_ml.ml_line_count)
+	new_topline = wp->w_buffer->b_ml.ml_line_count;
+    if (new_topline != wp->w_topline)
+    {
+	set_topline(wp, new_topline);
+	popup_set_firstline(wp);
+	redraw_win_later(wp, UPD_NOT_VALID);
+    }
+    return true;
+#else
+    return false;
+#endif
+}
+
     void
 f_popup_findecho(typval_T *argvars UNUSED, typval_T *rettv)
 {
diff --git a/src/proto.h b/src/proto.h
index 971a95659d..d944a39d6d 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -211,6 +211,15 @@ void mbyte_im_set_active(int active_arg);
 #  include "popupwin.pro"
 #  include "textprop.pro"
 # endif
+# ifdef FEAT_IMAGE_SIXEL
+#  include "sixel.pro"
+# endif
+# ifdef FEAT_IMAGE_KITTY
+#  include "kitty.pro"
+# endif
+# ifdef FEAT_IMAGE_CAIRO
+#  include "cairo.pro"
+# endif
 # include "testing.pro"
 # include "textobject.pro"
 # include "textformat.pro"
diff --git a/src/proto/cairo.pro b/src/proto/cairo.pro
new file mode 100644
index 0000000000..a297371042
--- /dev/null
+++ b/src/proto/cairo.pro
@@ -0,0 +1,6 @@
+/* cairo.c */
+bool cairo_popup_image_ensure(win_T *wp);
+bool cairo_popup_image_update(win_T *wp);
+void cairo_popup_image_free(win_T *wp);
+void cairo_popup_image_paint(win_T *wp, void *target, int x, int y, int src_x, int src_y, int draw_w, int draw_h);
+/* vim: set ft=c : */
diff --git a/src/proto/cindent.pro b/src/proto/cindent.pro
index 80a6add550..98721b1f2d 100644
--- a/src/proto/cindent.pro
+++ b/src/proto/cindent.pro
@@ -1,6 +1,7 @@
 /* cindent.c */
 int cin_is_cinword(char_u *line);
 int is_pos_in_string(char_u *line, colnr_T col);
+int check_linecomment(char_u *line);
 pos_T *find_start_comment(int ind_maxcomment);
 int cindent_on(void);
 void parse_cino(buf_T *buf);
diff --git a/src/proto/clientserver.pro b/src/proto/clientserver.pro
index 3acd5e01e7..2c71b130ee 100644
--- a/src/proto/clientserver.pro
+++ b/src/proto/clientserver.pro
@@ -13,4 +13,5 @@ void f_remote_send(typval_T *argvars, typval_T *rettv);
 void f_remote_startserver(typval_T *argvars, typval_T *rettv);
 void f_server2client(typval_T *argvars, typval_T *rettv);
 void f_serverlist(typval_T *argvars, typval_T *rettv);
+void check_clientserver_method_env(void);
 /* vim: set ft=c : */
diff --git a/src/proto/clipboard.pro b/src/proto/clipboard.pro
index 5bcaf2ce99..46dc72edeb 100644
--- a/src/proto/clipboard.pro
+++ b/src/proto/clipboard.pro
@@ -30,6 +30,7 @@ void x11_export_final_selection(void);
 void clip_free_selection(Clipboard_T *cbd);
 void clip_get_selection(Clipboard_T *cbd);
 void clip_yank_selection(int type, char_u *str, long len, Clipboard_T *cbd);
+int clip_convert_selection_offset(char_u **str, long_u *len, int offset, Clipboard_T *cbd);
 int clip_convert_selection(char_u **str, long_u *len, Clipboard_T *cbd);
 int may_get_selection(int regname);
 void may_set_selection(void);
@@ -44,4 +45,5 @@ void call_clip_provider_request(int reg);
 void call_clip_provider_set(int reg);
 void inc_clip_provider(void);
 void dec_clip_provider(void);
+int clip_convert_data(char_u **buf, long *len_store, int *motion, bool vim, bool vimenc, char_u **tofree);
 /* vim: set ft=c : */
diff --git a/src/proto/gui_gtk4.pro b/src/proto/gui_gtk4.pro
index 0a1ba1296c..acfb13c9a5 100644
--- a/src/proto/gui_gtk4.pro
+++ b/src/proto/gui_gtk4.pro
@@ -38,8 +38,14 @@ void gui_mch_set_fg_color(guicolor_T color);
 void gui_mch_set_bg_color(guicolor_T color);
 void gui_mch_set_sp_color(guicolor_T color);
 guicolor_T gui_mch_get_rgb(guicolor_T pixel);
+void gui_gtk4_update_size(void);
+cairo_t *gui_gtk4_get_multisign_context(int x, int y, int w, int h);
 void gui_mch_clear_block(int row1, int col1, int row2, int col2);
 void gui_mch_clear_all(void);
+void gui_gtk4_remove_image(win_T *wp);
+void gui_mch_free_popup_image(win_T *wp);
+bool gui_mch_update_popup_image_pixels(win_T *wp);
+void gui_mch_draw_popup_image(win_T *wp, int row, int col, int src_x, int src_y, int draw_w, int draw_h);
 void gui_mch_delete_lines(int row, int num_lines);
 void gui_mch_insert_lines(int row, int num_lines);
 void gui_mch_draw_hollow_cursor(guicolor_T color);
@@ -80,10 +86,6 @@ void clip_mch_request_selection(Clipboard_T *cbd);
 void clip_mch_set_selection(Clipboard_T *cbd);
 int clip_mch_own_selection(Clipboard_T *cbd);
 void clip_mch_lose_selection(Clipboard_T *cbd);
-void gui_mch_post_balloon(BalloonEval *beval, char_u *mesg);
-BalloonEval *gui_mch_create_beval_area(void *target, char_u *mesg, void (*mesgCB)(BalloonEval *, int), void *clientData);
-void gui_mch_enable_beval_area(BalloonEval *beval);
-void gui_mch_disable_beval_area(BalloonEval *beval);
 guint gtk_main_level(void);
 void gtk_main_quit(void);
 void mch_set_mouse_shape(int shape);
@@ -103,7 +105,7 @@ void gui_mch_update_scrollbar_size(void);
 void gui_mch_set_text_area_pos(int x, int y, int w, int h);
 char_u *gui_mch_browse(int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter);
 char_u *gui_mch_browsedir(char_u *title, char_u *initdir);
-int gui_mch_dialog(int type, char_u *title, char_u *message, char_u *buttons, int dfltbutton, char_u *textfield, int ex_cmd);
+int gui_mch_dialog(int type, char_u *title, char_u *message, char_u *buttons, int def_but, char_u *textfield, int ex_cmd);
 void gui_mch_find_dialog(exarg_T *eap);
 void gui_mch_replace_dialog(exarg_T *eap);
 void ex_helpfind(exarg_T *eap);
diff --git a/src/proto/gui_gtk_x11.pro b/src/proto/gui_gtk_x11.pro
index 696f6a07af..037bc02e36 100644
--- a/src/proto/gui_gtk_x11.pro
+++ b/src/proto/gui_gtk_x11.pro
@@ -60,6 +60,9 @@ int gui_mch_wait_for_chars(long wtime);
 void gui_mch_flush(void);
 void gui_mch_clear_block(int row1arg, int col1arg, int row2arg, int col2arg);
 void gui_mch_clear_all(void);
+void gui_mch_free_popup_image(win_T *wp);
+bool gui_mch_update_popup_image_pixels(win_T *wp);
+void gui_mch_draw_popup_image(win_T *wp, int row, int col, int src_x, int src_y, int draw_w, int draw_h);
 void gui_mch_delete_lines(int row, int num_lines);
 void gui_mch_insert_lines(int row, int num_lines);
 void clip_mch_request_selection(Clipboard_T *cbd);
diff --git a/src/proto/gui_w32.pro b/src/proto/gui_w32.pro
index a93df3672c..e6319e90cf 100644
--- a/src/proto/gui_w32.pro
+++ b/src/proto/gui_w32.pro
@@ -32,6 +32,9 @@ void gui_mch_draw_part_cursor(int w, int h, guicolor_T color);
 void gui_mch_update(void);
 int gui_mch_wait_for_chars(int wtime);
 void gui_mch_clear_block(int row1, int col1, int row2, int col2);
+void gui_mch_free_popup_image(win_T *wp);
+bool gui_mch_update_popup_image_pixels(win_T *wp);
+void gui_mch_draw_popup_image(win_T *wp, int row, int col, int src_x, int src_y, int draw_w, int draw_h);
 void gui_mch_clear_all(void);
 void gui_mch_enable_menu(int flag);
 void gui_mch_set_menu_pos(int x, int y, int w, int h);
diff --git a/src/proto/insexpand.pro b/src/proto/insexpand.pro
index e973eac4f7..2c1882dc19 100644
--- a/src/proto/insexpand.pro
+++ b/src/proto/insexpand.pro
@@ -14,6 +14,7 @@ int ctrl_x_mode_cmdline(void);
 int ctrl_x_mode_function(void);
 int ctrl_x_mode_omni(void);
 int ctrl_x_mode_spell(void);
+int ctrl_x_mode_eval(void);
 int ctrl_x_mode_line_or_eval(void);
 int ctrl_x_mode_register(void);
 int ctrl_x_mode_not_default(void);
diff --git a/src/proto/kitty.pro b/src/proto/kitty.pro
new file mode 100644
index 0000000000..8c2970c7d1
--- /dev/null
+++ b/src/proto/kitty.pro
@@ -0,0 +1,5 @@
+/* kitty.c */
+char_u *kitty_encode(image_rgb_T *img, int id, int zindex);
+int kitty_probe_parse(char *buf, int n);
+char_u *kitty_delete(int id);
+/* vim: set ft=c : */
diff --git a/src/proto/map.pro b/src/proto/map.pro
index d696aabcd7..5f736f5047 100644
--- a/src/proto/map.pro
+++ b/src/proto/map.pro
@@ -12,7 +12,7 @@ int ExpandMappings(char_u *pat, regmatch_T *regmatch, int *numMatches, char_u **
 int check_abbr(int c, char_u *ptr, int col, int mincol);
 char_u *eval_map_expr(mapblock_T *mp, int c);
 char_u *vim_strsave_escape_csi(char_u *p);
-void vim_unescape_csi(char_u *p);
+size_t vim_unescape_csi(char_u *p);
 int makemap(FILE *fd, buf_T *buf);
 int put_escstr(FILE *fd, char_u *strstart, int what);
 void check_map_keycodes(void);
diff --git a/src/proto/message.pro b/src/proto/message.pro
index 34b381866f..29519a2af6 100644
--- a/src/proto/message.pro
+++ b/src/proto/message.pro
@@ -38,8 +38,8 @@ char_u *msg_outtrans_one(char_u *p, int attr);
 int msg_outtrans_len_attr(char_u *msgstr, int len, int attr);
 void msg_make(char_u *arg);
 int msg_outtrans_special(char_u *strstart, int from, int maxlen);
-char_u *str2special_save(char_u *str, int replace_spaces, int replace_lt);
-char_u *str2special(char_u **sp, int replace_spaces, int replace_lt);
+char_u *str2special_save(char_u *str, int replace_spaces, int replace_others);
+char_u *str2special(char_u **sp, int replace_spaces, int replace_others);
 void str2specialbuf(char_u *sp, char_u *buf, int len);
 void msg_prt_line(char_u *s, int list);
 void msg_puts(char *s);
diff --git a/src/proto/mouse.pro b/src/proto/mouse.pro
index b13ba6cda4..0493270ae7 100644
--- a/src/proto/mouse.pro
+++ b/src/proto/mouse.pro
@@ -4,6 +4,7 @@ void mouse_set_hor_scroll_step(long step);
 int do_mouse(oparg_T *oap, int c, int dir, long count, int fixindent);
 void ins_mouse(int c);
 void ins_mousescroll(int dir);
+int cmdline_mousescroll(int dir);
 int is_mouse_key(int c);
 int get_mouse_button(int code, int *is_click, int *is_drag);
 int get_pseudo_mouse_code(int button, int is_click, int is_drag);
diff --git a/src/proto/os_mswin.pro b/src/proto/os_mswin.pro
index 6b023b9440..bcb789f518 100644
--- a/src/proto/os_mswin.pro
+++ b/src/proto/os_mswin.pro
@@ -17,6 +17,7 @@ void mch_settmode(tmode_T tmode);
 int mch_get_shellsize(void);
 void mch_set_shellsize(void);
 void mch_new_shellsize(void);
+void mch_calc_cell_size(struct cellsize *cs_out);
 void mch_suspend(void);
 void display_errors(void);
 int mch_has_exp_wildcard(char_u *p);
diff --git a/src/proto/os_win32.pro b/src/proto/os_win32.pro
index 3f26388b25..4850ea02fe 100644
--- a/src/proto/os_win32.pro
+++ b/src/proto/os_win32.pro
@@ -48,6 +48,8 @@ int mch_get_shellsize(void);
 void mch_set_shellsize(void);
 void mch_new_shellsize(void);
 void mch_set_winsize_now(void);
+void mch_calc_cell_size(struct cellsize *cs_out);
+int mch_kitty_probe(void);
 int mch_call_shell(char_u *cmd, int options);
 void win32_build_env(dict_T *env, garray_T *gap, int is_terminal);
 char_u *mch_get_cmd_output_direct(char **argv, char_u *infile, int flags, int *ret_len);
diff --git a/src/proto/popupwin.pro b/src/proto/popupwin.pro
index 14e4a6fd29..98e3a5f592 100644
--- a/src/proto/popupwin.pro
+++ b/src/proto/popupwin.pro
@@ -59,11 +59,15 @@ void may_update_popup_mask(int type);
 void may_update_popup_position(void);
 int popup_get_base_screen_cell(int row, int col, schar_T *linep, int *attrp, u8char_T *ucp);
 void popup_set_base_screen_cell(int row, int col, schar_T line, int attr, u8char_T uc);
+void popup_images_invalidate(void);
+void update_popup_images(void);
+void update_popup_images_rect(int left, int top, int right, int bottom);
 void update_popups(void (*win_update)(win_T *wp));
 int set_ref_in_popups(int copyID);
 int popup_is_popup(win_T *wp);
 win_T *popup_find_preview_window(void);
 win_T *popup_find_info_window(void);
+bool popup_scroll_info(int dir, bool by_page);
 void f_popup_findecho(typval_T *argvars, typval_T *rettv);
 void f_popup_findinfo(typval_T *argvars, typval_T *rettv);
 void f_popup_findpreview(typval_T *argvars, typval_T *rettv);
diff --git a/src/proto/search.pro b/src/proto/search.pro
index 3e700a6d8e..8830c86466 100644
--- a/src/proto/search.pro
+++ b/src/proto/search.pro
@@ -30,7 +30,6 @@ int search_for_exact_line(buf_T *buf, pos_T *pos, int dir, char_u *pat);
 int searchc(cmdarg_T *cap, int t_cmd);
 pos_T *findmatch(oparg_T *oap, int initc);
 pos_T *findmatchlimit(oparg_T *oap, int initc, int flags, int maxtravel);
-int check_linecomment(char_u *line);
 void showmatch(int c);
 int current_search(long count, int forward);
 int linewhite(linenr_T lnum);
diff --git a/src/proto/sixel.pro b/src/proto/sixel.pro
new file mode 100644
index 0000000000..71947ffaf5
--- /dev/null
+++ b/src/proto/sixel.pro
@@ -0,0 +1,5 @@
+/* sixel.c */
+char_u *sixel_resize_rgb(char_u *src, int sw, int sh, int dw, int dh);
+char_u *sixel_encode(image_rgb_T *img);
+void sixel_free_all(void);
+/* vim: set ft=c : */
diff --git a/src/proto/term.pro b/src/proto/term.pro
index 3f099338be..1e453f09c5 100644
--- a/src/proto/term.pro
+++ b/src/proto/term.pro
@@ -87,7 +87,7 @@ int decode_modifiers(int n);
 bool in_osc_sequence(void);
 int check_termcode(int max_offset, char_u *buf, int bufsize, int *buflen);
 void term_get_fg_color(char_u *r, char_u *g, char_u *b);
-void term_get_bg_color(char_u *r, char_u *g, char_u *b);
+int term_get_bg_color(char_u *r, char_u *g, char_u *b);
 char_u *replace_termcodes(char_u *from, char_u **bufp, scid_T sid_arg, int flags, int *did_simplify);
 void show_termcodes(int flags);
 int show_one_termcode(char_u *name, char_u *code, int printit);
diff --git a/src/proto/terminal.pro b/src/proto/terminal.pro
index 6429ffadd5..cc859dd6cb 100644
--- a/src/proto/terminal.pro
+++ b/src/proto/terminal.pro
@@ -36,6 +36,7 @@ int term_is_finished(buf_T *buf);
 int term_show_buffer(buf_T *buf);
 void term_change_in_curbuf(void);
 int term_get_attr(win_T *wp, linenr_T lnum, int col);
+int term_get_default_attr(win_T *wp);
 void term_reset_hlfwin(win_T *wp);
 void term_update_hlfwin(win_T *wp);
 void term_update_hlfwin_all(void);
diff --git a/src/proto/textprop.pro b/src/proto/textprop.pro
index be9d80c6e3..511d3b5065 100644
--- a/src/proto/textprop.pro
+++ b/src/proto/textprop.pro
@@ -36,4 +36,6 @@ void clear_buf_prop_types(buf_T *buf);
 int adjust_prop_columns(linenr_T lnum, colnr_T col, int bytes_added, int flags);
 void adjust_props_for_split(linenr_T lnum_props, linenr_T lnum_top, int kept, int deleted, int at_eol);
 void prepend_joined_props(unpacked_memline_T *um, linenr_T lnum, int last_line, long col, int removed);
+bool text_prop_count_valid(int prop_count, size_t propdata_len);
+bool text_prop_vtext_valid(char_u *props, int prop_count, size_t propdata_len);
 /* vim: set ft=c : */
diff --git a/src/proto/usercmd.pro b/src/proto/usercmd.pro
index 8c53f562b3..fa45ad152c 100644
--- a/src/proto/usercmd.pro
+++ b/src/proto/usercmd.pro
@@ -9,6 +9,7 @@ char_u *get_user_cmd_addr_type(expand_T *xp, int idx);
 char_u *get_user_cmd_flags(expand_T *xp, int idx);
 char_u *get_user_cmd_nargs(expand_T *xp, int idx);
 char_u *get_user_cmd_complete(expand_T *xp, int idx);
+char_u *get_user_cmd_completeopt(expand_T *xp, int idx);
 char_u *cmdcomplete_type_to_str(int expand, char_u *compl_arg);
 int cmdcomplete_str_to_type(char_u *complete_str);
 char *uc_fun_cmd(void);
diff --git a/src/register.c b/src/register.c
index 358fe6454f..95a1145e43 100644
--- a/src/register.c
+++ b/src/register.c
@@ -2759,7 +2759,7 @@ ex_display(exarg_T *eap)
     }
 
     // display alternate file name
-    if ((arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int)
+    if ((arg == NULL || vim_strchr(arg, '#') != NULL) && !got_int)
     {
 	char_u	    *fname;
 	linenr_T    dummy;
@@ -3152,6 +3152,12 @@ write_reg_contents_ex(
 
     if (name == '#')
     {
+	if (len == 0)
+	{
+	  curwin->w_alt_fnum = 0; // clear altfile
+	  return;
+	}
+
 	buf_T	*buf;
 
 	if (VIM_ISDIGIT(*str))
diff --git a/src/screen.c b/src/screen.c
index bd0f0aead7..51ea61f373 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -467,6 +467,56 @@ skip_for_popup(int row, int col)
     return FALSE;
 }
 
+#ifdef FEAT_PROP_POPUP
+// Cells where ScreenLines[] was updated but terminal output was suppressed
+// because the cell was under an opacity popup.  For these cells the terminal
+// no longer matches ScreenLines[], so the "cell unchanged, skip output"
+// optimization must not be applied until they are output again.
+static char_u	*suppressed_cells = NULL;
+static int	suppressed_rows = 0;
+static int	suppressed_cols = 0;
+
+    static void
+mark_suppressed_cell(int row, int col)
+{
+    if (suppressed_cells == NULL
+	    || suppressed_rows != screen_Rows
+	    || suppressed_cols != screen_Columns)
+    {
+	vim_free(suppressed_cells);
+	suppressed_cells = alloc_clear(
+				   (size_t)screen_Rows * screen_Columns);
+	if (suppressed_cells == NULL)
+	{
+	    suppressed_rows = 0;
+	    suppressed_cols = 0;
+	    return;
+	}
+	suppressed_rows = screen_Rows;
+	suppressed_cols = screen_Columns;
+    }
+    suppressed_cells[row * suppressed_cols + col] = TRUE;
+}
+
+    static void
+unmark_suppressed_cell(int row, int col)
+{
+    if (suppressed_cells != NULL
+	    && row >= 0 && row < suppressed_rows
+	    && col >= 0 && col < suppressed_cols)
+	suppressed_cells[row * suppressed_cols + col] = FALSE;
+}
+
+    static int
+is_suppressed_cell(int row, int col)
+{
+    return suppressed_cells != NULL
+	&& row >= 0 && row < suppressed_rows
+	&& col >= 0 && col < suppressed_cols
+	&& suppressed_cells[row * suppressed_cols + col];
+}
+#endif
+
 #ifdef FEAT_PROP_POPUP
 /*
  * Cached attributes of the current opacity popup, computed once per
@@ -696,6 +746,13 @@ screen_line(
 	redraw_next = force || char_needs_redraw(off_from + char_cells,
 			      off_to + char_cells, endcol - col - char_cells);
 
+#ifdef FEAT_PROP_POPUP
+	// A cell whose output was suppressed under an opacity popup does not
+	// match the terminal even when ScreenLines[] is unchanged.
+	if (!redraw_this && is_suppressed_cell(row, col + coloff))
+	    redraw_this = TRUE;
+#endif
+
 #ifdef FEAT_GUI
 # ifdef FEAT_GUI_MSWIN
 	changed_this = changed_next;
@@ -1083,7 +1140,11 @@ screen_line(
 	// blank out the rest of the line
 	while (col < clear_width && ScreenLines[off_to] == ' '
 						  && ScreenAttrs[off_to] == 0
-				  && (!enc_utf8 || ScreenLinesUC[off_to] == 0))
+				  && (!enc_utf8 || ScreenLinesUC[off_to] == 0)
+#ifdef FEAT_PROP_POPUP
+				  && !is_suppressed_cell(row, col + coloff)
+#endif
+				  )
 	{
 	    ScreenCols[off_to] =
 			      (flags & SLF_INC_VCOL) ? ++last_vcol : last_vcol;
@@ -1900,7 +1961,13 @@ screen_puts_len(
 			|| (ScreenLinesUC[off] != 0
 					  && screen_comp_differs(off, u8cc))))
 		|| ScreenAttrs[off] != cell_attr
-		|| exmode_active;
+		|| exmode_active
+#ifdef FEAT_PROP_POPUP
+		// Output was suppressed under an opacity popup: the terminal
+		// does not match ScreenLines[] even when unchanged.
+		|| is_suppressed_cell(row, col)
+#endif
+		;
 
 	if ((need_redraw || force_redraw_this) && !skip_for_popup(row, col))
 	{
@@ -2462,6 +2529,12 @@ screen_char(unsigned off, int row, int col)
 	    ScreenLinesUC[off2] = 0;
 	    screen_char(off2, row, col + 1);
 	}
+	mark_suppressed_cell(row, col);
+	if (enc_utf8 && ScreenLinesUC[off] != 0
+		&& utf_char2cells(ScreenLinesUC[off]) == 2
+		&& col + 1 < screen_Columns
+		&& popup_is_under_opacity(row, col + 1))
+	    mark_suppressed_cell(row, col + 1);
 	screen_cur_col = 9999;
 	return;
     }
@@ -2470,6 +2543,8 @@ screen_char(unsigned off, int row, int col)
 	    && col + 1 < screen_Columns
 	    && popup_is_under_opacity(row, col + 1))
     {
+	mark_suppressed_cell(row, col);
+	mark_suppressed_cell(row, col + 1);
 	screen_cur_col = 9999;
 	return;
     }
@@ -2503,6 +2578,14 @@ screen_char(unsigned off, int row, int col)
 
     windgoto(row, col);
 
+#ifdef FEAT_PROP_POPUP
+    // The cell is output below, the terminal matches ScreenLines again.
+    unmark_suppressed_cell(row, col);
+    if (enc_utf8 && ScreenLinesUC[off] != 0
+	    && utf_char2cells(ScreenLinesUC[off]) == 2)
+	unmark_suppressed_cell(row, col + 1);
+#endif
+
     if (screen_attr != attr)
 	screen_start_highlight(attr);
 
@@ -2595,6 +2678,8 @@ screen_char_2(unsigned off, int row, int col)
     // If under a higher-zindex opacity popup, suppress output.
     if (popup_is_under_opacity(row, col))
     {
+	mark_suppressed_cell(row, col);
+	mark_suppressed_cell(row, col + 1);
 	screen_cur_col = 9999;
 	return;
     }
@@ -2604,6 +2689,9 @@ screen_char_2(unsigned off, int row, int col)
     // second byte directly.
     screen_char(off, row, col);
     out_char(ScreenLines[off + 1]);
+#ifdef FEAT_PROP_POPUP
+    unmark_suppressed_cell(row, col + 1);
+#endif
     ++screen_cur_col;
 }
 
@@ -2791,11 +2879,21 @@ screen_fill(
 	    // skip blanks (used often, keep it fast!)
 	    if (enc_utf8)
 		while (off < end_off && ScreenLines[off] == ' '
-			  && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0)
+			  && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0
+#ifdef FEAT_PROP_POPUP
+			  && !is_suppressed_cell(row,
+					      (int)(off - LineOffset[row]))
+#endif
+			  )
 		    ++off;
 	    else
 		while (off < end_off && ScreenLines[off] == ' '
-						     && ScreenAttrs[off] == 0)
+						     && ScreenAttrs[off] == 0
+#ifdef FEAT_PROP_POPUP
+			  && !is_suppressed_cell(row,
+					      (int)(off - LineOffset[row]))
+#endif
+			  )
 		    ++off;
 	    if (off < end_off)		// something to be cleared
 	    {
@@ -2808,6 +2906,10 @@ screen_fill(
 		while (col--)		// clear chars in ScreenLines
 		{
 		    space_to_screenline(off, 0);
+#ifdef FEAT_PROP_POPUP
+		    // T_CE cleared the terminal cell, it matches again.
+		    unmark_suppressed_cell(row, (int)(off - LineOffset[row]));
+#endif
 		    ++off;
 		}
 	    }
@@ -2831,6 +2933,13 @@ screen_fill(
 		    // comment on subpixel antialiasing)
 		    || (gui.in_use && col+1 < end_col
 						&& ScreenLines[off+1] != c)
+
+#endif
+#ifdef FEAT_PROP_POPUP
+		    // Output was suppressed under an opacity popup: the
+		    // terminal does not match ScreenLines[] even when
+		    // unchanged.
+		    || is_suppressed_cell(row, col)
 #endif
 		    )
 		    // Skip if under a(nother) popup.
@@ -3415,6 +3524,13 @@ screenalloc(int doclear)
     screen_Rows = Rows;
     screen_Columns = Columns;
 
+#ifdef FEAT_GUI
+    // Cursor position may now be out of bounds after resize
+    if (gui.in_use && (gui.cursor_row >= screen_Rows
+		|| gui.cursor_col >= screen_Columns))
+	gui.cursor_is_valid = false;
+#endif
+
     set_must_redraw(UPD_CLEAR);	// need to clear the screen later
     if (doclear)
 	screenclear2(TRUE);
@@ -3478,6 +3594,9 @@ free_screenlines(void)
     VIM_CLEAR(popup_mask);
     VIM_CLEAR(popup_mask_next);
     VIM_CLEAR(popup_transparent);
+    VIM_CLEAR(suppressed_cells);
+    suppressed_rows = 0;
+    suppressed_cols = 0;
 #endif
 }
 
@@ -3542,6 +3661,17 @@ screenclear2(int doclear)
 	did_clear = TRUE;
 	clear_cmdline = FALSE;
 	mode_displayed = FALSE;
+#ifdef FEAT_PROP_POPUP
+	// The display was cleared, the terminal matches ScreenLines again.
+	if (suppressed_cells != NULL)
+	    vim_memset(suppressed_cells, 0,
+			       (size_t)suppressed_rows * suppressed_cols);
+#endif
+#if defined(FEAT_IMAGE_SIXEL) || defined(FEAT_IMAGE_KITTY)
+	// Clearing the display removes kitty image placements; force the
+	// next redraw to retransmit popup images.
+	popup_images_invalidate();
+#endif
     }
     else
     {
diff --git a/src/scriptfile.c b/src/scriptfile.c
index d0735ffe44..a9b2574934 100644
--- a/src/scriptfile.c
+++ b/src/scriptfile.c
@@ -1806,9 +1806,9 @@ do_source_ext(
     sticky_cmdmod_flags = 0;
 
     save_current_sctx = current_sctx;
-    if (cmdmod.cmod_flags & CMOD_VIM9CMD)
-	// When the ":vim9cmd" command modifier is used, source the script as a
-	// Vim9 script.
+    if ((cmdmod.cmod_flags & CMOD_VIM9CMD) && cookie.source_from_buf)
+	// When the ":vim9cmd" command modifier is used, source buffer lines as
+	// Vim9 script
 	current_sctx.sc_version = SCRIPT_VERSION_VIM9;
     else
 	current_sctx.sc_version = 1;  // default script version
diff --git a/src/search.c b/src/search.c
index d7a0299abc..565f8ff3ba 100644
--- a/src/search.c
+++ b/src/search.c
@@ -2527,10 +2527,11 @@ findmatchlimit(
 	    }
 	}
 
-	// Track block comment state when FM_SKIPCOMM is set.
+	// Track block comment state when FM_SKIPCOMM is set.  Markers inside a
+	// string are not comments, so skip them while "inquote" is set.
 	// Backward: '/' of end-marker enters comment; '*' of start-marker exits.
 	// Forward:  '/' of start-marker enters comment; '/' of end-marker exits.
-	if (skip_comments && !comment_dir)
+	if (skip_comments && !comment_dir && !inquote)
 	{
 	    if (backwards)
 	    {
@@ -2843,65 +2844,6 @@ findmatchlimit(
     return (pos_T *)NULL;	// never found it
 }
 
-/*
- * Check if line[] contains a / / comment.
- * Return MAXCOL if not, otherwise return the column.
- */
-    int
-check_linecomment(char_u *line)
-{
-    char_u  *p;
-
-    p = line;
-    // skip Lispish one-line comments
-    if (curbuf->b_p_lisp)
-    {
-	if (vim_strchr(p, ';') != NULL) // there may be comments
-	{
-	    int in_str = FALSE;	// inside of string
-
-	    p = line;		// scan from start
-	    while ((p = vim_strpbrk(p, (char_u *)"\";")) != NULL)
-	    {
-		if (*p == '"')
-		{
-		    if (in_str)
-		    {
-			if (*(p - 1) != '\\') // skip escaped quote
-			    in_str = FALSE;
-		    }
-		    else if (p == line || ((p - line) >= 2
-				      // skip #\" form
-				      && *(p - 1) != '\\' && *(p - 2) != '#'))
-			in_str = TRUE;
-		}
-		else if (!in_str && ((p - line) < 2
-				    || (*(p - 1) != '\\' && *(p - 2) != '#'))
-			       && !is_pos_in_string(line, (colnr_T)(p - line)))
-		    break;	// found!
-		++p;
-	    }
-	}
-	else
-	    p = NULL;
-    }
-    else
-	while ((p = vim_strchr(p, '/')) != NULL)
-	{
-	    // Accept a double /, unless it's preceded with * and followed by
-	    // *, because * / / * is an end and start of a C comment.  Only
-	    // accept the position if it is not inside a string.
-	    if (p[1] == '/' && (p == line || p[-1] != '*' || p[2] != '*')
-			       && !is_pos_in_string(line, (colnr_T)(p - line)))
-		break;
-	    ++p;
-	}
-
-    if (p == NULL)
-	return MAXCOL;
-    return (int)(p - line);
-}
-
 /*
  * Move cursor briefly to character matching the one under the cursor.
  * Used for Insert mode and "r" command.
@@ -3826,9 +3768,9 @@ find_pattern_in_path(
 		    // compare the first "len" chars from "ptr"
 		    startp = skipwhite(p);
 		    if (p_ic)
-			matched = !MB_STRNICMP(startp, ptr, len);
+			matched = MB_STRNICMP(startp, ptr, len) == 0;
 		    else
-			matched = !STRNCMP(startp, ptr, len);
+			matched = STRNCMP(startp, ptr, len) == 0;
 		    if (matched && define_matched && whole
 						  && vim_iswordc(startp[len]))
 			matched = FALSE;
diff --git a/src/sixel.c b/src/sixel.c
new file mode 100644
index 0000000000..5245af6632
--- /dev/null
+++ b/src/sixel.c
@@ -0,0 +1,696 @@
+/* vi:set ts=8 sts=4 sw=4 noet:
+ *
+ * VIM - Vi IMproved	by Bram Moolenaar
+ *
+ * Do ":help uganda"  in Vim to read copying and usage conditions.
+ * Do ":help credits" in Vim to see a list of people who contributed.
+ * See README.txt for an overview of the Vim source code.
+ */
+
+/*
+ * sixel.c: RGB to DEC sixel encoder, by Yasuhiro Matsumoto.
+ *
+ * The encoder is intentionally self-contained (no libsixel dependency).
+ * The fast path builds a palette on the fly from unique 24-bit colors and
+ * fails over to a fixed 6x6x6 + grayscale 256-color palette when the input
+ * has more colors than fit in the dynamic palette.
+ *
+ * Algorithm reference: github.com/mattn/go-sixel (sixel.go).
+ */
+
+#include "vim.h"
+
+#if defined(FEAT_IMAGE_SIXEL) || defined(PROTO)
+
+// Palette size cap (sixel allows up to 256 color registers; index 0 is
+// reserved as a transparent key, so usable colors are 1..MAX_COLORS).
+#define SIXEL_MAX_COLORS    255
+
+// Working buffer for one band (6 pixel rows). Allocated as
+// width * (palette_size+1) bytes; bit p (0..5) marks pixel at row offset p.
+typedef struct
+{
+    char_u  *bits;	    // bitmask buffer, width * paletteSize bytes
+    size_t   bits_len;	    // allocated bytes in "bits"
+    int	    *seen;	    // per-color "used in this band" flags
+    int	    *used;	    // colors used in this band
+    int	    *xmin;	    // leftmost x used by color in this band
+    int	    *xmax;	    // rightmost x used by color in this band
+    int	     color_len;	    // allocated length for per-color arrays
+    int	     seen_gen;	    // generation counter to avoid memset
+} sixel_band_T;
+
+typedef struct
+{
+    unsigned int    *keys;	    // hash keys for dynamic palette lookup
+    char_u	    *vals;	    // hash values for dynamic palette lookup
+    int		     hash_cap;	    // allocated slots in keys/vals
+    char_u	    *idx;	    // width * height paletted image
+    size_t	     idx_len;	    // allocated bytes in idx
+    char_u	    *pal;	    // dynamic palette storage (RGB triples)
+    int		     pal_len;	    // allocated bytes in pal
+    sixel_band_T     band;	    // reusable band scratch
+} sixel_state_T;
+
+static char_u	sixel_fixed_palette[240 * 3];
+static char_u	sixel_rgb_cube_idx[256];
+static int	sixel_fixed_tables_ready = FALSE;
+static sixel_state_T sixel_state;
+
+/*
+ * Initialize the shared fixed sixel palette and RGB->cube lookup table.
+ */
+    static void
+sixel_init_fixed_tables(void)
+{
+    int	    r, g, b, gr, n;
+
+    if (sixel_fixed_tables_ready)
+	return;
+
+    n = 0;
+    for (r = 0; r < 6; r++)
+	for (g = 0; g < 6; g++)
+	    for (b = 0; b < 6; b++)
+	    {
+		sixel_fixed_palette[n * 3]     = (char_u)(r * 51);
+		sixel_fixed_palette[n * 3 + 1] = (char_u)(g * 51);
+		sixel_fixed_palette[n * 3 + 2] = (char_u)(b * 51);
+		n++;
+	    }
+    for (gr = 0; gr < 24; gr++)
+    {
+	int v = 8 + gr * 10;
+
+	sixel_fixed_palette[n * 3]     = (char_u)v;
+	sixel_fixed_palette[n * 3 + 1] = (char_u)v;
+	sixel_fixed_palette[n * 3 + 2] = (char_u)v;
+	n++;
+    }
+    for (n = 0; n < 256; n++)
+    {
+	int idx = n / 43;
+
+	sixel_rgb_cube_idx[n] = (char_u)(idx > 5 ? 5 : idx);
+    }
+    sixel_fixed_tables_ready = TRUE;
+}
+
+    static int
+sixel_ensure_hash_capacity(int max_colors, int *cap_out)
+{
+    int cap = 1024;
+
+    while (cap < max_colors * 4)
+	cap <<= 1;
+    if (cap > sixel_state.hash_cap)
+    {
+	unsigned int	*keys;
+	char_u		*vals;
+
+	keys = ALLOC_MULT(unsigned int, cap);
+	vals = ALLOC_MULT(char_u, cap);
+	if (keys == NULL || vals == NULL)
+	{
+	    vim_free(keys);
+	    vim_free(vals);
+	    return FAIL;
+	}
+	if (sixel_state.hash_cap > 0)
+	{
+	    mch_memmove(keys, sixel_state.keys,
+			(size_t)sixel_state.hash_cap * sizeof(*keys));
+	    mch_memmove(vals, sixel_state.vals,
+			(size_t)sixel_state.hash_cap * sizeof(*vals));
+	}
+	vim_free(sixel_state.keys);
+	vim_free(sixel_state.vals);
+	sixel_state.keys = keys;
+	sixel_state.vals = vals;
+	sixel_state.hash_cap = cap;
+    }
+    vim_memset(sixel_state.keys, 0, (size_t)cap * sizeof(*sixel_state.keys));
+    *cap_out = cap;
+    return OK;
+}
+
+    static int
+sixel_ensure_idx_capacity(size_t pixels)
+{
+    if (pixels > sixel_state.idx_len)
+    {
+	char_u *idx = vim_realloc(sixel_state.idx, pixels);
+
+	if (idx == NULL)
+	    return FAIL;
+	sixel_state.idx = idx;
+	sixel_state.idx_len = pixels;
+    }
+    return OK;
+}
+
+    static int
+sixel_ensure_pal_capacity(int max_colors)
+{
+    int need = max_colors * 3;
+
+    if (need > sixel_state.pal_len)
+    {
+	char_u *pal = vim_realloc(sixel_state.pal, (size_t)need);
+
+	if (pal == NULL)
+	    return FAIL;
+	sixel_state.pal = pal;
+	sixel_state.pal_len = need;
+    }
+    return OK;
+}
+
+    static int
+sixel_ensure_band_capacity(int width, int npal)
+{
+    size_t	    bits_need = (size_t)width * (npal + 1);
+    sixel_band_T    *band = &sixel_state.band;
+
+    if (bits_need > band->bits_len)
+    {
+	char_u *bits = vim_realloc(band->bits, bits_need);
+
+	if (bits == NULL)
+	    return FAIL;
+	band->bits = bits;
+	band->bits_len = bits_need;
+    }
+    if (npal + 1 > band->color_len)
+    {
+	int *seen = ALLOC_MULT(int, npal + 1);
+	int *used = ALLOC_MULT(int, npal + 1);
+	int *xmin = ALLOC_MULT(int, npal + 1);
+	int *xmax = ALLOC_MULT(int, npal + 1);
+
+	if (seen == NULL || used == NULL || xmin == NULL || xmax == NULL)
+	{
+	    vim_free(seen);
+	    vim_free(used);
+	    vim_free(xmin);
+	    vim_free(xmax);
+	    return FAIL;
+	}
+	if (band->color_len > 0)
+	{
+	    mch_memmove(seen, band->seen,
+			(size_t)band->color_len * sizeof(*seen));
+	    mch_memmove(used, band->used,
+			(size_t)band->color_len * sizeof(*used));
+	    mch_memmove(xmin, band->xmin,
+			(size_t)band->color_len * sizeof(*xmin));
+	    mch_memmove(xmax, band->xmax,
+			(size_t)band->color_len * sizeof(*xmax));
+	}
+	// seen[] is checked against the band's generation counter; if the
+	// newly grown tail held garbage equal to the current generation, the
+	// band loop would read uninitialised xmin/xmax.  Zero the new tail
+	// (and the matching slots in used/xmin/xmax for good measure) so the
+	// "first time this colour is touched" branch is always taken.
+	{
+	    size_t tail = (size_t)(npal + 1 - band->color_len);
+
+	    vim_memset(seen + band->color_len, 0, tail * sizeof(*seen));
+	    vim_memset(used + band->color_len, 0, tail * sizeof(*used));
+	    vim_memset(xmin + band->color_len, 0, tail * sizeof(*xmin));
+	    vim_memset(xmax + band->color_len, 0, tail * sizeof(*xmax));
+	}
+	vim_free(band->seen);
+	vim_free(band->used);
+	vim_free(band->xmin);
+	vim_free(band->xmax);
+	band->seen = seen;
+	band->used = used;
+	band->xmin = xmin;
+	band->xmax = xmax;
+	band->color_len = npal + 1;
+    }
+    return OK;
+}
+
+/*
+ * Append a string to a growarray of bytes.  Returns FAIL on OOM.
+ */
+    static int
+ga_concat_bytes(garray_T *gap, const char *s, int len)
+{
+    if (ga_grow(gap, len) == FAIL)
+	return FAIL;
+    mch_memmove((char_u *)gap->ga_data + gap->ga_len, s, len);
+    gap->ga_len += len;
+    return OK;
+}
+
+    static int
+ga_concat_int(garray_T *gap, int n)
+{
+    char    buf[16];
+    int	    len = vim_snprintf(buf, sizeof(buf), "%d", n);
+
+    return ga_concat_bytes(gap, buf, len);
+}
+
+/*
+ * Nearest-neighbor RGB resize.  Source and destination are tightly packed
+ * R,G,B byte triples.  Returns a malloced buffer of size dw*dh*3.  When
+ * sw==dw && sh==dh, returns a plain copy.  Returns NULL on OOM.
+ */
+    char_u *
+sixel_resize_rgb(char_u *src, int sw, int sh, int dw, int dh)
+{
+    char_u  *dst;
+    int	     x, y;
+
+    if (src == NULL || sw <= 0 || sh <= 0 || dw <= 0 || dh <= 0)
+	return NULL;
+
+    dst = alloc((size_t)dw * dh * 3);
+    if (dst == NULL)
+	return NULL;
+
+    if (sw == dw && sh == dh)
+    {
+	mch_memmove(dst, src, (size_t)dw * dh * 3);
+	return dst;
+    }
+
+    for (y = 0; y < dh; y++)
+    {
+	int	    sy = (int)((long long)y * sh / dh);
+	char_u	    *srow = src + (size_t)sy * sw * 3;
+	char_u	    *drow = dst + (size_t)y * dw * 3;
+
+	for (x = 0; x < dw; x++)
+	{
+	    int	    sx = (int)((long long)x * sw / dw);
+	    char_u  *sp = srow + sx * 3;
+	    char_u  *dp = drow + x * 3;
+
+	    dp[0] = sp[0];
+	    dp[1] = sp[1];
+	    dp[2] = sp[2];
+	}
+    }
+    return dst;
+}
+
+/*
+ * Build a paletted image from an RGB / RGBA buffer using on-the-fly hashing.
+ * On success: *pal_out receives a malloced array of (npal*3) bytes (R,G,B
+ * triples) and *idx_out receives a malloced array of width*height bytes
+ * (indices 1..npal; 0 is reserved as transparent).
+ *
+ * Handles both RGB (3 bytes/pixel, has_alpha == FALSE) and RGBA (4 bytes/
+ * pixel, has_alpha == TRUE).  Sixel cannot represent partial transparency,
+ * so RGBA pixels are split at half coverage: alpha < 128 pixels are mapped
+ * to palette index 0 -- which the sixel emitter never writes to the
+ * bitmask, leaving the cell's underlying terminal contents visible
+ * (transparency).  Rendering them opaque instead would show the image's
+ * anti-aliased edge fringe (mostly-transparent, often light-colored
+ * pixels) as bright dots around the image.  Pixels with alpha >= 128 are
+ * deduplicated by their R,G,B triple, ignoring the alpha value.
+ *
+ * Returns OK on success, FAIL when colors exceed max_colors (caller may
+ * fall back to a fixed palette) or on OOM.
+ */
+    static int
+rgb_to_paletted_fast(
+	char_u	*pixels,
+	int	 width,
+	int	 height,
+	int	 has_alpha,
+	int	 max_colors,
+	char_u **pal_out,
+	int	*npal_out,
+	char_u **idx_out)
+{
+    int		     cap;
+    int		     mask;
+    int		     used = 0;
+    unsigned int    *keys;
+    char_u	    *vals;
+    char_u	    *idx;
+    char_u	    *pal;
+    int		     i, n;
+    int		     bpp = has_alpha ? 4 : 3;
+
+    if (sixel_ensure_hash_capacity(max_colors, &cap) == FAIL
+	    || sixel_ensure_idx_capacity((size_t)width * height) == FAIL
+	    || sixel_ensure_pal_capacity(max_colors) == FAIL)
+	return FAIL;
+    keys = sixel_state.keys;
+    vals = sixel_state.vals;
+    idx = sixel_state.idx;
+    pal = sixel_state.pal;
+    mask = cap - 1;
+
+    n = width * height;
+    for (i = 0; i < n; i++)
+    {
+	char_u		*p = pixels + (size_t)i * bpp;
+	unsigned int	 key;
+	unsigned int	 h;
+	int		 slot;
+
+	if (has_alpha && p[3] < 128)
+	{
+	    idx[i] = 0;	    // transparent -- terminal leaves cell as-is
+	    continue;
+	}
+	key = ((unsigned int)p[0] << 16)
+		| ((unsigned int)p[1] << 8)
+		| (unsigned int)p[2];
+	h = key * 2654435761u;
+	slot = (int)(h & mask);
+
+	for (;;)
+	{
+	    if (keys[slot] == 0)
+	    {
+		// new color
+		if (used >= max_colors)
+		    goto too_many;
+		keys[slot] = key + 1;
+		vals[slot] = (char_u)(used + 1);    // 1-based palette index
+		pal[used * 3]	  = p[0];
+		pal[used * 3 + 1] = p[1];
+		pal[used * 3 + 2] = p[2];
+		used++;
+		idx[i] = vals[slot];
+		break;
+	    }
+	    if (keys[slot] == key + 1)
+	    {
+		idx[i] = vals[slot];
+		break;
+	    }
+	    slot = (slot + 1) & mask;
+	}
+    }
+    *pal_out = pal;
+    *npal_out = used;
+    *idx_out = idx;
+    return OK;
+
+too_many:
+    return FAIL;
+}
+
+/*
+ * Fallback: quantize pixels to a fixed 6x6x6 RGB cube + 24-step grayscale.
+ * Always succeeds; produces 240 palette entries.
+ *
+ * Handles both RGB (3 bytes/pixel, has_alpha == FALSE) and RGBA (4 bytes/
+ * pixel, has_alpha == TRUE).  For RGBA, alpha < 128 pixels are mapped to
+ * palette index 0 -- which the sixel emitter never writes to the bitmask,
+ * leaving the cell's underlying terminal contents visible (transparency);
+ * see rgb_to_paletted_fast() for why the cut is at half coverage.
+ */
+    static int
+rgb_to_paletted_fixed(
+	char_u	*pixels,
+	int	 width,
+	int	 height,
+	int	 has_alpha,
+	char_u **pal_out,
+	int	*npal_out,
+	char_u **idx_out)
+{
+    char_u  *idx;
+    int	     n;
+    int	     bpp = has_alpha ? 4 : 3;
+
+    if (sixel_ensure_idx_capacity((size_t)width * height) == FAIL)
+	return FAIL;
+    idx = sixel_state.idx;
+
+    sixel_init_fixed_tables();
+
+    // map every pixel to the nearest cube cell
+    for (n = 0; n < width * height; n++)
+    {
+	char_u	*p = pixels + (size_t)n * bpp;
+	int	 ri, gi, bi;
+
+	if (has_alpha && p[3] < 128)
+	{
+	    idx[n] = 0;
+	    continue;
+	}
+	ri = sixel_rgb_cube_idx[p[0]];
+	gi = sixel_rgb_cube_idx[p[1]];
+	bi = sixel_rgb_cube_idx[p[2]];
+	idx[n] = (char_u)(ri * 36 + gi * 6 + bi + 1);	// 1-based
+    }
+
+    *pal_out = sixel_fixed_palette;
+    *npal_out = 240;
+    *idx_out = idx;
+    return OK;
+}
+
+/*
+ * Emit a run of `cnt` identical sixel data bytes (ch in 0..63) into gap.
+ * Uses RLE form `!N{c}` when it shortens the output.
+ */
+    static int
+emit_run(garray_T *gap, char_u ch, int cnt)
+{
+    char_u  c = (char_u)(63 + ch);
+
+    while (cnt > 255)
+    {
+	if (ga_concat_bytes(gap, "!255", 4) == FAIL
+		|| ga_append(gap, c) == FAIL)
+	    return FAIL;
+	cnt -= 255;
+    }
+    if (cnt <= 0)
+	return OK;
+    if (cnt <= 3)
+    {
+	while (cnt-- > 0)
+	    if (ga_append(gap, c) == FAIL)
+		return FAIL;
+	return OK;
+    }
+    if (ga_append(gap, '!') == FAIL
+	    || ga_concat_int(gap, cnt) == FAIL
+	    || ga_append(gap, c) == FAIL)
+	return FAIL;
+    return OK;
+}
+
+/*
+ * Encode an RGB(A) image into a sixel DCS sequence.
+ * Returns a malloced char_u* containing the full sequence
+ * (\033P...\033\\), or NULL on OOM.
+ */
+    char_u *
+sixel_encode(image_rgb_T *img)
+{
+    garray_T	ga;
+    char_u	*pal = NULL;
+    char_u	*idx = NULL;
+    int		npal = 0;
+    int		width, height;
+    int		band, p, x, n;
+    sixel_band_T	*band_state = &sixel_state.band;
+    char_u	*result;
+
+    if (img == NULL || img->data == NULL || img->width <= 0 || img->height <= 0)
+	return NULL;
+    width = img->width;
+    height = img->height;
+
+    if (rgb_to_paletted_fast(img->data, width, height, img->has_alpha,
+		SIXEL_MAX_COLORS, &pal, &npal, &idx) == FAIL)
+    {
+	if (rgb_to_paletted_fixed(img->data, width, height, img->has_alpha,
+		    &pal, &npal, &idx) == FAIL)
+	    return NULL;
+    }
+
+    ga_init2(&ga, sizeof(char_u), 4096);
+
+    // DECSIXEL Introducer + Raster Attributes "1;1;W;H.
+    // P2=1 means pixel positions left unspecified by any colour register
+    // keep their previous on-screen contents instead of being painted with
+    // colour register 0.  That gives true transparency for RGBA images:
+    // alpha < 128 pixels are emitted as palette index 0 (which we never
+    // write to the bitmask), so the terminal leaves the popup's underlying
+    // cell colour visible there -- no flatten, no colour-match drift.
+    if (ga_concat_bytes(&ga, "\033P0;1;8q\"1;1;", 13) == FAIL
+	    || ga_concat_int(&ga, width) == FAIL
+	    || ga_append(&ga, ';') == FAIL
+	    || ga_concat_int(&ga, height) == FAIL)
+	goto fail;
+
+    // Color register definitions  #N;2;R;G;B  (RGB scaled to 0..100).
+    // Round to nearest, not truncate, so the round-trip 8bit -> 0..100 -> 8bit
+    // stays within ~1 level instead of drifting up to 2-3 levels darker.  This
+    // matters when the popup blends RGBA alpha onto the terminal background:
+    // truncation made the flattened bg visibly darker than the surrounding
+    // terminal cells.
+    for (n = 0; n < npal; n++)
+    {
+	int r = (pal[n * 3]     * 100 + 127) / 255;
+	int g = (pal[n * 3 + 1] * 100 + 127) / 255;
+	int b = (pal[n * 3 + 2] * 100 + 127) / 255;
+
+	if (ga_append(&ga, '#') == FAIL
+		|| ga_concat_int(&ga, n + 1) == FAIL
+		|| ga_concat_bytes(&ga, ";2;", 3) == FAIL
+		|| ga_concat_int(&ga, r) == FAIL
+		|| ga_append(&ga, ';') == FAIL
+		|| ga_concat_int(&ga, g) == FAIL
+		|| ga_append(&ga, ';') == FAIL
+		|| ga_concat_int(&ga, b) == FAIL)
+	    goto fail;
+    }
+
+    // bitmask buffer: width bytes per palette index, +1 for the unused index 0
+    if (sixel_ensure_band_capacity(width, npal) == FAIL)
+	goto fail;
+
+    for (band = 0; band < (height + 5) / 6; band++)
+    {
+	int gen;
+	int last_was_cr = 0;
+	int used_count = 0;
+
+	if (++band_state->seen_gen <= 0)
+	{
+	    vim_memset(band_state->seen, 0, (npal + 1) * sizeof(int));
+	    band_state->seen_gen = 1;
+	}
+	gen = band_state->seen_gen;
+
+	if (band > 0 && ga_append(&ga, '-') == FAIL)
+	    goto fail;
+
+	// Fill the bitmask for this band.
+	for (p = 0; p < 6; p++)
+	{
+	    int y = band * 6 + p;
+	    char_u  rowmask = (char_u)(1 << p);
+	    char_u  *row;
+
+	    if (y >= height)
+		continue;
+	    row = idx + (size_t)y * width;
+	    for (x = 0; x < width; x++)
+	    {
+		char_u  pix = row[x];
+
+		if (pix == 0)
+		    continue;
+		if (band_state->seen[pix] != gen)
+		{
+		    band_state->seen[pix] = gen;
+		    band_state->used[used_count++] = pix;
+		    band_state->xmin[pix] = x;
+		    band_state->xmax[pix] = x;
+		    vim_memset(band_state->bits + (size_t)pix * width, 0, width);
+		}
+		else
+		{
+		    if (x < band_state->xmin[pix])
+			band_state->xmin[pix] = x;
+		    if (x > band_state->xmax[pix])
+			band_state->xmax[pix] = x;
+		}
+		band_state->bits[(size_t)pix * width + x] |= rowmask;
+	    }
+	}
+
+	for (n = 0; n < used_count; n++)
+	{
+	    int	     pix = band_state->used[n];
+	    char_u  *row;
+	    char_u   ch0;
+	    int	     cnt;
+	    int	     start = band_state->xmin[pix];
+	    int	     end = band_state->xmax[pix];
+
+	    if (last_was_cr && ga_append(&ga, '$') == FAIL)
+		goto fail;
+	    if (ga_append(&ga, '#') == FAIL
+		    || ga_concat_int(&ga, pix) == FAIL)
+		goto fail;
+
+	    row = band_state->bits + (size_t)pix * width;
+	    if (start > 0 && emit_run(&ga, 0, start) == FAIL)
+		goto fail;
+	    ch0 = row[start];
+	    cnt = 1;
+	    for (x = start + 1; x <= end; x++)
+	    {
+		char_u  ch = row[x];
+
+		if (ch == ch0)
+		{
+		    cnt++;
+		    continue;
+		}
+		if (emit_run(&ga, ch0, cnt) == FAIL)
+		    goto fail;
+		ch0 = ch;
+		cnt = 1;
+	    }
+	    if (emit_run(&ga, ch0, cnt) == FAIL)
+		goto fail;
+	    last_was_cr = 1;
+	}
+    }
+
+    // String terminator
+    if (ga_concat_bytes(&ga, "\033\\", 2) == FAIL
+	    || ga_append(&ga, NUL) == FAIL)
+	goto fail;
+
+    result = (char_u *)ga.ga_data;
+    return result;
+
+fail:
+    ga_clear(&ga);
+    return NULL;
+}
+
+#if defined(EXITFREE) || defined(PROTO)
+/*
+ * Release all module-level allocations cached by the sixel encoder.  Called
+ * from free_all_mem() on shutdown when EXITFREE is defined; the encoder
+ * reuses these buffers across invocations, so they otherwise live until
+ * process exit and show up as leaks under tools like ccmalloc/valgrind.
+ */
+    void
+sixel_free_all(void)
+{
+    sixel_band_T    *band = &sixel_state.band;
+
+    VIM_CLEAR(sixel_state.keys);
+    VIM_CLEAR(sixel_state.vals);
+    VIM_CLEAR(sixel_state.idx);
+    VIM_CLEAR(sixel_state.pal);
+    sixel_state.hash_cap = 0;
+    sixel_state.idx_len = 0;
+    sixel_state.pal_len = 0;
+
+    VIM_CLEAR(band->bits);
+    VIM_CLEAR(band->seen);
+    VIM_CLEAR(band->used);
+    VIM_CLEAR(band->xmin);
+    VIM_CLEAR(band->xmax);
+    band->bits_len = 0;
+    band->color_len = 0;
+    band->seen_gen = 0;
+}
+#endif
+
+#endif // FEAT_IMAGE_SIXEL
diff --git a/src/spell.c b/src/spell.c
index b48ee87b03..96700782ef 100644
--- a/src/spell.c
+++ b/src/spell.c
@@ -3270,7 +3270,7 @@ spell_soundfold_sofo(slang_T *slang, char_u *inword, char_u *res)
     else
     {
 	// The sl_sal_first[] table contains the translation.
-	for (s = inword; (c = *s) != NUL; ++s)
+	for (s = inword; (c = *s) != NUL && ri < MAXWLEN - 1; ++s)
 	{
 	    if (VIM_ISWHITE(c))
 		c = ' ';
@@ -4325,7 +4325,7 @@ dump_prefixes(
 			}
 		    }
 		}
-		else
+		else if (depth < MAXWLEN - 1)
 		{
 		    // Normal char, go one level deeper.
 		    prefix[depth++] = c;
diff --git a/src/spellfile.c b/src/spellfile.c
index 8a373f343f..2e7f6a5398 100644
--- a/src/spellfile.c
+++ b/src/spellfile.c
@@ -642,7 +642,7 @@ tree_count_words(char_u *byts, long byts_len, idx_T *idxs)
 		    ++curi[depth];
 		}
 	    }
-	    else
+	    else if (depth < MAXWLEN - 1)
 	    {
 		// Normal char, go one level deeper to count the words.
 		++depth;
@@ -1670,7 +1670,7 @@ read_tree_node(
     if (len <= 0)
 	return SP_TRUNCERROR;
 
-    if (startidx + len >= maxidx)
+    if (len >= maxidx - startidx)
 	return SP_FORMERROR;
     byts[idx++] = len;
 
@@ -5742,7 +5742,7 @@ sug_filltree(spellinfo_T *spin, slang_T *slang)
 		    ++curi[depth];
 		}
 	    }
-	    else
+	    else if (depth < MAXWLEN - 1)
 	    {
 		// Normal char, go one level deeper.
 		tword[depth++] = c;
diff --git a/src/strings.c b/src/strings.c
index ff63a3ef40..71f9d83e21 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -1584,6 +1584,7 @@ f_str2blob(typval_T *argvars, typval_T *rettv)
 	return;
 
     char_u	*to_encoding = NULL;
+    char_u	*to_encoding_raw = NULL;  // Encoding name with endianness preserved for iconv
     if (argvars[1].v_type != VAR_UNKNOWN)
     {
 	dict_T *d = argvars[1].vval.v_dict;
@@ -1591,50 +1592,144 @@ f_str2blob(typval_T *argvars, typval_T *rettv)
 	{
 	    char_u *enc = dict_get_string(d, "encoding", FALSE);
 	    if (enc != NULL)
-		to_encoding = enc_canonize(enc_skip(enc));
+	    {
+		char_u *enc_skipped = enc_skip(enc);
+		to_encoding = enc_canonize(enc_skipped);
+
+		// For iconv, preserve the endianness suffix by creating a
+		// normalized version with hyphens: "utf16le" -> "utf-16le"
+		to_encoding_raw = normalize_encoding_name(enc_skipped);
+		if (to_encoding_raw == NULL)
+		{
+		    emsg(_(e_out_of_memory));
+		    VIM_CLEAR(to_encoding);
+		    return;
+		}
+	    }
 	}
     }
 
-    FOR_ALL_LIST_ITEMS(list, li)
+    // Special handling for UTF-16/UCS-2/UTF-32/UCS-4 target encodings: join the
+    // list items with a newline and convert the whole string at once, so that
+    // the wide-encoded newline separators and embedded NUL bytes are preserved
+    // (mirrors blob2str()).  convert_string() cannot be used here because it
+    // treats every Unicode encoding as utf-8, leaving the bytes unconverted.
+    int to_prop = 0;
+    if (to_encoding != NULL)
+	to_prop = enc_canon_props(to_encoding);
+    if (to_encoding != NULL && (to_prop & (ENC_2BYTE | ENC_4BYTE | ENC_2WORD)))
     {
-	if (li->li_tv.v_type != VAR_STRING)
-	    continue;
+	garray_T	str_ga;
 
-	string_T    str = {li->li_tv.vval.v_string, 0};
+	ga_init2(&str_ga, 1, 256);
+	FOR_ALL_LIST_ITEMS(list, li)
+	{
+	    char_u *s;
 
-	if (str.string == NULL)
-	    STR_LITERAL_SET(str, "");
-	else
-	    str.length = STRLEN(str.string);
+	    if (li->li_tv.v_type != VAR_STRING)
+		continue;
+
+	    s = li->li_tv.vval.v_string;
 
-	if (to_encoding != NULL)
+	    // Each list string item is separated by a newline in the blob
+	    if (li != list->lv_first)
+		ga_append(&str_ga, NL);
+	    if (s != NULL && *s != NUL)
+	    {
+		int slen = (int)STRLEN(s);
+
+		if (ga_grow(&str_ga, slen) == FAIL)
+		{
+		    ga_clear(&str_ga);
+		    goto done;
+		}
+		mch_memmove((char_u *)str_ga.ga_data + str_ga.ga_len, s,
+								(size_t)slen);
+		str_ga.ga_len += slen;
+	    }
+	}
+
+	if (str_ga.ga_len > 0)
 	{
-	    int		res;
-	    string_T	converted;
+	    vimconv_T	vimconv;
 
-	    res = convert_string(&str, p_enc, to_encoding, &converted);
-	    if (res != OK)
+	    vimconv.vc_type = CONV_NONE;
+	    if (convert_setup_ext(&vimconv, p_enc, FALSE, to_encoding_raw, FALSE)
+								    == FAIL)
 	    {
+		ga_clear(&str_ga);
 		semsg(_(e_str_encoding_to_failed), to_encoding);
 		goto done;
 	    }
-	    str.string = converted.string;
-	    str.length = converted.length;
+	    vimconv.vc_fail = TRUE;
+
+	    int		len = str_ga.ga_len;
+	    char_u	*converted = string_convert_ext(&vimconv,
+				    (char_u *)str_ga.ga_data, &len, NULL);
+	    convert_setup(&vimconv, NULL, NULL);
+	    ga_clear(&str_ga);
+
+	    if (converted == NULL)
+	    {
+		semsg(_(e_str_encoding_to_failed), to_encoding);
+		goto done;
+	    }
+	    if (len > 0 && ga_grow(&blob->bv_ga, len) == OK)
+	    {
+		mch_memmove((char_u *)blob->bv_ga.ga_data + blob->bv_ga.ga_len,
+						    converted, (size_t)len);
+		blob->bv_ga.ga_len += len;
+	    }
+	    vim_free(converted);
 	}
+	else
+	    ga_clear(&str_ga);
+    }
+    else
+    {
+	FOR_ALL_LIST_ITEMS(list, li)
+	{
+	    if (li->li_tv.v_type != VAR_STRING)
+		continue;
 
-	if (li != list->lv_first)
-	    // Each list string item is separated by a newline in the blob
-	    ga_append(&blob->bv_ga, NL);
+	    string_T	str = {li->li_tv.vval.v_string, 0};
 
-	blob_from_string(str.string, blob);
+	    if (str.string == NULL)
+		STR_LITERAL_SET(str, "");
+	    else
+		str.length = STRLEN(str.string);
 
-	if (to_encoding != NULL)
-	    vim_free(str.string);
+	    if (to_encoding != NULL)
+	    {
+		int	    res;
+		string_T    converted;
+
+		res = convert_string(&str, p_enc, to_encoding, &converted);
+		if (res != OK)
+		{
+		    semsg(_(e_str_encoding_to_failed), to_encoding);
+		    goto done;
+		}
+		str.string = converted.string;
+		str.length = converted.length;
+	    }
+
+	    if (li != list->lv_first)
+		// Each list string item is separated by a newline in the blob
+		ga_append(&blob->bv_ga, NL);
+
+	    blob_from_string(str.string, blob);
+
+	    if (to_encoding != NULL)
+		vim_free(str.string);
+	}
     }
 
 done:
     if (to_encoding != NULL)
 	vim_free(to_encoding);
+    if (to_encoding_raw != NULL)
+	vim_free(to_encoding_raw);
 }
 
 /*
diff --git a/src/structs.h b/src/structs.h
index a67bbe7333..527aeb2b90 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -665,6 +665,7 @@ typedef struct expand
     xp_prefix_T	xp_prefix;
 #if defined(FEAT_EVAL)
     char_u	*xp_arg;		// completion function
+    int		xp_complete_opt;	// UCC_ flags for user command
     sctx_T	xp_script_ctx;		// SCTX for completion function
 #endif
     int		xp_backslash;		// one of the XP_BS_ values
@@ -3196,6 +3197,9 @@ typedef struct {
     int		b_sst_freecount;
     linenr_T	b_sst_check_lnum;
     short_u	b_sst_lasttick;	// last display tick
+
+    // Cache for in_id_list(); see idl_cache_T in syntax.c.
+    void	*b_idlist_cache;
 #endif // FEAT_SYN_HL
 
 #ifdef FEAT_SPELL
@@ -4260,6 +4264,65 @@ struct window_S
     char_u	*w_popup_mask_cells; // cached mask cells
     int		w_popup_mask_height; // height of w_popup_mask_cells
     int		w_popup_mask_width;  // width of w_popup_mask_cells
+
+# ifdef FEAT_IMAGE
+    char_u	*w_popup_image_data;	// RGB pixels (w*h*3) or RGBA (w*h*4)
+    int		w_popup_image_w;	// source pixel width
+    int		w_popup_image_h;	// source pixel height
+    int		w_popup_image_alpha;	// TRUE when data is RGBA, not RGB
+    // Last screen rectangle (in cells) where the image was emitted.  Used
+    // to invalidate ScreenLines under the previous image when the popup
+    // moves or the clip changes; otherwise screen_fill() skips the paint
+    // for cells whose desired space+attr already matches what was drawn
+    // before (e.g. body -> top padding both write ' '+popup_attr), leaving
+    // image pixels stranded in the terminal (sixel/kitty) or on gui.surface
+    // (GDI/Cairo).  cells_h == 0 means "no previous emit".
+    int		w_popup_image_emit_row;
+    int		w_popup_image_emit_col;
+    int		w_popup_image_emit_cells_w;
+    int		w_popup_image_emit_cells_h;
+    // TRUE when the pixel buffer was replaced after the last emit.  For
+    // RGBA images the backends that composite onto the previous emit
+    // instead of replacing it (sixel P2=1 transparency, cairo OPERATOR_OVER)
+    // must repaint the cells underneath first, or the old frame stays
+    // visible under the new frame's transparent pixels.
+    bool	w_popup_image_px_dirty;
+#  ifdef FEAT_IMAGE_SIXEL
+    char_u	*w_popup_image_seq;	// cached sixel DCS sequence (terminal)
+    int		w_popup_image_seq_w;	// pixel width of cached seq
+    int		w_popup_image_seq_h;	// pixel height used for cached seq;
+					// -1 means cache is invalid
+    int		w_popup_image_seq_crop_x; // pixel offset (left) into source
+    int		w_popup_image_seq_crop_y; // pixel offset (top) into source
+    int		w_popup_image_seq_cells_w; // cell width  spanning seq pixels
+    int		w_popup_image_seq_cells_h; // cell height spanning seq pixels
+    int		w_popup_image_seq_zindex;  // zindex encoded into seq (kitty z=)
+    bool	w_popup_image_emit_valid;  // true while the kitty placement
+					   // emitted at w_popup_image_emit_*
+					   // is still on the terminal
+#  endif
+#  ifdef FEAT_IMAGE_GDI
+    // Pre-built Windows GUI image cache.  The bitmap is a 32-bit top-down
+    // DIB section, the DC keeps it selected for fast BitBlt, and the bits
+    // pointer is updated in place on same-size frame swaps.  Stored as
+    // void* so structs.h does not have to pull in <windows.h>.
+    void	*w_popup_image_hbitmap;
+    void	*w_popup_image_hdc;
+    void	*w_popup_image_bits;
+#  endif
+#  ifdef FEAT_IMAGE_CAIRO
+    // Pre-built Cairo GUI image cache.  Holds a cairo_image_surface_t*
+    // with the popup's pixel data converted to ARGB32 / RGB24 (BGRA byte
+    // order expected by cairo on little-endian).  Composited onto
+    // gui.surface by gui_mch_draw_popup_image().  Stored as void* so
+    // structs.h does not have to pull in <cairo.h>.
+    void	*w_popup_image_surface;
+#  endif
+#  ifdef FEAT_IMAGE_GDK
+    // Cached GdkTexture for the image.
+    void	*w_popup_image_texture;
+#  endif
+# endif
 # if defined(FEAT_TIMERS)
     timer_T	*w_popup_timer;	    // timer for closing popup window
 # endif
@@ -5433,6 +5496,28 @@ struct cellsize {
 };
 #endif
 
+#if defined(FEAT_IMAGE) || defined(PROTO)
+// RGB(A) image input shared by all popup image backends.
+// "data" points to width*height*3 bytes of tightly packed R,G,B triples
+// when has_alpha is FALSE, or width*height*4 R,G,B,A quadruples otherwise.
+// Backends that cannot represent partial alpha (e.g. sixel) flatten the
+// alpha channel onto the terminal background before encoding.
+typedef struct {
+    char_u  *data;
+    int	     width;
+    int	     height;
+    int	     has_alpha;
+} image_rgb_T;
+
+// Terminal-side image backend selected at runtime by popup_image_backend().
+// IMAGE_BACKEND_SIXEL emits DEC sixel DCS sequences via sixel_encode();
+// IMAGE_BACKEND_KITTY emits kitty graphics protocol APC sequences via
+// kitty_encode().  GUI builds use a separate FEAT_IMAGE_GDI path and never
+// consult this enum.
+# define IMAGE_BACKEND_SIXEL  0
+# define IMAGE_BACKEND_KITTY  1
+#endif
+
 #ifdef FEAT_WAYLAND
 
 typedef struct vwl_connection_S vwl_connection_T;
diff --git a/src/syntax.c b/src/syntax.c
index c845a1051f..4333c31839 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -345,6 +345,7 @@ static void init_syn_patterns(void);
 static char_u *get_syn_pattern(char_u *arg, synpat_T *ci);
 static int get_id_list(char_u **arg, int keylen, short **list, int skip);
 static void syn_combine_list(short **clstr1, short **clstr2, int list_op);
+static void idl_cache_clear(synblock_T *block);
 
 /*
  * Start the syntax recognition for a line.  This function is normally called
@@ -1027,6 +1028,9 @@ syn_stack_free_block(synblock_T *block)
 {
     synstate_T	*p;
 
+    // Syntax definitions may have changed: drop the in_id_list() cache.
+    idl_cache_clear(block);
+
     if (block->b_sst_array == NULL)
 	return;
 
@@ -6110,6 +6114,194 @@ copy_id_list(short *list)
     return retval;
 }
 
+/*
+ * Cache for in_id_list() {{{
+ *
+ * A "contains"/cluster list is otherwise scanned with recursive cluster
+ * expansion on every check.  Each distinct list is resolved once into a
+ * cluster-expanded, sorted set of group IDs so membership becomes a binary
+ * search.  The cache lives in the synblock and is cleared by
+ * syn_stack_free_block() when syntax definitions change (which also covers
+ * list pointer reuse).
+ */
+#define IDL_CACHE_SIZE 16
+
+typedef struct
+{
+    short	*idl_key;	// the list this entry resolves (NULL when empty)
+    short	*idl_ids;	// sorted, cluster-expanded group IDs (allocated)
+    int		idl_count;	// number of IDs in idl_ids
+    short	idl_marker;	// leading ALLBUT/TOP/CONTAINED item, or 0
+    bool	idl_usable;	// false: not cacheable, use the slow path
+} idl_entry_T;
+
+typedef struct
+{
+    idl_entry_T	ent[IDL_CACHE_SIZE];
+    int		round;		// round-robin replacement index
+    int		last;		// index of the last returned entry (fast path)
+} idl_cache_T;
+
+/*
+ * Collect the explicit group IDs of "list" into "ga", expanding clusters.
+ * "seen" records visited clusters to break cycles and avoid duplicate work.
+ * Return false when the list cannot be represented as a plain set (a nested
+ * ALLBUT/TOP/CONTAINED marker) or on out of memory.
+ */
+    static bool
+idl_collect(short *list, garray_T *ga, garray_T *seen)
+{
+    if (list == NULL || list == ID_LIST_ALL)
+	return false;
+    for (short item = *list; item != 0; item = *++list)
+    {
+	if (item >= SYNID_ALLBUT && item < SYNID_CLUSTER)
+	    return false;	// nested ALLBUT/TOP/CONTAINED: not cacheable
+	if (item >= SYNID_CLUSTER)
+	{
+	    short	*scl_list;
+	    bool	seen_it = false;
+
+	    for (int i = 0; i < seen->ga_len; ++i)
+		if (((short *)seen->ga_data)[i] == item)
+		{
+		    seen_it = true;
+		    break;
+		}
+	    if (seen_it)
+		continue;
+	    if (ga_grow(seen, 1) == FAIL)
+		return false;
+	    ((short *)seen->ga_data)[seen->ga_len++] = item;
+	    // Record the cluster id itself, not just its members: the slow
+	    // path matches "item == id" for a cluster id present in the list.
+	    if (ga_grow(ga, 1) == FAIL)
+		return false;
+	    ((short *)ga->ga_data)[ga->ga_len++] = item;
+	    scl_list = SYN_CLSTR(syn_block)[item - SYNID_CLUSTER].scl_list;
+	    if (scl_list != NULL && !idl_collect(scl_list, ga, seen))
+		return false;
+	}
+	else
+	{
+	    if (ga_grow(ga, 1) == FAIL)
+		return false;
+	    ((short *)ga->ga_data)[ga->ga_len++] = item;
+	}
+    }
+    return true;
+}
+
+    static int
+idl_id_cmp(const void *a, const void *b)
+{
+    return (int)*(const short *)a - (int)*(const short *)b;
+}
+
+/*
+ * Get the cache entry that resolves "list", building it if needed.
+ * Returns NULL only on allocation failure.
+ */
+    static idl_entry_T *
+idl_get_entry(short *list)
+{
+    idl_cache_T	*cache = (idl_cache_T *)syn_block->b_idlist_cache;
+    idl_entry_T	*e;
+    garray_T	ga, seen;
+
+    if (cache == NULL)
+    {
+	cache = ALLOC_CLEAR_ONE(idl_cache_T);
+	if (cache == NULL)
+	    return NULL;
+	syn_block->b_idlist_cache = cache;
+    }
+    // Fast path: the same list is usually queried many times in a row.
+    if (cache->ent[cache->last].idl_key == list)
+	return &cache->ent[cache->last];
+    for (int i = 0; i < IDL_CACHE_SIZE; ++i)
+	if (cache->ent[i].idl_key == list)
+	{
+	    cache->last = i;
+	    return &cache->ent[i];
+	}
+
+    // Build a new entry, replacing one in round-robin order.
+    cache->last = cache->round;
+    e = &cache->ent[cache->round];
+    cache->round = (cache->round + 1) % IDL_CACHE_SIZE;
+    VIM_CLEAR(e->idl_ids);
+    e->idl_count = 0;
+    e->idl_key = list;
+    e->idl_marker = 0;
+    e->idl_usable = true;
+
+    // A leading ALLBUT/TOP/CONTAINED marker is kept aside; the rest is the set.
+    if (*list >= SYNID_ALLBUT && *list < SYNID_CLUSTER)
+    {
+	e->idl_marker = *list;
+	++list;
+    }
+
+    ga_init2(&ga, sizeof(short), 50);
+    ga_init2(&seen, sizeof(short), 10);
+    if (!idl_collect(list, &ga, &seen))
+    {
+	e->idl_usable = false;
+	ga_clear(&ga);
+	ga_clear(&seen);
+	return e;
+    }
+    ga_clear(&seen);
+    if (ga.ga_len > 0)
+    {
+	qsort(ga.ga_data, (size_t)ga.ga_len, sizeof(short), idl_id_cmp);
+	e->idl_ids = (short *)ga.ga_data;	// take ownership
+	e->idl_count = ga.ga_len;
+    }
+    else
+	ga_clear(&ga);
+    return e;
+}
+
+/*
+ * Return true if "id" is in the resolved set of cache entry "e".
+ */
+    static bool
+idl_contains(idl_entry_T *e, short id)
+{
+    int	lo = 0;
+    int	hi = e->idl_count - 1;
+
+    while (lo <= hi)
+    {
+	int	mid = (lo + hi) / 2;
+	short	v = e->idl_ids[mid];
+
+	if (v == id)
+	    return true;
+	if (v < id)
+	    lo = mid + 1;
+	else
+	    hi = mid - 1;
+    }
+    return false;
+}
+
+    static void
+idl_cache_clear(synblock_T *block)
+{
+    idl_cache_T	*cache = (idl_cache_T *)block->b_idlist_cache;
+
+    if (cache == NULL)
+	return;
+    for (int i = 0; i < IDL_CACHE_SIZE; ++i)
+	vim_free(cache->ent[i].idl_ids);
+    vim_free(cache);
+    block->b_idlist_cache = NULL;
+}
+// }}}
+
 /*
  * Check if syntax group "ssp" is in the ID list "list" of "cur_si".
  * "cur_si" can be NULL if not checking the "containedin" list.
@@ -6131,6 +6323,7 @@ in_id_list(
     static int	depth = 0;
     int		r;
     int		toplevel;
+    idl_entry_T	*e;
 
     // If ssp has a "containedin" list and "cur_si" is in it, return TRUE.
     if (cur_si != NULL && ssp->cont_in_list != NULL
@@ -6166,6 +6359,42 @@ in_id_list(
     toplevel = !(flags & HL_CONTAINED) || (flags & HL_INCLUDED_TOPLEVEL);
 
     /*
+     * Fast path: use the resolved, sorted set cached for this list.  Only the
+     * leading ALLBUT/TOP/CONTAINED gate depends on "ssp"/"flags", so it is
+     * applied here; membership itself is a binary search.  Can be turned off
+     * with test_override('syn_idlist_cache', 1) to verify the result matches
+     * the slow path.
+     */
+    e = disable_syn_idlist_cache_for_testing ? NULL : idl_get_entry(list);
+    if (e != NULL && e->idl_usable)
+    {
+	if (e->idl_marker != 0)
+	{
+	    item = e->idl_marker;
+	    if (item < SYNID_TOP)
+	    {
+		if (item - SYNID_ALLBUT != ssp->inc_tag)
+		    return FALSE;
+	    }
+	    else if (item < SYNID_CONTAINED)
+	    {
+		if (item - SYNID_TOP != ssp->inc_tag || !toplevel)
+		    return FALSE;
+	    }
+	    else
+	    {
+		if (item - SYNID_CONTAINED != ssp->inc_tag || toplevel)
+		    return FALSE;
+	    }
+	    retval = FALSE;
+	}
+	else
+	    retval = TRUE;
+	return idl_contains(e, id) ? retval : !retval;
+    }
+
+    /*
+     * Slow path (uncacheable list, e.g. a nested ALLBUT).
      * If the first item is "ALLBUT", return TRUE if "id" is NOT in the
      * contains list.  We also require that "id" is at the same ":syn include"
      * level as the list.
diff --git a/src/tag.c b/src/tag.c
index 24d33bc11d..0e9d9344bf 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -1535,23 +1535,23 @@ find_tagfunc_tags(
 		continue;
 
 	    len += (int)STRLEN(tv->vval.v_string) + 1;   // Space for "\tVALUE"
-	    if (!STRCMP(dict_key, "name"))
+	    if (STRCMP(dict_key, "name") == 0)
 	    {
 		res_name = tv->vval.v_string;
 		continue;
 	    }
-	    if (!STRCMP(dict_key, "filename"))
+	    if (STRCMP(dict_key, "filename") == 0)
 	    {
 		res_fname = tv->vval.v_string;
 		continue;
 	    }
-	    if (!STRCMP(dict_key, "cmd"))
+	    if (STRCMP(dict_key, "cmd") == 0)
 	    {
 		res_cmd = tv->vval.v_string;
 		continue;
 	    }
 	    has_extra = 1;
-	    if (!STRCMP(dict_key, "kind"))
+	    if (STRCMP(dict_key, "kind") == 0)
 	    {
 		res_kind = tv->vval.v_string;
 		continue;
@@ -1617,13 +1617,13 @@ find_tagfunc_tags(
 		    if (tv->v_type != VAR_STRING || tv->vval.v_string == NULL)
 			continue;
 
-		    if (!STRCMP(dict_key, "name"))
+		    if (STRCMP(dict_key, "name") == 0)
 			continue;
-		    if (!STRCMP(dict_key, "filename"))
+		    if (STRCMP(dict_key, "filename") == 0)
 			continue;
-		    if (!STRCMP(dict_key, "cmd"))
+		    if (STRCMP(dict_key, "cmd") == 0)
 			continue;
-		    if (!STRCMP(dict_key, "kind"))
+		    if (STRCMP(dict_key, "kind") == 0)
 			continue;
 
 		    *p++ = TAB;
diff --git a/src/term.c b/src/term.c
index d60465e41d..35fc8d3ae1 100644
--- a/src/term.c
+++ b/src/term.c
@@ -137,10 +137,12 @@ static termrequest_T rfg_status = TERMREQUEST_INIT;
 static int fg_r = 0;
 static int fg_g = 0;
 static int fg_b = 0;
+# endif
+// Background color values from the OSC 11 response, also used by the
+// image backend to flatten RGBA alpha onto the actual terminal background.
 static int bg_r = 255;
 static int bg_g = 255;
 static int bg_b = 255;
-# endif
 
 // Request background color report:
 static termrequest_T rbg_status = TERMREQUEST_INIT;
@@ -5278,6 +5280,13 @@ handle_version_response(int first, int *arg, int argc, char_u *tp)
 	    term_props[TPR_DECRQM].tpr_status = TPR_YES;
 	}
 
+	// foot terminal sends 1;12700;0
+	if (arg[0] == 1 && version == 12700 && arg[2] == 0)
+	{
+	    term_props[TPR_MOUSE].tpr_status = TPR_MOUSE_SGR;
+	    term_props[TPR_DECRQM].tpr_status = TPR_YES;
+	}
+
 	// GNU screen sends 83;30600;0, 83;40500;0, etc.
 	// 30600/40500 is a version number of GNU screen. DA2 support is added
 	// on 3.6.  DCS string has a special meaning to GNU screen, but xterm
@@ -5440,9 +5449,14 @@ put_key_modifiers_in_typebuf(
     modifiers = may_remove_shift_modifier(modifiers, key);
 
     // Produce modifiers with K_SPECIAL KS_MODIFIER {mod}
-    char_u string[MAX_KEY_CODE_LEN + 1];
+    // worst-case: 3-byte modifier + 4 byte multi-char key + NUL
+    char_u string[MAX_KEY_CODE_LEN + 2];
     int new_slen = modifiers2keycode(modifiers, &key, string);
 
+    // reject overlong key that would overflow string
+    if (key > 0x10FFFF)
+	return -1;
+
     // Add the bytes for the key.
     new_slen += add_key_to_buf(key, string + new_slen);
 
@@ -5710,7 +5724,9 @@ handle_csi(
 			return -1;
 		    if (!VIM_ISDIGIT(*ap))
 			break;
-		    arg[argc] = arg[argc] * 10 + (*ap - '0');
+		    // avoid overflow
+		    if (arg[argc] <= (INT_MAX - 9) / 10)
+			arg[argc] = arg[argc] * 10 + (*ap - '0');
 		    ++ap;
 		}
 		++argc;
@@ -5993,7 +6009,7 @@ check_for_color_response(char_u *resp, int len)
 		    char_u *tp_r = resp + j + 7;
 		    char_u *tp_g = resp + j + (is_4digit ? 12 : 10);
 		    char_u *tp_b = resp + j + (is_4digit ? 17 : 13);
-#if defined(FEAT_TERMRESPONSE) && defined(FEAT_TERMINAL)
+#ifdef FEAT_TERMRESPONSE
 		    int rval, gval, bval;
 
 		    rval = hexhex2nr(tp_r);
@@ -6008,11 +6024,9 @@ check_for_color_response(char_u *resp, int len)
 			LOG_TRN("Received RBG response: r=%d g=%d b=%d", rval, gval, bval);
 #ifdef FEAT_TERMRESPONSE
 			rbg_status.tr_progress = STATUS_GOT;
-# ifdef FEAT_TERMINAL
 			bg_r = rval;
 			bg_g = gval;
 			bg_b = bval;
-# endif
 #endif
 			if (!option_was_set((char_u *)"bg")
 				      && STRCMP(p_bg, new_bg_val) != 0)
@@ -6948,19 +6962,23 @@ term_get_fg_color(char_u *r, char_u *g, char_u *b)
     *g = fg_g;
     *b = fg_b;
 }
+#endif
 
+#ifdef FEAT_TERMRESPONSE
 /*
- * Get the text background color, if known.
+ * Get the text background color, if known.  Returns OK when the OSC 11
+ * response has been parsed and *r, *g, *b are populated; FAIL otherwise.
  */
-    void
+    int
 term_get_bg_color(char_u *r, char_u *g, char_u *b)
 {
     if (rbg_status.tr_progress != STATUS_GOT)
-	return;
+	return FAIL;
 
     *r = bg_r;
     *g = bg_g;
     *b = bg_b;
+    return OK;
 }
 #endif
 
diff --git a/src/terminal.c b/src/terminal.c
index 30c48b6eb6..5ebb8d87e7 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -1107,7 +1107,7 @@ term_write_session(FILE *fd, win_T *wp, hashtab_T *terminal_bufs)
 	if (!HASHITEM_EMPTY(entry))
 	{
 	    // we've already opened this terminal buffer
-	    if (fprintf(fd, "execute 'buffer ' . s:term_buf_%d", bufnr) < 0)
+	    if (fprintf(fd, "execute 'buffer ' . term_buf_%d", bufnr) < 0)
 		return FAIL;
 	    return put_eol(fd);
 	}
@@ -1128,7 +1128,7 @@ term_write_session(FILE *fd, win_T *wp, hashtab_T *terminal_bufs)
     if (put_eol(fd) != OK)
 	return FAIL;
 
-    if (fprintf(fd, "let s:term_buf_%d = bufnr()", bufnr) < 0)
+    if (fprintf(fd, "var term_buf_%d: number = bufnr()", bufnr) < 0)
 	return FAIL;
 
     if (terminal_bufs != NULL && wp->w_buffer->b_nwindows > 1)
@@ -4449,6 +4449,19 @@ term_get_attr(win_T *wp, linenr_T lnum, int col)
     return cell2attr(term, wp, &cellattr->attrs, &cellattr->fg, &cellattr->bg);
 }
 
+/*
+ * Return the screen attribute for the terminal's default color.  Used to tell
+ * whether a line's fill (background) is the default or was set explicitly.
+ */
+    int
+term_get_default_attr(win_T *wp)
+{
+    term_T	*term = wp->w_buffer->b_term;
+    cellattr_T	*cellattr = &term->tl_default_color;
+
+    return cell2attr(term, wp, &cellattr->attrs, &cellattr->fg, &cellattr->bg);
+}
+
 /*
  * Convert a cterm color number 0 - 255 to RGB.
  * This is compatible with xterm.
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index 3dee2cf5f4..579c209822 100644
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -252,6 +252,7 @@ NEW_TESTS = \
 	test_plugin_matchit \
 	test_plugin_matchparen \
 	test_plugin_netrw \
+	test_plugin_python3complete \
 	test_plugin_osc52 \
 	test_plugin_tar \
 	test_plugin_termdebug \
@@ -532,6 +533,7 @@ NEW_TESTS_RES = \
 	test_plugin_matchit.res \
 	test_plugin_matchparen.res \
 	test_plugin_netrw.res \
+	test_plugin_python3complete.res \
 	test_plugin_osc52.res \
 	test_plugin_tar.res \
 	test_plugin_termdebug.res \
diff --git a/src/testdir/dumps/Test_popup_opacity_attr_1.dump b/src/testdir/dumps/Test_popup_opacity_attr_1.dump
new file mode 100644
index 0000000000..da0602e342
--- /dev/null
+++ b/src/testdir/dumps/Test_popup_opacity_attr_1.dump
@@ -0,0 +1,12 @@
+>X+0&#ffffff0| |X| |X| |X| |X| |X| |X| |X| |X| |X| @40
+|X| |╔+2#0000001#ffffff255|�@19|╗| +0#0000000#ffffff0@35
+|X| |â•‘+2#0000001#ffffff255|b|o|l|d| +0#949494255&|X| |X| |X| |X| |X| |X| @3|â•‘+2#0000001&| +0#0000000#ffffff0@35
+|X| |â•‘+2#0000001#ffffff255| +0#949494255&|X| |X| |X| |X| |X| |X| |X| |X| @3|â•‘+2#0000001&| +0#0000000#ffffff0@35
+|X| |╚+2#0000001#ffffff255|�@19|�| +0#0000000#ffffff0@35
+|X| |╔+2#ff404010#ffffff255|�@19|╗| +0#0000000#ffffff0@35
+|X| |â•‘+2#ff404010#ffffff255|b|o|l|d|c|o|l|o|r|X+0#949494255&| |X| |X| |X| @3|â•‘+2#ff404010&| +0#0000000#ffffff0@35
+|X| |â•‘+2#ff404010#ffffff255| +0#949494255&|X| |X| |X| |X| |X| |X| |X| |X| @3|â•‘+2#ff404010&| +0#0000000#ffffff0@35
+|X| |╚+2#ff404010#ffffff255|�@19|�| +0#0000000#ffffff0@35
+|X| |X| |X| |X| |X| |X| |X| |X| |X| |X| @40
+|~+0#4040ff13&| @58
+| +0#0000000&@41|1|,|1| @10|A|l@1| 
diff --git a/src/testdir/dumps/Test_popup_opacity_attr_2.dump b/src/testdir/dumps/Test_popup_opacity_attr_2.dump
new file mode 100644
index 0000000000..9a549c42ad
--- /dev/null
+++ b/src/testdir/dumps/Test_popup_opacity_attr_2.dump
@@ -0,0 +1,12 @@
+>X+0&#ffffff0| |X| |X| |X| |X| |X| |X| |X| |X| |X| @40
+|X| |╔+2#000000255#ffffff255|�@19|╗| +0#0000000#ffffff0@35
+|X| |â•‘+2#000000255#ffffff255|b|o|l|d| +0#999999255&|X| |X| |X| |X| |X| |X| @3|â•‘+2#000000255&| +0#0000000#ffffff0@35
+|X| |â•‘+2#000000255#ffffff255| +0#999999255&|X| |X| |X| |X| |X| |X| |X| |X| @3|â•‘+2#000000255&| +0#0000000#ffffff0@35
+|X| |╚+2#000000255#ffffff255|�@19|�| +0#0000000#ffffff0@35
+|X| |╔+2#ff0000255#ffffff255|�@19|╗| +0#0000000#ffffff0@35
+|X| |â•‘+2#ff0000255#ffffff255|b|o|l|d|c|o|l|o|r|X+0#999999255&| |X| |X| |X| @3|â•‘+2#ff0000255&| +0#0000000#ffffff0@35
+|X| |â•‘+2#ff0000255#ffffff255| +0#999999255&|X| |X| |X| |X| |X| |X| |X| |X| @3|â•‘+2#ff0000255&| +0#0000000#ffffff0@35
+|X| |╚+2#ff0000255#ffffff255|�@19|�| +0#0000000#ffffff0@35
+|X| |X| |X| |X| |X| |X| |X| |X| |X| |X| @40
+|~+0#0000ff255&| @58
+| +0#0000000&@41|1|,|1| @10|A|l@1| 
diff --git a/src/testdir/dumps/Test_popup_opacity_only_cterm_or_gui_set_1.dump b/src/testdir/dumps/Test_popup_opacity_only_cterm_or_gui_set_1.dump
new file mode 100644
index 0000000000..97e52e95bd
--- /dev/null
+++ b/src/testdir/dumps/Test_popup_opacity_only_cterm_or_gui_set_1.dump
@@ -0,0 +1,12 @@
+>X+0&#ffffff0| @2|X| @2|X| @2|X| @2|X| @42
+|X| |P+0#0000001#ffafaf255|o|p|u|p| +0#875f5f255&|X| @2|X+0#0000000#ffffff0| @2|X| @42
+|X| | +0#875f5f255#ffafaf255@1|X| @2|X| @2|X+0#0000000#ffffff0| @2|X| @42
+|X| @2|X| @2|X| @2|X| @2|X| @42
+|~+0#4040ff13&| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+| +0#0000000&@41|1|,|1| @10|A|l@1| 
diff --git a/src/testdir/dumps/Test_popup_opacity_only_cterm_or_gui_set_2.dump b/src/testdir/dumps/Test_popup_opacity_only_cterm_or_gui_set_2.dump
new file mode 100644
index 0000000000..36892be96c
--- /dev/null
+++ b/src/testdir/dumps/Test_popup_opacity_only_cterm_or_gui_set_2.dump
@@ -0,0 +1,12 @@
+>X+0&#ffffff0| @2|X| @2|X| @2|X| @2|X| @42
+|X| |P+0#000000255#ffb2b2255|o|p|u|p| +0#994d4d255&|X| @2|X+0#0000000#ffffff0| @2|X| @42
+|X| | +0#994d4d255#ffb2b2255@1|X| @2|X| @2|X+0#0000000#ffffff0| @2|X| @42
+|X| @2|X| @2|X| @2|X| @2|X| @42
+|~+0#0000ff255&| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+| +0#0000000&@41|1|,|1| @10|A|l@1| 
diff --git a/src/testdir/dumps/Test_popup_opacity_only_cterm_or_gui_set_3.dump b/src/testdir/dumps/Test_popup_opacity_only_cterm_or_gui_set_3.dump
new file mode 100644
index 0000000000..17cf2c13c6
--- /dev/null
+++ b/src/testdir/dumps/Test_popup_opacity_only_cterm_or_gui_set_3.dump
@@ -0,0 +1,12 @@
+>X+0&#ffffff0| @2|X| @2|X| @2|X| @2|X| @42
+|X| |P+0#000000255#ff6666255|o|p|u|p| +0#990000255&|X| @2|X+0#0000000#ffffff0| @2|X| @42
+|X| | +0#990000255#ff6666255@1|X| @2|X| @2|X+0#0000000#ffffff0| @2|X| @42
+|X| @2|X| @2|X| @2|X| @2|X| @42
+|~+0#0000ff255&| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|:+0#0000000&|h|i|g|h|l|i|g|h|t| |P|o|p|u|p|C|o|l|o|r| |c|t|e|r|m|b|g|=|N|O|N|E| |g|u|i|b|g|=|r|1|,|1| @10|A|l@1| 
diff --git a/src/testdir/dumps/Test_popup_opacity_only_cterm_or_gui_set_4.dump b/src/testdir/dumps/Test_popup_opacity_only_cterm_or_gui_set_4.dump
new file mode 100644
index 0000000000..b3c81fa977
--- /dev/null
+++ b/src/testdir/dumps/Test_popup_opacity_only_cterm_or_gui_set_4.dump
@@ -0,0 +1,12 @@
+>X+0&#ffffff0| @2|X| @2|X| @2|X| @2|X| @42
+|X| |P+0#0000001#ff5f5f255|o|p|u|p| +0#870000255&|X| @2|X+0#0000000#ffffff0| @2|X| @42
+|X| | +0#870000255#ff5f5f255@1|X| @2|X| @2|X+0#0000000#ffffff0| @2|X| @42
+|X| @2|X| @2|X| @2|X| @2|X| @42
+|~+0#4040ff13&| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+| +0#0000000&@41|1|,|1| @10|A|l@1| 
diff --git a/src/testdir/dumps/Test_popup_opacity_undefined_popup_highlight_1.dump b/src/testdir/dumps/Test_popup_opacity_undefined_popup_highlight_1.dump
new file mode 100644
index 0000000000..412e0c9f54
--- /dev/null
+++ b/src/testdir/dumps/Test_popup_opacity_undefined_popup_highlight_1.dump
@@ -0,0 +1,12 @@
+>r+0#ff404010#ffffff0|e|d| +0#0000000&|R+0&#ff404010|E|D| +0&#ffffff0|g+0#40ff4011&|r|e@1|n| +0#0000000&|G+0&#40ff4011|R|E@1|N| +0&#ffffff0|b+0#4040ff13&|l|u|e| +0#0000000&|B+0&#4040ff13|L|U|E| +0&#ffffff0|n|o|r|m|a|l| |R+1&&|E|V|E|R|S|E| +0&&@15
+|r+0#ff404010&|e|╔+0#0000001#ffffff255|�@40|╗| +0#0000000#ffffff0@14
+|r+0#ff404010&|e|â•‘+0#0000001#ffffff255|P|o+0&#ff8787255|p|u|p+0&#ffffff255|g+0#87ff87255&|P+0#0000001&|o|p|u|p|G+0#949494255#87ff87255|P+0#0000001&|o|p|u|p+0&#ffffff255|b+0#8787ff255&|P+0#0000001&|o|p|u|p+0&#8787ff255|L+0#949494255&|P+0#0000001&|o|p+0&#ffffff255|u|p|r+0#949494255&|P+0#0000001&|o|p|u|p|E+1#949494255&|P+0#0000001&|o|p|u|p|â•‘| +0#0000000#ffffff0@14
+|r+0#ff404010&|e|â•‘+0#0000001#ffffff255| +0#949494255&|R+0&#ff8787255|E|D| +0&#ffffff255|g+0#87ff87255&|r|e@1|n| +0#949494255&|G+0&#87ff87255|R|E@1|N| +0&#ffffff255|b+0#8787ff255&|l|u|e| +0#949494255&|B+0&#8787ff255|L|U|E| +0&#ffffff255|n|o|r|m|a|l| |R+1&&|E|V|E|R|S|E|â•‘+0#0000001&| +0#0000000#ffffff0@14
+|r+0#ff404010&|e|╚+0#0000001#ffffff255|�@40|�| +0#0000000#ffffff0@14
+|~+0#4040ff13&| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+| +0#0000000&@41|1|,|1| @10|A|l@1| 
diff --git a/src/testdir/dumps/Test_popup_opacity_undefined_popup_highlight_2.dump b/src/testdir/dumps/Test_popup_opacity_undefined_popup_highlight_2.dump
new file mode 100644
index 0000000000..b2f64df85c
--- /dev/null
+++ b/src/testdir/dumps/Test_popup_opacity_undefined_popup_highlight_2.dump
@@ -0,0 +1,12 @@
+>r+0#ff404010#ffffff0|e|d| +0#0000000&|R+0&#ff404010|E|D| +0&#ffffff0|g+0#40ff4011&|r|e@1|n| +0#0000000&|G+0&#40ff4011|R|E@1|N| +0&#ffffff0|b+0#4040ff13&|l|u|e| +0#0000000&|B+0&#4040ff13|L|U|E| +0&#ffffff0|n|o|r|m|a|l| |R+1&&|E|V|E|R|S|E| +0&&@15
+|r+0#ff404010&|e|╔+0#ffffff16#000000255|�@40|╗| +0#0000000#ffffff0@14
+|r+0#ff404010&|e|â•‘+0#ffffff16#000000255|P|o+0&#5f0000255|p|u|p+0&#000000255|g+0#005f00255&|P+0#ffffff16&|o|p|u|p|G+0#626262255#005f00255|P+0#ffffff16&|o|p|u|p+0&#000000255|b+0#00005f255&|P+0#ffffff16&|o|p|u|p+0&#00005f255|L+0#626262255&|P+0#ffffff16&|o|p+0&#000000255|u|p|r+0#626262255&|P+0#ffffff16&|o|p|u|p|E+1#626262255&|P+0#ffffff16&|o|p|u|p|â•‘| +0#0000000#ffffff0@14
+|r+0#ff404010&|e|â•‘+0#ffffff16#000000255| +0#626262255&|R+0&#5f0000255|E|D| +0&#000000255|g+0#005f00255&|r|e@1|n| +0#626262255&|G+0&#005f00255|R|E@1|N| +0&#000000255|b+0#00005f255&|l|u|e| +0#626262255&|B+0&#00005f255|L|U|E| +0&#000000255|n|o|r|m|a|l| |R+1&&|E|V|E|R|S|E|â•‘+0#ffffff16&| +0#0000000#ffffff0@14
+|r+0#ff404010&|e|╚+0#ffffff16#000000255|�@40|�| +0#0000000#ffffff0@14
+|~+0#4040ff13&| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+| +0#0000000&@41|1|,|1| @10|A|l@1| 
diff --git a/src/testdir/dumps/Test_popup_opacity_undefined_popup_highlight_3.dump b/src/testdir/dumps/Test_popup_opacity_undefined_popup_highlight_3.dump
new file mode 100644
index 0000000000..733f7c8c36
--- /dev/null
+++ b/src/testdir/dumps/Test_popup_opacity_undefined_popup_highlight_3.dump
@@ -0,0 +1,12 @@
+>r+0#ff0000255#ffffff0|e|d| +0#0000000&|R+0&#ff0000255|E|D| +0&#ffffff0|g+0#00ff00255&|r|e@1|n| +0#0000000&|G+0&#00ff00255|R|E@1|N| +0&#ffffff0|b+0#0000ff255&|l|u|e| +0#0000000&|B+0&#0000ff255|L|U|E| +0&#ffffff0|n|o|r|m|a|l| |R+1&&|E|V|E|R|S|E| +0&&@15
+|r+0#ff0000255&|e|╔+0#ffffff255#000000255|�@40|╗| +0#0000000#ffffff0@14
+|r+0#ff0000255&|e|â•‘+0#ffffff255#000000255|P|o+0&#660000255|p|u|p+0&#000000255|g+0#006600255&|P+0#ffffff255&|o|p|u|p|G+0#666666255#006600255|P+0#ffffff255&|o|p|u|p+0&#000000255|b+0#000066255&|P+0#ffffff255&|o|p|u|p+0&#000066255|L+0#666666255&|P+0#ffffff255&|o|p+0&#000000255|u|p|r+0#666666255&|P+0#ffffff255&|o|p|u|p|E+1#666666255&|P+0#ffffff255&|o|p|u|p|â•‘| +0#0000000#ffffff0@14
+|r+0#ff0000255&|e|â•‘+0#ffffff255#000000255| +0#666666255&|R+0&#660000255|E|D| +0&#000000255|g+0#006600255&|r|e@1|n| +0#666666255&|G+0&#006600255|R|E@1|N| +0&#000000255|b+0#000066255&|l|u|e| +0#666666255&|B+0&#000066255|L|U|E| +0&#000000255|n|o|r|m|a|l| |R+1&&|E|V|E|R|S|E|â•‘+0#ffffff255&| +0#0000000#ffffff0@14
+|r+0#ff0000255&|e|╚+0#ffffff255#000000255|�@40|�| +0#0000000#ffffff0@14
+|~+0#0000ff255&| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+| +0#0000000&@41|1|,|1| @10|A|l@1| 
diff --git a/src/testdir/dumps/Test_popup_opacity_undefined_popup_highlight_4.dump b/src/testdir/dumps/Test_popup_opacity_undefined_popup_highlight_4.dump
new file mode 100644
index 0000000000..8c56ad9548
--- /dev/null
+++ b/src/testdir/dumps/Test_popup_opacity_undefined_popup_highlight_4.dump
@@ -0,0 +1,12 @@
+>r+0#ff0000255#ffffff0|e|d| +0#0000000&|R+0&#ff0000255|E|D| +0&#ffffff0|g+0#00ff00255&|r|e@1|n| +0#0000000&|G+0&#00ff00255|R|E@1|N| +0&#ffffff0|b+0#0000ff255&|l|u|e| +0#0000000&|B+0&#0000ff255|L|U|E| +0&#ffffff0|n|o|r|m|a|l| |R+1&&|E|V|E|R|S|E| +0&&@15
+|r+0#ff0000255&|e|╔+0#000000255#ffffff255|�@40|╗| +0#0000000#ffffff0@14
+|r+0#ff0000255&|e|â•‘+0#000000255#ffffff255|P|o+0&#ff9999255|p|u|p+0&#ffffff255|g+0#99ff99255&|P+0#000000255&|o|p|u|p|G+0#999999255#99ff99255|P+0#000000255&|o|p|u|p+0&#ffffff255|b+0#9999ff255&|P+0#000000255&|o|p|u|p+0&#9999ff255|L+0#999999255&|P+0#000000255&|o|p+0&#ffffff255|u|p|r+0#999999255&|P+0#000000255&|o|p|u|p|E+1#999999255&|P+0#000000255&|o|p|u|p|â•‘| +0#0000000#ffffff0@14
+|r+0#ff0000255&|e|â•‘+0#000000255#ffffff255| +0#999999255&|R+0&#ff9999255|E|D| +0&#ffffff255|g+0#99ff99255&|r|e@1|n| +0#999999255&|G+0&#99ff99255|R|E@1|N| +0&#ffffff255|b+0#9999ff255&|l|u|e| +0#999999255&|B+0&#9999ff255|L|U|E| +0&#ffffff255|n|o|r|m|a|l| |R+1&&|E|V|E|R|S|E|â•‘+0#000000255&| +0#0000000#ffffff0@14
+|r+0#ff0000255&|e|╚+0#000000255#ffffff255|�@40|�| +0#0000000#ffffff0@14
+|~+0#0000ff255&| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+| +0#0000000&@41|1|,|1| @10|A|l@1| 
diff --git a/src/testdir/dumps/Test_popup_opacity_undefined_popup_highlight_5.dump b/src/testdir/dumps/Test_popup_opacity_undefined_popup_highlight_5.dump
new file mode 100644
index 0000000000..cb1742b101
--- /dev/null
+++ b/src/testdir/dumps/Test_popup_opacity_undefined_popup_highlight_5.dump
@@ -0,0 +1,12 @@
+>r+0#ff0000255#ffffff0|e|d| +0#0000000&|R+0&#ff0000255|E|D| +0&#ffffff0|g+0#00ff00255&|r|e@1|n| +0#0000000&|G+0&#00ff00255|R|E@1|N| +0&#ffffff0|b+0#0000ff255&|l|u|e| +0#0000000&|B+0&#0000ff255|L|U|E| +0&#ffffff0|n|o|r|m|a|l| |R+1&&|E|V|E|R|S|E| +0&&@15
+|r+0#ff0000255&|e|╔+0#8b008b255#ffffff255|�@40|╗| +0#0000000#ffffff0@14
+|r+0#ff0000255&|e|â•‘+0#8b008b255#ffffff255|P|o+0&#ff9999255|p|u|p+0&#ffffff255|g+0#99ff99255&|P+0#8b008b255&|o|p|u|p|G+0#999999255#99ff99255|P+0#8b008b255&|o|p|u|p+0&#ffffff255|b+0#9999ff255&|P+0#8b008b255&|o|p|u|p+0&#9999ff255|L+0#999999255&|P+0#8b008b255&|o|p+0&#ffffff255|u|p|r+0#999999255&|P+0#8b008b255&|o|p|u|p|E+1#999999255&|P+0#8b008b255&|o|p|u|p|â•‘| +0#0000000#ffffff0@14
+|r+0#ff0000255&|e|â•‘+0#8b008b255#ffffff255| +0#999999255&|R+0&#ff9999255|E|D| +0&#ffffff255|g+0#99ff99255&|r|e@1|n| +0#999999255&|G+0&#99ff99255|R|E@1|N| +0&#ffffff255|b+0#9999ff255&|l|u|e| +0#999999255&|B+0&#9999ff255|L|U|E| +0&#ffffff255|n|o|r|m|a|l| |R+1&&|E|V|E|R|S|E|â•‘+0#8b008b255&| +0#0000000#ffffff0@14
+|r+0#ff0000255&|e|╚+0#8b008b255#ffffff255|�@40|�| +0#0000000#ffffff0@14
+|~+0#0000ff255&| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|:+0#0000000&|h|i|g|h|l|i|g|h|t| |P|o|p|u|p|C|o|l|o|r| |c|t|e|r|m|f|g|=|D|a|r|k|M|a|g|e|n|t|a| |1|,|1| @10|A|l@1| 
diff --git a/src/testdir/dumps/Test_popup_opacity_undefined_popup_highlight_6.dump b/src/testdir/dumps/Test_popup_opacity_undefined_popup_highlight_6.dump
new file mode 100644
index 0000000000..9dccb841b1
--- /dev/null
+++ b/src/testdir/dumps/Test_popup_opacity_undefined_popup_highlight_6.dump
@@ -0,0 +1,12 @@
+>r+0#ff0000255#ffffff0|e|d| +0#0000000&|R+0&#ff0000255|E|D| +0&#ffffff0|g+0#00ff00255&|r|e@1|n| +0#0000000&|G+0&#00ff00255|R|E@1|N| +0&#ffffff0|b+0#0000ff255&|l|u|e| +0#0000000&|B+0&#0000ff255|L|U|E| +0&#ffffff0|n|o|r|m|a|l| |R+1&&|E|V|E|R|S|E| +0&&@15
+|r+0#ff0000255&|e|╔+0#8b008b255#ffffff255|�@40|╗| +0#0000000#ffffff0@14
+|r+0#ff0000255&|e|â•‘+0#8b008b255#ffffff255|P|o+0&#ff9999255|p|u|p+0&#ffffff255|g+0#99ff99255&|P+0#8b008b255&|o|p|u|p|G+0#999999255#99ff99255|P+0#8b008b255&|o|p|u|p+0&#ffffff255|b+0#9999ff255&|P+0#8b008b255&|o|p|u|p+0&#9999ff255|L+0#999999255&|P+0#8b008b255&|o|p+0&#ffffff255|u|p|r+0#999999255&|P+0#8b008b255&|o|p|u|p|E+1#999999255&|P+0#8b008b255&|o|p|u|p|â•‘| +0#0000000#ffffff0@14
+|r+0#ff0000255&|e|â•‘+0#8b008b255#ffffff255| +0#999999255&|R+0&#ff9999255|E|D| +0&#ffffff255|g+0#99ff99255&|r|e@1|n| +0#999999255&|G+0&#99ff99255|R|E@1|N| +0&#ffffff255|b+0#9999ff255&|l|u|e| +0#999999255&|B+0&#9999ff255|L|U|E| +0&#ffffff255|n|o|r|m|a|l| |R+1&&|E|V|E|R|S|E|â•‘+0#8b008b255&| +0#0000000#ffffff0@14
+|r+0#ff0000255&|e|╚+0#8b008b255#ffffff255|�@40|�| +0#0000000#ffffff0@14
+|~+0#0000ff255&| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+| +0#0000000&@41|1|,|1| @10|A|l@1| 
diff --git a/src/testdir/dumps/Test_popup_opacity_undefined_popup_highlight_7.dump b/src/testdir/dumps/Test_popup_opacity_undefined_popup_highlight_7.dump
new file mode 100644
index 0000000000..c90dcb7d07
--- /dev/null
+++ b/src/testdir/dumps/Test_popup_opacity_undefined_popup_highlight_7.dump
@@ -0,0 +1,12 @@
+>r+0#ff0000255#ffffff0|e|d| +0#0000000&|R+0&#ff0000255|E|D| +0&#ffffff0|g+0#00ff00255&|r|e@1|n| +0#0000000&|G+0&#00ff00255|R|E@1|N| +0&#ffffff0|b+0#0000ff255&|l|u|e| +0#0000000&|B+0&#0000ff255|L|U|E| +0&#ffffff0|n|o|r|m|a|l| |R+1&&|E|V|E|R|S|E| +0&&@15
+|r+0#ff0000255&|e|╔+0#000000255#66b9b9255|�@40|╗| +0#0000000#ffffff0@14
+|r+0#ff0000255&|e|â•‘+0#000000255#66b9b9255|P|o+0&#665454255|p|u|p+0&#66b9b9255|g+0#00b954255&|P+0#000000255&|o|p|u|p|G+0#005454255#00b954255|P+0#000000255&|o|p|u|p+0&#66b9b9255|b+0#0054b9255&|P+0#000000255&|o|p|u|p+0&#0054b9255|L+0#005454255&|P+0#000000255&|o|p+0&#66b9b9255|u|p|r+0#005454255&|P+0#000000255&|o|p|u|p|E+1#005454255&|P+0#000000255&|o|p|u|p|â•‘| +0#0000000#ffffff0@14
+|r+0#ff0000255&|e|â•‘+0#000000255#66b9b9255| +0#005454255&|R+0&#665454255|E|D| +0&#66b9b9255|g+0#00b954255&|r|e@1|n| +0#005454255&|G+0&#00b954255|R|E@1|N| +0&#66b9b9255|b+0#0054b9255&|l|u|e| +0#005454255&|B+0&#0054b9255|L|U|E| +0&#66b9b9255|n|o|r|m|a|l| |R+1&&|E|V|E|R|S|E|â•‘+0#000000255&| +0#0000000#ffffff0@14
+|r+0#ff0000255&|e|╚+0#000000255#66b9b9255|�@40|�| +0#0000000#ffffff0@14
+|~+0#0000ff255&| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|:+0#0000000&|h|i|g|h|l|i|g|h|t| |P|o|p|u|p|C|o|l|o|r| |c|t|e|r|m|b|g|=|D|a|r|k|C|y|a|n| |g|u|i|1|,|1| @10|A|l@1| 
diff --git a/src/testdir/dumps/Test_popup_opacity_undefined_popup_highlight_8.dump b/src/testdir/dumps/Test_popup_opacity_undefined_popup_highlight_8.dump
new file mode 100644
index 0000000000..c6e3ac5cf4
--- /dev/null
+++ b/src/testdir/dumps/Test_popup_opacity_undefined_popup_highlight_8.dump
@@ -0,0 +1,12 @@
+>r+0#ff404010#ffffff0|e|d| +0#0000000&|R+0&#ff404010|E|D| +0&#ffffff0|g+0#40ff4011&|r|e@1|n| +0#0000000&|G+0&#40ff4011|R|E@1|N| +0&#ffffff0|b+0#4040ff13&|l|u|e| +0#0000000&|B+0&#4040ff13|L|U|E| +0&#ffffff0|n|o|r|m|a|l| |R+1&&|E|V|E|R|S|E| +0&&@15
+|r+0#ff404010&|e|╔+0#0000001#5fafaf255|�@40|╗| +0#0000000#ffffff0@14
+|r+0#ff404010&|e|â•‘+0#0000001#5fafaf255|P|o+0&#585858255|p|u|p+0&#5fafaf255|g+0#00af5f255&|P+0#0000001&|o|p|u|p|G+0#005f5f255#00af5f255|P+0#0000001&|o|p|u|p+0&#5fafaf255|b+0#005faf255&|P+0#0000001&|o|p|u|p+0&#005faf255|L+0#005f5f255&|P+0#0000001&|o|p+0&#5fafaf255|u|p|r+0#005f5f255&|P+0#0000001&|o|p|u|p|E+1#005f5f255&|P+0#0000001&|o|p|u|p|â•‘| +0#0000000#ffffff0@14
+|r+0#ff404010&|e|â•‘+0#0000001#5fafaf255| +0#005f5f255&|R+0&#585858255|E|D| +0&#5fafaf255|g+0#00af5f255&|r|e@1|n| +0#005f5f255&|G+0&#00af5f255|R|E@1|N| +0&#5fafaf255|b+0#005faf255&|l|u|e| +0#005f5f255&|B+0&#005faf255|L|U|E| +0&#5fafaf255|n|o|r|m|a|l| |R+1&&|E|V|E|R|S|E|â•‘+0#0000001&| +0#0000000#ffffff0@14
+|r+0#ff404010&|e|╚+0#0000001#5fafaf255|�@40|�| +0#0000000#ffffff0@14
+|~+0#4040ff13&| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+|~| @58
+| +0#0000000&@41|1|,|1| @10|A|l@1| 
diff --git a/src/testdir/dumps/Test_popupwin_opacity_fade_to_background_1.dump b/src/testdir/dumps/Test_popupwin_opacity_fade_to_background_1.dump
index 120ab96151..9997dc6f37 100644
--- a/src/testdir/dumps/Test_popupwin_opacity_fade_to_background_1.dump
+++ b/src/testdir/dumps/Test_popupwin_opacity_fade_to_background_1.dump
@@ -1,5 +1,5 @@
 >X+0&#ffffff0| @2|X| @2|X| @2|X| @2|X| @42
-|X| |P+0#ffffff16#5f5fff255|o|p|u|p| +0#000087255&|X| @2|X+0#0000000#ffffff0| @2|X| @42
+|X| |P+0#0000001#5f5fff255|o|p|u|p| +0#000087255&|X| @2|X+0#0000000#ffffff0| @2|X| @42
 |X| | +0#000087255#5f5fff255@1|X| @2|X| @2|X+0#0000000#ffffff0| @2|X| @42
 |X| @2|X| @2|X| @2|X| @2|X| @42
 |~+0#4040ff13&| @58
diff --git a/src/testdir/dumps/Test_popupwin_opacity_hl_80.dump b/src/testdir/dumps/Test_popupwin_opacity_hl_80.dump
index 932ebb7249..c57365eaae 100644
--- a/src/testdir/dumps/Test_popupwin_opacity_hl_80.dump
+++ b/src/testdir/dumps/Test_popupwin_opacity_hl_80.dump
@@ -1,7 +1,7 @@
 >1+0&#ffffff0| @73
 |2| @73
-|3| @7|f+0#ff404010#87d7ff255|o@1| +0#5fafd7255&@1|b+0#ffffff16&|a|r| +0#0000000#ffffff0@57
-|4| @7|b+0#ffffff16#87d7ff255|a|z| +0#5fafd7255&@4| +0#0000000#ffffff0@57
+|3| @7|f+0#ff404010#87d7ff255|o@1| +0#5fafd7255&@1|b+0#0000001&|a|r| +0#0000000#ffffff0@57
+|4| @7|b+0#0000001#87d7ff255|a|z| +0#5fafd7255&@4| +0#0000000#ffffff0@57
 |5| @73
 |6| @73
 |7| @73
diff --git a/src/testdir/dumps/Test_popupwin_opacity_settext_1.dump b/src/testdir/dumps/Test_popupwin_opacity_settext_1.dump
new file mode 100644
index 0000000000..56ec5dfd8d
--- /dev/null
+++ b/src/testdir/dumps/Test_popupwin_opacity_settext_1.dump
@@ -0,0 +1,12 @@
+>s+0&#ffffff0|o|m|e| |t|e|x|t| |h|e|r|e| @60
+@1|╔+0#0000001#ffffff255|�@2|╗| +0#0000000#ffffff0@68
+@1|â•‘+0#0000001#ffffff255|a|b|c|â•‘| +0#0000000#ffffff0@68
+@1|â•‘+0#0000001#ffffff255|A|B|C|â•‘| +0#0000000#ffffff0@68
+@1|â•‘+0#0000001#ffffff255|1|2|3|â•‘| +0#0000000#ffffff0@68
+@1|â•‘+0#0000001#ffffff255|4|5|6|â•‘| +0#0000000#ffffff0@68
+|m|╚+0#0000001#ffffff255|�@2|�|e+0#0000000#ffffff0|x|t| @65
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|1|,|1| @10|A|l@1| 
diff --git a/src/testdir/dumps/Test_popupwin_opacity_settext_2.dump b/src/testdir/dumps/Test_popupwin_opacity_settext_2.dump
new file mode 100644
index 0000000000..237ca18f96
--- /dev/null
+++ b/src/testdir/dumps/Test_popupwin_opacity_settext_2.dump
@@ -0,0 +1,12 @@
+>s+0&#ffffff0|o|m|e| |t|e|x|t| |h|e|r|e| @60
+@1|╔+0#0000001#ffffff255|�@25|╗| +0#0000000#ffffff0@45
+@1|â•‘+0#0000001#ffffff255|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|â•‘| +0#0000000#ffffff0@45
+@1|â•‘+0#0000001#ffffff255| +0#818181255&@25|â•‘+0#0000001&| +0#0000000#ffffff0@45
+@1|â•‘+0#0000001#ffffff255| +0#818181255&@25|â•‘+0#0000001&| +0#0000000#ffffff0@45
+@1|â•‘+0#0000001#ffffff255| +0#818181255&@25|â•‘+0#0000001&| +0#0000000#ffffff0@45
+|m|â•‘+0#0000001#ffffff255|r+0#818181255&|e| |t|e|x|t| @18|â•‘+0#0000001&| +0#0000000#ffffff0@45
+|~+0#4040ff13&|â•‘+0#0000001#ffffff255|.| +0#8787ff255&@24|â•‘+0#0000001&| +0#4040ff13#ffffff0@45
+|~|╚+0#0000001#ffffff255|�@25|�| +0#4040ff13#ffffff0@45
+|~| @73
+|~| @73
+| +0#0000000&@56|1|,|1| @10|A|l@1| 
diff --git a/src/testdir/dumps/Test_popupwin_opacity_settext_3.dump b/src/testdir/dumps/Test_popupwin_opacity_settext_3.dump
new file mode 100644
index 0000000000..419898c8dd
--- /dev/null
+++ b/src/testdir/dumps/Test_popupwin_opacity_settext_3.dump
@@ -0,0 +1,12 @@
+>s+0&#ffffff0|o|m|e| |t|e|x|t| |h|e|r|e| @60
+@75
+@75
+@75
+@75
+@75
+|m|o|r|e| |t|e|x|t| @65
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|:+0#0000000&|c|a|l@1| |p|o|p|u|p|_|c|l|e|a|r|(|)| @37|1|,|1| @10|A|l@1| 
diff --git a/src/testdir/dumps/Test_popupwin_opacity_zero_01.dump b/src/testdir/dumps/Test_popupwin_opacity_zero_01.dump
index 8028c98c23..9b11b5c0e0 100644
--- a/src/testdir/dumps/Test_popupwin_opacity_zero_01.dump
+++ b/src/testdir/dumps/Test_popupwin_opacity_zero_01.dump
@@ -1,7 +1,7 @@
 >b+0&#ffffff0|a|c|k|g|r|o|u|n|d| |t|e|x|t| |h|e|r|e| @54
 |b|a|c|k|g|r|o|u|n|d| |t|e|x|t| |h|e|r|e| @54
-|b|a|c|k|b+0#ffffff16#8787d7255|l|u|e|n+0#00005f255&|p+0#ffffff16&|o|p|u|p|t+0#0000000#ffffff0| |h|e|r|e| @54
-|b|a|c|k|g|r|o|r+0#ffffff16#ffffff255|e|d| +0#0000000#ffffff0|p+0#ffffff16#ffffff255|o|p|u|p|h+0#0000000#ffffff0|e|r|e| @54
+|b|a|c|k|b+0#0000001#8787d7255|l|u|e|n+0#00005f255&|p+0#0000001&|o|p|u|p|t+0#0000000#ffffff0| |h|e|r|e| @54
+|b|a|c|k|g|r|o|r+0#0000001#ffffff255|e|d| +0#0000000#ffffff0|p+0#0000001#ffffff255|o|p|u|p|h+0#0000000#ffffff0|e|r|e| @54
 |b|a|c|k|g|r|o|u|n|d| |t|e|x|t| |h|e|r|e| @54
 |b|a|c|k|g|r|o|u|n|d| |t|e|x|t| |h|e|r|e| @54
 |b|a|c|k|g|r|o|u|n|d| |t|e|x|t| |h|e|r|e| @54
diff --git a/src/testdir/dumps/Test_popupwin_opacity_zero_02.dump b/src/testdir/dumps/Test_popupwin_opacity_zero_02.dump
index d09818da58..f790559ef0 100644
--- a/src/testdir/dumps/Test_popupwin_opacity_zero_02.dump
+++ b/src/testdir/dumps/Test_popupwin_opacity_zero_02.dump
@@ -1,7 +1,7 @@
 >b+0&#ffffff0|a|c|k|g|r|o|u|n|d| |t|e|x|t| |h|e|r|e| @54
 |b|a|c|k|g|r|o|u|n|d| |t|e|x|t| |h|e|r|e| @54
-|b|a|c|k|b+0#ffffff16#8787d7255|l|u|e|n+0#00005f255&|p+0#ffffff16&|o|p|u|p|t+0#0000000#ffffff0| |h|e|r|e| @54
-|b|a|c|k|g|r|o|r+0#ffffff16#ffffff255|e|d| +0#0000000#ffffff0|p+0#ffffff16#ffffff255|o|p|u|p|h+0#0000000#ffffff0|e|r|e| @54
+|b|a|c|k|b+0#0000001#8787d7255|l|u|e|n+0#00005f255&|p+0#0000001&|o|p|u|p|t+0#0000000#ffffff0| |h|e|r|e| @54
+|b|a|c|k|g|r|o|r+0#0000001#ffffff255|e|d| +0#0000000#ffffff0|p+0#0000001#ffffff255|o|p|u|p|h+0#0000000#ffffff0|e|r|e| @54
 |b|a|c|k|g|r|o|u|n|d| |t|e|x|t| |h|e|r|e| @54
 |b|a|c|k|g|r|o|u|n|d| |t|e|x|t| |h|e|r|e| @54
 |b|a|c|k|g|r|o|u|n|d| |t|e|x|t| |h|e|r|e| @54
diff --git a/src/testdir/dumps/Test_popupwin_setoptions_title_1.dump b/src/testdir/dumps/Test_popupwin_setoptions_title_1.dump
new file mode 100644
index 0000000000..67e2e6c4f0
--- /dev/null
+++ b/src/testdir/dumps/Test_popupwin_setoptions_title_1.dump
@@ -0,0 +1,10 @@
+> +0&#ffffff0@74
+|~+0#4040ff13&| @73
+|~| @73
+|~| @31|â•”+0#0000001#ffd7ff255|t|i|t|l|e|-|1|â•—| +0#4040ff13#ffffff0@32
+|~| @31|â•‘+0#0000001#ffd7ff255|h|e|l@1|o| @1|â•‘| +0#4040ff13#ffffff0@32
+|~| @31|╚+0#0000001#ffd7ff255|�@6|�| +0#4040ff13#ffffff0@32
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|0|,|0|-|1| @8|A|l@1| 
diff --git a/src/testdir/dumps/Test_popupwin_setoptions_title_2.dump b/src/testdir/dumps/Test_popupwin_setoptions_title_2.dump
new file mode 100644
index 0000000000..939ea7a291
--- /dev/null
+++ b/src/testdir/dumps/Test_popupwin_setoptions_title_2.dump
@@ -0,0 +1,10 @@
+> +0&#ffffff0@74
+|~+0#4040ff13&| @73
+|~| @73
+|~| @31|â•”+0#0000001#ffd7ff255|t|i|t|l|e|-|2|â•—| +0#4040ff13#ffffff0@32
+|~| @31|â•‘+0#0000001#ffd7ff255|h|e|l@1|o| @1|â•‘| +0#4040ff13#ffffff0@32
+|~| @31|╚+0#0000001#ffd7ff255|�@6|�| +0#4040ff13#ffffff0@32
+|~| @73
+|~| @73
+|~| @73
+|:+0#0000000&|c|a|l@1| |p|o|p|u|p|_|s|e|t|o|p|t|i|o|n|s|(|g|:|i|d|,| |#|{|t|i|t|l|e|:| |'|t|i|t|l|e|-|2|'|}|)| @7|0|,|0|-|1| @8|A|l@1| 
diff --git a/src/testdir/dumps/Test_pumopt_opacity_text_attrs.dump b/src/testdir/dumps/Test_pumopt_opacity_text_attrs.dump
index 1ae8db5a1c..62e7df726b 100644
--- a/src/testdir/dumps/Test_pumopt_opacity_text_attrs.dump
+++ b/src/testdir/dumps/Test_pumopt_opacity_text_attrs.dump
@@ -1,7 +1,7 @@
 |�*0&#ffffff0|�> +&@70
-|�*0#0000001#ffd787255|�|�*0#875f00255&|�|�|�|漢*4#ff875f255&| +&| +4#e000e06#ffffff0|テ*&|ス|ト|�*0#0000000&|�|�|�|�|カ|タ|カ|ナ| +&@34
-|�*0#ffffff16#87afaf255|�|漢|字|�*0#00005f255&|�|漢*4#875faf255&| +&| +4#e000e06#ffffff0|テ*&|ス|ト|�*0#0000000&|�|�|�|�|カ|タ|カ|ナ| +&@34
-|カ*0#ffffff16#87afaf255|タ|カ|ナ|候|補|漢*4#875faf255&| +&| +4#e000e06#ffffff0|テ*&|ス|ト|�*0#0000000&|�|�|�|�|カ|タ|カ|ナ| +&@34
+|�*0#0000001#ffd787255|�|�*0#875f00255&|�|�|�|漢*4#ff875f255&| +&| +4#e000e06#ffffff255|テ*4&#ffffff0|ス|ト|�*0#0000000&|�|�|�|�|カ|タ|カ|ナ| +&@34
+|�*0#ffffff16#87afaf255|�|漢|字|�*0#00005f255&|�|漢*4#875faf255&| +&| +4#e000e06#ffffff255|テ*4&#ffffff0|ス|ト|�*0#0000000&|�|�|�|�|カ|タ|カ|ナ| +&@34
+|カ*0#ffffff16#87afaf255|タ|カ|ナ|候|補|漢*4#875faf255&| +&| +4#e000e06#ffffff255|テ*4&#ffffff0|ス|ト|�*0#0000000&|�|�|�|�|カ|タ|カ|ナ| +&@34
 |�*&|�|�|�|�|�|漢*4#e000e06&|字|テ|ス|ト|�*0#0000000&|�|�|�|�|カ|タ|カ|ナ| +&@34
 |�*&|�|�|�|�|�|漢*4#e000e06&|字|テ|ス|ト|�*0#0000000&|�|�|�|�|カ|タ|カ|ナ| +&@34
 |�*&|�|�|�|�|�|漢*4#e000e06&|字|テ|ス|ト|�*0#0000000&|�|�|�|�|カ|タ|カ|ナ| +&@34
diff --git a/src/testdir/dumps/Test_terminal_colored_empty_1.dump b/src/testdir/dumps/Test_terminal_colored_empty_1.dump
new file mode 100644
index 0000000000..96ac812a03
--- /dev/null
+++ b/src/testdir/dumps/Test_terminal_colored_empty_1.dump
@@ -0,0 +1,10 @@
+| +0&#8080809@74
+|o|l|d| @71
+@75
+> +0&#ffffff0@74
+|!+2#ffffff16#00e0003|s|h| |.|/|X|t|e|r|m|_|c|o|l|o|r|e|d|.|s|h| |[|f|i|n|i|s|h|e|d|]| @23|4|,|0|-|1| @9|A|l@1
+| +0#0000000#ffffff0@74
+|~+0#4040ff13&| @73
+|~| @73
+|[+1#0000000&|N|o| |N|a|m|e|]| @47|0|,|0|-|1| @9|A|l@1
+| +0&&@74
diff --git a/src/testdir/dumps/Test_terminal_colored_empty_2.dump b/src/testdir/dumps/Test_terminal_colored_empty_2.dump
new file mode 100644
index 0000000000..96ac812a03
--- /dev/null
+++ b/src/testdir/dumps/Test_terminal_colored_empty_2.dump
@@ -0,0 +1,10 @@
+| +0&#8080809@74
+|o|l|d| @71
+@75
+> +0&#ffffff0@74
+|!+2#ffffff16#00e0003|s|h| |.|/|X|t|e|r|m|_|c|o|l|o|r|e|d|.|s|h| |[|f|i|n|i|s|h|e|d|]| @23|4|,|0|-|1| @9|A|l@1
+| +0#0000000#ffffff0@74
+|~+0#4040ff13&| @73
+|~| @73
+|[+1#0000000&|N|o| |N|a|m|e|]| @47|0|,|0|-|1| @9|A|l@1
+| +0&&@74
diff --git a/src/testdir/dumps/Test_terminal_visual_colored_empty.dump b/src/testdir/dumps/Test_terminal_visual_colored_empty.dump
new file mode 100644
index 0000000000..c44f068302
--- /dev/null
+++ b/src/testdir/dumps/Test_terminal_visual_colored_empty.dump
@@ -0,0 +1,10 @@
+| +0#0000001#a8a8a8255| +0#0000000#8080809@73
+|o+0#0000001#a8a8a8255|l|d| +0#0000000#8080809@71
+| +0#0000001#a8a8a8255| +0#0000000#8080809@73
+> +0&#ffffff0@74
+|!+2#ffffff16#00e0003|s|h| |.|/|X|t|e|r|m|_|c|o|l|o|r|e|d|.|s|h| |[|f|i|n|i|s|h|e|d|]| @23|4|,|0|-|1| @9|A|l@1
+| +0#0000000#ffffff0@74
+|~+0#4040ff13&| @73
+|~| @73
+|[+1#0000000&|N|o| |N|a|m|e|]| @47|0|,|0|-|1| @9|A|l@1
+|-+2&&@1| |V|I|S|U|A|L| |L|I|N|E| |-@1| +0&&@46|4| @9
diff --git a/src/testdir/dumps/Test_wildmenu_pum_info_mouse_scroll_1.dump b/src/testdir/dumps/Test_wildmenu_pum_info_mouse_scroll_1.dump
new file mode 100644
index 0000000000..dc622d74ab
--- /dev/null
+++ b/src/testdir/dumps/Test_wildmenu_pum_info_mouse_scroll_1.dump
@@ -0,0 +1,12 @@
+| +0&#ffffff0@23|╔+0#0000001#e0e0e08|�@14|X| +0#0000000#ffffff0@33
+|~+0#4040ff13&| @22|â•‘+0#0000001#e0e0e08| |i|n|f|o| |l|i|n|e| |1| @1| +0#0000000#0000001|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @22|â•‘+0#0000001#e0e0e08| |i|n|f|o| |l|i|n|e| |2| @1| +0#0000000#0000001|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @22|â•‘+0#0000001#e0e0e08| |i|n|f|o| |l|i|n|e| |3| @1| +0#0000000#0000001|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @22|â•‘+0#0000001#e0e0e08| |i|n|f|o| |l|i|n|e| |4| @1| +0#0000000#a8a8a8255|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @22|â•‘+0#0000001#e0e0e08| |i|n|f|o| |l|i|n|e| |5| @1| +0#0000000#a8a8a8255|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @22|â•‘+0#0000001#e0e0e08| |i|n|f|o| |l|i|n|e| |6| @1| +0#0000000#a8a8a8255|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @22|â•‘+0#0000001#e0e0e08| |i|n|f|o| |l|i|n|e| |7| @1| +0#0000000#a8a8a8255|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @22|â•‘+0#0000001#e0e0e08| |i|n|f|o| |l|i|n|e| |8| @1| +0#0000000#a8a8a8255|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @6| +0#0000001#e0e0e08|a|p@1|l|e| @1|f| |f|r|u|i|t| |â•‘| |i|n|f|o| |l|i|n|e| |9| @1| +0#0000000#a8a8a8255|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @6| +0#0000001#ffd7ff255|b|a|n|a|n|a| |f| |f|r|u|i|t| |╚+0&#e0e0e08|�@14|⇲| +0#4040ff13#ffffff0@33
+|:+0#0000000&|D|i|c|t|C|m|d| |a|p@1|l|e> @60
diff --git a/src/testdir/dumps/Test_wildmenu_pum_info_mouse_scroll_2.dump b/src/testdir/dumps/Test_wildmenu_pum_info_mouse_scroll_2.dump
new file mode 100644
index 0000000000..115b1b949e
--- /dev/null
+++ b/src/testdir/dumps/Test_wildmenu_pum_info_mouse_scroll_2.dump
@@ -0,0 +1,12 @@
+| +0&#ffffff0@23|╔+0#0000001#e0e0e08|�@14|X| +0#0000000#ffffff0@33
+|~+0#4040ff13&| @22|â•‘+0#0000001#e0e0e08| |i|n|f|o| |l|i|n|e| |1|0| | +0#0000000#a8a8a8255|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @22|â•‘+0#0000001#e0e0e08| |i|n|f|o| |l|i|n|e| |1@1| | +0#0000000#a8a8a8255|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @22|â•‘+0#0000001#e0e0e08| |i|n|f|o| |l|i|n|e| |1|2| | +0#0000000#0000001|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @22|â•‘+0#0000001#e0e0e08| |i|n|f|o| |l|i|n|e| |1|3| | +0#0000000#0000001|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @22|â•‘+0#0000001#e0e0e08| |i|n|f|o| |l|i|n|e| |1|4| | +0#0000000#0000001|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @22|â•‘+0#0000001#e0e0e08| |i|n|f|o| |l|i|n|e| |1|5| | +0#0000000#a8a8a8255|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @22|â•‘+0#0000001#e0e0e08| |i|n|f|o| |l|i|n|e| |1|6| | +0#0000000#a8a8a8255|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @22|â•‘+0#0000001#e0e0e08| |i|n|f|o| |l|i|n|e| |1|7| | +0#0000000#a8a8a8255|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @6| +0#0000001#e0e0e08|a|p@1|l|e| @1|f| |f|r|u|i|t| |â•‘| |i|n|f|o| |l|i|n|e| |1|8| | +0#0000000#a8a8a8255|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @6| +0#0000001#ffd7ff255|b|a|n|a|n|a| |f| |f|r|u|i|t| |╚+0&#e0e0e08|�@14|⇲| +0#4040ff13#ffffff0@33
+|:+0#0000000&|D|i|c|t|C|m|d| |a|p@1|l|e> @42|0|,|0|-|1| @8|A|l@1| 
diff --git a/src/testdir/dumps/Test_wildmenu_pum_info_mouse_scroll_3.dump b/src/testdir/dumps/Test_wildmenu_pum_info_mouse_scroll_3.dump
new file mode 100644
index 0000000000..1a0c4fbcbb
--- /dev/null
+++ b/src/testdir/dumps/Test_wildmenu_pum_info_mouse_scroll_3.dump
@@ -0,0 +1,12 @@
+| +0&#ffffff0@23|╔+0#0000001#e0e0e08|�@14|X| +0#0000000#ffffff0@33
+|~+0#4040ff13&| @22|â•‘+0#0000001#e0e0e08| |i|n|f|o| |l|i|n|e| |4| @1| +0#0000000#a8a8a8255|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @22|â•‘+0#0000001#e0e0e08| |i|n|f|o| |l|i|n|e| |5| @1| +0#0000000#0000001|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @22|â•‘+0#0000001#e0e0e08| |i|n|f|o| |l|i|n|e| |6| @1| +0#0000000#0000001|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @22|â•‘+0#0000001#e0e0e08| |i|n|f|o| |l|i|n|e| |7| @1| +0#0000000#0000001|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @22|â•‘+0#0000001#e0e0e08| |i|n|f|o| |l|i|n|e| |8| @1| +0#0000000#a8a8a8255|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @22|â•‘+0#0000001#e0e0e08| |i|n|f|o| |l|i|n|e| |9| @1| +0#0000000#a8a8a8255|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @22|â•‘+0#0000001#e0e0e08| |i|n|f|o| |l|i|n|e| |1|0| | +0#0000000#a8a8a8255|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @22|â•‘+0#0000001#e0e0e08| |i|n|f|o| |l|i|n|e| |1@1| | +0#0000000#a8a8a8255|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @6| +0#0000001#e0e0e08|a|p@1|l|e| @1|f| |f|r|u|i|t| |â•‘| |i|n|f|o| |l|i|n|e| |1|2| | +0#0000000#a8a8a8255|â•‘+0#0000001#e0e0e08| +0#4040ff13#ffffff0@33
+|~| @6| +0#0000001#ffd7ff255|b|a|n|a|n|a| |f| |f|r|u|i|t| |╚+0&#e0e0e08|�@14|⇲| +0#4040ff13#ffffff0@33
+|:+0#0000000&|D|i|c|t|C|m|d| |a|p@1|l|e> @42|0|,|0|-|1| @8|A|l@1| 
diff --git a/src/testdir/lsan-suppress.txt b/src/testdir/lsan-suppress.txt
index 7083c1bbb1..e6c2af18d4 100644
--- a/src/testdir/lsan-suppress.txt
+++ b/src/testdir/lsan-suppress.txt
@@ -16,3 +16,7 @@ leak:libxcb*.so.*
 leak:gdk_x11_screen_init_gl
 # leak reported on CI for test_clipmethod
 leak:libgtk-3*.so.*
+# Leak from GTK when creating gtk4 dialog windows?
+leak:wl_proxy_marshal_array_flags
+leak:gtk_widget_realize
+leak:libgtk-4*.so.*
diff --git a/src/testdir/test_buffer.vim b/src/testdir/test_buffer.vim
index 4f0f1acb24..733ef65434 100644
--- a/src/testdir/test_buffer.vim
+++ b/src/testdir/test_buffer.vim
@@ -935,4 +935,19 @@ func Test_split_window_in_BufLeave_from_switching_buffer()
   bwipe! Xb
 endfunc
 
+" Switch to a buffer whose name contains '%' via completion (#20529).
+func Test_buffer_switch_to_name_with_percent()
+  CheckMSWindows
+
+  let bufnr = bufadd('Xpercent%name')
+  call setbufvar(bufnr, '&buflisted', 1)
+  call bufload(bufnr)
+  enew
+
+  call feedkeys(":b Xpercent\<Tab>\<CR>", 'xt')
+  call assert_equal(bufnr, bufnr('%'))
+
+  exe 'bwipe! ' .. bufnr
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_cd.vim b/src/testdir/test_cd.vim
index a175cd2748..d732e54397 100644
--- a/src/testdir/test_cd.vim
+++ b/src/testdir/test_cd.vim
@@ -211,6 +211,9 @@ func Test_lcd_win_execute()
 endfunc
 
 func Test_cd_from_non_existing_dir()
+  if has('sun')
+    throw 'Skipped: Solaris does not allow deleting the current working directory'
+  endif
   CheckNotMSWindows
 
   let saveddir = getcwd()
diff --git a/src/testdir/test_cindent.vim b/src/testdir/test_cindent.vim
index f050d82f8c..90dff6049e 100644
--- a/src/testdir/test_cindent.vim
+++ b/src/testdir/test_cindent.vim
@@ -5604,6 +5604,37 @@ def Test_cindent_comment_brackets()
   assert_equal('    arg3);', getline(3))
   bwipe!
 
+  # stray } in a // line comment inside an aggregate (enum/struct) whose
+  # opening brace is at the end of the line must not affect the next member
+  new
+  setl cindent sw=4
+  var code6 =<< trim [CODE]
+  typedef enum {
+      ND_BLOCK,  // { ... }
+      ND_FUNCALL,
+  } NodeKind;
+  [CODE]
+  setline(1, code6)
+  cursor(3, 1)
+  normal ==
+  assert_equal('    ND_FUNCALL,', getline(3))
+  bwipe!
+
+  # same, a struct member with a trailing // } comment
+  new
+  setl cindent sw=4
+  var code7 =<< trim [CODE]
+  struct S {
+      int a;  // }
+      int b;
+  };
+  [CODE]
+  setline(1, code7)
+  cursor(3, 1)
+  normal ==
+  assert_equal('    int b;', getline(3))
+  bwipe!
+
 enddef
 
 
diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim
index ea14145f44..240b447698 100644
--- a/src/testdir/test_clientserver.vim
+++ b/src/testdir/test_clientserver.vim
@@ -504,6 +504,48 @@ func Test_clientserver_socketserver_invalid_msg()
   call StopVimInTerminal(buf)
 endfunc
 
+" Test that $VIM_CLIENTSERVER env var works properly
+func Test_clientserver_env_method()
+  CheckFeature socketserver
+
+  let g:test_is_flaky = 1
+  let cmd = GetVimCommand()
+
+  if cmd == ''
+    throw 'GetVimCommand() failed'
+  endif
+
+  " Don't use channel:2000, because previous tests use that and it may take a
+  " while for the channel to fully close.
+  let actual = cmd .. ' --servername channel:4000'
+  let $VIM_CLIENTSERVER = 'socket'
+
+  let job = job_start(actual, {'stoponexit': 'kill', 'out_io': 'null'})
+
+  call WaitForAssert({-> assert_equal("run", job_status(job))})
+
+  if !has('win32') || !has('gui_running')
+      call assert_match('channel:4000',
+            \ system(actual .. ' --remote-expr "v:servername"'))
+  endif
+
+  if has('win32')
+    call job_stop(job, 'kill')
+  else
+    call system(actual .. " --remote-expr 'execute(\"qa!\")'")
+  endif
+  unlet $VIM_CLIENTSERVER
+
+  try
+    call WaitForAssert({-> assert_equal("dead", job_status(job))})
+  finally
+    if job_status(job) != 'dead'
+      call assert_report('Server did not exit')
+      call job_stop(job, 'kill')
+    endif
+  endtry
+endfunc
+
 " Uncomment this line to get a debugging log
 " call ch_logfile('channellog', 'w')
 
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index 31fb1f8ffc..d1e20f6d29 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -3648,6 +3648,10 @@ func Test_completion_filetypecmd()
   call assert_equal('"filetype off on', @:)
   call feedkeys(":filetype indent of\<C-A>\<C-B>\"\<CR>", 'tx')
   call assert_equal('"filetype indent off', @:)
+  call feedkeys(":filetype plugin\<C-A>\<C-B>\"\<CR>", 'tx')
+  call assert_equal('"filetype plugin', @:)
+  call feedkeys(":filetype plugin indent\<C-A>\<C-B>\"\<CR>", 'tx')
+  call assert_equal('"filetype plugin indent', @:)
   set wildoptions&
 endfunc
 
@@ -4768,6 +4772,114 @@ func Test_customlist_dict_completion_info_popup()
   call StopVimInTerminal(buf)
 endfunc
 
+" Test that the mouse scroll wheel scrolls the info popup of the command line
+" completion popup menu when the mouse pointer is on top of it.
+func Test_wildmenu_pum_info_mouse_scroll()
+  CheckScreendump
+  CheckFeature quickfix
+
+  let lines =<< trim END
+    func DictComp(A, L, P)
+      let info = join(map(range(1, 30), '"info line " .. v:val'), "\n")
+      return [
+            \ {'word': 'apple',  'kind': 'f', 'menu': 'fruit', 'info': info},
+            \ {'word': 'banana', 'kind': 'f', 'menu': 'fruit', 'info': info},
+            \ ]
+    endfunc
+    command -nargs=1 -complete=customlist,DictComp DictCmd echo <q-args>
+    set wildmenu wildoptions=pum completeopt=menu,popup mouse=a
+
+    " Put the mouse on top of the info popup and turn the scroll wheel.
+    func ScrollInfo(keys)
+      let pos = popup_getpos(popup_findinfo())
+      call test_setmouse(pos.line + 1, pos.col + 1)
+      call feedkeys(a:keys, 'nt')
+    endfunc
+    cnoremap <F6> <Cmd>call ScrollInfo(repeat("\<ScrollWheelDown>", 3))<CR>
+    cnoremap <F7> <Cmd>call ScrollInfo(repeat("\<ScrollWheelUp>", 2))<CR>
+  END
+  call writefile(lines, 'XtestWildmenuMouseScroll', 'D')
+  let buf = RunVimInTerminal('-S XtestWildmenuMouseScroll', #{rows: 12})
+
+  " The info popup is shown next to the completion popup menu.
+  call term_sendkeys(buf, ":DictCmd \<Tab>")
+  call VerifyScreenDump(buf, 'Test_wildmenu_pum_info_mouse_scroll_1', {})
+
+  " Scrolling down with the wheel scrolls the info popup without closing the
+  " completion popup menu.
+  call term_sendkeys(buf, "\<F6>")
+  call VerifyScreenDump(buf, 'Test_wildmenu_pum_info_mouse_scroll_2', {})
+
+  " Scrolling back up scrolls the info popup up again.
+  call term_sendkeys(buf, "\<F7>")
+  call VerifyScreenDump(buf, 'Test_wildmenu_pum_info_mouse_scroll_3', {})
+
+  call term_sendkeys(buf, "\<Esc>")
+  call StopVimInTerminal(buf)
+endfunc
+
+func s:ReadCmdlineInfo()
+  let l = filereadable('Xclinfo') ? map(readfile('Xclinfo'), 'str2nr(v:val)') : []
+  return len(l) == 2 ? l : [-1, -1]
+endfunc
+
+func Test_wildmenu_pum_info_scroll_keys()
+  CheckRunVimInTerminal
+  CheckFeature quickfix
+
+  let lines =<< trim END
+    func DictComp(A, L, P)
+      let info = join(map(range(1, 40), '"info line " .. v:val'), "\n")
+      return [{'word': 'apple', 'info': info}, {'word': 'banana', 'info': info}]
+    endfunc
+    command -nargs=1 -complete=customlist,DictComp DictCmd echo <q-args>
+    set wildmenu wildoptions=pum completeopt=menu,popup
+    func InfoState()
+      let id = popup_findinfo()
+      call writefile([id ? popup_getpos(id).firstline : -1, wildmenumode()],
+            \ 'Xclinfo')
+    endfunc
+    " A <Cmd> mapping runs without closing the wildmenu, so it can report the
+    " info popup state while completion is active.
+    cnoremap <F4> <Cmd>call InfoState()<CR>
+  END
+  call writefile(lines, 'XtestCmdlineScroll', 'D')
+  let buf = RunVimInTerminal('-S XtestCmdlineScroll', #{rows: 12})
+  call TermWait(buf, 50)
+
+  " Show the completion popup menu with the info popup next to it.
+  call term_sendkeys(buf, ":DictCmd \<Tab>")
+  call TermWait(buf, 50)
+  call term_sendkeys(buf, "\<F4>")
+  call WaitForAssert({-> assert_equal([1, 1], s:ReadCmdlineInfo())})
+
+  " Ctrl-Shift-Down then Ctrl-Shift-Up scroll the info popup by a line without
+  " closing the wildmenu.
+  call term_sendkeys(buf, "\<Esc>[1;6B")
+  call term_sendkeys(buf, "\<F4>")
+  call WaitForAssert({-> assert_equal([2, 1], s:ReadCmdlineInfo())})
+  call term_sendkeys(buf, "\<Esc>[1;6A")
+  call term_sendkeys(buf, "\<F4>")
+  call WaitForAssert({-> assert_equal([1, 1], s:ReadCmdlineInfo())})
+
+  " Ctrl-Shift-N then Ctrl-Shift-P scroll like the arrows.
+  call term_sendkeys(buf, "\<Esc>[27;6;110~")
+  call term_sendkeys(buf, "\<F4>")
+  call WaitForAssert({-> assert_equal([2, 1], s:ReadCmdlineInfo())})
+  call term_sendkeys(buf, "\<Esc>[27;6;112~")
+  call term_sendkeys(buf, "\<F4>")
+  call WaitForAssert({-> assert_equal([1, 1], s:ReadCmdlineInfo())})
+
+  " Ctrl-Shift-PageDown scrolls down by a page (more than one line).
+  call term_sendkeys(buf, "\<Esc>[6;6~")
+  call term_sendkeys(buf, "\<F4>")
+  call WaitForAssert({-> assert_true(s:ReadCmdlineInfo()[0] > 2)})
+
+  call term_sendkeys(buf, "\<Esc>")
+  call StopVimInTerminal(buf)
+  call delete('Xclinfo')
+endfunc
+
 func Test_cmdline_complete_findfunc_dict()
   CheckScreendump
 
diff --git a/src/testdir/test_crypt.vim b/src/testdir/test_crypt.vim
index d540fbbd62..5c9dfe3baf 100644
--- a/src/testdir/test_crypt.vim
+++ b/src/testdir/test_crypt.vim
@@ -491,4 +491,28 @@ func Test_crypt_off_by_one()
   bwipe!
 endfunc
 
+func Test_crypt_sodium_short_body()
+  CheckFeature sodium
+  " A VimCrypt~04! file with a complete 36-byte header (12 magic + 16 salt +
+  " 8 seed) but a body shorter than one secretstream header (24 bytes) used to
+  " underflow the body length and crash with a wild out-of-bounds read in
+  " crypto_secretstream_xchacha20poly1305_pull().  It must now fail cleanly.
+  " Bytes: "VimCrypt~04!" + 16 salt + 8 seed + 8-byte body = 44 bytes.
+  call writefile(0z56696D43727970747E303421
+        \ + 0zA0A1A2A3A4A5A6A7A8A9AAABACADAEAF
+        \ + 0zB0B1B2B3B4B5B6B7
+        \ + 0z0000000000000000, 'Xtest_sodium_short')
+
+  let v:errmsg = ''
+  try
+  call feedkeys(":split Xtest_sodium_short\<CR>foobar\<CR>", "xt")
+  catch /^Vim\%((\S\+)\)\=:E1198:/
+    " no-op
+  endtry
+
+  bwipe!
+  call delete('Xtest_sodium_short')
+  set key=
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_cursor_func.vim b/src/testdir/test_cursor_func.vim
index e541da886d..9aaeb5d47d 100644
--- a/src/testdir/test_cursor_func.vim
+++ b/src/testdir/test_cursor_func.vim
@@ -125,7 +125,7 @@ func Test_screenpos()
   exe "normal G\<C-Y>\<C-Y>"
   redraw
   let winbar_height = get(wininfo, 'winbar', 0)
-  call assert_equal({'row': winrow + wininfo.height - 1 + winbar_height,
+  call assert_equal({'row': winrow + winheight(winid) - 1 + winbar_height,
 	\ 'col': wincol + 7,
 	\ 'curscol': wincol + 7,
 	\ 'endcol': wincol + 7}, winid->screenpos(line('$'), 8))
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 9dd8767fba..61a72fd1f3 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -746,7 +746,7 @@ def s:GetFilenameChecks(): dict<list<string>>
          '/tmp/bash-fc-3Ozjlw', '/tmp/bash-fc.3Ozjlw', 'PKGBUILD', 'file.bash', '/usr/share/doc/bash-completion/filter.sh',
          '/etc/udev/cdsymlinks.conf', 'any/etc/udev/cdsymlinks.conf', 'file.bats', '.ash_history', 'any/etc/neofetch/config.conf', '.xprofile',
          'user-dirs.defaults', 'user-dirs.dirs', 'makepkg.conf', '.makepkg.conf', 'file.mdd', 'file.cygport', '.envrc', '.envrc.file', 'file.envrc', 'devscripts.conf',
-         '.devscripts', 'file.lo', 'file.la', 'file.lai'],
+         '.devscripts', 'file.lo', 'file.la', 'file.lai', '/etc/X11/xinit/xinitrc', '/etc/X11/xinit/xserverrc', '~/.xinitrc', '/etc/X11/xinit/xinitrc.d/foobar'],
     shaderslang: ['file.slang'],
     sieve: ['file.siv', 'file.sieve'],
     sil: ['file.sil'],
@@ -2546,6 +2546,25 @@ func Test_tf_file_v2()
   call assert_equal('terraform', &filetype)
   bwipe!
 
+  " A backslash continuation line may start with any character
+  let lines =<< trim END
+    /def greet = \
+        plain words that start the continued line
+    ;a comment
+  END
+  call writefile(lines, "Xfile.tf", "D")
+  split Xfile.tf
+  call assert_equal('tf', &filetype)
+  bwipe!
+
+  " The user override wins regardless of content
+  let g:filetype_tf = 'terraform'
+  call writefile([';;; looks like tf'], 'Xfile.tf', 'D')
+  split Xfile.tf
+  call assert_equal('terraform', &filetype)
+  bwipe!
+  unlet g:filetype_tf
+
   filetype off
 endfunc
 
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 6b1761bc85..b859cad174 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -330,7 +330,7 @@ func Test_strptime()
 
   " Force DST and check that it's considered.
   " MS-Windows CRT tzset() does not parse POSIX TZ strings with DST rules.
-  if !has('win32')
+  if !has('win32') && !has('sun')
     let $TZ = 'WINTER0SUMMER,J1,J365'
     call assert_equal(1484653763 - 3600, strptime('%Y-%m-%d %T', '2017-01-17 11:49:23'))
   endif
@@ -3702,6 +3702,10 @@ func Test_keytrans()
   call assert_equal('<M-x>', "\<*M-x>"->keytrans())
   call assert_equal('<C-I>', "\<*C-I>"->keytrans())
   call assert_equal('<S-3>', "\<*S-3>"->keytrans())
+  call assert_equal('<Bar>', '|'->keytrans())
+  call assert_equal('<M-Bar>', "\<*M-|>"->keytrans())
+  call assert_equal('<Bslash>', '\'->keytrans())
+  call assert_equal('<M-Bslash>', "\<*M-\>"->keytrans())
   call assert_equal('Ï€', 'Ï€'->keytrans())
   call assert_equal('<M-Ï€>', "\<M-Ï€>"->keytrans())
   call assert_equal('Ä›', 'Ä›'->keytrans())
@@ -4370,8 +4374,27 @@ func Test_slice()
 endfunc
 
 
+" Test for getbgcolor()
+" The actual value depends on terminal capability and highlight settings, so
+" only verify the documented shape: either [] or [r, g, b] with each
+" component an integer in 0..255.
+func Test_getbgcolor()
+  let bg = getbgcolor()
+  call assert_equal(v:t_list, type(bg))
+  if !empty(bg)
+    call assert_equal(3, len(bg))
+    for c in bg
+      call assert_equal(v:t_number, type(c))
+      call assert_true(c >= 0 && c <= 255, $'component out of range: {c}')
+    endfor
+  endif
+endfunc
+
 " Test for getcellpixels() for unix system
-" Pixel size of a cell is terminal-dependent, so in the test, only the list and size 2 are checked.
+" Pixel size of a cell is terminal-dependent.  When the host terminal of the
+" RunVimInTerminal vterm exposes neither ws_xpixel/ws_ypixel via TIOCGWINSZ
+" nor a CSI 14 t reply, getcellpixels() returns an empty list -- accept
+" both shapes here, just verify the syntax is a (possibly empty) list.
 func Test_getcellpixels_for_unix()
   CheckNotMSWindows
   CheckRunVimInTerminal
@@ -4384,7 +4407,7 @@ func Test_getcellpixels_for_unix()
   call term_sendkeys(buf, ":redi END\<CR>")
   call term_sendkeys(buf, "P")
 
-  call WaitForAssert({-> assert_match("\[\d+, \d+\]", term_getline(buf, 3))}, 1000)
+  call WaitForAssert({-> assert_match('\[\(\d\+,\s*\d\+\)\?\]', term_getline(buf, 3))}, 1000)
 
   call StopVimInTerminal(buf)
 endfunc
@@ -4520,6 +4543,20 @@ func Test_str2blob()
     call assert_equal(0zABBB0AABBB, str2blob(['«»', '«»'], {'encoding': 'latin1'}))
     call assert_equal(0zC2ABC2BB, str2blob(['«»'], {'encoding': 'utf8'}))
 
+    if has('iconv')
+      call assert_equal(0z480065006C006C006F00, str2blob(['Hello'], {'encoding': 'utf-16le'}))
+      call assert_equal(0z480065006C006C006F00, str2blob(['Hello'], {'encoding': 'utf16le'}))
+      call assert_equal(0z00480065006C006C006F, str2blob(['Hello'], {'encoding': 'utf-16be'}))
+      call assert_equal(0z48006900.0A004200.79006500, str2blob(['Hi', 'Bye'], {'encoding': 'utf-16le'}))
+      call assert_equal(0z61000A006200, str2blob(["a\nb"], {'encoding': 'utf-16le'}))
+      call assert_equal(0z, str2blob([''], {'encoding': 'utf-16le'}))
+      call assert_equal(0z0A00, str2blob(['', ''], {'encoding': 'utf-16le'}))
+      for enc in ['utf-16le', 'utf-16be', 'ucs-2le', 'utf-32le', 'utf-32be']
+        call assert_equal(['Hello', 'World'],
+              \ blob2str(str2blob(['Hello', 'World'], {'encoding': enc}), {'encoding': enc}), enc)
+      endfor
+    endif
+
     call assert_equal(0z62, str2blob(["b"], test_null_dict()))
     call assert_equal(0z63, str2blob(["c"], {'encoding': test_null_string()}))
 
@@ -4588,12 +4625,14 @@ func Test_blob2str()
     call assert_fails("call blob2str(0z6162, {'encoding': []})", 'E730: Using a List as a String')
     call assert_fails("call blob2str(0z6162, {'encoding': 'ab12xy'})", 'E1515: Unable to convert from ''ab12xy'' encoding')
 
-    #" UTF-16LE encoding
-    call assert_equal(['Hello'], blob2str(0z480065006C006C006F00, {'encoding': 'utf-16le'}))
-    call assert_equal(['Hello'], blob2str(0z480065006C006C006F00, {'encoding': 'utf16le'}))
-    #" UCS-2LE encoding
-    call assert_equal(['Hello'], blob2str(0z480065006C006C006F00, {'encoding': 'ucs-2le'}))
-    call assert_equal(['Hello'], blob2str(0z480065006C006C006F00, {'encoding': 'ucs2le'}))
+    if has("iconv")
+      #" UTF-16LE encoding
+      call assert_equal(['Hello'], blob2str(0z480065006C006C006F00, {'encoding': 'utf-16le'}))
+      call assert_equal(['Hello'], blob2str(0z480065006C006C006F00, {'encoding': 'utf16le'}))
+      #" UCS-2LE encoding
+      call assert_equal(['Hello'], blob2str(0z480065006C006C006F00, {'encoding': 'ucs-2le'}))
+      call assert_equal(['Hello'], blob2str(0z480065006C006C006F00, {'encoding': 'ucs2le'}))
+    endif
   END
   call v9.CheckLegacyAndVim9Success(lines)
 endfunc
diff --git a/src/testdir/test_gettext_utf8.vim b/src/testdir/test_gettext_utf8.vim
index b1ab6f8b0b..6b41e434c0 100644
--- a/src/testdir/test_gettext_utf8.vim
+++ b/src/testdir/test_gettext_utf8.vim
@@ -16,7 +16,9 @@ func Test_gettext()
       call assert_equal('ОШИБК�: for __PACKAGE__', gettext("ERROR: ", "__PACKAGE__"))
 
       call assert_equal('ОШИБК�: for __PACKAGE__', ngettext("ERROR: ", "ERRORS: ", 1, "__PACKAGE__"))
-      call assert_equal('ОШИБК�: for __PACKAGE__', ngettext("ERROR: ", "ERRORS: ", 2, "__PACKAGE__"))
+      if !has('sun')
+        call assert_equal('ОШИБК�: for __PACKAGE__', ngettext("ERROR: ", "ERRORS: ", 2, "__PACKAGE__"))
+      endif
 
       call assert_equal('%d буфер удалён из пам�ти for __PACKAGE__', ngettext("%d buffer unloaded", "%d buffers unloaded", 1, "__PACKAGE__"))
       call assert_equal('%d буфера удалено из пам�ти for __PACKAGE__', ngettext("%d buffer unloaded", "%d buffers unloaded", 2, "__PACKAGE__"))
diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
index 8f59358611..d36660d01a 100644
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -154,6 +154,24 @@ func Test_quoteplus()
   let @+ = quoteplus_saved
 endfunc
 
+" Test that legacy script menu files are sourced when :gui is executed with
+" the :vim9cmd modifier
+func Test_vim9cmd_gui()
+  CheckX11BasedGui
+
+  let lines =<< trim END
+    " Ignore the "failed to create input context" error.
+    call test_ignore_error("E285")
+    vim9cmd gui -f
+    call writefile([!empty(menu_info("Help"))], "XguimenuOK")
+    qa!
+  END
+  call writefile(lines, 'Xguimenuscript', 'D')
+  call system(GetVimCommand() .. ' --noplugin -S Xguimenuscript')
+  call assert_equal(['1'], readfile('XguimenuOK'))
+  call delete('XguimenuOK')
+endfunc
+
 func Test_gui_read_stdin()
   CheckUnix
 
diff --git a/src/testdir/test_ins_complete.vim b/src/testdir/test_ins_complete.vim
index 7eda457e1a..93ca66f5a9 100644
--- a/src/testdir/test_ins_complete.vim
+++ b/src/testdir/test_ins_complete.vim
@@ -6331,4 +6331,90 @@ func Test_completion_with_mapped_ctrl_r()
   bwipe!
 endfunc
 
+" Keys are mapped during completion started by complete(), but not in other
+" CTRL-X modes.
+func Test_mapped_ctrl_n_during_complete_function()
+  new
+  inoremap <buffer> <F2> <Cmd>call complete(1, ['foo', 'foobar'])<CR>
+  inoremap <buffer> <F3> <Cmd>let b:info =
+        \ [getline('.'), complete_info(['selected']).selected]<CR>
+
+  " During completion started by complete() the <C-N> mapping applies:
+  " <Down> moves the selection without inserting it.
+  inoremap <buffer> <expr> <C-N> complete_info().mode ==# 'eval' ? '<Down>' : '<C-N>'
+  call feedkeys("i\<F2>\<*C-N>\<F3>\<C-Y>\<Esc>", 'tx')
+  call assert_equal(['foo', 1], b:info)
+  call assert_equal('foobar', getline(1))
+
+  " In other CTRL-X modes the mapping is ignored: the builtin <C-N> selects
+  " and inserts the next match.
+  %delete _
+  call setline(1, ['foo', 'foobar', ''])
+  inoremap <buffer> <expr> <C-N> pumvisible() ? '<Down>' : '<C-N>'
+  call feedkeys("3GAf\<C-X>\<C-N>\<C-N>\<F3>\<C-Y>\<Esc>", 'tx')
+  call assert_equal(['foobar', 1], b:info)
+
+  bwipe!
+endfunc
+
+func Test_smartcase_longest()
+  func! GetMatches()
+    let info = complete_info(["matches"])
+    return map(copy(info.matches), {_, v -> v.word})
+  endfunc
+
+  func! TestInner(key)
+    let pr = "\<c-r>=string(GetMatches())\<cr>"
+    let words = ["InputEvent", "inputmap", "INPUT_MAP"]
+
+    new
+    set completeopt=menuone,noselect,longest ignorecase smartcase
+
+    " Lowercase 'inp' all three (case-insensitive).
+    call setline(1, words)
+    exe $"normal! ggOinp{a:key}{pr}"
+    let line = getline(1)
+    call assert_match('\c^input', line, 'inp prefix, key=' .. strtrans(a:key))
+    call assert_equal("['InputEvent', 'inputmap', 'INPUT_MAP']",
+          \ substitute(line, '\c^input', '', ''),
+          \ 'inp matches, key=' .. strtrans(a:key))
+
+    " Uppercase 'I' excludes lowercase 'inputmap'
+    %d
+    call setline(1, words)
+    exe $"normal! ggOI{a:key}{pr}"
+    let line = getline(1)
+    call assert_match('\c^input', line, 'I prefix, key=' .. strtrans(a:key))
+    call assert_equal("['InputEvent', 'INPUT_MAP']",
+          \ substitute(line, '\c^input', '', ''),
+          \ 'I matches, key=' .. strtrans(a:key))
+
+    set ignorecase& smartcase& completeopt&
+    bw!
+  endfunc
+
+  call TestInner("\<c-n>")
+  call TestInner("\<c-p>")
+  call TestInner("\<c-x>\<c-n>")
+  call TestInner("\<c-x>\<c-p>")
+  delfunc GetMatches
+  delfunc TestInner
+endfunc
+
+" Check that calling complete() while filtering Ctrl-N completion doesn't
+" break dot-repeat.
+func Test_call_complete_while_filtering()
+  new
+  setlocal complete=. completeopt=menuone,noselect
+  inoremap <buffer> <F2> <Cmd>call complete(3, ['obar', 'obaz'])<CR>
+  call setline(1, ['foobar', 'foobaz'])
+
+  call feedkeys("Gofo\<C-N>ob\<F2>cd\<Esc>", 'tx')
+  call assert_equal(['foobar', 'foobaz', 'foobcd'], getline(1, '$'))
+  normal! .
+  call assert_equal(['foobar', 'foobaz', 'foobcd', 'foobcd'], getline(1, '$'))
+
+  bwipe!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab nofoldenable
diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim
index 29f42848d4..d181bbf396 100644
--- a/src/testdir/test_mapping.vim
+++ b/src/testdir/test_mapping.vim
@@ -5,11 +5,41 @@ import './util/vim9.vim' as v9
 
 func Test_abbreviation()
   new
-  " abbreviation with 0x80 should work
+
+  " abbreviation with 0x80 (full-id)
   inoreab чкпр   vim
   call feedkeys("Goчкпр \<Esc>", "xt")
   call assert_equal('vim ', getline('$'))
   iunab чкпр
+
+  " abbreviation with 0x80 (non-id)
+  inoreab abc� abc^
+  inoreab � ^
+  call feedkeys("Goabc� def� � \<Esc>", "xt")
+  call assert_equal('abc^ def� ^ ', getline('$'))
+  iunab abc�
+  iunab �
+
+  " abbreviation with 0x9b (non-id)
+  inoreab abcï¼› abc;
+  inoreab ï¼› ;
+  call feedkeys("Goabcï¼› defï¼› ï¼› \<Esc>", "xt")
+  call assert_equal('abc; defï¼› ; ', getline('$'))
+  iunab abcï¼›
+  iunab ï¼›
+
+  " abbreviation with composing chars (end-id)
+  inoreab ..ã a^~
+  inoreab ..β̃ β^~
+  inoreab ..π̃ π^~
+  inoreab ..Λ̃ Λ^~
+  call feedkeys("Go..ã ..β̃ ..π̃ ..Λ̃ \<Esc>", "xt")
+  call assert_equal('a^~ β^~ π^~ Λ^~ ', getline('$'))
+  iunab ..ã
+  iunab ..β̃
+  iunab ..π̃
+  iunab ..Λ̃
+
   bwipe!
 endfunc
 
diff --git a/src/testdir/test_marks.vim b/src/testdir/test_marks.vim
index 61bfade627..d4b01dfda3 100644
--- a/src/testdir/test_marks.vim
+++ b/src/testdir/test_marks.vim
@@ -329,5 +329,26 @@ func Test_jump_mark_autocmd()
   bwipe!
 endfunc
 
+func Test_mark_formatprg_on_empty()
+  new
+  if has('win32')
+    setl formatprg=more
+  else
+    setl formatprg=cat
+  endif
+  call assert_equal([0, 0], [line("'["), col("'[")])
+  call assert_equal([0, 0], [line("']"), col("']")])
+  let v:errmsg = ''
+  try
+    norm! gqG
+  catch
+    call assert_report('gqG on empty buffer should not fail: ' .. v:exception)
+  endtry
+  call assert_true(empty(v:errmsg))
+  " col() is 1-based, so 1 == first column (:marks shows it as 0)
+  call assert_equal([1, 1], [line("'["), col("'[")])
+  call assert_equal([1, 1], [line("']"), col("']")])
+  bwipe!
+endfunc
 
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_matchfuzzy.vim b/src/testdir/test_matchfuzzy.vim
index dfeb074d7f..f6565c7545 100644
--- a/src/testdir/test_matchfuzzy.vim
+++ b/src/testdir/test_matchfuzzy.vim
@@ -331,4 +331,35 @@ func Test_matchfuzzy_long_multiword_no_overflow()
   call assert_equal([[], [], []], matchfuzzypos([word], pat_overflow))
 endfunc
 
+func Test_matchfuzzy_oversized_candidate()
+  let str = repeat('a', 1024) .. 'z'
+  call assert_equal([], matchfuzzy([str], 'az'))
+  call assert_equal([[], [], []], matchfuzzypos([str], 'az'))
+
+  call assert_equal([str], matchfuzzy([str], 'a'))
+  let r = matchfuzzypos([str], 'a')
+  call assert_equal([str], r[0])
+  call assert_equal([0], r[1][0])
+
+  let edge = 'a' .. repeat('x', 1022) .. 'a'
+  call assert_equal([edge], matchfuzzy([edge], 'aa'))
+  let e = matchfuzzypos([edge], 'aa')
+  call assert_equal([edge], e[0])
+  call assert_equal([0, 1023], e[1][0])
+
+  let cand = 'x' .. repeat('a', 1024)
+  call assert_equal([], matchfuzzy([cand], repeat('a', 1024)))
+  call assert_equal([[], [], []], matchfuzzypos([cand], repeat('a', 1024)))
+endfunc
+
+func Test_matchfuzzy_long_candidate_mbyte()
+  let ok = repeat('好', 1023) .. '界'
+  call assert_equal([ok], matchfuzzy([ok], '好界'))
+  call assert_notequal([], matchfuzzypos([ok], '好界')[0])
+
+  let toolong = repeat('好', 1024) .. '界'
+  call assert_equal([], matchfuzzy([toolong], '好界'))
+  call assert_equal([[], [], []], matchfuzzypos([toolong], '好界'))
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_mksession.vim b/src/testdir/test_mksession.vim
index 9bf1b47ff5..4dec8815a4 100644
--- a/src/testdir/test_mksession.vim
+++ b/src/testdir/test_mksession.vim
@@ -581,17 +581,20 @@ func Test_mksession_terminal_shared_windows()
   let lines = readfile('Xtest_mks.out')
   let found_creation = 0
   let found_use = 0
+  let found_var = 0
 
   for line in lines
     if line =~ '^terminal'
       let found_creation = 1
       call assert_match('terminal ++curwin ++cols=\d\+ ++rows=\d\+', line)
-    elseif line =~ "^execute 'buffer ' . s:term_buf_" . term_buf . "$"
+    elseif line =~ $"^var term_buf_{term_buf}: number = bufnr()$"
+      let found_var = 1
+    elseif line =~ "^execute 'buffer ' . term_buf_" . term_buf . "$"
       let found_use = 1
     endif
   endfor
 
-  call assert_true(found_creation && found_use)
+  call assert_true(found_creation && found_use && found_var)
 
   call StopShellInTerminal(term_buf)
   call delete('Xtest_mks.out')
diff --git a/src/testdir/test_mswin_event.vim b/src/testdir/test_mswin_event.vim
index 101051748e..1977e3d93f 100644
--- a/src/testdir/test_mswin_event.vim
+++ b/src/testdir/test_mswin_event.vim
@@ -704,9 +704,7 @@ func Test_mswin_event_mouse()
   CheckMSWindows
   new
 
-  if !has('gui_running')
-    let g:test_is_flaky = 1
-  endif
+  let g:test_is_flaky = 1
 
   set mousemodel=extend
   call test_override('no_query_mouse', 1)
diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim
index eea7891236..9b9eca8cfd 100644
--- a/src/testdir/test_normal.vim
+++ b/src/testdir/test_normal.vim
@@ -3896,6 +3896,108 @@ func Test_normal_percent_jump()
   bwipe!
 endfunc
 
+" Test that "%" skips parens inside comments when 'comments' defines C-style
+" "//" or "/*" comments.
+func Test_normal_percent_skip_comment()
+  new
+  setlocal comments=s1:/*,mb:*,ex:*/,://
+
+  " Forward: skip a ")" inside a // comment, match the real one.
+  silent! %delete _
+  call setline(1, ['foo(  // )', ');'])
+  call cursor(1, 4)
+  normal %
+  call assert_equal([2, 1], [line('.'), col('.')])
+
+  " Forward: skip a ")" inside a /* */ comment, match the real one.
+  silent! %delete _
+  call setline(1, ['bar( /* ) */ x)'])
+  call cursor(1, 4)
+  normal %
+  call assert_equal([1, 15], [line('.'), col('.')])
+
+  " Backward: skip a "(" inside a // comment, match the real one.
+  silent! %delete _
+  call setline(1, ['( // (', ')'])
+  call cursor(2, 1)
+  normal %
+  call assert_equal([1, 1], [line('.'), col('.')])
+
+  " Cursor inside a // comment: a match inside that comment is still found.
+  silent! %delete _
+  call setline(1, ['x // ( y )'])
+  call cursor(1, 6)
+  normal %
+  call assert_equal([1, 10], [line('.'), col('.')])
+
+  " Cursor inside a /* */ comment: a match inside that comment is still found.
+  silent! %delete _
+  call setline(1, ['/* a ( b ) c */'])
+  call cursor(1, 6)
+  normal %
+  call assert_equal([1, 10], [line('.'), col('.')])
+
+  " When 'comments' has no C-style comments the parens are not skipped.
+  setlocal comments=b:#
+  silent! %delete _
+  call setline(1, ['foo(  // )', ');'])
+  call cursor(1, 4)
+  normal %
+  call assert_equal([1, 10], [line('.'), col('.')])
+
+  " With "%" in 'cpoptions' Vi-compatible matching is used and the parens
+  " inside comments are not skipped.
+  let save_cpo = &cpoptions
+  setlocal comments=s1:/*,mb:*,ex:*/,://
+  set cpoptions+=%
+  silent! %delete _
+  call setline(1, ['foo(  // )', ');'])
+  call cursor(1, 4)
+  normal %
+  call assert_equal([1, 10], [line('.'), col('.')])
+  let &cpoptions = save_cpo
+
+  bwipe!
+endfunc
+
+" A "//" inside a string must not be treated as a line comment by "%".  The
+" line is scanned in a single pass, so this stays fast even on lines with many
+" slashes (e.g. base64 data).
+func Test_normal_percent_skip_comment_string()
+  new
+  setlocal comments=s1:/*,mb:*,ex:*/,://
+
+  " The "//" inside the string is not a comment, so "(" matches the real ")".
+  call setline(1, ['("a // b")'])
+  call cursor(1, 1)
+  normal %
+  call assert_equal([1, 10], [line('.'), col('.')])
+
+  " JSON-like: "{" matches the closing "}" although the string has slashes.
+  silent! %delete _
+  call setline(1, ['{', '  "k": "x//y",', '}'])
+  call cursor(1, 1)
+  normal %
+  call assert_equal([3, 1], [line('.'), col('.')])
+
+  " A "/*" inside a string must not start a block comment, so "(" still
+  " matches the real ")" after the string.
+  silent! %delete _
+  call setline(1, ['( "a /* b" )'])
+  call cursor(1, 1)
+  normal %
+  call assert_equal([1, 12], [line('.'), col('.')])
+
+  " A real /* */ block comment is still skipped: "(" matches the last ")".
+  silent! %delete _
+  call setline(1, ['( /* ) */ x )'])
+  call cursor(1, 1)
+  normal %
+  call assert_equal([1, 13], [line('.'), col('.')])
+
+  bwipe!
+endfunc
+
 " Test for << and >> commands to shift text by 'shiftwidth'
 func Test_normal_shift_rightleft()
   new
diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim
index 686defdb44..80c02e04dd 100644
--- a/src/testdir/test_options.vim
+++ b/src/testdir/test_options.vim
@@ -2484,6 +2484,13 @@ func Test_opt_scrolljump()
          \            'topline':5, 'coladd':0, 'skipcol':0, 'curswant':0},
          \           winsaveview())
 
+  norm! 100Gzt
+  set scrolljump=-100
+  norm! 20k
+  call assert_equal({'lnum':80, 'leftcol':0, 'col':0, 'topfill':0,
+        \            'topline':71, 'coladd':0, 'skipcol':0, 'curswant':0},
+        \           winsaveview())
+
   set scrolljump&
   bw
 endfunc
diff --git a/src/testdir/test_plugin_netrw.vim b/src/testdir/test_plugin_netrw.vim
index 22477c68a8..eee5f09841 100644
--- a/src/testdir/test_plugin_netrw.vim
+++ b/src/testdir/test_plugin_netrw.vim
@@ -172,6 +172,30 @@ function Test_MakeBookmark(netrw_curdir, fname)
   call s:MakeBookmark(a:fname)
   bw
 endfunction
+
+" Test the markings match pattern rebuilt by s:NetrwMarkFile() when unmarking an entry
+function Test_NetrwMarkFile_match_pattern_rebuild()
+  new
+  let curbufnr = bufnr("%")
+
+  call s:NetrwMarkFile(1, 'fname_dir/')
+  call s:NetrwMarkFile(1, 'fname_file')
+  let match_pattern = s:netrwmarkfilemtch_{curbufnr}
+
+  " Assert match pattern after marking and unmarking a directory entry
+  call s:NetrwMarkFile(1, 'dir/')
+  call s:NetrwMarkFile(1, 'dir/')
+  let rebuilt_match_pattern = s:netrwmarkfilemtch_{curbufnr}
+  call assert_equal(match_pattern, rebuilt_match_pattern)
+
+  " Assert match pattern after marking and unmarking a file entry
+  call s:NetrwMarkFile(1, 'file')
+  call s:NetrwMarkFile(1, 'file')
+  let rebuilt_match_pattern = s:netrwmarkfilemtch_{curbufnr}
+  call assert_equal(match_pattern, rebuilt_match_pattern)
+
+  bw
+endfunction
 " }}}
 END
 
@@ -765,6 +789,10 @@ func Test_netrw_bookmark_goto_delete_prompt()
   bw!
 endfunc
 
+func Test_netrw_markings_match_pattern_rebuild()
+  call Test_NetrwMarkFile_match_pattern_rebuild()
+endfunc
+
 func Test_netrw_mf_command_injection()
   CheckUnix
   CheckExecutable touch
@@ -821,4 +849,24 @@ func Test_netrw_injection()
   endtry
 endfunc
 
+" Deleting a file whose name contains an Ex command separator must not let the
+" name inject commands into the :execute in s:NetrwLocalRmFile().
+func Test_netrw_local_rm_injection()
+  CheckUnix
+  let dir   = getcwd() . '/Xnetrwrm'
+  let fname = "x|let g:injected = 1"
+  call mkdir(dir, 'pR')
+  call writefile([], dir . '/' . fname)
+  try
+    call netrw#Call('NetrwLocalRmFile', dir, fname, 1)
+    call assert_false(exists('g:injected'), 'filename must not inject Ex commands')
+    " The file is removed before the sink, so its absence also confirms the
+    " vulnerable code path was actually exercised (not skipped on an error).
+    call assert_false(filereadable(dir . '/' . fname), 'crafted file must be deleted')
+  finally
+    call delete(dir . '/' . fname)
+    unlet! g:injected
+  endtry
+endfunc
+
 " vim:ts=8 sts=2 sw=2 et
diff --git a/src/testdir/test_plugin_python3complete.vim b/src/testdir/test_plugin_python3complete.vim
new file mode 100644
index 0000000000..590348ee4a
--- /dev/null
+++ b/src/testdir/test_plugin_python3complete.vim
@@ -0,0 +1,239 @@
+" Tests for the Python omni-completion plugin (runtime/autoload/python3complete.vim).
+"
+CheckFeature python3
+
+" Run omni-completion against the given buffer contents and assert that the
+" marker file was not created.  Pre-patch behaviour exec()s reconstructed
+" def/class headers, which evaluates the buffer-supplied expression and
+" creates the marker file.  Post-patch, the expressions are stripped.
+func s:CompleteAndExpectNoMarker(buffer_lines, marker_path, msg)
+  call delete(a:marker_path)
+  defer delete(a:marker_path)
+  let g:pythoncomplete_allow_import = 0
+  new
+  setfiletype python
+  call setline(1, a:buffer_lines)
+  call cursor(line('$'), col([line('$'), '$']))
+
+  " The PoC trigger -- direct invocation of the omnifunc with an empty base.
+  " This is the same path Vim takes for CTRL-X CTRL-O.
+  silent! call python3complete#Complete(0, '')
+
+  call assert_false(filereadable(a:marker_path),
+        \ a:msg . ' (marker ' . a:marker_path . ' was created)')
+
+  bwipe!
+  unlet! g:pythoncomplete_allow_import
+endfunc
+
+func Test_python3complete_no_exec_via_function_default()
+  let marker = tempname()
+  call s:CompleteAndExpectNoMarker([
+        \ 'def f(x=open(' . string(marker) . ', "w").close()):',
+        \ '    pass',
+        \ 'f.',
+        \ ], marker,
+        \ 'function default expression was evaluated during omni-completion')
+endfunc
+
+func Test_python3complete_no_exec_via_function_annotation()
+  let marker = tempname()
+  call s:CompleteAndExpectNoMarker([
+        \ 'def f(x: open(' . string(marker) . ', "w").close()):',
+        \ '    pass',
+        \ 'f.',
+        \ ], marker,
+        \ 'function annotation expression was evaluated during omni-completion')
+endfunc
+
+func Test_python3complete_no_exec_via_class_base()
+  let marker = tempname()
+  " "or object" gives the class a valid base after the side-effecting
+  " open().close() expression returns None.  Without "or object" the
+  " exec would raise TypeError, but the file would still be created
+  " before the exception -- the assertion would still hold.  Using
+  " "or object" keeps the buffer parseable as valid Python.
+  call s:CompleteAndExpectNoMarker([
+        \ 'class Foo(open(' . string(marker) . ', "w").close() or object):',
+        \ '    pass',
+        \ 'Foo.',
+        \ ], marker,
+        \ 'class base expression was evaluated during omni-completion')
+endfunc
+
+func Test_python3complete_no_exec_with_multiple_params()
+  " The strip must apply to every parameter, not just the first.
+  let marker = tempname()
+  call s:CompleteAndExpectNoMarker([
+        \ 'def f(a, b=1, c=open(' . string(marker) . ', "w").close(), d=2):',
+        \ '    pass',
+        \ 'f.',
+        \ ], marker,
+        \ 'non-first parameter default was evaluated during omni-completion')
+endfunc
+
+func Test_python3complete_no_exec_via_starargs_default()
+  " "*args" and "**kw" must still be preserved after stripping; ensure a
+  " default following them is also stripped.
+  let marker = tempname()
+  call s:CompleteAndExpectNoMarker([
+        \ 'def f(*args, key=open(' . string(marker) . ', "w").close(), **kw):',
+        \ '    pass',
+        \ 'f.',
+        \ ], marker,
+        \ 'keyword-only default after *args was evaluated during omni-completion')
+endfunc
+
+func Test_python3complete_normal_completion_still_works()
+  " Positive control: completion against a buffer with a legitimate class
+  " must still produce completion items.  The stripping logic should not
+  " break the normal completion path.
+  let g:pythoncomplete_allow_import = 0
+
+  new
+  setfiletype python
+  call setline(1, [
+        \ 'class MyHelper:',
+        \ '    def alpha(self): pass',
+        \ '    def beta(self): pass',
+        \ 'h = MyHelper()',
+        \ 'h.',
+        \ ])
+  call cursor(5, 3)
+
+  " First call returns the column to start completion at; second returns
+  " the list of completion items.
+  let start = python3complete#Complete(1, '')
+  call assert_true(start >= 0,
+        \ 'python3complete#Complete(1, "") returned ' . start)
+
+  let items = python3complete#Complete(0, '')
+  " Items should be a list (possibly empty if the parser can't resolve "h",
+  " but should not be a parse error from our stripping changes).
+  call assert_equal(type([]), type(items),
+        \ 'python3complete#Complete(0, "") did not return a list')
+
+  bwipe!
+  unlet! g:pythoncomplete_allow_import
+endfunc
+
+func Test_python3complete_inherited_completion_via_dotted_base()
+  " Positive control for the class-base whitelist: a dotted-name base class
+  " (the common, safe case) must still be carried into the reconstructed
+  " source so that completion on a subclass can resolve inherited members.
+  let g:pythoncomplete_allow_import = 0
+
+  new
+  setfiletype python
+  call setline(1, [
+        \ 'class Base:',
+        \ '    def shared(self): pass',
+        \ 'class Derived(Base):',
+        \ '    def own(self): pass',
+        \ 'd = Derived()',
+        \ 'd.',
+        \ ])
+  call cursor(6, 3)
+
+  let items = python3complete#Complete(0, '')
+  call assert_equal(type([]), type(items),
+        \ 'completion against a subclass with a dotted base did not return a list')
+
+  bwipe!
+  unlet! g:pythoncomplete_allow_import
+endfunc
+
+" Build a tiny Python module that creates a marker file as a side effect of
+" being imported, add its directory to sys.path, run omni-completion against
+" a buffer containing `import vimtest_marker_mod`, and report whether the
+" marker file was created.  Used by the two allow_import tests below.
+func s:RunImportCompletion(allow_import_value)
+  let g:pythoncomplete_allow_import = a:allow_import_value
+  let marker = tempname()
+  let module_dir = tempname()
+  call mkdir(module_dir, 'R')
+
+  call writefile([
+        \ 'open(' . string(marker) . ', "w").close()',
+        \ ], module_dir . '/vimtest_marker_mod.py')
+
+  defer delete(marker)
+
+  " Pass module_dir to Python via a g: variable so vim.eval() can read it.
+  let g:pythoncomplete_test_module_dir = module_dir
+  py3 << EOF
+import sys, vim
+_p = vim.eval('g:pythoncomplete_test_module_dir')
+if _p not in sys.path:
+    sys.path.insert(0, _p)
+# Drop any cached copy so the module body re-runs and the marker side
+# effect fires on import.
+sys.modules.pop('vimtest_marker_mod', None)
+EOF
+
+  new
+  setfiletype python
+  call setline(1, [
+        \ 'import vimtest_marker_mod',
+        \ 'vimtest_marker_mod.',
+        \ ])
+  call cursor(2, 2)
+
+  silent! call python3complete#Complete(0, '')
+
+  let ran = filereadable(marker)
+
+  bwipe!
+  unlet g:pythoncomplete_allow_import
+
+  " Teardown: restore sys.path, drop the cached module so a subsequent
+  " test run starts clean, clean up the temp module dir.
+  py3 << EOF
+import sys, vim
+_p = vim.eval('g:pythoncomplete_test_module_dir')
+if _p in sys.path:
+    sys.path.remove(_p)
+sys.modules.pop('vimtest_marker_mod', None)
+EOF
+  unlet g:pythoncomplete_test_module_dir
+  call delete(module_dir, 'rf')
+  call delete(marker)
+  unlet! g:pythoncomplete_allow_import
+
+  return ran
+endfunc
+
+func Test_python3complete_allow_import_off_blocks_imports()
+  " GHSA-52mc-rq6p-rc7c mitigation: with the default flag value (0), an
+  " `import` line harvested from the buffer must NOT be exec()'d.  The
+  " marker module's side effect (creating a file when its body runs) is
+  " the observable proof that the exec did or did not happen.
+  call assert_false(s:RunImportCompletion(0),
+        \ 'g:pythoncomplete_allow_import=0 did not block the buffer import')
+endfunc
+
+func Test_python3complete_allow_import_on_runs_imports()
+  " Symmetric positive control: with the flag set to non-zero, the harvested
+  " import IS exec()'d and the module loads.  Without this control the
+  " negative test above could pass for unrelated reasons (e.g. completion
+  " failing to parse the buffer at all).
+  call assert_true(s:RunImportCompletion(1),
+        \ 'g:pythoncomplete_allow_import=1 did not run the buffer import')
+endfunc
+
+func Test_python3complete_no_exec_via_class_docstring()
+  " A class-body docstring is emitted verbatim between triple quotes by
+  " get_code() and runs at class-definition time during exec().  A single-
+  " quoted source docstring lets an embedded """ survive doc()'s leading/
+  " trailing quote strip and break out of the generated literal.
+  let marker = tempname()
+  call s:CompleteAndExpectNoMarker([
+        \ 'class Foo:',
+        \ '    ''x"""+open("' . marker . '", "w").close()+"""y''',
+        \ '    pass',
+        \ 'Foo.',
+        \ ], marker,
+        \ 'class docstring expression was evaluated during omni-completion')
+endfunc
+
+" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim
index d9d77a7ad0..5189d70bda 100644
--- a/src/testdir/test_popup.vim
+++ b/src/testdir/test_popup.vim
@@ -2646,8 +2646,9 @@ func Test_popup_opacity_move_after_close()
   call StopVimInTerminal(buf)
 endfunc
 
-func Test_popup_create_sandbox()
+func Test_popup_sandbox()
   call assert_fails('sandbox call popup_create("hello", {})', 'E48:')
+  call assert_fails('sandbox call popup_setoptions(1, {})', 'E48:')
 endfunc
 
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 11e431246a..5156584e4f 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -1753,6 +1753,27 @@ func Test_popup_set_firstline()
   call StopVimInTerminal(buf)
 endfunc
 
+func Test_popup_setoptions_title_redraw()
+  CheckScreendump
+
+  " Changing the title with popup_setoptions() must redraw the popup right
+  " away, without waiting for a later event such as a cursor movement.
+  let lines =<< trim END
+      let g:id = popup_create('hello', #{title: 'title-1', border: []})
+      redraw
+  END
+  call writefile(lines, 'XtestPopupTitleRedraw', 'D')
+  let buf = RunVimInTerminal('-S XtestPopupTitleRedraw', #{rows: 10})
+
+  call VerifyScreenDump(buf, 'Test_popupwin_setoptions_title_1', {})
+
+  " No other event happens between popup_setoptions() and the dump.
+  call term_sendkeys(buf, ":call popup_setoptions(g:id, #{title: 'title-2'})\<CR>")
+  call VerifyScreenDump(buf, 'Test_popupwin_setoptions_title_2', {})
+
+  call StopVimInTerminal(buf)
+endfunc
+
 " this tests that we don't get stuck with an error in "win_execute()"
 func Test_popup_filter_win_execute_error()
   CheckScreendump
@@ -3977,6 +3998,78 @@ func Test_popupmenu_info_border_mouse()
   call StopVimInTerminal(buf)
 endfunc
 
+func s:ReadInfoState()
+  let l = filereadable('Xinfofl') ? map(readfile('Xinfofl'), 'str2nr(v:val)') : []
+  return len(l) == 3 ? l : [-1, -1, -1]
+endfunc
+
+func Test_popupmenu_info_scroll_keys()
+  CheckRunVimInTerminal
+  CheckFeature quickfix
+
+  let lines =<< trim END
+      func Omni_test(findstart, base)
+        if a:findstart
+          return col(".")
+        endif
+        return [#{word: "scrollme",
+              \ info: join(map(range(1, 40), '"info line " .. v:val'), "\n")},
+              \ #{word: "another", info: "short"}]
+      endfunc
+      set completeopt=menu,menuone,popup
+      set omnifunc=Omni_test
+      func InfoState()
+        let id = popup_findinfo()
+        call writefile([id ? popup_getpos(id).firstline : -1, pumvisible(),
+              \ get(complete_info(['selected']), 'selected', -1)], 'Xinfofl')
+      endfunc
+      " A <Cmd> mapping runs without closing the completion menu, so it can
+      " report the info popup state while completion is active.
+      inoremap <F4> <Cmd>call InfoState()<CR>
+  END
+  call writefile(lines, 'XtestInfoScroll', 'D')
+  let buf = RunVimInTerminal('-S XtestInfoScroll', #{rows: 14})
+  call TermWait(buf, 50)
+
+  " Open insert-mode completion; the info popup is shown, first item selected.
+  call term_sendkeys(buf, "i\<C-X>\<C-O>")
+  call TermWait(buf, 50)
+  call term_sendkeys(buf, "\<F4>")
+  call WaitForAssert({-> assert_equal([1, 1, 0], s:ReadInfoState())})
+
+  " Ctrl-Shift-Down then Ctrl-Shift-Up scroll the info popup by a line; the
+  " menu stays open and the selected item does not change.
+  call term_sendkeys(buf, "\<Esc>[1;6B")
+  call term_sendkeys(buf, "\<F4>")
+  call WaitForAssert({-> assert_equal([2, 1, 0], s:ReadInfoState())})
+  call term_sendkeys(buf, "\<Esc>[1;6A")
+  call term_sendkeys(buf, "\<F4>")
+  call WaitForAssert({-> assert_equal([1, 1, 0], s:ReadInfoState())})
+
+  " Ctrl-Shift-N then Ctrl-Shift-P scroll like the arrows, again without
+  " moving the selection.
+  call term_sendkeys(buf, "\<Esc>[27;6;110~")
+  call term_sendkeys(buf, "\<F4>")
+  call WaitForAssert({-> assert_equal([2, 1, 0], s:ReadInfoState())})
+  call term_sendkeys(buf, "\<Esc>[27;6;112~")
+  call term_sendkeys(buf, "\<F4>")
+  call WaitForAssert({-> assert_equal([1, 1, 0], s:ReadInfoState())})
+
+  " Ctrl-Shift-PageDown scrolls down by a page (more than one line).
+  call term_sendkeys(buf, "\<Esc>[6;6~")
+  call term_sendkeys(buf, "\<F4>")
+  call WaitForAssert({-> assert_true(s:ReadInfoState()[0] > 2)})
+
+  " Plain Ctrl-N still moves the selection to the next item.
+  call term_sendkeys(buf, "\<C-N>")
+  call term_sendkeys(buf, "\<F4>")
+  call WaitForAssert({-> assert_equal(1, s:ReadInfoState()[2])})
+
+  call term_sendkeys(buf, "\<Esc>")
+  call StopVimInTerminal(buf)
+  call delete('Xinfofl')
+endfunc
+
 func Test_popupmenu_info_align_menu()
   CheckScreendump
   CheckFeature quickfix
@@ -5180,6 +5273,34 @@ func Test_popup_opacity_zero()
   call StopVimInTerminal(buf)
 endfunc
 
+func Test_popup_opacity_settext_no_leftover()
+  CheckScreendump
+
+  " Growing a no-highlight opacity popup with popup_settext() used to leave
+  " cells of the old, smaller popup on the screen: the background redraw
+  " under an opacity popup suppresses terminal output, so a later draw must
+  " not skip cells that look unchanged in ScreenLines.
+  let lines =<< trim END
+    call setline(1, ['some text here', '', '', '', '', '', 'more text'])
+    let g:winid = popup_create(['abc', 'ABC', '123', '456'],
+        \ #{line: 2, col: 2, border: [], highlight: 'None', opacity: 50})
+  END
+  call writefile(lines, 'XtestPopupOpacitySettext', 'D')
+  let buf = RunVimInTerminal('-S XtestPopupOpacitySettext', #{rows: 12})
+  call VerifyScreenDump(buf, 'Test_popupwin_opacity_settext_1', {})
+
+  " Replace with larger content: no cells of the small popup may remain.
+  call term_sendkeys(buf, ":call popup_settext(g:winid,"
+	\ .. " ['ABCDEFGHIJKLMNOPQRSTUVWXYZ', '', '', '', '', '.'])\<CR>")
+  call VerifyScreenDump(buf, 'Test_popupwin_opacity_settext_2', {})
+
+  " After closing the popup the screen must be fully restored.
+  call term_sendkeys(buf, ":call popup_clear()\<CR>")
+  call VerifyScreenDump(buf, 'Test_popupwin_opacity_settext_3', {})
+
+  call StopVimInTerminal(buf)
+endfunc
+
 func Test_popup_opacity_terminal_no_freeze()
   CheckFeature terminal
   CheckUnix
@@ -5485,8 +5606,6 @@ endfunc
 func Test_popup_opacity_fade_to_background()
   CheckScreendump
 
-  " Opacity popup spanning a vertical split should redraw both windows
-  " underneath, not just the left one (blend accumulation bug).
   let lines =<< trim END
     call setline(1, repeat(['X   X   X   X   X'], 4))
     hi PopupColor guibg=blue
@@ -5494,7 +5613,7 @@ func Test_popup_opacity_fade_to_background()
         \ line: 2, col: 3,
         \ minwidth: 10,
         \ minheight: 2,
-        \ highlight: 'PopupColor',
+        \ highlights: 'Normal:PopupColor',
         \ opacity: 60,
         \ zindex: 50,
         \})
@@ -5521,4 +5640,387 @@ func Test_popup_opacity_fade_to_background()
   call StopVimInTerminal(buf)
 endfunc
 
+func Test_popup_opacity_undefined_popup_highlight()
+  CheckScreendump
+
+  let lines =<< trim END
+  highlight clear PopupColor
+  highlight red ctermfg=red guifg=red
+  highlight revred ctermbg=red guibg=red
+  highlight blue ctermfg=blue guifg=blue
+  highlight revblue ctermbg=blue guibg=blue
+  highlight green ctermfg=green guifg=green
+  highlight revgreen ctermbg=green guibg=green
+  highlight reverse cterm=reverse
+  call matchadd('red', 'red')
+  call matchadd('revred', 'RED')
+  call matchadd('blue', 'blue')
+  call matchadd('revblue', 'BLUE')
+  call matchadd('green', 'green')
+  call matchadd('revgreen', 'GREEN')
+  call matchadd('reverse', 'REVERSE')
+  call setline(1, repeat(['red RED green GREEN blue BLUE normal REVERSE'], 5))
+  call popup_create('Popup Popup Popup Popup Popup Popup Popup', #{
+            \ line: 2, col: 3,
+            \ border: [1, 1, 1, 1],
+            \ minwidth: 10,
+            \ minheight: 2,
+            \ highlights: 'Normal:PopupColor',
+            \ opacity: 60,
+            \ })
+  END
+  call writefile(lines, 'XtestPopupOpacityUndefinedPopupHighlight', 'D')
+  let buf = RunVimInTerminal('-S XtestPopupOpacityUndefinedPopupHighlight', #{rows: 12, cols: 60})
+  " light background without Normal color set
+  call VerifyScreenDump(buf, 'Test_popup_opacity_undefined_popup_highlight_1', {})
+
+  " dark background without Normal color set
+  call term_sendkeys(buf, ":set background=dark\<CR>")
+  call VerifyScreenDump(buf, 'Test_popup_opacity_undefined_popup_highlight_2', {})
+
+  " dark termguicolors
+  call term_sendkeys(buf, ":set termguicolors\<CR>")
+  call VerifyScreenDump(buf, 'Test_popup_opacity_undefined_popup_highlight_3', {})
+
+  " light termguicolors
+  call term_sendkeys(buf, ":set background=light\<CR>")
+  call VerifyScreenDump(buf, 'Test_popup_opacity_undefined_popup_highlight_4', {})
+
+  " PopupColor only have fg color defined
+  call term_sendkeys(buf, ":highlight PopupColor ctermfg=DarkMagenta guifg=DarkMagenta\<CR>")
+  call VerifyScreenDump(buf, 'Test_popup_opacity_undefined_popup_highlight_5', {})
+
+  " termguicolors PopupColor only have fg color defined
+  call term_sendkeys(buf, ":set termguicolors\<CR>")
+  call VerifyScreenDump(buf, 'Test_popup_opacity_undefined_popup_highlight_6', {})
+
+  " termguicolors PopupColor only have bg color defined
+  call term_sendkeys(buf, ":highlight clear PopupColor\<CR>")
+  call TermWait(buf, 25)
+  call term_sendkeys(buf, ":highlight PopupColor ctermbg=DarkCyan guibg=DarkCyan\<CR>")
+  call VerifyScreenDump(buf, 'Test_popup_opacity_undefined_popup_highlight_7', {})
+
+  " PopupColor only have bg color defined
+  call term_sendkeys(buf, ":set notermguicolors\<CR>")
+  call VerifyScreenDump(buf, 'Test_popup_opacity_undefined_popup_highlight_8', {})
+
+  call StopVimInTerminal(buf)
+endfunc
+
+func Test_popup_opacity_only_cterm_or_gui_set()
+  CheckScreendump
+
+  let lines =<< trim END
+  call setline(1, repeat(['X   X   X   X   X'], 4))
+  highlight clear PopupColor
+  let g:pop_id = popup_create(['Popup'], #{
+        \ line: 2, col: 3,
+        \ minwidth: 10,
+        \ minheight: 2,
+        \ highlights: 'Normal:PopupColor',
+        \ opacity: 60,
+        \ zindex: 50,
+        \})
+  highlight PopupColor ctermbg=red
+  END
+  call writefile(lines, 'XtestPopupOpacityOnlyCtermOrGuiSet', 'D')
+  let buf = RunVimInTerminal('-S XtestPopupOpacityOnlyCtermOrGuiSet', #{rows: 12, cols: 60})
+  " cterm set and notermguicolors
+  call VerifyScreenDump(buf, 'Test_popup_opacity_only_cterm_or_gui_set_1', {})
+
+  " ctermbg set and termguicolors
+  call term_sendkeys(buf, ":set termguicolors\<CR>")
+  call VerifyScreenDump(buf, 'Test_popup_opacity_only_cterm_or_gui_set_2', {})
+
+  " guibg set and termguicolors
+  call term_sendkeys(buf, ":highlight PopupColor ctermbg=NONE guibg=red\<CR>")
+  call VerifyScreenDump(buf, 'Test_popup_opacity_only_cterm_or_gui_set_3', {})
+
+  " guibg set and notermguicolors
+  call term_sendkeys(buf, ":set notermguicolors\<CR>")
+  call VerifyScreenDump(buf, 'Test_popup_opacity_only_cterm_or_gui_set_4', {})
+
+  call StopVimInTerminal(buf)
+endfunc
+
+func Test_popup_opacity_attr()
+  CheckScreendump
+
+  let lines =<< trim END
+  highlight PopupBold cterm=bold gui=bold
+  highlight PopupBoldColor  cterm=bold gui=bold ctermfg=red guifg=red
+  call setline(1, repeat(['X X X X X X X X X X'], 10))
+  call popup_create('bold', #{
+        \ line: 2, col: 3,
+        \ border: [1, 1, 1, 1],
+        \ minwidth: 20,
+        \ minheight: 2,
+        \ opacity: 60,
+        \ highlights: 'Normal:PopupBold',
+        \ })
+  call popup_create('boldcolor', #{
+        \ line: 6, col: 3,
+        \ border: [1, 1, 1, 1],
+        \ minwidth: 20,
+        \ minheight: 2,
+        \ opacity: 60,
+        \ highlights: 'Normal:PopupBoldColor',
+        \ })
+  END
+  call writefile(lines, 'XtestPopupOpacityAttr', 'D')
+  let buf = RunVimInTerminal('-S XtestPopupOpacityAttr', #{rows: 12, cols: 60})
+  " cterm set and notermguicolors
+  call VerifyScreenDump(buf, 'Test_popup_opacity_attr_1', {})
+
+  " ctermbg set and termguicolors
+  call term_sendkeys(buf, ":set termguicolors\<CR>")
+  call VerifyScreenDump(buf, 'Test_popup_opacity_attr_2', {})
+
+  call StopVimInTerminal(buf)
+endfunc
+
+func Test_popup_image_update()
+  CheckFeature image
+
+  " 2x2 RGB = 12 bytes per image (4 pixels x 3 bytes).
+  let image1 = 0zff000000ff000000ffffffff
+  let image2 = 0z112233445566778899aabbcc
+  let image3 = repeat([0xff, 0x00, 0x00], 40 * 32)->list2blob()
+
+  let winid = popup_create('', #{
+        \ image: #{data: image1, width: 2, height: 2},
+        \ line: 1,
+        \ col: 1,
+        \ border: [],
+        \ padding: [0, 0, 0, 0],
+        \ })
+  let pos1 = popup_getpos(winid)
+
+  call popup_setoptions(winid, #{image: #{data: image2, width: 2, height: 2}})
+  let pos2 = popup_getpos(winid)
+  call assert_equal(pos1.width, pos2.width)
+  call assert_equal(pos1.height, pos2.height)
+
+  call popup_setoptions(winid, #{image: #{data: image3, width: 40, height: 32}})
+  let pos3 = popup_getpos(winid)
+  call assert_true(pos3.width > pos2.width || pos3.height > pos2.height)
+
+  call popup_close(winid)
+endfunc
+
+func Test_popup_image_clear_with_empty_dict()
+  CheckFeature image
+
+  " Documented sentinel: popup_setoptions(winid, #{image: {}}) removes a
+  " previously set image.  After the empty-dict call, popup_getoptions()
+  " must not expose an "image" key any more.
+  let blob = repeat([0xff, 0x00, 0x00], 2 * 2)->list2blob()
+  let winid = popup_create('', #{
+        \ image: #{data: blob, width: 2, height: 2},
+        \ line: 1, col: 1,
+        \ })
+  call assert_true(has_key(popup_getoptions(winid), 'image'))
+
+  call popup_setoptions(winid, #{image: {}})
+  call assert_false(has_key(popup_getoptions(winid), 'image'))
+
+  " Passing #{image: {}} again on a popup with no image is a harmless no-op.
+  call popup_setoptions(winid, #{image: {}})
+  call assert_false(has_key(popup_getoptions(winid), 'image'))
+
+  " The same popup can be re-armed with a fresh image after clearing.
+  call popup_setoptions(winid, #{image: #{data: blob, width: 2, height: 2}})
+  call assert_true(has_key(popup_getoptions(winid), 'image'))
+
+  call popup_close(winid)
+endfunc
+
+func Test_popup_image_set_and_getoptions()
+  CheckFeature image
+
+  " RGB image: 4x4 cells, 3 bytes per pixel.
+  let blob = repeat([0xff, 0x00, 0x00], 4 * 4)->list2blob()
+  let winid = popup_create('', #{
+        \ image: #{data: blob, width: 4, height: 4},
+        \ line: 1, col: 1,
+        \ })
+  let opt = popup_getoptions(winid)
+  call assert_true(has_key(opt, 'image'),
+        \ 'popup_getoptions() should expose the image dict')
+  call assert_equal(['alpha', 'data', 'height', 'width'], sort(keys(opt.image)))
+  call assert_equal(4, opt.image.width)
+  call assert_equal(4, opt.image.height)
+  call assert_equal(0, opt.image.alpha)
+  call assert_equal(v:t_blob, type(opt.image.data))
+  call assert_equal(4 * 4 * 3, len(opt.image.data))
+  call assert_equal(blob, opt.image.data)
+  " The returned blob must be an independent copy: mutating it does not
+  " affect the popup's stored pixel buffer.
+  let saved = copy(opt.image.data)
+  let opt.image.data[0] = 0
+  let opt2 = popup_getoptions(winid)
+  call assert_equal(saved, opt2.image.data)
+  call popup_close(winid)
+
+  " RGBA image: 4 bytes per pixel, alpha flag should round-trip true.
+  let rgba = repeat([0x11, 0x22, 0x33, 0x80], 2 * 2)->list2blob()
+  let winid = popup_create('', #{
+        \ image: #{data: rgba, width: 2, height: 2},
+        \ line: 1, col: 1,
+        \ })
+  let opt = popup_getoptions(winid)
+  call assert_equal(1, opt.image.alpha)
+  call assert_equal(2 * 2 * 4, len(opt.image.data))
+  call assert_equal(rgba, opt.image.data)
+  call popup_close(winid)
+
+  " No image set -> getoptions must not expose an "image" key.
+  let winid = popup_create('plain', #{line: 1, col: 1})
+  call assert_false(has_key(popup_getoptions(winid), 'image'))
+  call popup_close(winid)
+endfunc
+
+func Test_popup_image_required_params()
+  CheckFeature image
+
+  let blob = repeat([0xff, 0x00, 0x00], 2 * 2)->list2blob()
+
+  " Wrong data length is rejected with a clear error and the popup is not
+  " created, so there is nothing to clean up.
+  call assert_fails(
+        \ "call popup_create('', #{image: #{data: 0z00, width: 2, height: 2}})",
+        \ 'E475:')
+  call assert_equal([], popup_list())
+
+  " Missing/zero required keys are silently ignored: the popup is created
+  " without an image, so popup_getoptions() should not expose "image".
+  let winid = popup_create('', #{
+        \ image: #{width: 2, height: 2},
+        \ line: 1, col: 1,
+        \ })
+  call assert_false(has_key(popup_getoptions(winid), 'image'))
+  call popup_close(winid)
+
+  let winid = popup_create('', #{
+        \ image: #{data: blob, height: 2},
+        \ line: 1, col: 1,
+        \ })
+  call assert_false(has_key(popup_getoptions(winid), 'image'))
+  call popup_close(winid)
+
+  let winid = popup_create('', #{
+        \ image: #{data: blob, width: 2},
+        \ line: 1, col: 1,
+        \ })
+  call assert_false(has_key(popup_getoptions(winid), 'image'))
+  call popup_close(winid)
+
+  let winid = popup_create('', #{
+        \ image: #{data: blob, width: 0, height: 2},
+        \ line: 1, col: 1,
+        \ })
+  call assert_false(has_key(popup_getoptions(winid), 'image'))
+  call popup_close(winid)
+endfunc
+
+func Test_popup_image_move()
+  CheckFeature image
+
+  let img = repeat([0xff, 0x00, 0x00], 8 * 8)->list2blob()
+  let id = popup_create('', #{
+        \ image: #{data: img, width: 8, height: 8},
+        \ line: 3, col: 5,
+        \ })
+  redraw
+  call assert_equal(1, popup_getpos(id).visible)
+  call assert_equal(8, popup_getoptions(id).image.width)
+  call assert_equal(8, popup_getoptions(id).image.height)
+  let saved = popup_getoptions(id).image.data
+
+  " Moving the popup updates its position and keeps the pixel buffer intact.
+  for [l, c] in [[1, 1], [5, 10], [8, 20], [2, 3]]
+    call popup_move(id, #{line: l, col: c})
+    redraw
+    let pos = popup_getpos(id)
+    call assert_equal(l, pos.line)
+    call assert_equal(c, pos.col)
+    call assert_equal(1, pos.visible)
+    call assert_equal(saved, popup_getoptions(id).image.data)
+  endfor
+
+  call popup_close(id)
+endfunc
+
+func Test_popup_image_opacity_overlay()
+  CheckFeature image
+
+  " Bottom popup carries an image.
+  let img = repeat([0x00, 0xff, 0x00], 16 * 16)->list2blob()
+  let img_id = popup_create('', #{
+        \ image: #{data: img, width: 16, height: 16},
+        \ line: 3, col: 3, zindex: 50,
+        \ })
+  " Top popup overlaps it with some opacity.
+  let top_id = popup_create(['XXXX', 'XXXX'], #{
+        \ line: 3, col: 3, zindex: 100,
+        \ minwidth: 6, minheight: 2,
+        \ opacity: 50,
+        \ })
+  redraw
+
+  call assert_equal(1, popup_getpos(img_id).visible)
+  call assert_equal(1, popup_getpos(top_id).visible)
+  " The semi-transparent popup is drawn above the image popup.
+  call assert_true(popup_getoptions(top_id).zindex > popup_getoptions(img_id).zindex)
+  call assert_equal(50, popup_getoptions(top_id).opacity)
+  " The image popup keeps its pixel buffer while something is drawn on top.
+  call assert_equal(16, popup_getoptions(img_id).image.width)
+  call assert_equal(len(img), len(popup_getoptions(img_id).image.data))
+
+  call popup_close(top_id)
+  call popup_close(img_id)
+endfunc
+
+func Test_popup_image_clipwindow_scroll()
+  CheckFeature image
+
+  " An image popup anchored to a textprop with "clipwindow" set stays visible
+  " (clipped) while the prop is in reach, hides when the host scrolls the prop
+  " out of view, and keeps its pixel buffer when it comes back.
+  call prop_type_add('imgclipprop', {})
+  new
+  call setline(1, range(1, 200)->mapnew({_, v -> 'line ' .. v}))
+  call prop_add(5, 1, #{type: 'imgclipprop', length: 4})
+  let host = win_getid()
+
+  let img = repeat([0x00, 0x00, 0xff], 24 * 24)->list2blob()
+  let id = popup_create('', #{
+        \ image: #{data: img, width: 24, height: 24},
+        \ textprop: 'imgclipprop',
+        \ textpropwin: host,
+        \ line: -1, col: 1,
+        \ wrap: v:false, fixed: v:true,
+        \ clipwindow: v:true,
+        \ })
+  redraw
+  call assert_equal(1, popup_getoptions(id).clipwindow)
+  call assert_equal(1, popup_getpos(id).visible)
+  let saved = popup_getoptions(id).image.data
+
+  " Scroll the host so the prop is far below topline: the popup hides.
+  call win_execute(host, 'normal! Gzb')
+  redraw
+  call assert_equal(0, popup_getpos(id).visible)
+
+  " Scroll back: the popup reappears and still carries its image.
+  call win_execute(host, 'normal! ggzt')
+  redraw
+  call assert_equal(1, popup_getpos(id).visible)
+  call assert_equal(saved, popup_getoptions(id).image.data)
+
+  call popup_close(id)
+  bwipe!
+  call prop_type_delete('imgclipprop')
+endfunc
+
 " vim: shiftwidth=2 sts=2
diff --git a/src/testdir/test_recover.vim b/src/testdir/test_recover.vim
index 69caa89135..bb61e1995d 100644
--- a/src/testdir/test_recover.vim
+++ b/src/testdir/test_recover.vim
@@ -503,7 +503,9 @@ func Test_recover_corrupted_swap_file1()
   new
   let sample = 'samples/recover-crash1.swp'
   let target = 'Xpoc1.swp'
-  call filecopy(sample, target)
+  " In an out-of-source-tree build the sample may be a symlink, this copies the
+  " data into a real file.
+  call writefile(readblob(sample), target, 'D')
   try
     sil recover! Xpoc1
   catch /^Vim\%((\S\+)\)\=:E1364:/
@@ -517,7 +519,9 @@ func Test_recover_corrupted_swap_file1()
   new
   let sample = 'samples/recover-crash2.swp'
   let target = 'Xpoc2.swp'
-  call filecopy(sample, target)
+  " In an out-of-source-tree build the sample may be a symlink, this copies the
+  " data into a real file.
+  call writefile(readblob(sample), target, 'D')
   try
     sil recover! Xpoc2
   catch /^Vim\%((\S\+)\)\=:E1364:/
diff --git a/src/testdir/test_registers.vim b/src/testdir/test_registers.vim
index bb1dd31f3e..e1c493ac4b 100644
--- a/src/testdir/test_registers.vim
+++ b/src/testdir/test_registers.vim
@@ -51,7 +51,7 @@ func Test_display_registers()
     " these commands work in the sandbox
     let a = execute('sandbox display')
     " When X11 connection is not available, there is a warning W23
-    " filter this out (we could also run the :display comamand twice)
+    " filter this out (we could also run the :display command twice)
     let a = substitute(a, 'W23.*0\n', '', '')
     let b = execute('sandbox registers')
 
@@ -77,6 +77,14 @@ func Test_display_registers()
     call assert_match('^\nType Name Content\n'
           \ .         '  c  ":   ls', a)
 
+    let a = execute('registers %')
+    call assert_match('^\nType Name Content\n'
+          \ .         '  c  "%   file2', a)
+
+    let a = execute('registers #')
+    call assert_match('^\nType Name Content\n'
+          \ .         '  c  "#   file1', a)
+
     bwipe!
 endfunc
 
@@ -396,6 +404,11 @@ func Test_set_register()
   call assert_equal('Xfile_alt_1', getreg('#'))
   call setreg('#', b2)
   call assert_equal('Xfile_alt_2', getreg('#'))
+  call setreg('#', '')
+  call assert_equal('', getreg('#'))
+  call setreg('#', 'alt_1')
+  let @# = ''
+  call assert_equal('', getreg('#'))
 
   let ab = 'regwrite'
   call setreg('=', '')
diff --git a/src/testdir/test_restricted.vim b/src/testdir/test_restricted.vim
index 21133089ee..1997e20b4f 100644
--- a/src/testdir/test_restricted.vim
+++ b/src/testdir/test_restricted.vim
@@ -70,6 +70,7 @@ func Test_restricted_mode()
     if has('channel')
       call assert_fails("call ch_logfile('Xlog')", 'E145:')
       call assert_fails("call ch_open('localhost:8765')", 'E145:')
+      call assert_fails("call ch_setoptions('localhost:8765', {})", 'E145:')
     endif
 
     if has('job')
diff --git a/src/testdir/test_source.vim b/src/testdir/test_source.vim
index b7b0d11753..7982f51f04 100644
--- a/src/testdir/test_source.vim
+++ b/src/testdir/test_source.vim
@@ -635,6 +635,22 @@ func Test_source_buffer_vim9()
   %bw!
 endfunc
 
+" Test that the modifier does not override the script type when sourcing files
+" with :vim9cmd and :legacy
+func Test_source_file_ignores_modifiers()
+  let lines = ["let g:legacy_sourced = 42"]
+  call writefile(lines, 'Xsourcelegacy', 'D')
+  vim9cmd source Xsourcelegacy
+  call assert_equal(42, g:legacy_sourced)
+  unlet g:legacy_sourced
+
+  let lines = ["vim9script", "g:vim9_sourced = 42"]
+  call writefile(lines, 'Xsourcevim9', 'D')
+  legacy source Xsourcevim9
+  call assert_equal(42, g:vim9_sourced)
+  unlet g:vim9_sourced
+endfunc
+
 func Test_source_buffer_long_line()
   " This was reading past the end of the line.
   new
diff --git a/src/testdir/test_spell.vim b/src/testdir/test_spell.vim
index 3b7f727d80..b524cf60fc 100644
--- a/src/testdir/test_spell.vim
+++ b/src/testdir/test_spell.vim
@@ -1584,4 +1584,31 @@ func Test_suggest_spell_restore()
   bwipe!
 endfunc
 
+" A crafted .spl with a self-referential BY_INDEX node in the PREFIXTREE drove
+" dump_prefixes() past its MAXWLEN-sized depth arrays (stack out-of-bounds
+" write).  The tree parses cleanly (shared refs aren't recursed); the walk
+" happens on :spelldump.  Reaching the assert means no OOB.  Same class as the
+" tree_count_words() fix (9.2.0653).
+func Test_spelldump_prefixtree_overflow()
+  CheckUnix
+  call mkdir('Xrtp/spell', 'pR')
+  " VIMspell + v50, SN_PREFCOND(prefixcnt=1), SN_END,
+  " LWORDTREE word "a" with affixID=1 (so dump_prefixes runs),
+  " empty KWORDTREE, PREFIXTREE child BY_INDEX -> nodeidx 0 (self-cycle), 'A'
+  let spl = eval('0z56494D7370656C6C32030000000003000100FF00000004'
+        \ .. '0161010220010000000000000002010100000041')
+  call writefile(spl, 'Xrtp/spell/xx.utf-8.spl', 'b')
+
+  new
+  set runtimepath+=./Xrtp
+  set spelllang=xx
+  set spell
+  spelldump
+  call assert_true(line('$') > 1)
+
+  set spell& spelllang& runtimepath&
+  bwipe!
+  bwipe!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_spellfile.vim b/src/testdir/test_spellfile.vim
index 07156818d9..9ec728a768 100644
--- a/src/testdir/test_spellfile.vim
+++ b/src/testdir/test_spellfile.vim
@@ -1247,4 +1247,52 @@ func Test_mkspell_no_compflag_overflow()
   call assert_false(filereadable('Xcompbof.spl'))
 endfunc
 
+func Test_spell_sug_tree_count_words_overflow()
+  " A crafted .spl/.sug pair with a BY_INDEX self-cycle in the fold word tree
+  " parses cleanly (shared refs aren't recursed, so read_tree_node()'s depth
+  " cap never trips), but drove tree_count_words() past its MAXWLEN-sized depth
+  " arrays -> stack out-of-bounds write.  The walk only happens when
+  " spellsuggest() loads the matching .sug.  Reaching the assert == no OOB.
+  call mkdir('Xrtp/spell', 'pR')
+  " VIMspell + v50, SN_SUGFILE(ts), SN_END, LWORDTREE{node:1,BY_INDEX->0,'A'},
+  " empty KWORDTREE/PREFIXTREE
+  let spl = eval('0z56494D7370656C6C320B0000000008000000001234'
+        \ .. '5678FF000000020101000000410000000000000000')
+  " VIMsug + v1, matching ts, SUGWORDTREE word "a", empty SUGTABLE
+  let sug = 0z56494D737567010000000012345678000000040161010000000000
+  call writefile(spl, 'Xrtp/spell/xx.utf-8.spl', 'b')
+  call writefile(sug, 'Xrtp/spell/xx.utf-8.sug', 'b')
+
+  new
+  set runtimepath+=./Xrtp
+  set spelllang=xx
+  set spell
+  " Unpatched: OOB write here (ASan abort, or crash).  Patched: returns a list.
+  call assert_equal(v:t_list, type(spellsuggest('helloo')))
+
+  set spell& spelllang& runtimepath&
+  bwipe!
+endfunc
+
+" A word longer than MAXWLEN must not overflow the soundfold result buffer in
+" the single-byte SOFO branch of spell_soundfold_sofo().
+func Test_soundfold_overflow()
+  let _enc=&enc
+  set enc=latin1
+  call writefile(['SOFOFROM ab', 'SOFOTO xy'], 'Xtest.aff', 'D')
+  call writefile(['1', 'foo'], 'Xtest.dic', 'D')
+  mkspell! Xtest Xtest
+  defer delete('Xtest.latin1.spl')
+  defer delete('Xtest.latin1.sug')
+  setl spelllang=Xtest.latin1.spl spell
+
+  " Before the fix the copy loop wrote one byte per input byte into a
+  " MAXWLEN (254) stack buffer with no upper bound, smashing the stack.
+  let sound = soundfold(repeat('ab', 300))
+  call assert_true(strlen(sound) < 254, 'soundfold result exceeds MAXWLEN')
+
+  set spell& spelllang&
+  let &enc = _enc
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_startup_utf8.vim b/src/testdir/test_startup_utf8.vim
index 55888e8dfd..e209a56048 100644
--- a/src/testdir/test_startup_utf8.vim
+++ b/src/testdir/test_startup_utf8.vim
@@ -78,8 +78,9 @@ func Test_detect_fifo()
 	\ ]
   if RunVim([], after, '<(cat Xtestin_fifo)')
     let lines = readfile('Xtestout')
-    call assert_match('\[fifo\]', lines[0])
-    call assert_match('\[fifo\]', lines[1])
+    let filetype = has('sun') ? '\[character special\]' : '\[fifo\]'
+    call assert_match(filetype, lines[0])
+    call assert_match(filetype, lines[1])
   else
     call assert_equal('', 'RunVim failed.')
   endif
diff --git a/src/testdir/test_statusline.vim b/src/testdir/test_statusline.vim
index 48c7bb6696..c00582d5fd 100644
--- a/src/testdir/test_statusline.vim
+++ b/src/testdir/test_statusline.vim
@@ -14,11 +14,15 @@ func TearDown()
 endfunc
 
 func s:get_statusline()
+  redraw!
   if has('gui_running')
-    redraw!
     sleep 1m
   endif
-  return ScreenLines(&lines - 1, &columns)[0]
+  " Read the screen directly after redraw! instead of going through
+  " ScreenLines(), whose own redraw! may process events and change the window
+  " layout between here and the screenstring() calls.
+  let row = &lines - 1
+  return join(map(range(1, &columns), 'screenstring(row, v:val)'), '')
 endfunc
 
 func StatuslineWithCaughtError()
@@ -116,10 +120,30 @@ func Test_statusline()
   call assert_match('^    Xstatusline\s*$', s:get_statusline())
   set statusline=%.6(%f%)
   call assert_match('^<sline\s*$', s:get_statusline())
+  set statusline=%.5(1234567%),%2.5(1234567%),%5.5(1234567%),%50.5(1234567%)
+  call assert_match('^<4567,<4567,<4567,<4567\s*$', s:get_statusline())
   set statusline=%14f
   call assert_match('^   Xstatusline\s*$', s:get_statusline())
   set statusline=%.4L
   call assert_match('^10>3\s*$', s:get_statusline())
+  for filler in ['-', '∙']
+    exec 'set fillchars+=stl:'..filler
+    set statusline=%-5(x%),%-5.(x%),%-5.5(x%),%-5.10(x%);
+    call assert_match(substitute('^x____,x____,x____,x____;_*$', '_', filler, 'g'), s:get_statusline())
+    set statusline=%5(x%),%5.(x%),%5.5(x%),%5.10(x%);
+    call assert_match(substitute('^____x,____x,____x,____x;_*$', '_', filler, 'g'), s:get_statusline())
+    set statusline=%.5(12🙂345%),%4.5(12🙂345%),%5.5(12🙂345%),%50.5(12🙂345%);
+    call assert_match(substitute('^<345,<345,<345_,<345_;_*$', '_', filler, 'g'), s:get_statusline())
+  endfor
+  if has('linux')
+    " This assumes MAXPATHL is 4096 bytes.
+    set stl=%{%repeat('x',4096-6)%}%10(X%)
+    set fillchars+=stl:-
+    call assert_match('^<x\+----X$', s:get_statusline())
+    set fillchars+=stl:∙
+    call assert_match('^<x\+∙X$', s:get_statusline())
+  endif
+  set fillchars&
 
   " %h: Help buffer flag, text is "[help]".
   " %H: Help buffer flag, text is ",HLP".
diff --git a/src/testdir/test_suspend.vim b/src/testdir/test_suspend.vim
index ae05dd21f2..69abeaed6e 100644
--- a/src/testdir/test_suspend.vim
+++ b/src/testdir/test_suspend.vim
@@ -30,7 +30,8 @@ func Test_suspend()
 
   call term_sendkeys(buf, v:progpath
         \               . " --clean -X"
-        \               . " -c 'set nu keyprotocol='"
+        \               . " --cmd 'set t_RK= keyprotocol='"
+        \               . " -c 'set nu'"
         \               . " -c 'call setline(1, \"foo\")'"
         \               . " Xfoo\<CR>")
   " Cursor in terminal buffer should be on first line in spawned vim.
@@ -80,7 +81,8 @@ func Test_suspend_autocmd()
 
   call term_sendkeys(buf, v:progpath
         \               . " --clean -X"
-        \               . " -c 'set nu keyprotocol='"
+        \               . " --cmd 'set t_RK= keyprotocol='"
+        \               . " -c 'set nu'"
         \               . " -c 'let g:count = 0'"
         \               . " -c 'au VimSuspend * let g:count += 1'"
         \               . " -c 'au VimResume * let g:count += 1'"
diff --git a/src/testdir/test_syntax.vim b/src/testdir/test_syntax.vim
index 739fee528d..170e2e3b93 100644
--- a/src/testdir/test_syntax.vim
+++ b/src/testdir/test_syntax.vim
@@ -689,6 +689,43 @@ func Test_syn_zsub()
   bw!
 endfunc
 
+func s:SynDumpBuffer(ft, lines)
+  new
+  syntax on
+  execute 'setfiletype ' .. a:ft
+  call setline(1, a:lines)
+  let result = []
+  for lnum in range(1, line('$'))
+    for col in range(1, max([1, len(getline(lnum))]))
+      call add(result, synIDattr(synID(lnum, col, 1), 'name'))
+    endfor
+  endfor
+  bwipe!
+  return result
+endfunc
+
+" The in_id_list() cache is a speed optimization only: highlighting must be
+" identical with the cache on (default) and off.  Compare full-buffer synID()
+" output both ways across filetypes that use "contains"/cluster lists.
+func Test_syntax_idlist_cache_unchanged()
+  let samples = {
+        \ 'c': ['#define M 0x1F', "char c = '\\n';",
+        \       'int f(int a) { return a + 0xAB; }'],
+        \ 'vim': ['func <SID>Foo() abort', '  let x = [1, 2] + {"k": 0z1f}',
+        \         'endfunc'],
+        \ 'python': ['class C:', '    def m(self): return {1: "s", 2: r"\d"}'],
+        \ 'sh': ['case $x in', '  a) echo "${y:-0xAB}";;', 'esac'],
+        \ }
+  for ft in sort(keys(samples))
+    call test_override('syn_idlist_cache', 0)
+    let l:on = s:SynDumpBuffer(ft, samples[ft])
+    call test_override('syn_idlist_cache', 1)
+    let l:off = s:SynDumpBuffer(ft, samples[ft])
+    call test_override('ALL', 0)
+    call assert_equal(l:off, l:on, 'filetype ' .. ft)
+  endfor
+endfunc
+
 " Using \z() in a region with NFA failing should not crash.
 func Test_syn_wrong_z_one()
   new
diff --git a/src/testdir/test_termencoding.vim b/src/testdir/test_termencoding.vim
index f4f523163c..f533ffa0de 100644
--- a/src/testdir/test_termencoding.vim
+++ b/src/testdir/test_termencoding.vim
@@ -25,7 +25,7 @@ func Test_termencoding_euc_jp()
 	\ 'set termencoding=utf-8',
 	\ 'scriptencoding utf-8',
 	\ 'exe "normal aE83: �ッファを作��������他�を使用���...\<Esc>"',
-	\ 'split Xeuc_jp.txt',
+	\ has('sun') ? 'split ++enc=euc-jp Xeuc_jp.txt' : 'split Xeuc_jp.txt',
 	\ ], 'XTest_tenc_euc_jp', 'D')
   let buf = RunVimInTerminal('-S XTest_tenc_euc_jp', {'rows': 10})
   call VerifyScreenDump(buf, 'Test_tenc_euc_jp_01', {})
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 8360284fc3..4152173931 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -1150,7 +1150,11 @@ func Test_terminal_composing_unicode()
   endif
 
   enew
-  let buf = term_start(cmd, {'curwin': 1})
+  let term_opts = {'curwin': 1}
+  if has('sun')
+    let term_opts.env = {'LC_ALL': 'C.UTF-8'}
+  endif
+  let buf = term_start(cmd, term_opts)
   let g:job = term_getjob(buf)
   call WaitFor({-> term_getline(buf, 1) !=# ''}, 1000)
 
@@ -1339,7 +1343,7 @@ endfunc
 
 " Run Vim, start a terminal in that Vim with the kill argument,
 " :qall works.
-func Run_terminal_qall_kill(line1, line2)
+func Run_terminal_qall_kill_int(line1, line2, cmd)
   " 1. Open a terminal window and wait for the prompt to appear
   " 2. set kill using term_setkill()
   " 3. make Vim exit, it will kill the shell
@@ -1351,7 +1355,7 @@ func Run_terminal_qall_kill(line1, line2)
 	\ 'endwhile',
 	\ a:line2,
 	\ 'au VimLeavePre * call writefile(["done"], "Xdone")',
-	\ 'qall',
+	\ a:cmd,
 	\ ]
   if !RunVim([], after, '')
     return
@@ -1360,6 +1364,11 @@ func Run_terminal_qall_kill(line1, line2)
   call delete("Xdone")
 endfunc
 
+func Run_terminal_qall_kill(line1, line2)
+  call Run_terminal_qall_kill_int(a:line1, a:line2, 'qall')
+  call Run_terminal_qall_kill_int(a:line1, a:line2, 'wqall')
+endfunc
+
 " Run Vim in a terminal, then start a terminal in that Vim with a kill
 " argument, check that :qall works.
 func Test_terminal_qall_kill_arg()
diff --git a/src/testdir/test_terminal3.vim b/src/testdir/test_terminal3.vim
index 2e80f6fe44..22d19909a5 100644
--- a/src/testdir/test_terminal3.vim
+++ b/src/testdir/test_terminal3.vim
@@ -1039,6 +1039,51 @@ func Test_terminal_visual_empty_listchars()
   call StopVimInTerminal(buf)
 endfunc
 
+func Test_terminal_normal_mode_colored_empty_line()
+  CheckScreendump
+  CheckRunVimInTerminal
+  CheckUnix
+
+  " Erase lines with a gray background (CSI 100m) using CSI K.  The empty lines
+  " around "old" must stay gray in Terminal-Normal mode too, not only while the
+  " job is running.
+  call writefile(["printf '\\033[100m\\033[K\\nold\\033[K\\n\\033[K\\033[0m\\n'"],
+	\ 'Xterm_colored.sh', 'D')
+  call writefile([':term sh ./Xterm_colored.sh'], 'XtermColored', 'D')
+  let buf = RunVimInTerminal('-S XtermColored', #{rows: 10})
+  call term_wait(buf)
+  call VerifyScreenDump(buf, 'Test_terminal_colored_empty_1', {})
+
+  " Enter Terminal-Normal mode: the empty lines must still be gray.
+  call term_sendkeys(buf, "\<C-W>N")
+  call term_wait(buf)
+  call VerifyScreenDump(buf, 'Test_terminal_colored_empty_2', {})
+
+  call StopVimInTerminal(buf)
+endfunc
+
+func Test_terminal_visual_colored_empty_line()
+  CheckScreendump
+  CheckRunVimInTerminal
+  CheckUnix
+
+  " Empty lines erased with a gray background (CSI 100m, CSI K).  When such a
+  " line is selected in Terminal-Normal mode the Visual highlight must show on
+  " its first cell, while the rest of the line keeps the background color.
+  call writefile(["printf '\\033[100m\\033[K\\nold\\033[K\\n\\033[K\\033[0m\\n'"],
+	\ 'Xterm_colored.sh', 'D')
+  call writefile([':set listchars=', ':term sh ./Xterm_colored.sh'],
+	\ 'XtermColored', 'D')
+  let buf = RunVimInTerminal('-S XtermColored', #{rows: 10})
+  call term_wait(buf)
+
+  call term_sendkeys(buf, "\<C-W>NggVG")
+  call term_wait(buf)
+  call VerifyScreenDump(buf, 'Test_terminal_visual_colored_empty', {})
+
+  call StopVimInTerminal(buf)
+endfunc
+
 func Test_terminal_ansi_color_windows_cui()
   if !has('win32') || has('gui_running')
     throw 'Skipped: only for the Windows CUI'
diff --git a/src/testdir/test_textprop2.vim b/src/testdir/test_textprop2.vim
index 193a808415..523a59b1b2 100644
--- a/src/testdir/test_textprop2.vim
+++ b/src/testdir/test_textprop2.vim
@@ -428,4 +428,110 @@ func Test_multiline_prop_delete_penultimate_line()
   call s:CleanupPropTypes(['1', '2', '3'])
 endfunc
 
+func s:ManipulateUndoBlob(name, repl)
+  " Replace the saved old line (00 00 00 08 'QQQQQQQQ') in the undo file with
+  " the crafted "repl" blob, then read it back in.
+  let blob   = readfile(a:name, 'B')
+  let marker = 0z000000085151515151515151
+  let repl   = a:repl
+  let mlen   = len(marker)
+  let idx    = -1
+  let i      = 0
+  while i <= len(blob) - mlen
+    if blob[i : i + mlen - 1] ==# marker
+      let idx = i
+      break
+    endif
+    let i += 1
+  endwhile
+  call assert_true(idx >= 0, 'saved-line marker not found in undo file')
+
+  let head = idx > 0 ? blob[0 : idx - 1] : 0z
+  call writefile(head + repl + blob[idx + mlen :], a:name)
+
+  exe "rundo" a:name
+endfunc
+
+" A crafted undo file can restore a line whose declared text-property count is
+" far larger than the data, making get_text_props() / consumers read past the
+" line buffer.  Restore such a line and force a consumer; reaching the asserts
+" (no ASan abort / crash) means the count is bounded.
+func Test_textprop_undo_bad_prop_count()
+  CheckFeature persistent_undo
+
+  new
+  call setline(1, ['QQQQQQQQ', 'DECOYLINE'])
+  let &ul = &ul
+  call setline(1, 'BBBB')           " undo step saves old line 1 = "QQQQQQQQ"
+  wundo Xtpundo
+  " 39-byte blob: "AAAA" NUL count=0xFFFF, one zeroed textprop_T(32).
+  " propdata_len becomes 34 while the count claims 65535 properties.
+  call s:ManipulateUndoBlob('Xtpundo', 0z000000274141414100FFFF
+	\ + repeat(0z00, 32))
+
+  undo
+
+  " Safety: prove the malicious line was actually restored before the consumer
+  " runs, so the test can't pass vacuously if the patch missed.
+  call assert_equal('AAAA', getline(1))
+
+  " Adding a property anywhere sets b_has_textprop, so get_text_props() will
+  " actually inspect line 1 instead of returning early.
+  call prop_type_add('Xtp', {})
+  call prop_add(2, 1, {'type': 'Xtp', 'length': 1})
+
+  " this caused OOB read, now it is rejected as a corrupted (untrusted) undo
+  " file with a catchable error instead of an internal error
+  call assert_fails('call prop_list(1)', 'E967:')
+
+  call prop_type_delete('Xtp')
+  bwipe!
+  call delete('Xtpundo')
+endfunc
+
+" A crafted undo file can restore a line whose virtual-text property declares an
+" out-of-range tp_text_offset.  Turning that offset into a pointer and reading
+" the virtual text would read past the line buffer.  Restore such a line and
+" force a consumer; reaching the asserts (no ASan abort / crash) means the
+" offset is bounded.
+func Test_textprop_undo_bad_vtext_offset()
+  CheckFeature persistent_undo
+
+  new
+  call setline(1, ['QQQQQQQQ', 'DECOYLINE'])
+  let &ul = &ul
+  call setline(1, 'BBBB')           " undo step saves old line 1 = "QQQQQQQQ"
+  wundo Xtpundo
+
+  " One textprop_T for a virtual text prop (tp_id < 0) whose tp_text_offset
+  " (0x00100000) points far past the 34-byte property data.  The count (1) is
+  " valid, so only the offset/length check can reject this.
+  let prop  = 0z01000000          " tp_col = 1
+  let prop += 0z04000000          " tp_len = 4
+  let prop += 0zFFFFFFFF          " tp_id = -1 (virtual text)
+  let prop += 0z00000000          " tp_type = 0
+  let prop += 0z00000000          " tp_flags = 0
+  let prop += 0z00000000          " tp_padleft = 0
+  let prop += 0z00001000          " u.tp_text_offset = 0x00100000
+  let prop += 0z00000000          " union upper bytes
+  call s:ManipulateUndoBlob('Xtpundo', 0z000000274141414100 + 0z0100 + prop)
+
+  undo
+
+  " Safety: prove the malicious line was actually restored before the consumer
+  " runs, so the test can't pass vacuously if the patch missed.
+  call assert_equal('AAAA', getline(1))
+
+  call prop_type_add('Xtp', {})
+  call prop_add(2, 1, {'type': 'Xtp', 'length': 1})
+
+  " this caused OOB read, now it is rejected as a corrupted (untrusted) undo
+  " file with a catchable error
+  call assert_fails('call prop_list(1)', 'E967:')
+
+  call prop_type_delete('Xtp')
+  bwipe!
+  call delete('Xtpundo')
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_usercommands.vim b/src/testdir/test_usercommands.vim
index 8b90a826e4..e505e2d4c3 100644
--- a/src/testdir/test_usercommands.vim
+++ b/src/testdir/test_usercommands.vim
@@ -373,10 +373,10 @@ endfunc
 
 func Test_CmdCompletion()
   call feedkeys(":com -\<C-A>\<C-B>\"\<CR>", 'tx')
-  call assert_equal('"com -addr bang bar buffer complete count keepscript nargs range register', @:)
+  call assert_equal('"com -addr bang bar buffer complete completeopt count keepscript nargs range register', @:)
 
   call feedkeys(":com -nargs=0 -\<C-A>\<C-B>\"\<CR>", 'tx')
-  call assert_equal('"com -nargs=0 -addr bang bar buffer complete count keepscript nargs range register', @:)
+  call assert_equal('"com -nargs=0 -addr bang bar buffer complete completeopt count keepscript nargs range register', @:)
 
   call feedkeys(":com -nargs=\<C-A>\<C-B>\"\<CR>", 'tx')
   call assert_equal('"com -nargs=* + 0 1 ? _', @:)
@@ -520,6 +520,149 @@ func Test_CmdCompletion()
   delcom DoCmd
 endfunc
 
+" Test for -completeopt=escape: spaces, tabs and backslashes returned by a
+" customlist/custom completion function are backslash-escaped when inserted
+" into the command line, so the value survives as a single argument.  The
+" ArgLead passed to the function and the matches shown in the popup menu
+" remain unescaped.
+func Test_command_completeopt_escape()
+  let g:EscArgLead = ''
+  func! EscOne(A, L, P)
+    let g:EscArgLead = a:A
+    return ['hello world']
+  endfunc
+  func! EscBs(A, L, P)
+    let g:EscArgLead = a:A
+    return ['foo\bar']
+  endfunc
+  func! EscBoth(A, L, P)
+    let g:EscArgLead = a:A
+    return ['foo bar\baz']
+  endfunc
+  func! EscTab(A, L, P)
+    let g:EscArgLead = a:A
+    return ["foo\tbar"]
+  endfunc
+  func! EscCustom(A, L, P)
+    let g:EscArgLead = a:A
+    return "hello world"
+  endfunc
+  func! EscMulti(A, L, P)
+    let g:EscArgLead = a:A
+    return filter(['one value', 'two values', 'three values'],
+          \       {_, v -> stridx(v, a:A) == 0})
+  endfunc
+
+  " customlist + -completeopt=escape: spaces and backslashes are escaped.
+  com! -nargs=1 -complete=customlist,EscOne -completeopt=escape DoCmd
+        \ let g:EscQargs = <q-args>
+  call feedkeys(":DoCmd \<Tab>\<C-B>\"\<CR>", 'tx')
+  call assert_equal('"DoCmd hello\ world', @:)
+  " <q-args> yields the unescaped value.
+  let g:EscQargs = ''
+  call feedkeys(":DoCmd \<Tab>\<CR>", 'tx')
+  call assert_equal('hello world', g:EscQargs)
+  delcom DoCmd
+
+  com! -nargs=1 -complete=customlist,EscBs -completeopt=escape DoCmd echo <q-args>
+  call feedkeys(":DoCmd \<Tab>\<C-B>\"\<CR>", 'tx')
+  call assert_equal('"DoCmd foo\\bar', @:)
+  delcom DoCmd
+
+  com! -nargs=1 -complete=customlist,EscBoth -completeopt=escape DoCmd echo <q-args>
+  call feedkeys(":DoCmd \<Tab>\<C-B>\"\<CR>", 'tx')
+  call assert_equal('"DoCmd foo\ bar\\baz', @:)
+  delcom DoCmd
+
+  " A tab in a match is escaped like a space (the argument splitter also
+  " splits on tabs) and <q-args> yields the literal tab again.
+  com! -nargs=1 -complete=customlist,EscTab -completeopt=escape DoCmd
+        \ let g:EscQargs = <q-args>
+  call feedkeys(":DoCmd \<Tab>\<C-B>\"\<CR>", 'tx')
+  call assert_equal("\"DoCmd foo\\\tbar", @:)
+  " CTRL-A (insert all matches) escapes each match too.
+  call feedkeys(":DoCmd \<C-A>\<C-B>\"\<CR>", 'tx')
+  call assert_equal("\"DoCmd foo\\\tbar", @:)
+  let g:EscQargs = ''
+  call feedkeys(":DoCmd \<Tab>\<CR>", 'tx')
+  call assert_equal("foo\tbar", g:EscQargs)
+  let g:EscArgLead = ''
+  call assert_equal(["foo\tbar"], getcompletion("DoCmd foo\\\tb", 'cmdline'))
+  call assert_equal("foo\tb", g:EscArgLead)
+  delcom DoCmd
+  unlet g:EscQargs
+
+  " custom (newline-separated) + -completeopt=escape.
+  com! -nargs=1 -complete=custom,EscCustom -completeopt=escape DoCmd echo <q-args>
+  call feedkeys(":DoCmd \<Tab>\<C-B>\"\<CR>", 'tx')
+  call assert_equal('"DoCmd hello\ world', @:)
+  delcom DoCmd
+
+  " Without -completeopt=escape the literal string is inserted as-is.
+  com! -nargs=1 -complete=customlist,EscOne DoCmd echo <q-args>
+  call feedkeys(":DoCmd \<Tab>\<C-B>\"\<CR>", 'tx')
+  call assert_equal('"DoCmd hello world', @:)
+  delcom DoCmd
+
+  " getcompletion() returns the unescaped form even with -completeopt=escape,
+  " because the escape only applies at cmdline insertion, not the pum/list.
+  com! -nargs=1 -complete=customlist,EscBoth -completeopt=escape DoCmd echo <q-args>
+  call assert_equal(['foo bar\baz'], getcompletion('DoCmd ', 'cmdline'))
+  delcom DoCmd
+
+  " ArgLead passed to the completion function is unescaped: the user typed
+  " `foo\ b` (logical "foo b"), so the function should see "foo b", not
+  " "foo\ b", and `getcompletion()` should find the "foo bar\baz" match.
+  com! -nargs=1 -complete=customlist,EscBoth -completeopt=escape DoCmd echo <q-args>
+  let g:EscArgLead = ''
+  call assert_equal(['foo bar\baz'], getcompletion('DoCmd foo\ b', 'cmdline'))
+  call assert_equal('foo b', g:EscArgLead)
+  delcom DoCmd
+
+  " Same logic applies to custom (newline-separated): the regex used for
+  " filtering is built from the unescaped pattern, so "hello\ wo" matches
+  " "hello world".
+  com! -nargs=1 -complete=custom,EscCustom -completeopt=escape DoCmd echo <q-args>
+  let g:EscArgLead = ''
+  call assert_equal(['hello world'], getcompletion('DoCmd hello\ wo', 'cmdline'))
+  call assert_equal('hello wo', g:EscArgLead)
+  delcom DoCmd
+
+  " Multi-argument case: with -nargs=+ the argument splitter still runs, so an
+  " escaped match stays a single argument and <f-args> splits the line on the
+  " unescaped spaces.  This is the scenario -nargs=_ cannot express.
+  com! -nargs=+ -complete=customlist,EscMulti -completeopt=escape DoCmd
+        \ let g:EscArgs = [<f-args>]
+  let g:EscArgs = []
+  call feedkeys(":DoCmd one\<Tab> two\<Tab>\<CR>", 'tx')
+  call assert_equal(['one value', 'two values'], g:EscArgs)
+  delcom DoCmd
+  unlet g:EscArgs
+
+  " Tab-completion on the attribute value.
+  call feedkeys(":com -completeopt=esc\<Tab>\<C-B>\"\<CR>", 'tx')
+  call assert_equal('"com -completeopt=escape', @:)
+
+  " Invalid value gives E475; empty value gives E179.
+  call assert_fails('com! -nargs=1 -complete=customlist,EscOne -completeopt=bogus DoCmd :',
+        \ 'E475:')
+  call assert_fails('com! -nargs=1 -complete=customlist,EscOne -completeopt= DoCmd :',
+        \ 'E179:')
+
+  " -completeopt=escape is meaningless with -nargs=_ (the splitter is disabled),
+  " so the combination is rejected at command-definition time.
+  call assert_fails('com! -nargs=_ -complete=customlist,EscOne -completeopt=escape DoCmd :',
+        \ 'E1579:')
+
+  delfunc EscOne
+  delfunc EscBs
+  delfunc EscBoth
+  delfunc EscTab
+  delfunc EscCustom
+  delfunc EscMulti
+  unlet g:EscArgLead
+endfunc
+
 func CallExecute(A, L, P)
   " Drop first '\n'
   return execute('echo "hi"')[1:]
diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index bd0dca335f..1062df185d 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -3156,6 +3156,10 @@ def Test_expr9_dict()
   v9.CheckDefFailure(['var x = ({'], 'E723:', 2)
   v9.CheckScriptFailure(['vim9script', 'var x = ({'], 'E723:', 2)
   v9.CheckDefExecAndScriptFailure(['{}[getftype("file")]'], 'E716: Key not present in Dictionary: ""', 1)
+
+  # invalid dot notation key name
+  v9.CheckDefAndScriptFailure(['var x = { "a#b": 1 }', 'x.a#b'], ['E488:', 'E716:'], 2)
+  v9.CheckDefAndScriptFailure(['var x = { "a:b": 1 }', 'x.a:b'], ['E488:', 'E716:'], 2)
 enddef
 
 def Test_expr9_dict_vim9script()
diff --git a/src/testdir/test_vimscript.vim b/src/testdir/test_vimscript.vim
index a07ed6eadf..da94dad7b8 100644
--- a/src/testdir/test_vimscript.vim
+++ b/src/testdir/test_vimscript.vim
@@ -7729,6 +7729,27 @@ func Test_builtin_fullcommand()
 
 endfunc
 
+" Test that temporary directory is re-created after wipeout {{{1
+func Test_delete_temp_dir()
+  " assumes Unix has always flock/dirfd support
+  CheckUnix
+  CheckNotMac
+  if has('sun')
+    throw 'Skipped: Solaris Vim does not detect deleted tempdir without flock()'
+  endif
+  let a = tempname()
+  let dir = fnamemodify(a, ':h')
+  call delete(dir, 'rf')
+
+  let newdir = fnamemodify(tempname(), ':h')
+  call assert_notequal(dir, newdir)
+  " if the test fails (e.g. because vim has no support for flock/dirfd,
+  " recreate the directory, to prevent followup test failures
+  if dir == newdir
+    call mkdir(dir, '', 0o700)
+  endif
+endfunc
+
 "-------------------------------------------------------------------------------
 " Modelines								    {{{1
 " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/src/testdir/test_virtualedit.vim b/src/testdir/test_virtualedit.vim
index 902bbbfd1e..24a1903031 100644
--- a/src/testdir/test_virtualedit.vim
+++ b/src/testdir/test_virtualedit.vim
@@ -788,4 +788,18 @@ func Test_set_virtualedit_on_mode_change()
   bwipe!
 endfunc
 
+func Test_strip_autoindent_with_virtualedit_onemore()
+  new
+  setlocal autoindent virtualedit=onemore
+  call feedkeys("i   x\<CR>\<Esc>", 'tnix')
+  call assert_equal(['   x', ''], getline(1, '$'))
+
+  %delete _
+  setlocal virtualedit&
+  call feedkeys("i   x\<CR>\<Esc>", 'tnix')
+  call assert_equal(['   x', ''], getline(1, '$'))
+
+  bwipe!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_wayland.vim b/src/testdir/test_wayland.vim
index 9049075637..1a84ffcd14 100644
--- a/src/testdir/test_wayland.vim
+++ b/src/testdir/test_wayland.vim
@@ -229,14 +229,15 @@ func Test_wayland_mime_types_correct()
   call s:PreTest()
 
   let l:mimes = [
+        \ 'application/x-vim-enc-text',
         \ '_VIMENC_TEXT',
         \ '_VIM_TEXT',
+        \ 'application/x-vim-text',
         \ 'text/plain;charset=utf-8',
         \ 'text/plain',
         \ 'UTF8_STRING',
         \ 'STRING',
         \ 'TEXT',
-        \ 'application/x-vim-instance-' .. getpid()
         \ ]
 
   call setreg('+', 'text', 'c')
diff --git a/src/testdir/test_xxd.vim b/src/testdir/test_xxd.vim
index 990683b172..aca1c4f2fe 100644
--- a/src/testdir/test_xxd.vim
+++ b/src/testdir/test_xxd.vim
@@ -712,7 +712,7 @@ func Test_xxd_color2()
 
   let $PS1='$ '
   " This needs dash, plain bashs sh does not seem to work :(
-  let buf = RunVimInTerminal('', #{rows: 20, cmd: 'sh'})
+  let buf = RunVimInTerminal('', #{rows: 20, cmd: 'dash'})
   call term_sendkeys(buf,  s:xxd_cmd .. " -R never  < XXDfile_colors\<cr>")
   call TermWait(buf)
   redraw
@@ -838,4 +838,17 @@ func Test_xxd_color_term_unset()
   call delete(outfile)
 endfunc
 
+func Test_xxd_reverse_long_input()
+  " triggered UB in huntype()
+  let input = 'Xxd_reverse_input'
+  call writefile([repeat('1', 515)], input, 'D')
+
+  " When this triggers undefined behaviour, there will be a warning output
+  " from the system() command
+  let out = system(s:xxd_cmd . ' -r ' . input)
+  call assert_equal('', out)
+  let out = system(s:xxd_cmd . ' -b -r ' . input)
+  call assert_equal('', out)
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testing.c b/src/testing.c
index eaa7c69f84..e6ba03963a 100644
--- a/src/testing.c
+++ b/src/testing.c
@@ -1055,6 +1055,8 @@ f_test_override(typval_T *argvars, typval_T *rettv UNUSED)
     }
     else if (STRCMP(name, (char_u *)"nfa_fail") == 0)
 	nfa_fail_for_testing = val;
+    else if (STRCMP(name, (char_u *)"syn_idlist_cache") == 0)
+	disable_syn_idlist_cache_for_testing = val;
     else if (STRCMP(name, (char_u *)"no_query_mouse") == 0)
 	no_query_mouse_for_testing = val;
     else if (STRCMP(name, (char_u *)"no_wait_return") == 0)
@@ -1081,6 +1083,7 @@ f_test_override(typval_T *argvars, typval_T *rettv UNUSED)
 	disable_redraw_for_testing = FALSE;
 	ignore_redraw_flag_for_testing = FALSE;
 	nfa_fail_for_testing = FALSE;
+	disable_syn_idlist_cache_for_testing = FALSE;
 	no_query_mouse_for_testing = FALSE;
 	ui_delay_for_testing = 0;
 	reset_term_props_on_termresponse = FALSE;
diff --git a/src/textprop.c b/src/textprop.c
index a049edec9b..6d5a108631 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -99,7 +99,7 @@ um_goto_line(unpacked_memline_T *um, linenr_T lnum, int extra_props)
     // New format: [prop_count (uint16)][textprop_T...][vtext...]
     if (propdata_len < PROP_COUNT_SIZE + sizeof(textprop_T))
     {
-	iemsg(e_text_property_info_corrupted);
+	emsg(e_text_property_info_corrupted);
 	um->buf = NULL;
 	return false;
     }
@@ -109,9 +109,22 @@ um_goto_line(unpacked_memline_T *um, linenr_T lnum, int extra_props)
     char_u	    *props_start;
 
     mch_memmove(&prop_count, count_ptr, PROP_COUNT_SIZE);
+    if (!text_prop_count_valid(prop_count, propdata_len))
+    {
+	emsg(e_text_property_info_corrupted);
+	um->buf = NULL;
+	return false;
+    }
     proplen = (int)prop_count;
     props_start = count_ptr + PROP_COUNT_SIZE;
 
+    if (!text_prop_vtext_valid(props_start, proplen, propdata_len))
+    {
+	emsg(e_text_property_info_corrupted);
+	um->buf = NULL;
+	return false;
+    }
+
     um->props = ALLOC_MULT(textprop_T, proplen + extra_props);
     if (um->props == NULL)
     {
@@ -1231,10 +1244,21 @@ get_text_props(buf_T *buf, linenr_T lnum, char_u **props, int will_change)
     // prop_count is never zero.
     if (propdata_len < PROP_COUNT_SIZE + sizeof(textprop_T))
     {
-	iemsg(e_text_property_info_corrupted);
+	emsg(e_text_property_info_corrupted);
 	return 0;
     }
     mch_memmove(&prop_count, text + textlen, PROP_COUNT_SIZE);
+    if (!text_prop_count_valid(prop_count, propdata_len))
+    {
+	emsg(e_text_property_info_corrupted);
+	return 0;
+    }
+    if (!text_prop_vtext_valid(text + textlen + PROP_COUNT_SIZE,
+					   (int)prop_count, propdata_len))
+    {
+	emsg(e_text_property_info_corrupted);
+	return 0;
+    }
     *props = text + textlen + PROP_COUNT_SIZE;
     return (int)prop_count;
 }
@@ -3248,4 +3272,36 @@ prepend_joined_props(
     um_abort(&r_um);
 }
 
+    bool
+text_prop_count_valid(int prop_count, size_t propdata_len)
+{
+    if (propdata_len < PROP_COUNT_SIZE)
+	return false;
+    return (size_t)prop_count * sizeof(textprop_T)
+		    <= propdata_len - PROP_COUNT_SIZE;
+}
+
+/*
+ * Return true when every virtual text property's offset and length stay within
+ * "propdata_len", so tp_text_offset can be safely turned into a pointer.
+ * "props" may be unaligned.
+ */
+    bool
+text_prop_vtext_valid(char_u *props, int prop_count, size_t propdata_len)
+{
+    for (int i = 0; i < prop_count; ++i)
+    {
+	textprop_T  prop;
+
+	mch_memmove(&prop, props + (size_t)i * sizeof(textprop_T),
+							  sizeof(textprop_T));
+	if (prop.tp_id >= 0 || prop.u.tp_text_offset <= 0)
+	    continue;
+	if (prop.tp_len < 0 || (size_t)prop.u.tp_text_offset
+				+ (size_t)prop.tp_len + 1 > propdata_len)
+	    return false;
+    }
+    return true;
+}
+
 #endif // FEAT_PROP_POPUP
diff --git a/src/usercmd.c b/src/usercmd.c
index 2d47569653..412ac0ae7a 100644
--- a/src/usercmd.c
+++ b/src/usercmd.c
@@ -24,6 +24,7 @@ typedef struct ucmd
     cmd_addr_T	uc_addr_type;	// The command's address type
     sctx_T	uc_script_ctx;	// SCTX where the command was defined
     int		uc_flags;	// some UC_ flags
+    int		uc_compl_opt;	// completion options (UCC_ flags)
 #ifdef FEAT_EVAL
     char_u	*uc_compl_arg;	// completion argument if any
 #endif
@@ -211,6 +212,7 @@ find_ucmd(
 		    if (xp != NULL)
 		    {
 			xp->xp_arg = uc->uc_compl_arg;
+			xp->xp_complete_opt = uc->uc_compl_opt;
 			xp->xp_script_ctx = uc->uc_script_ctx;
 			xp->xp_script_ctx.sc_lnum += SOURCING_LNUM;
 		    }
@@ -283,6 +285,16 @@ set_context_in_user_cmd(expand_T *xp, char_u *arg_in)
 		xp->xp_context = EXPAND_USER_COMPLETE;
 		xp->xp_pattern = p + 1;
 	    }
+	    else if (STRNICMP(arg, "completeopt", p - arg) == 0)
+	    {
+		xp->xp_context = EXPAND_USER_COMPLETEOPT;
+		// xp_pattern points to the last comma-separated item being
+		// typed so that completion replaces only that item.
+		xp->xp_pattern = p + 1;
+		for (char_u *c = p + 1; *c != NUL; ++c)
+		    if (*c == ',')
+			xp->xp_pattern = c + 1;
+	    }
 	    else if (STRNICMP(arg, "nargs", p - arg) == 0)
 	    {
 		xp->xp_context = EXPAND_USER_NARGS;
@@ -440,7 +452,7 @@ get_user_cmd_flags(expand_T *xp UNUSED, int idx)
 {
     static char *user_cmd_flags[] = {
 	"addr", "bang", "bar", "buffer", "complete",
-	"count", "nargs", "range", "register", "keepscript"
+	"completeopt", "count", "nargs", "range", "register", "keepscript"
     };
 
     if (idx < 0 || idx >= (int)ARRAY_LENGTH(user_cmd_flags))
@@ -473,6 +485,26 @@ get_user_cmd_complete(expand_T *xp UNUSED, int idx)
     return command_complete_tab[idx].value.string;
 }
 
+/*
+ * Names of options accepted by -completeopt= for :command.  Keep in sync with
+ * parse_completeopt_arg() below.
+ */
+static char *user_cmd_completeopt_tab[] = {
+    "escape"
+};
+
+/*
+ * Function given to ExpandGeneric() to obtain the list of values for
+ * -completeopt.
+ */
+    char_u *
+get_user_cmd_completeopt(expand_T *xp UNUSED, int idx)
+{
+    if (idx < 0 || idx >= (int)ARRAY_LENGTH(user_cmd_completeopt_tab))
+	return NULL;
+    return (char_u *)user_cmd_completeopt_tab[idx];
+}
+
 /*
  * Return the row in the command_complete_tab table that contains the given key.
  */
@@ -715,6 +747,9 @@ uc_list(char_u *name, size_t name_len)
 			len += (int)uc_compl_arglen;
 		    }
 		}
+		if (p_verbose > 0 && (cmd->uc_compl_opt & UCC_ESCAPE))
+		    len += vim_snprintf((char *)IObuff + len, IOSIZE - len,
+						       " -completeopt=escape");
 #endif
 	    }
 
@@ -911,6 +946,72 @@ parse_compl_arg(
     return OK;
 }
 
+/*
+ * Parse a -completeopt= value.  "value" points to a comma-separated list of
+ * option names; on success the corresponding UCC_ flags are OR'ed into
+ * "*compl_opt".
+ * Returns FAIL on an unknown name.
+ */
+    static int
+parse_completeopt_arg(char_u *value, int vallen, int *compl_opt)
+{
+    char_u  *p = value;
+    char_u  *end = value + vallen;
+    int	    flags = 0;
+
+    if (vallen == 0)
+    {
+	semsg(_(e_argument_required_for_str), "-completeopt");
+	return FAIL;
+    }
+
+    while (p < end)
+    {
+	char_u	*comma;
+	size_t	itemlen;
+	int	matched = FALSE;
+	int	i;
+
+	comma = vim_strchr(p, ',');
+	if (comma == NULL || comma > end)
+	    itemlen = (size_t)(end - p);
+	else
+	    itemlen = (size_t)(comma - p);
+
+	if (itemlen == 0)
+	{
+	    semsg(_(e_invalid_value_for_argument_str), "completeopt");
+	    return FAIL;
+	}
+
+	for (i = 0; i < (int)ARRAY_LENGTH(user_cmd_completeopt_tab); ++i)
+	{
+	    char *name = user_cmd_completeopt_tab[i];
+
+	    if (STRLEN(name) == itemlen
+				   && STRNCMP(p, name, itemlen) == 0)
+	    {
+		if (STRCMP(name, "escape") == 0)
+		    flags |= UCC_ESCAPE;
+		matched = TRUE;
+		break;
+	    }
+	}
+	if (!matched)
+	{
+	    semsg(_(e_invalid_value_for_argument_str), "completeopt");
+	    return FAIL;
+	}
+
+	p += itemlen;
+	if (p < end && *p == ',')
+	    ++p;
+    }
+
+    *compl_opt |= flags;
+    return OK;
+}
+
 /*
  * Scan attributes in the ":command" command.
  * Return FAIL when something is wrong.
@@ -924,6 +1025,7 @@ uc_scan_attr(
     int		*flags,
     int		*complp,
     char_u	**compl_arg,
+    int		*compl_opt,
     cmd_addr_T	*addr_type_arg)
 {
     char_u	*p;
@@ -1054,6 +1156,17 @@ uc_scan_attr(
 								      == FAIL)
 		return FAIL;
 	}
+	else if (STRNICMP(attr, "completeopt", attrlen) == 0)
+	{
+	    if (val == NULL)
+	    {
+		semsg(_(e_argument_required_for_str), "-completeopt");
+		return FAIL;
+	    }
+
+	    if (parse_completeopt_arg(val, (int)vallen, compl_opt) == FAIL)
+		return FAIL;
+	}
 	else if (STRNICMP(attr, "addr", attrlen) == 0)
 	{
 	    *argt |= EX_RANGE;
@@ -1093,6 +1206,7 @@ uc_add_command(
     int		flags,
     int		compl,
     char_u	*compl_arg UNUSED,
+    int		compl_opt,
     cmd_addr_T	addr_type,
     int		force)
 {
@@ -1186,6 +1300,7 @@ uc_add_command(
     cmd->uc_argt = argt;
     cmd->uc_def = def;
     cmd->uc_compl = compl;
+    cmd->uc_compl_opt = compl_opt;
     cmd->uc_script_ctx = current_sctx;
     if (flags & UC_VIM9)
 	cmd->uc_script_ctx.sc_version = SCRIPT_VERSION_VIM9;
@@ -1268,6 +1383,7 @@ ex_command(exarg_T *eap)
     int		flags = 0;
     int		compl = EXPAND_NOTHING;
     char_u	*compl_arg = NULL;
+    int		compl_opt = 0;
     cmd_addr_T	addr_type_arg = ADDR_NONE;
     int		has_attr = (eap->arg[0] == '-');
     int		name_len;
@@ -1280,7 +1396,7 @@ ex_command(exarg_T *eap)
 	++p;
 	end = skiptowhite(p);
 	if (uc_scan_attr(p, end - p, &argt, &def, &flags, &compl,
-					   &compl_arg, &addr_type_arg) == FAIL)
+			       &compl_arg, &compl_opt, &addr_type_arg) == FAIL)
 	    goto theend;
 	p = skipwhite(end);
     }
@@ -1326,6 +1442,13 @@ ex_command(exarg_T *eap)
 		       (char_u *)_(e_complete_used_without_allowing_arguments),
 								   TRUE, TRUE);
     }
+    else if ((compl_opt & UCC_ESCAPE) && (argt & EX_ARGSPACE))
+    {
+	// -nargs=_ disables the argument splitter, so escaping spaces in
+	// inserted matches has no effect.  Reject the combination instead of
+	// silently ignoring it.
+	emsg(_(e_completeopt_escape_cannot_be_used_with_nargs_underscore));
+    }
     else
     {
 	char_u *tofree = NULL;
@@ -1333,7 +1456,7 @@ ex_command(exarg_T *eap)
 	p = may_get_cmd_block(eap, p, &tofree, &flags);
 
 	uc_add_command(name, end - name, p, argt, def, flags, compl, compl_arg,
-						  addr_type_arg, eap->forceit);
+					compl_opt, addr_type_arg, eap->forceit);
 	vim_free(tofree);
 
 	return;  // success
@@ -1823,6 +1946,11 @@ uc_check_code(
 		STRCPY(buf, eap->arg);
 	    break;
 	case 1: // Quote, but don't split
+	{
+	    // For -completeopt=escape give <q-args> the logical value: a
+	    // backslash before a space, tab or backslash is collapsed.
+	    int	unesc = (cmd->uc_compl_opt & UCC_ESCAPE) != 0;
+
 	    result = STRLEN(eap->arg) + 2;
 	    for (p = eap->arg; *p; ++p)
 	    {
@@ -1830,6 +1958,13 @@ uc_check_code(
 		    // DBCS can contain \ in a trail byte, skip the
 		    // double-byte character.
 		    ++p;
+		else if (unesc && *p == '\\'
+				     && (VIM_ISWHITE(p[1]) || p[1] == '\\'))
+		{
+		    if (VIM_ISWHITE(p[1]))
+			--result;
+		    ++p;
+		}
 		else
 		     if (*p == '\\' || *p == '"')
 		    ++result;
@@ -1844,6 +1979,13 @@ uc_check_code(
 			// DBCS can contain \ in a trail byte, copy the
 			// double-byte character to avoid escaping.
 			*buf++ = *p++;
+		    else if (unesc && *p == '\\'
+				     && (VIM_ISWHITE(p[1]) || p[1] == '\\'))
+		    {
+			++p;	// drop the escaping backslash
+			if (*p == '\\')
+			    *buf++ = '\\';	// re-escape for the quotes
+		    }
 		    else
 			 if (*p == '\\' || *p == '"')
 			*buf++ = '\\';
@@ -1853,6 +1995,7 @@ uc_check_code(
 	    }
 
 	    break;
+	}
 	case 2: // Quote and split (<f-args>)
 	    // This is hard, so only do it once, and cache the result
 	    if (*split_buf == NULL)
diff --git a/src/version.c b/src/version.c
index f53e87ee07..270e1aa084 100644
--- a/src/version.c
+++ b/src/version.c
@@ -545,6 +545,36 @@ static char *(features[]) =
 #else
 	"-sodium",
 #endif
+#ifdef FEAT_IMAGE
+	"+image",
+#else
+	"-image",
+#endif
+#ifdef FEAT_IMAGE_SIXEL
+	"+image_sixel",
+#else
+	"-image_sixel",
+#endif
+#ifdef FEAT_IMAGE_KITTY
+	"+image_kitty",
+#else
+	"-image_kitty",
+#endif
+#ifdef FEAT_IMAGE_GDI
+	"+image_gdi",
+#else
+	"-image_gdi",
+#endif
+#ifdef FEAT_IMAGE_CAIRO
+	"+image_cairo",
+#else
+	"-image_cairo",
+#endif
+#ifdef FEAT_IMAGE_GDK
+	"+image_gdk",
+#else
+	"-image_gdk",
+#endif
 #ifdef FEAT_SOUND
 	"+sound",
 #else
@@ -744,6 +774,228 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    699,
+/**/
+    698,
+/**/
+    697,
+/**/
+    696,
+/**/
+    695,
+/**/
+    694,
+/**/
+    693,
+/**/
+    692,
+/**/
+    691,
+/**/
+    690,
+/**/
+    689,
+/**/
+    688,
+/**/
+    687,
+/**/
+    686,
+/**/
+    685,
+/**/
+    684,
+/**/
+    683,
+/**/
+    682,
+/**/
+    681,
+/**/
+    680,
+/**/
+    679,
+/**/
+    678,
+/**/
+    677,
+/**/
+    676,
+/**/
+    675,
+/**/
+    674,
+/**/
+    673,
+/**/
+    672,
+/**/
+    671,
+/**/
+    670,
+/**/
+    669,
+/**/
+    668,
+/**/
+    667,
+/**/
+    666,
+/**/
+    665,
+/**/
+    664,
+/**/
+    663,
+/**/
+    662,
+/**/
+    661,
+/**/
+    660,
+/**/
+    659,
+/**/
+    658,
+/**/
+    657,
+/**/
+    656,
+/**/
+    655,
+/**/
+    654,
+/**/
+    653,
+/**/
+    652,
+/**/
+    651,
+/**/
+    650,
+/**/
+    649,
+/**/
+    648,
+/**/
+    647,
+/**/
+    646,
+/**/
+    645,
+/**/
+    644,
+/**/
+    643,
+/**/
+    642,
+/**/
+    641,
+/**/
+    640,
+/**/
+    639,
+/**/
+    638,
+/**/
+    637,
+/**/
+    636,
+/**/
+    635,
+/**/
+    634,
+/**/
+    633,
+/**/
+    632,
+/**/
+    631,
+/**/
+    630,
+/**/
+    629,
+/**/
+    628,
+/**/
+    627,
+/**/
+    626,
+/**/
+    625,
+/**/
+    624,
+/**/
+    623,
+/**/
+    622,
+/**/
+    621,
+/**/
+    620,
+/**/
+    619,
+/**/
+    618,
+/**/
+    617,
+/**/
+    616,
+/**/
+    615,
+/**/
+    614,
+/**/
+    613,
+/**/
+    612,
+/**/
+    611,
+/**/
+    610,
+/**/
+    609,
+/**/
+    608,
+/**/
+    607,
+/**/
+    606,
+/**/
+    605,
+/**/
+    604,
+/**/
+    603,
+/**/
+    602,
+/**/
+    601,
+/**/
+    600,
+/**/
+    599,
+/**/
+    598,
+/**/
+    597,
+/**/
+    596,
+/**/
+    595,
+/**/
+    594,
+/**/
+    593,
+/**/
+    592,
+/**/
+    591,
+/**/
+    590,
+/**/
+    589,
 /**/
     588,
 /**/
@@ -2269,7 +2521,11 @@ list_version(void)
     msg_puts(_("without GUI."));
 #elif defined(FEAT_GUI_GTK)
 # if defined(USE_GTK4)
+#  ifdef USE_GTK4_SNAPSHOT
+    msg_puts(_("with GTK4 GUI (hwaccel)."));
+#  else
     msg_puts(_("with GTK4 GUI."));
+#  endif
 # elif defined(USE_GTK3)
     msg_puts(_("with GTK3 GUI."));
 # elif defined(FEAT_GUI_GNOME)
diff --git a/src/vim.h b/src/vim.h
index 0208616dfa..a619b1e6df 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -344,7 +344,10 @@
 #endif
 #ifdef BACKSLASH_IN_FILENAME
 # define PATH_ESC_CHARS ((char_u *)" \t\n*?[{`%#'\"|!<")
-# define BUFFER_ESC_CHARS ((char_u *)" \t\n*?[`%#'\"|!<")
+// '%' and '#' are not escaped for ":buffer": it has no EX_XFILE, so they are
+// not expanded, and escaping them as "\%"/"\#" breaks buffer name matching
+// when '%'/'#' is in 'isfname' (backslash treated as a path separator).
+# define BUFFER_ESC_CHARS ((char_u *)" \t\n*?[`'\"|!<")
 #else
 # ifdef VMS
     // VMS allows a lot of characters in the file name
@@ -698,7 +701,8 @@ extern int (*dyn_libintl_wputenv)(const wchar_t *envstring);
 #define POPUP_HANDLED_2	    0x02    // used by popup_do_filter()
 #define POPUP_HANDLED_3	    0x04    // used by popup_check_cursor_pos()
 #define POPUP_HANDLED_4	    0x08    // used by may_update_popup_mask()
-#define POPUP_HANDLED_5	    0x10    // used by update_popups()
+#define POPUP_HANDLED_5	    0x10    // used by update_popups() and
+				    // update_popup_images()
 
 /*
  * Terminal highlighting attribute bits.
@@ -869,7 +873,8 @@ extern int (*dyn_libintl_wputenv)(const wchar_t *envstring);
 #define EXPAND_FILETYPECMD	63
 #define EXPAND_PATTERN_IN_BUF	64
 #define EXPAND_RETAB		65
-#define EXPAND_MACACTION	66
+#define EXPAND_USER_COMPLETEOPT	66
+#define EXPAND_MACACTION	67
 
 
 // Values for exmode_active (0 is no exmode)
@@ -2324,6 +2329,11 @@ typedef enum {
 # define VIM_ATOM_NAME "_VIM_TEXT"
 # define VIMENC_ATOM_NAME "_VIMENC_TEXT"
 
+// These are used for the GTK4 GUI, since GTK4 only supports conforming mime
+// types, see gui_gtk4_cb.c for more information.
+# define VIM_MIMETYPE_NAME "application/x-vim-text"
+# define VIMENC_MIMETYPE_NAME "application/x-vim-enc-text"
+
 // Selection states for modeless selection
 # define SELECT_CLEARED		0
 # define SELECT_IN_PROGRESS	1
@@ -3091,6 +3101,10 @@ long elapsed(DWORD start_tick);
 #define UC_BUFFER	1	// -buffer: local to current buffer
 #define UC_VIM9		2	// {} argument: Vim9 syntax.
 
+// flags for the -completeopt= attribute of :command
+#define UCC_ESCAPE	0x1	// escape spaces, tabs and backslashes in
+				// matches
+
 // flags used by vim_strsave_fnameescape()
 #define VSE_NONE	0
 #define VSE_SHELL	1	// escape for a shell command
diff --git a/src/vim.ico b/src/vim.ico
index 7eb2648937..c223b5b216 100644
Binary files a/src/vim.ico and b/src/vim.ico differ
diff --git a/src/vim9expr.c b/src/vim9expr.c
index 9d6033464c..a041a3e70a 100644
--- a/src/vim9expr.c
+++ b/src/vim9expr.c
@@ -2860,9 +2860,8 @@ compile_subscript(
 		    return FAIL;
 		}
 		p = *arg;
-		if (eval_isdictc(*p))
-		    while (eval_isnamec(*p))
-			MB_PTR_ADV(p);
+		while (eval_isdictc(*p))
+		    MB_PTR_ADV(p);
 		if (p == *arg)
 		{
 		    semsg(_(e_syntax_error_at_str), *arg);
diff --git a/src/window.c b/src/window.c
index bd56885008..89c890f0f4 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6211,6 +6211,16 @@ win_free_popup(win_T *win)
     // the timer may have been cleared, making the pointer invalid
     if (timer_valid(win->w_popup_timer))
 	stop_timer(win->w_popup_timer);
+# endif
+# ifdef FEAT_IMAGE
+    vim_free(win->w_popup_image_data);
+#  ifdef FEAT_IMAGE_SIXEL
+    vim_free(win->w_popup_image_seq);
+#  endif
+#  if defined(FEAT_IMAGE_GDI) || defined(FEAT_IMAGE_CAIRO) \
+    || defined(FEAT_IMAGE_GDK)
+    gui_mch_free_popup_image(win);
+#  endif
 # endif
     vim_free(win->w_frame);
     win_free(win, NULL);
diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
index 323d5a3982..9b1ca6ea55 100644
--- a/src/xxd/xxd.c
+++ b/src/xxd/xxd.c
@@ -76,6 +76,7 @@
  * 25.03.2026  Fix color output issues
  * 26.04.2026  Use unsigned long for printing offsets
  * 31.05.2026  Colorize binary output
+ * 15.06.2026  Fix UB in huntype()
  *
  * (c) 1990-1998 by Juergen Weigert (jnweiger@gmail.com)
  *
@@ -156,7 +157,7 @@ extern void perror __P((char *));
 # endif
 #endif
 
-char version[] = "xxd 2026-05-31 by Juergen Weigert et al.";
+char version[] = "xxd 2026-06-16 by Juergen Weigert et al.";
 #ifdef WIN32
 char osver[] = " (Win32)";
 #else
@@ -445,7 +446,8 @@ huntype(
 	  bt = parse_bin_digit(c);
 	  if (bt != -1)
 	    {
-	      b = ((b << 1) | bt);
+	      /* shift via unsigned to avoid signed overflow on bad input */
+	      b = (int)(((unsigned)b << 1) | (unsigned)bt);
 	      ++bcnt;
 	    }
 	}
@@ -461,7 +463,7 @@ huntype(
 		  p = 0;
 		  continue;
 		}
-	      want_off = (want_off << 4) | n1;
+	      want_off = (long)(((unsigned long)want_off << 4) | (unsigned)n1);
 	    }
 	  else /* HEX_BITS */
 	    {
@@ -471,7 +473,7 @@ huntype(
 		  bcnt = 0;
 		  continue;
 		}
-	      want_off = (want_off << 4) | n1;
+	      want_off = (long)(((unsigned long)want_off << 4) | (unsigned)n1);
 	    }
 	  continue;
 	}
@@ -607,9 +609,7 @@ xxdline(FILE *fp, char *l, char *colors, int nz)
     {
       strcpy(z, l);
       if (colors)
-	{
 	  memcpy(z_colors, colors, strlen(z));
-	}
     }
 
   if (nz || !zero_seen++)
diff --git a/uninstall.txt b/uninstall.txt
index 960c910960..9b38c1581e 100644
--- a/uninstall.txt
+++ b/uninstall.txt
@@ -3,11 +3,12 @@ Uninstalling Vim on MS-Windows.
 There are three ways to remove Vim:
 
 1. With the GUI uninstaller.
-   This is only available when Vim was installed with the self-installing
+   This is the only way when Vim was installed with the self-installing
    executable.  This has a minimal number of questions.  It can delete
    everything that was installed.
 
 2. With uninstall.exe.
+   If you used install.exe in the zip package, use this way.
    This removes most installed items, but does not delete the files you
    unpacked.