patch 9.1.2108: tests: Test_foldtextresult_rightleft() does not restore 'columns'

Problem:  Test_foldtextresult_rightleft() does not restore 'columns'
          (after v9.1.2102)
Solution: Save and restore the value of 'columns' (zeertzjq).

related: #19220
closes:  #19234

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

.gitattributes

@@ -1,4 +1,13 @@
-src/testdir/test42.in diff
+# The old test .ok files are expected to use LF line endings, even on Windows.
+# In src/testdir/Make_mvc.mak and src/testdir/Make_ming.mak, the test result
+# files .out are converted to LF line endings before being compared.
+# Therefore, if the .ok files' line endings are not specified and are
+# converted to CRLF, the comparison between .ok and .out will fail.
+src/testdir/test*.ok text eol=lf
+
+# This ok file contains literal CR LF endings. Should not be touched by git,
+# so handle as binary
+src/testdir/test21.ok -text
 
 # `vim.pot` is updated every time any of the *.c files are modified.  And as it
 # contains line numbers for strings from *.c files, inserting a line into a
@@ -24,8 +33,10 @@ src/po/vim.pot -diff
 src/po/vim.pot diff=ignore_vim_pot
 
 # GitHub reacts to the `linguist-generated` attribute, by ignoring marked files
-# for the repository's language statistics and hiddning changes in these files
+# for the repository's language statistics and hiding changes in these files
 # by default in diffs.
 #
 # https://docs.github.com/en/repositories/working-with-files/managing-files/customizing-how-changed-files-appear-on-github
 src/po/vim.pot linguist-generated=true
+
+runtime/syntax/testdir/input/vim_ex_help.vim -text diff linguist-language=vim linguist-detectable=true

.github/MAINTAINERS

@@ -3,20 +3,22 @@
 # You can use github users with @user or email addresses
 
 # These owners will be the default owners for everything in the repo.
-#*       @brammool
+#*	 @brammool
 
 # Order is important. The last matching pattern has the most precedence.
 # So if a pull request only touches javascript files, only these owners
 # will be requested to review.
 
 nsis/lang/russian.nsi					@RestorerZ
+runtime/autoload/context.vim				@lifepillar
 runtime/autoload/freebasic.vim				@dkearns
 runtime/autoload/hare.vim				@selenebun
 runtime/autoload/hcl.vim				@gpanders
-runtime/autoload/javascriptcomplete.vim				@jsit
+runtime/autoload/javascriptcomplete.vim			@jsit
 runtime/autoload/modula2.vim				@dkearns
 runtime/autoload/rubycomplete.vim			@segfault @dkearns
 runtime/autoload/rust.vim				@lilyball
+runtime/autoload/typeset.vim				@lifepillar
 runtime/autoload/xmlformat.vim				@chrisbra
 runtime/autoload/dist/json.vim				@habamax
 runtime/colors/blue.vim					@habamax @romainl @neutaaaaan
@@ -46,8 +48,10 @@ runtime/colors/wildcharm.vim				@habamax @romainl @neutaaaaan
 runtime/colors/zaibatsu.vim				@habamax @romainl @neutaaaaan
 runtime/colors/zellner.vim				@habamax @romainl @neutaaaaan
 runtime/compiler/biome.vim				@Konfekt
+runtime/compiler/cabal.vim				@mateoxh
 runtime/compiler/checkstyle.vim				@dkearns
 runtime/compiler/cm3.vim				@dkearns
+runtime/compiler/context.vim				@lifepillar
 runtime/compiler/cucumber.vim				@tpope
 runtime/compiler/dart.vim				@dkearns
 runtime/compiler/dart2js.vim				@dkearns
@@ -127,6 +131,8 @@ runtime/ftplugin/asy.vim				@avidseeker
 runtime/ftplugin/autohotkey.vim				@telemachus
 runtime/ftplugin/awk.vim				@dkearns
 runtime/ftplugin/basic.vim				@dkearns
+runtime/ftplugin/bicep.vim				@scottmckendry
+runtime/ftplugin/bicep-params.vim			@scottmckendry
 runtime/ftplugin/brighterscript.vim			@ribru17
 runtime/ftplugin/brightscript.vim			@ribru17
 runtime/ftplugin/bst.vim				@tpope
@@ -140,6 +146,7 @@ runtime/ftplugin/chicken.vim				@evhan
 runtime/ftplugin/clojure.vim				@axvr
 runtime/ftplugin/cmakecache.vim				@ribru17
 runtime/ftplugin/codeowners.vim				@jparise
+runtime/ftplugin/context.vim				@lifepillar
 runtime/ftplugin/cook.vim				@ribru17
 runtime/ftplugin/cs.vim					@nickspoons
 runtime/ftplugin/csh.vim				@dkearns
@@ -217,7 +224,8 @@ runtime/ftplugin/julia.vim				@carlobaldassi
 runtime/ftplugin/just.vim				@pbnj
 runtime/ftplugin/kconfig.vim				@chrisbra
 runtime/ftplugin/kdl.vim				@imsnif @jiangyinzuo
-runtime/ftplugin/kerml.vim			    @daumantas-kavolis-sensmetry
+runtime/ftplugin/kerml.vim				@daumantas-kavolis-sensmetry
+runtime/ftplugin/kitty.vim				@rivenirvana
 runtime/ftplugin/kivy.vim				@ribru17
 runtime/ftplugin/kotlin.vim				@udalov
 runtime/ftplugin/lc.vim					@ribru17
@@ -228,6 +236,8 @@ runtime/ftplugin/less.vim				@genoma
 runtime/ftplugin/lex.vim				@ribru17
 runtime/ftplugin/lf.vim					@andis-sprinkis
 runtime/ftplugin/liquid.vim				@tpope
+runtime/ftplugin/logtalk.dict				@pmoura
+runtime/ftplugin/logtalk.vim				@pmoura
 runtime/ftplugin/lua.vim				@dkearns
 runtime/ftplugin/lynx.vim				@dkearns
 runtime/ftplugin/m17ndb.vim				@dseomn
@@ -237,9 +247,11 @@ runtime/ftplugin/markdown.vim				@tpope
 runtime/ftplugin/mbsync.vim				@fymyte
 runtime/ftplugin/mediawiki.vim				@avidseeker
 runtime/ftplugin/meson.vim				@Liambeguin
+runtime/ftplugin/mf.vim					@lifepillar
 runtime/ftplugin/modula2.vim				@dkearns
 runtime/ftplugin/modula3.vim				@dkearns
 runtime/ftplugin/mojo.vim				@ribru17
+runtime/ftplugin/mp.vim					@lifepillar
 runtime/ftplugin/mss.vim				@Freed-Wu
 runtime/ftplugin/nginx.vim				@chr4
 runtime/ftplugin/nim.vim				@ribru17
@@ -249,7 +261,7 @@ runtime/ftplugin/nu.vim					@elkasztano
 runtime/ftplugin/octave.vim				@dkearns
 runtime/ftplugin/ondir.vim				@jparise
 runtime/ftplugin/opencl.vim				@Freed-Wu
-runtime/ftplugin/openscad.vim                           @squibid
+runtime/ftplugin/openscad.vim				@squibid
 runtime/ftplugin/openvpn.vim				@ObserverOfTime
 runtime/ftplugin/pascal.vim				@dkearns
 runtime/ftplugin/pbtxt.vim				@lakshayg
@@ -303,7 +315,7 @@ runtime/ftplugin/sshdconfig.vim				@jiangyinzuo
 runtime/ftplugin/svelte.vim				@igorlfs
 runtime/ftplugin/sway.vim				@ribru17
 runtime/ftplugin/swayconfig.vim				@jamespeapen
-runtime/ftplugin/sysml.vim			    @daumantas-kavolis-sensmetry
+runtime/ftplugin/sysml.vim				@daumantas-kavolis-sensmetry
 runtime/ftplugin/systemverilog.vim			@Kocha
 runtime/ftplugin/swig.vim				@jmarrec
 runtime/ftplugin/tap.vim				@petdance
@@ -336,11 +348,13 @@ runtime/import/dist/vimhighlight.vim			@lacygoill
 runtime/indent/arduino.vim				@k-takata
 runtime/indent/astro.vim				@wuelnerdotexe
 runtime/indent/basic.vim				@dkearns
+runtime/indent/bpftrace.vim				@sgruszka
 runtime/indent/bst.vim					@tpope
 runtime/indent/cdl.vim					@dkearns
 runtime/indent/chatito.vim				@ObserverOfTime
 runtime/indent/clojure.vim				@axvr
 runtime/indent/config.vim				@dkearns
+runtime/indent/context.vim				@lifepillar
 runtime/indent/cs.vim					@nickspoons
 runtime/indent/css.vim					@dkearns
 runtime/indent/cucumber.vim				@tpope
@@ -382,12 +396,15 @@ runtime/indent/ld.vim					@dkearns
 runtime/indent/lf.vim					@andis-sprinkis
 runtime/indent/less.vim					@genoma
 runtime/indent/liquid.vim				@tpope
+runtime/indent/logtalk.vim				@pmoura
 runtime/indent/lua.vim					@marcuscf
 runtime/indent/m17ndb.vim				@dseomn
 runtime/indent/make.vim					@dkearns
 runtime/indent/meson.vim				@Liambeguin
+runtime/indent/mf.vim					@lifepillar
 runtime/indent/mma.vim					@dkearns
 runtime/indent/mojo.vim					@ribru17
+runtime/indent/mp.vim					@lifepillar
 runtime/indent/nginx.vim				@chr4
 runtime/indent/nsis.vim					@k-takata
 runtime/indent/nu.vim					@elkasztano
@@ -454,6 +471,7 @@ runtime/syntax/asy.vim					@avidseeker
 runtime/syntax/autohotkey.vim				@mmikeww
 runtime/syntax/awk.vim					@dkearns
 runtime/syntax/basic.vim				@dkearns
+runtime/syntax/bpftrace.vim				@sgruszka
 runtime/syntax/bst.vim					@tpope
 runtime/syntax/bzl.vim					@dbarnett
 runtime/syntax/bzr.vim					@hdima
@@ -467,7 +485,9 @@ runtime/syntax/chicken.vim				@evhan
 runtime/syntax/chuck.vim				@andreacfromtheapp
 runtime/syntax/clojure.vim				@axvr
 runtime/syntax/codeowners.vim				@jparise
+runtime/syntax/context.vim				@lifepillar
 runtime/syntax/cs.vim					@nickspoons
+runtime/syntax/csh.vim					@dkearns
 runtime/syntax/css.vim					@jsit
 runtime/syntax/csv.vim					@habamax
 runtime/syntax/cucumber.vim				@tpope
@@ -558,6 +578,7 @@ runtime/syntax/less.vim					@genoma
 runtime/syntax/lf.vim					@andis-sprinkis
 runtime/syntax/liquid.vim				@tpope
 runtime/syntax/log.vim					@mao-yining
+runtime/syntax/logtalk.vim				@pmoura
 runtime/syntax/lua.vim					@marcuscf
 runtime/syntax/lynx.vim					@dkearns
 runtime/syntax/lyrics.vim				@ObserverOfTime
@@ -572,11 +593,13 @@ runtime/syntax/mbsync.vim				@fymyte
 runtime/syntax/mason.vim				@petdance
 runtime/syntax/mediawiki.vim				@avidseeker
 runtime/syntax/meson.vim				@Liambeguin
+runtime/syntax/mf.vim					@lifepillar
 runtime/syntax/modula2.vim				@dkearns
 runtime/syntax/modula2/opt/iso.vim			@trijezdci
 runtime/syntax/modula2/opt/pim.vim			@trijezdci
 runtime/syntax/modula2/opt/r10.vim			@trijezdci
 runtime/syntax/modula3.vim				@dkearns
+runtime/syntax/mp.vim					@lifepillar
 runtime/syntax/mss.vim					@Freed-Wu
 runtime/syntax/n1ql.vim					@pr3d4t0r
 runtime/syntax/nginx.vim				@chr4
@@ -679,6 +702,7 @@ runtime/syntax/xs.vim					@petdance
 runtime/syntax/xslt.vim					@Boobies
 runtime/syntax/zserio.vim				@dpelle
 runtime/syntax/zsh.vim					@chrisbra
+runtime/tools/preproc_indent.vim			@h-east
 runtime/tutor/tutor1.eo					@dpelle
 runtime/tutor/tutor1.fr					@dpelle
 runtime/tutor/tutor1.ru					@RestorerZ

.github/workflows/ci.yml

@@ -84,7 +84,7 @@ jobs:
             architecture: arm64
           - features: normal
             compiler: gcc
-            extra: [vimtags, proto]
+            extra: [vimtags, proto, preproc_indent]
           - features: huge
             compiler: gcc
             extra: [no_x11_wl]
@@ -363,6 +363,16 @@ jobs:
             true
           )
 
+      - name: Check preprocessor indent
+        if: contains(matrix.extra, 'preproc_indent')
+        run: |
+          # This will exit with an error code if the files differ from source
+          (
+            "${SRCDIR}"/vim -u NONE --not-a-term -esNX +"cd runtime/tools" -S preproc_indent.vim
+            git diff --exit-code -- src/*.[ch] src/xxd/xxd.c
+            true
+          )
+
       - name: Generate gcov files
         if: matrix.coverage
         run: |
@@ -522,6 +532,7 @@ jobs:
           - { features: HUGE,   toolchain: mingw, VIMDLL: yes, GUI: yes, arch: x86, python3: stable, coverage: yes }
           - { features: HUGE,   toolchain: msvc,  VIMDLL: no,  GUI: yes, arch: x86 }
           - { features: HUGE,   toolchain: mingw, VIMDLL: yes, GUI: no,  arch: x64, coverage: yes }
+          - { features: HUGE,   toolchain: msvc,  VIMDLL: no,  GUI: no,  arch: x64, ttytype: conpty }
           - { features: NORMAL, toolchain: msvc,  VIMDLL: yes, GUI: no,  arch: x86 }
           - { features: NORMAL, toolchain: mingw, VIMDLL: no,  GUI: yes, arch: x64 }
           - { features: TINY,   toolchain: msvc,  VIMDLL: yes, GUI: yes, arch: x64 }
@@ -535,8 +546,6 @@ jobs:
           # Show Windows version
           cmd /c ver
 
-          git config --global core.autocrlf input
-
           if ${{ matrix.arch == 'x64' }}; then
             cygreg=registry
             pyreg=
@@ -616,11 +625,13 @@ jobs:
           call :downloadfile %LUA${{ env.BITS }}_URL% downloads\lua.zip
           7z x downloads\lua.zip -o%LUA_DIR% > nul || exit 1
 
-          echo %COL_GREEN%Download winpty%COL_RESET%
-          call :downloadfile %WINPTY_URL% downloads\winpty.zip
-          7z x -y downloads\winpty.zip -oD:\winpty > nul || exit 1
-          copy /Y D:\winpty\%WARCH%\bin\winpty.dll        src\winpty%BITS%.dll
-          copy /Y D:\winpty\%WARCH%\bin\winpty-agent.exe  src\
+          if not "${{ matrix.ttytype }}" == "conpty" (
+            echo %COL_GREEN%Download winpty%COL_RESET%
+            call :downloadfile %WINPTY_URL% downloads\winpty.zip
+            7z x -y downloads\winpty.zip -oD:\winpty > nul || exit 1
+            copy /Y D:\winpty\%WARCH%\bin\winpty.dll        src\winpty%BITS%.dll
+            copy /Y D:\winpty\%WARCH%\bin\winpty-agent.exe  src\
+          )
 
           echo %COL_GREEN%Download libsodium%COL_RESET%
           if "${{ matrix.toolchain }}"=="msvc" (
@@ -719,7 +730,7 @@ jobs:
       - name: Check version
         shell: cmd
         run: |
-          PATH %LUA_DIR%;C:\msys64\%MSYSTEM%\bin;%PATH%;%PYTHON3_DIR%
+          PATH %LUA_DIR%;C:\msys64\%MSYSTEM%\bin;%PYTHON3_DIR%;%PATH%
           if "${{ matrix.GUI }}"=="yes" (
             start /wait src\gvim -u NONE -i NONE -c "redir > version.txt | ver | q" || exit 1
             type version.txt
@@ -769,7 +780,7 @@ jobs:
         shell: cmd
         timeout-minutes: 15
         run: |
-          PATH %LUA_DIR%;C:\msys64\%MSYSTEM%\bin;%PATH%;%PYTHON3_DIR%;%SODIUM_LIB%
+          PATH %LUA_DIR%;C:\msys64\%MSYSTEM%\bin;%PYTHON3_DIR%;%PATH%;%SODIUM_LIB%
           call "%VCVARSALL%" %VCARCH%
 
           echo %COL_GREEN%Test gVim:%COL_RESET%
@@ -786,7 +797,7 @@ jobs:
         shell: cmd
         timeout-minutes: 15
         run: |
-          PATH %LUA_DIR%;C:\msys64\%MSYSTEM%\bin;%PATH%;%PYTHON3_DIR%;%SODIUM_LIB%
+          PATH %LUA_DIR%;C:\msys64\%MSYSTEM%\bin;%PYTHON3_DIR%;%PATH%;%SODIUM_LIB%
           call "%VCVARSALL%" %VCARCH%
 
           echo %COL_GREEN%Test Vim:%COL_RESET%

CONTRIBUTING.md

@@ -12,10 +12,10 @@ A pull request has the advantage that it will trigger the Continuous
 Integration tests, you will be warned of problems (you can ignore the coverage
 warning, it's noisy).
 
-Please consider adding a test. All new functionality should be tested and bug
-fixes should be tested for regressions: the test should fail before the fix and
-pass after the fix. Look through recent patches for examples and find help
-with ":help testing". The tests are located under "src/testdir".
+Please always add a test, if possible. All new functionality should be tested
+and bug fixes should be tested for regressions: the test should fail before the
+fix and pass after the fix. Look through recent patches for examples and find
+help with ":help testing". The tests are located under "src/testdir".
 
 Contributions will be distributed with Vim under the Vim license. Providing a
 change to be included implies that you agree with this and your contribution
@@ -46,6 +46,15 @@ When merging PRs into Vim, the current maintainer @chrisbra usually adds missing
 anybody that explicitly *ACK*s a pull request as a statement that those
 approvers are happy with that particular change.
 
+## Using AI
+
+When using AI for contributions, please disclose this. Any AI-generated code
+must follow the Vim code style. In particular, [test_codestyle.vim][18]
+must not report any failures. Check the CI output for any test failures.
+
+Ensure that changes are properly tested. Do not submit a single PR that
+addresses multiple unrelated issues.
+
 # Reporting issues
 
 We use GitHub [issues][17], but that is not a requirement. Writing to the Vim
@@ -160,3 +169,4 @@ mailing list. For other questions please use the [Vi Stack Exchange][8] website,
 [15]: https://en.wikipedia.org/wiki/Developer_Certificate_of_Origin
 [16]: https://github.com/vim/vim/blob/master/runtime/doc/helphelp.txt
 [17]: https://github.com/vim/vim/issues
+[18]: https://github.com/vim/vim/blob/master/src/testdir/test_codestyle.vim

Filelist

@@ -248,6 +248,7 @@ SRC_ALL =	\
 		src/testdir/util/view_util.vim \
 		src/testdir/util/vim9.vim \
 		src/testdir/util/window_manager.vim \
+		src/testdir/util/socketserver.vim \
 		src/testdir/viewdumps.vim \
 		src/proto.h \
 		src/protodef.h \
@@ -1122,6 +1123,8 @@ LANG_GEN = \
 		runtime/tutor/sr/vim-01-beginner.tutor.json \
 		runtime/tutor/sr/vim-02-beginner.tutor \
 		runtime/tutor/sr/vim-02-beginner.tutor.json \
+		runtime/tutor/zh/vim-01-beginner.tutor \
+		runtime/tutor/zh/vim-01-beginner.tutor.json \
 		runtime/tutor/tutor1.?? \
 		runtime/tutor/tutor1.??_?? \
 		runtime/tutor/tutor1.bar \

README.md

@@ -1,16 +1,3 @@
-<div align="center" markdown="1">
-   <sup>Special thanks for supporting Vim by donating to the <a href="https://iccf-holland.org/">ICCF</a>:</sup>
-   <br>
-   <br>
-   <a href="https://go.warp.dev/vim">
-      <img alt="Warp sponsorship" width="400" src="https://raw.githubusercontent.com/warpdotdev/brand-assets/refs/heads/main/Github/Sponsor/Warp-Github-LG-03.png">
-   </a>
-
-### [Warp, built for coding with multiple AI agents.](https://www.warp.dev/vim)
-[Available for MacOS, Linux, & Windows](https://www.warp.dev/vim)<br>
-</div>
-<hr>
-
 # [![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)

ci/config.mk.sed

@@ -1,3 +1,3 @@
 /^CFLAGS[[:blank:]]*=/s/$/ -Wall -Wextra -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Werror -Wno-deprecated-declarations/
-/^PERL_CFLAGS_EXTRA[[:blank:]]*=/s/$/ -Wno-error=unused-function -Wno-shadow/
+/^PERL_CFLAGS_EXTRA[[:blank:]]*=/s/$/ -Wno-error=unused-function -Wno-strict-prototypes -Wno-shadow/
 /^RUBY_CFLAGS_EXTRA[[:blank:]]*=/s/$/ -Wno-error=unused-parameter -Wno-strict-prototypes/

lang/LICENSE.ru.txt

@@ -1,3 +1,8 @@
+Примечание. Данный текст перевода лицензии Vim предоставляется с целью
+ознакомления и не является юридически значимым. Переводчик не несёт
+ответственности за возможные неточности и ошибки при переводе лицензии.
+Единственно юридически значимым является текст лицензии Vim на английском языке.
+
 ЛИЦЕНЗИЯ VIM
 
 I)  Неизменённые копии программы Vim могут распространяться без ограничения
@@ -29,15 +34,15 @@ II) Изменённую (или дополненную) версию прогр
 	  будут распространяться на условиях настоящей лицензии или более
 	  поздней её версии. Лица, в данное время являющиеся ответственными
 	  за разработку, указаны в перечне, размещённом по адресу:
-	  https://github.com/orgs/vim/people. В случае изменения этой
-	  информации, актуальные данные будут опубликованы на
-	  соответствующих ресурсах (вероятнее всего по интернет‐адресам
-	  vim.sf.net, www.vim.org и/или comp.editors). В случае полной
-	  невозможности установить контакт с ответственным разработчиком,
-	  обязательства по отправке изменений утрачивают силу. После
-	  передачи подтверждения о получении изменений от ответственного
-	  разработчика, необходимость в повторной отправке копии изменённой
-	  программы Vim неприменима.
+	  https://github.com/orgs/vim/people.
+	  При изменении этой информации, актуальные данные будут
+	  опубликованы на соответствующих ресурсах (вероятнее всего
+	  по интернет‐адресам vim.sf.net, www.vim.org и/или comp.editors).
+	  В случае полной невозможности связаться с ответственным
+	  разработчиком, обязательства по отправке изменений утрачивают
+	  силу. После передачи подтверждения о получении изменений
+	  от ответственного разработчика, необходимость в повторной
+	  отправке копии изменённой программы Vim неприменима.
        b) Если лицом получена изменённая версия программа Vim,
 	  распространяющаяся на условиях, указанных в ч. II) п. 2) пп. а)
 	  допускается дальнейшее её распространение этим лицом без внесения

nsis/lang/japanese.nsi

@@ -32,14 +32,14 @@ LangString ^InstallBtn       ${LANG_JAPANESE} \
 ##############################################################################
 
 LicenseLangString page_lic_file 0 "..\lang\LICENSE.nsis.txt"
-#LicenseLangString page_lic_file ${LANG_JAPANESE} "..\lang\LICENSE.ja.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.ja.txt"
+#LangString vim_readme_file ${LANG_JAPANESE} "README.jax.txt"
 
 ##############################################################################
 # MUI Configuration Strings                                               {{{1

runtime/autoload/context.vim

@@ -3,7 +3,7 @@ vim9script
 # Language:           ConTeXt typesetting engine
 # Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
 # Former Maintainers: Nikolai Weibull <now@bitwi.se>
-# Latest Revision:    2023 Dec 26
+# Latest Revision:    2026 Jan 10
 
 # Typesetting {{{
 import autoload './typeset.vim'
@@ -30,14 +30,21 @@ export def StopJobs()
 enddef
 
 export def Log(bufname: string)
-  execute 'edit' typeset.LogPath(bufname)
+  var logpath = typeset.LogPath(bufname)
+
+  if filereadable(logpath)
+    execute 'edit' typeset.LogPath(bufname)
+    return
+  endif
+
+  echomsg $'[ConTeXt] No log file found ({logpath})'
 enddef
 # }}}
 
 # Completion {{{
 def BinarySearch(base: string, keywords: list<string>): list<string>
-  const pat = '^' .. base
-  const len = len(keywords)
+  var pat = '^' .. base
+  var len = len(keywords)
   var res = []
   var lft = 0
   var rgt = len

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:		2025 Dec 14
+# Last Change:		2026 Jan 20
 # Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 # These functions are moved here from runtime/filetype.vim to make startup
@@ -98,7 +98,7 @@ export def FTasmsyntax()
       b:asmsyntax = "masm"
       return
     elseif line =~ 'Texas Instruments Incorporated' || (line =~ '^\*' && !is_slash_star_encountered)
-      # tiasm uses `* commment`, but detection is unreliable if '/*' is seen
+      # tiasm uses `* comment`, but detection is unreliable if '/*' is seen
       b:asmsyntax = "tiasm"
       return
     elseif ((line =~? '\.title\>\|\.ident\>\|\.macro\>\|\.subtitle\>\|\.library\>'))
@@ -1506,7 +1506,7 @@ export def FTdsp()
 
   # Test the file contents
   for line in getline(1, 200)
-    # Chech for comment style
+    # Check for comment style
     if line =~ '^#.*'
       setf make
       return
@@ -1746,7 +1746,7 @@ const ft_from_ext = {
   "bst": "bst",
   # Bicep
   "bicep": "bicep",
-  "bicepparam": "bicep",
+  "bicepparam": "bicep-params",
   # BIND zone
   "zone": "bindzone",
   # Blank
@@ -1876,6 +1876,9 @@ const ft_from_ext = {
   "elv": "elvish",
   # Faust
   "lib": "faust",
+  # Fennel
+  "fnl": "fennel",
+  "fnlm": "fennel",
   # Libreoffice config files
   "xcu": "xml",
   "xlb": "xml",
@@ -1914,6 +1917,9 @@ const ft_from_ext = {
   # Diff files
   "diff": "diff",
   "rej": "diff",
+  # Djot
+  "dj": "djot",
+  "djot": "djot",
   # DOT
   "dot": "dot",
   "gv": "dot",
@@ -1976,6 +1982,8 @@ const ft_from_ext = {
   "fish": "fish",
   # Flix
   "flix": "flix",
+  # Fluent
+  "ftl": "fluent",
   # Focus Executable
   "fex": "focexec",
   "focexec": "focexec",
@@ -2118,6 +2126,8 @@ const ft_from_ext = {
   "tmpl": "template",
   # Hurl
   "hurl": "hurl",
+  # Hylo
+  "hylo": "hylo",
   # Hyper Builder
   "hb": "hb",
   # Httest
@@ -2227,6 +2237,10 @@ const ft_from_ext = {
   "k": "kwt",
   # Kivy
   "kv": "kivy",
+  # Koka
+  "kk": "koka",
+  # Kos
+  "kos": "kos",
   # Kotlin
   "kt": "kotlin",
   "ktm": "kotlin",
@@ -2359,6 +2373,8 @@ const ft_from_ext = {
   # N1QL
   "n1ql": "n1ql",
   "nql": "n1ql",
+  # Nickel
+  "ncl": "nickel",
   # Nim file
   "nim": "nim",
   "nims": "nim",
@@ -2811,6 +2827,8 @@ const ft_from_ext = {
   "txi": "texinfo",
   # Thrift (Apache)
   "thrift": "thrift",
+  # Tiger
+  "tig": "tiger",
   # TLA+
   "tla": "tla",
   # TPP - Text Presentation Program
@@ -3000,6 +3018,7 @@ const ft_from_ext = {
   "usd": "usd",
   # Rofi stylesheet
   "rasi": "rasi",
+  "rasinc": "rasi",
   # Zsh module
   # mdd: https://github.com/zsh-users/zsh/blob/57248b88830ce56adc243a40c7773fb3825cab34/Etc/zsh-development-guide#L285-L288
   # mdh, pro: https://github.com/zsh-users/zsh/blob/57248b88830ce56adc243a40c7773fb3825cab34/Etc/zsh-development-guide#L268-L271
@@ -3014,6 +3033,9 @@ const ft_from_ext = {
   "blp": "blueprint",
   # Blueprint build system file
   "bp": "bp",
+  # Tiltfile
+  "Tiltfile": "tiltfile",
+  "tiltfile": "tiltfile"
 }
 # Key: file name (the final path component, excluding the drive and root)
 # Value: filetype
@@ -3300,6 +3322,9 @@ const ft_from_name = {
   # TF (TinyFugue) mud client
   ".tfrc": "tf",
   "tfrc": "tf",
+  # Tilefile
+  "Tiltfile": "tiltfile",
+  "tiltfile": "tiltfile",
   # Trustees
   "trustees.conf": "trustees",
   # Vagrant (uses Ruby syntax)

runtime/autoload/dist/script.vim

@@ -4,7 +4,7 @@ vim9script
 # Invoked from "scripts.vim" in 'runtimepath'
 #
 # Maintainer:	The Vim Project <https://github.com/vim/vim>
-# Last Change:	2025 Aug 09
+# Last Change:	2025 Dec 22
 # Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 export def DetectFiletype()
@@ -233,6 +233,10 @@ export def Exe2filetype(name: string, line1: string): string
   elseif name =~ '^execlineb\>'
     return 'execline'
 
+    # Bpftrace
+  elseif name =~ '^bpftrace\>'
+    return 'bpftrace'
+
     # Vim
   elseif name =~ '^vim\>'
     return 'vim'

runtime/autoload/dist/vim.vim

@@ -1,9 +1,9 @@
 " Vim runtime support library,
 " runs the Vim9 script version or legacy script version
-" on demand (mostly for Neovim compatability)
+" on demand (mostly for Neovim compatibility)
 "
 " Maintainer:	The Vim Project <https://github.com/vim/vim>
-" Last Change:	2025 Apr 27
+" Last Change:	2026 Jan 11
 
 
 " enable the zip and gzip plugin by default, if not set

runtime/autoload/gnat.vim

@@ -3,7 +3,7 @@
 "     Language: Ada (GNAT)
 "          $Id: gnat.vim 887 2008-07-08 14:29:01Z krischik $
 "    Copyright: Copyright (C) 2006 Martin Krischik
-"   Maintainer:	Martin Krischi <krischik@users.sourceforge.net>k
+"   Maintainer:	Martin Krischi <krischik@users.sourceforge.net>
 "		Ned Okie <nokie@radford.edu>
 "      $Author: krischik $
 "        $Date: 2008-07-08 16:29:01 +0200 (Di, 08 Jul 2008) $

runtime/autoload/typeset.vim

@@ -2,7 +2,7 @@ vim9script
 
 # Language:           Generic TeX typesetting engine
 # Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
-# Latest Revision:    2022 Aug 12
+# Latest Revision:    2026 Jan 10
 
 # Constants and helpers {{{
 const SLASH = !exists("+shellslash") || &shellslash ? '/' : '\'
@@ -11,7 +11,7 @@ def Echo(msg: string, mode: string, label: string)
   redraw
   echo "\r"
   execute 'echohl' mode
-  echomsg printf('[%s] %s', label, msg)
+  echomsg $'[{label}] {msg}'
   echohl None
 enddef
 
@@ -29,7 +29,7 @@ enddef
 # }}}
 
 # Track jobs {{{
-var running_jobs = {} # Dictionary of job IDs of jobs currently executing
+var running_jobs: dict<list<job>> = {}
 
 def AddJob(label: string, j: job)
   if !has_key(running_jobs, label)
@@ -55,7 +55,7 @@ def ProcessOutput(qfid: number, wd: string, efm: string, ch: channel, msg: strin
   # Make sure the quickfix list still exists
   if getqflist({'id': qfid}).id != qfid
     EchoErr("Quickfix list not found, stopping the job")
-    call job_stop(ch_getjob(ch))
+    job_stop(ch_getjob(ch))
     return
   endif
 
@@ -106,31 +106,81 @@ enddef
 #
 # This function searches for the magic line in the first ten lines of the
 # given buffer, and returns the full path of the root document.
-#
-# NOTE: the value of "% !TEX root" *must* be a relative path.
 export def FindRootDocument(bufname: string = bufname("%")): string
-  const bufnr = bufnr(bufname)
+  var docpath = fnamemodify(bufname, ":p")
+  var bufnr = bufnr(bufname)
+  var header: list<string>
+  var rootpath = docpath
 
-  if !bufexists(bufnr)
-    return bufname
+  if bufexists(bufnr)
+    header = getbufline(bufnr, 1, 10)
+  elseif filereadable(bufname)
+    header = readfile(bufname, "", 10)
+  else
+    return simplify(rootpath)
   endif
 
-  var rootpath = fnamemodify(bufname(bufnr), ':p')
-
   # Search for magic line `% !TEX root = ...` in the first ten lines
-  const header = getbufline(bufnr, 1, 10)
-  const idx = match(header, '^\s*%\s\+!TEX\s\+root\s*=\s*\S')
+  var idx = match(header, '^\s*%\s\+!TEX\s\+root\s*=\s*\S')
+
   if idx > -1
-    const main = matchstr(header[idx], '!TEX\s\+root\s*=\s*\zs.*$')
-    rootpath = simplify(fnamemodify(rootpath, ":h") .. SLASH .. main)
+    rootpath = matchstr(header[idx], '!TEX\s\+root\s*=\s*\zs.*$')
+
+    if !isabsolutepath(rootpath) # Path is relative to the buffer's path
+      rootpath = fnamemodify(docpath, ":h") .. SLASH .. rootpath
+    endif
   endif
 
-  return rootpath
+  return simplify(rootpath)
+enddef
+
+# ConTeXt documents may specify an output directory in a comment using the
+# following syntax:
+#
+# runpath=texruns:<output directory>
+#
+# This function looks for such a comment in the first ten lines of the given
+# buffer, and returns the full path of the output directory. If the comment is
+# not found then the output directory coincides with the directory of the
+# buffer.
+export def GetOutputDirectory(bufname: string = bufname("%")): string
+  var basedir = fnamemodify(bufname, ':p:h')
+  var bufnr = bufnr(bufname)
+  var header: list<string>
+  var outdir = basedir
+
+  if bufexists(bufnr)
+    header = getbufline(bufnr, 1, 10)
+  elseif filereadable(bufname)
+    header = readfile(bufname, "", 10)
+  else
+    return simplify(outdir)
+  endif
+
+  # Search for output path in the first ten lines
+  var idx = match(header, '^\s*%.*\<runpath\s*=\s*texruns\s*:\s*\S')
+
+  if idx > -1
+    outdir = matchstr(header[idx], '\<runpath\s*=\s*texruns\s*:\s*\zs.*$')
+
+    if !isabsolutepath(outdir) # Path is relative to the buffer's directory
+      outdir = basedir .. SLASH .. outdir
+    endif
+  endif
+
+  return simplify(outdir)
 enddef
 
 export def LogPath(bufname: string): string
-  const logfile = FindRootDocument(bufname)
-  return fnamemodify(logfile, ":r") .. ".log"
+  var rootdoc = FindRootDocument(bufname)
+  var docname = fnamemodify(rootdoc, ":t:r")
+  var outdir = GetOutputDirectory(rootdoc)
+
+  if empty(docname) # Set an arbitrary name to avoid returning a dotfile (.log)
+    docname = '[NotFound]'
+  endif
+
+  return $'{outdir}{SLASH}{docname}.log'
 enddef
 
 # Typeset the specified path
@@ -146,14 +196,14 @@ enddef
 #   true if the job is started successfully;
 #   false otherwise.
 export def Typeset(
-  label: string,
-  Cmd:   func(string): list<string>,
-  path:  string,
-  efm:   string,
-  env:   dict<string> = {}
-): bool
-  var fp   = fnamemodify(path, ":p")
-  var wd   = fnamemodify(fp, ":h")
+    label: string,
+    Cmd:   func(string): list<string>,
+    path:  string,
+    efm:   string,
+    env:   dict<string> = {}
+    ): bool
+  var fp   = fnamemodify(path, ':p')
+  var wd   = fnamemodify(fp, ':h')
   var qfid = NewQuickfixList(fp)
 
   if qfid == -1
@@ -162,7 +212,7 @@ export def Typeset(
   endif
 
   if !filereadable(fp)
-    EchoErr(printf('File not readable: %s', fp), label)
+    EchoErr($'File not readable: {fp}', label)
     return false
   endif
 
@@ -173,7 +223,7 @@ export def Typeset(
     callback: (c, m) => ProcessOutput(qfid, wd, efm, c, m),
     close_cb: CloseCb,
     exit_cb: (j, e) => ExitCb(label, j, e),
-    })
+  })
 
   if job_status(jobid) ==# "fail"
     EchoErr("Failed to start job", label)
@@ -188,7 +238,7 @@ export def Typeset(
 enddef
 
 export def JobStatus(label: string)
-  EchoMsg('Jobs still running: ' .. string(len(GetRunningJobs(label))), label)
+  EchoMsg($'Jobs still running: {len(GetRunningJobs(label))}', label)
 enddef
 
 export def StopJobs(label: string)
@@ -211,20 +261,20 @@ enddef
 #   true if the job is started successfully;
 #   false otherwise.
 export def TypesetBuffer(
-  name: string,
-  Cmd: func(string): list<string>,
-  env = {},
-  label = 'Typeset'
-): bool
-  const bufname = bufname(name)
+    name: string,
+    Cmd: func(string): list<string>,
+    env = {},
+    label = 'Typeset'
+    ): bool
+  var bufname = bufname(name)
 
   if empty(bufname)
     EchoErr('Please save the buffer first.', label)
     return false
   endif
 
-  const efm = getbufvar(bufnr(bufname), "&efm")
-  const rootpath = FindRootDocument(bufname)
+  var efm = getbufvar(bufnr(bufname), "&efm")
+  var rootpath = FindRootDocument(bufname)
 
   return Typeset('ConTeXt', Cmd, rootpath, efm, env)
 enddef

runtime/autoload/xmlformat.vim

@@ -1,5 +1,5 @@
 " Vim plugin for formatting XML
-" Last Change: 2020 Jan 06
+" Last Change: 2023 March 15th
 "     Version: 0.3
 "      Author: Christian Brabandt <cb@256bit.org>
 "  Repository: https://github.com/chrisbra/vim-xml-ftplugin
@@ -37,13 +37,17 @@ func! xmlformat#Format() abort
     " Keep empty input lines?
     if empty(line)
       call add(result, '')
+      let current += 1
       continue
     elseif line !~# '<[/]\?[^>]*>'
-      let nextmatch = match(list, '<[/]\?[^>]*>', current)
-      if nextmatch > -1 
-        let line .= ' '. join(list[(current + 1):(nextmatch-1)], " ")
-        call remove(list, current+1, nextmatch-1)
+      let nextmatch = match(list, '^\s*$\|<[/]\?[^>]*>', current)
+      if nextmatch > -1
+        let lineEnd = nextmatch
+      else
+        let lineEnd = len(list)
       endif
+      let line .= ' '. join(list[(current + 1):(lineEnd-1)], " ")
+      call remove(list, current+1, lineEnd-1)
     endif
     " split on `>`, but don't split on very first opening <
     " this means, items can be like ['<tag>', 'tag content</tag>']
@@ -79,9 +83,13 @@ func! xmlformat#Format() abort
           if s:EndTag(t[1])
             call s:DecreaseIndent()
           endif
-          "for y in t[1:]
-            let result+=s:FormatContent(t[1:])
-          "endfor
+          let result+=s:FormatContent(t[1:])
+          if s:IsTag(t[1])
+            let lastitem = t[1]
+            continue
+          endif
+        elseif s:IsComment(item)
+          let result+=s:FormatContent([item])
         else
           call add(result, s:Indent(item))
         endif
@@ -94,7 +102,7 @@ func! xmlformat#Format() abort
   if !empty(result)
     let lastprevline = getline(v:lnum + count_orig)
     let delete_lastline = v:lnum + count_orig - 1 == line('$')
-    exe v:lnum. ",". (v:lnum + count_orig - 1). 'd'
+    exe 'silent ' .. v:lnum. ",". (v:lnum + count_orig - 1). 'd'
     call append(v:lnum - 1, result)
     " Might need to remove the last line, if it became empty because of the
     " append() call

runtime/compiler/cabal.vim

@@ -0,0 +1,39 @@
+" Vim compiler file
+" Compiler: Haskell Cabal Build file
+" Maintainer: Mateo Gjika <@mateoxh>
+
+if exists('current_compiler')
+  finish
+endif
+
+let current_compiler = 'cabal'
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+CompilerSet makeprg=cabal\ build
+
+CompilerSet errorformat=
+      \%W%f:(%l\\,%c)-(%e\\,%k):\ %tarning:\ [%.%#],
+      \%W%f:(%l\\,%c)-(%e\\,%k):\ %tarning:%m,
+      \%W%f:(%l\\,%c)-(%e\\,%k):\ %tarning:,
+      \%W%f:%l:%c-%k:\ %tarning:\ [%.%#],
+      \%W%f:%l:%c-%k:\ %tarning:%m,
+      \%W%f:%l:%c-%k:\ %tarning:,
+      \%W%f:%l:%c:\ %tarning:\ [%.%#],
+      \%W%f:%l:%c:\ %tarning:%m,
+      \%W%f:%l:%c:\ %tarning:,
+      \%E%f:(%l\\,%c)-(%e\\,%k):\ %trror:\ [%.%#],
+      \%E%f:(%l\\,%c)-(%e\\,%k):\ %trror:%m,
+      \%E%f:(%l\\,%c)-(%e\\,%k):\ %trror:,
+      \%E%f:%l:%c-%k:\ %trror:\ [%.%#],
+      \%E%f:%l:%c-%k:\ %trror:%m,
+      \%E%f:%l:%c-%k:\ %trror:,
+      \%E%f:%l:%c:\ %trror:\ [%.%#],
+      \%E%f:%l:%c:\ %trror:%m,
+      \%E%f:%l:%c:\ %trror:,
+      \%Z\ %\\+\|%.%#,
+      \%C%m
+
+let &cpo = s:save_cpo
+unlet s:save_cpo

runtime/compiler/context.vim

@@ -4,9 +4,7 @@ vim9script
 # Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
 # Former Maintainers: Nikolai Weibull <now@bitwi.se>
 # Contributors:       Enno Nagel
-# Last Change:        2024 Mar 29
-#                     2024 Apr 03 by The Vim Project (removed :CompilerSet definition)
-#                     2025 Mar 11 by The Vim Project (add comment for Dispatch)
+# Last Change:        2026 Jan 10
 
 if exists("g:current_compiler")
   finish
@@ -16,7 +14,6 @@ import autoload '../autoload/context.vim'
 
 g:current_compiler = 'context'
 
-# CompilerSet makeprg=context
 if get(b:, 'context_ignore_makefile', get(g:, 'context_ignore_makefile', 0)) ||
   (!filereadable('Makefile') && !filereadable('makefile'))
   var makeprg =  join(context.ConTeXtCmd(shellescape(expand('%:p:t'))), ' ')
@@ -30,14 +27,14 @@ const context_errorformat = join([
   "%-Qclose source%.%#> %f",
   "%-Popen source%.%#name '%f'",
   "%-Qclose source%.%#name '%f'",
-  "tex %trror%.%#error on line %l in file %f: %m",
+  "%E! %m",
+  "%Ztex %trror%.%#error on line %l in file %f",
   "%Elua %trror%.%#error on line %l in file %f:",
   "%+Emetapost %#> error: %#",
   "%Emetafun%.%#error: %m",
-  "! error: %#%m",
   "%-C %#",
   "%C! %m",
-  "%Z[ctxlua]%m",
+  "%Z%.%#[ctxlua]:%l:%m",
   "%+C<*> %.%#",
   "%-C%.%#",
   "%Z...%m",

runtime/compiler/gnat.vim

@@ -3,7 +3,7 @@
 "     Language: Ada (GNAT)
 "          $Id: gnat.vim 887 2008-07-08 14:29:01Z krischik $
 "    Copyright: Copyright (C) 2006 Martin Krischik
-"   Maintainer:	Martin Krischi <krischik@users.sourceforge.net>k
+"   Maintainer:	Martin Krischi <krischik@users.sourceforge.net>
 "		Ned Okie <nokie@radford.edu>
 "      $Author: krischik $
 "        $Date: 2008-07-08 16:29:01 +0200 (Di, 08 Jul 2008) $

runtime/compiler/pandoc.vim

@@ -2,7 +2,8 @@
 " Compiler:     Pandoc
 " Maintainer:   Konfekt
 " Last Change:	2024 Nov 19
-" 2025 May 15 Update the title regex for CompilerSet #17321
+" 2025 May 15 by Vim Project: Update the title regex for CompilerSet #17321
+" 2026 Jan 10 by Vim Project: Do not set the title #19048
 "
 " Expects output file extension, say `:make html` or `:make pdf`.
 " Passes additional arguments to pandoc, say `:make html --self-contained`.
@@ -52,8 +53,6 @@ endfunction
 
 execute 'CompilerSet makeprg=pandoc'..escape(
     \ ' --standalone'..
-    \ (s:PandocFiletype(&filetype) ==# 'markdown' && (getline(1) =~# '^%\s\+\S\+' || (search('^title:\s\+\S\+', 'cnw') > 0)) ?
-    \ '' : ' --metadata title=%:t:r:S')..
     \ ' '..s:PandocLang()..
     \ ' --from='..s:PandocFiletype(&filetype)..
     \ ' '..get(b:, 'pandoc_compiler_args', get(g:, 'pandoc_compiler_args', ''))..

runtime/compiler/perl.vim

@@ -1,6 +1,6 @@
 " Vim compiler file
 " Compiler:      Perl syntax checks (perl -Wc)
-" Maintainer:    vim-perl <vim-perl@googlegroups.com>
+" Maintainer:    vim-perl <vim-perl@googlegroups.com> (need to be subscribed to post)
 " Author:        Christian J. Robinson <heptite@gmail.com>
 " Homepage:      https://github.com/vim-perl/vim-perl
 " Bugs/requests: https://github.com/vim-perl/vim-perl/issues

runtime/compiler/perlcritic.vim

@@ -1,6 +1,6 @@
 " Vim compiler file
 " Compiler:      perlcritic
-" Maintainer:    vim-perl <vim-perl@googlegroups.com>
+" Maintainer:    vim-perl <vim-perl@googlegroups.com> (need to be subscribed to post)
 " Author:        Doug Kearns <dougkearns@gmail.com>
 " Homepage:      https://github.com/vim-perl/vim-perl
 " Bugs/requests: https://github.com/vim-perl/vim-perl/issues

runtime/compiler/podchecker.vim

@@ -1,6 +1,6 @@
 " Vim compiler file
 " Compiler:      podchecker
-" Maintainer:    vim-perl <vim-perl@googlegroups.com>
+" Maintainer:    vim-perl <vim-perl@googlegroups.com> (need to be subscribed to post)
 " Author:        Doug Kearns <dougkearns@gmail.com>
 " Homepage:      https://github.com/vim-perl/vim-perl
 " Bugs/requests: https://github.com/vim-perl/vim-perl/issues

runtime/compiler/pyright.vim

@@ -0,0 +1,25 @@
+" Vim compiler file
+" Compiler:     Pyright (Python Type Checker)
+" Maintainer:   @konfekt
+" Last Change:  2025 Dec 26
+
+if exists("current_compiler") | finish | endif
+let current_compiler = "pyright"
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" CompilerSet makeprg=pyright
+" CompilerSet makeprg=basedpyright
+exe 'CompilerSet makeprg=' ..  escape(
+        \ get(b:, 'pyright_makeprg', get(g:, 'pyright_makeprg', 'pyright')),
+        \ ' \|"')
+CompilerSet errorformat=
+      \%E%f:%l:%c\ -\ error:\ %m,
+      \%W%f:%l:%c\ -\ warning:\ %m,
+      \%N%f:%l:%c\ -\ note:\ %m,
+      \%C[ \t]\ %.%#,
+      \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/compiler/ruff.vim

@@ -4,6 +4,7 @@
 " Last Change:  2024 Nov 07
 "		2024 Nov 19 by the Vim Project (properly escape makeprg setting)
 "		2025 Nov 06 by the Vim Project (do not set buffer-local makeprg)
+"		2024 Dec 24 by the Vim Project (mute Found messages)
 
 if exists("current_compiler") | finish | endif
 let current_compiler = "ruff"
@@ -16,6 +17,7 @@ exe 'CompilerSet makeprg=' .. escape('ruff check --output-format=concise '
         \ ..get(b:, 'ruff_makeprg_params', get(g:, 'ruff_makeprg_params', '--preview')),
         \ ' \|"')
 CompilerSet errorformat=%f:%l:%c:\ %m,%f:%l:\ %m,%f:%l:%c\ -\ %m,%f:
+CompilerSet errorformat+=%-GFound\ %.%#
 
 let &cpo = s:cpo_save
 unlet s:cpo_save

runtime/compiler/ty.vim

@@ -0,0 +1,20 @@
+" Vim compiler file
+" Compiler:     Ty (Python Type Checker)
+" Maintainer:   @konfekt
+" Last Change:  2024 Dec 24
+
+if exists("current_compiler") | finish | endif
+let current_compiler = "ty"
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" CompilerSet makeprg=ty
+exe 'CompilerSet makeprg=' ..  escape(
+        \ get(b:, 'ty_makeprg', get(g:, 'ty_makeprg', 'ty check --no-progress --color=never'))
+        \ ..' --output-format=concise', ' \|"')
+CompilerSet errorformat=%f:%l:%c:\ %m,%f:%l:\ %m,%f:%l:%c\ -\ %m,%f:
+CompilerSet errorformat+=%-GFound\ %.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/doc/builtin.txt

@@ -1,4 +1,4 @@
-*builtin.txt*	For Vim version 9.1.  Last change: 2025 Dec 13
+*builtin.txt*	For Vim version 9.1.  Last change: 2026 Jan 17
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -23,9 +23,11 @@ Use CTRL-] on the function name to jump to the full explanation.
 
 USAGE				RESULT	DESCRIPTION	~
 
-abs({expr})			Float or Number  absolute value of {expr}
+abs({expr})			Float/Number
+					absolute value of {expr}
 acos({expr})			Float	arc cosine of {expr}
-add({object}, {item})		List/Blob   append {item} to {object}
+add({object}, {item})		List/Blob
+					append {item} to {object}
 and({expr}, {expr})		Number	bitwise AND
 append({lnum}, {text})		Number	append {text} below line {lnum}
 appendbufline({buf}, {lnum}, {text})
@@ -33,7 +35,8 @@ appendbufline({buf}, {lnum}, {text})
 					in buffer {buf}
 argc([{winid}])			Number	number of files in the argument list
 argidx()			Number	current index in the argument list
-arglistid([{winnr} [, {tabnr}]]) Number	argument list id
+arglistid([{winnr} [, {tabnr}]])
+				Number	argument list id
 argv({nr} [, {winid}])		String	{nr} entry of the argument list
 argv([-1, {winid}])		List	the argument list
 asin({expr})			Float	arc sine of {expr}
@@ -43,7 +46,7 @@ assert_equal({exp}, {act} [, {msg}])
 assert_equalfile({fname-one}, {fname-two} [, {msg}])
 				Number	assert file contents are equal
 assert_exception({error} [, {msg}])
-				Number	assert {error} is in v:exception
+				Number	assert {error} is in |v:exception|
 assert_fails({cmd} [, {error} [, {msg} [, {lnum} [, {context}]]]])
 				Number	assert {cmd} fails
 assert_false({actual} [, {msg}])
@@ -81,8 +84,8 @@ bufexists({buf})		Number	|TRUE| if buffer {buf} exists
 buflisted({buf})		Number	|TRUE| if buffer {buf} is listed
 bufload({buf})			Number	load buffer {buf} if not loaded yet
 bufloaded({buf})		Number	|TRUE| if buffer {buf} is loaded
-bufname([{buf}])		String	Name of the buffer {buf}
-bufnr([{buf} [, {create}]])	Number	Number of the buffer {buf}
+bufname([{buf}])		String	name of the buffer {buf}
+bufnr([{buf} [, {create}]])	Number	number of the buffer {buf}
 bufwinid({buf})			Number	window ID of buffer {buf}
 bufwinnr({buf})			Number	window number of buffer {buf}
 byte2line({byte})		Number	line number at byte count {byte}
@@ -121,7 +124,8 @@ ch_setoptions({handle}, {options})
 ch_status({handle} [, {options}])
 				String	status of channel {handle}
 changenr()			Number	current change number
-char2nr({expr} [, {utf8}])	Number	ASCII/UTF-8 value of first char in {expr}
+char2nr({expr} [, {utf8}])	Number	ASCII/UTF-8 value of first char in
+					{expr}
 charclass({string})		Number	character class of {string}
 charcol({expr} [, {winid}])	Number	column number of cursor or mark
 charidx({string}, {idx} [, {countcc} [, {utf16}]])
@@ -180,10 +184,12 @@ expand({expr} [, {nosuf} [, {list}]])
 expandcmd({string} [, {options}])
 				String	expand {string} like with `:edit`
 extend({expr1}, {expr2} [, {expr3}])
-				List/Dict insert items of {expr2} into {expr1}
+				List/Dict
+					insert items of {expr2} into {expr1}
 extendnew({expr1}, {expr2} [, {expr3}])
-				List/Dict like |extend()| but creates a new
-					List or Dictionary
+				List/Dict
+					like |extend()| but creates a new List
+					or Dictionary
 feedkeys({string} [, {mode}])	Number	add key sequence to typeahead buffer
 filecopy({from}, {to})		Number	|TRUE| if copying file {from} to {to}
 					worked
@@ -194,7 +200,8 @@ filter({expr1}, {expr2})	List/Dict/Blob/String
 					{expr2} is 0
 finddir({name} [, {path} [, {count}]])
 findfile({name} [, {path} [, {count}]])
-				String/List find dir/file {name} in {path}
+				String/List
+					find dir/file {name} in {path}
 flatten({list} [, {maxdepth}])	List	flatten {list} up to {maxdepth} levels
 flattennew({list} [, {maxdepth}])
 				List	flatten a copy of {list}
@@ -216,7 +223,8 @@ funcref({name} [, {arglist}] [, {dict}])
 				Funcref	reference to function {name}
 function({name} [, {arglist}] [, {dict}])
 				Funcref	named reference to function {name}
-garbagecollect([{atexit}])	none	free memory, breaking cyclic references
+garbagecollect([{atexit}])	none	free memory, breaking cyclic
+					references
 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}
@@ -229,7 +237,7 @@ getbufvar({buf}, {varname} [, {def}])
 getcellpixels()			List	get character cell pixel size
 getcellwidths()			List	get character cell width overrides
 getchangelist([{buf}])		List	list of change list items
-getchar([{expr} [, {opts}]])	Number or String
+getchar([{expr} [, {opts}]])	Number/String
 					get one character from the user
 getcharmod()			Number	modifiers for the last typed character
 getcharpos({expr})		List	position of cursor, mark, etc.
@@ -245,7 +253,8 @@ getcmdprompt()			String	return the current command-line prompt
 getcmdscreenpos()		Number	return cursor screen position in
 					command-line
 getcmdtype()			String	return current command-line type
-getcmdwintype()			String	return current command-line window type
+getcmdwintype()			String	return current command-line window
+					type
 getcompletion({pat}, {type} [, {filtered}])
 				List	list of cmdline completion matches
 getcompletiontype({pat})	String	return the type of the command-line
@@ -263,7 +272,8 @@ getimstatus()			Number	|TRUE| if the IME status is active
 getjumplist([{winnr} [, {tabnr}]])
 				List	list of jump list items
 getline({lnum})			String	line {lnum} of current buffer
-getline({lnum}, {end})		List	lines {lnum} to {end} of current buffer
+getline({lnum}, {end})		List	lines {lnum} to {end} of current
+					buffer
 getloclist({nr})		List	list of location list items
 getloclist({nr}, {what})	Dict	get specific location list properties
 getmarklist([{buf}])		List	list of global/local marks
@@ -275,7 +285,8 @@ getpos({expr})			List	position of cursor, mark, etc.
 getqflist()			List	list of quickfix items
 getqflist({what})		Dict	get specific quickfix list properties
 getreg([{regname} [, 1 [, {list}]]])
-				String or List   contents of a register
+				String/List
+					contents of a register
 getreginfo([{regname}])		Dict	information about a register
 getregion({pos1}, {pos2} [, {opts}])
 				List	get the text from {pos1} to {pos2}
@@ -286,7 +297,8 @@ getscriptinfo([{opts}])		List	list of sourced scripts
 getstacktrace()			List	get current stack trace of Vim scripts
 gettabinfo([{expr}])		List	list of tab pages
 gettabvar({nr}, {varname} [, {def}])
-				any	variable {varname} in tab {nr} or {def}
+				any	variable {varname} in tab {nr} or
+					{def}
 gettabwinvar({tabnr}, {winnr}, {name} [, {def}])
 				any	{name} in {winnr} in tab page {tabnr}
 gettagstack([{nr}])		Dict	get the tag stack of window {nr}
@@ -305,8 +317,8 @@ globpath({path}, {expr} [, {nosuf} [, {list} [, {alllinks}]]])
 has({feature} [, {check}])	Number	|TRUE| if feature {feature} supported
 has_key({dict}, {key})		Number	|TRUE| if {dict} has entry {key}
 haslocaldir([{winnr} [, {tabnr}]])
-				Number	|TRUE| if the window executed |:lcd|
-					or |:tcd|
+				Number	|TRUE| if the window executed `:lcd` or
+					`:tcd`
 hasmapto({what} [, {mode} [, {abbr}]])
 				Number	|TRUE| if mapping to {what} exists
 histadd({history}, {item})	Number	add an item to a history
@@ -332,9 +344,13 @@ inputdialog({prompt} [, {text} [, {cancelreturn}]])
 inputlist({textlist})		Number	let the user pick from a choice list
 inputrestore()			Number	restore typeahead
 inputsave()			Number	save and clear typeahead
-inputsecret({prompt} [, {text}]) String	like input() but hiding the text
-insert({object}, {item} [, {idx}]) List	insert {item} in {object} [before {idx}]
-instanceof({object}, {class})	Number	|TRUE| if {object} is an instance of {class}
+inputsecret({prompt} [, {text}])
+				String	like input() but hiding the text
+insert({object}, {item} [, {idx}])
+				List	insert {item} in {object}
+					[before {idx}]
+instanceof({object}, {class})	Number	|TRUE| if {object} is an instance of
+					{class}
 interrupt()			none	interrupt script execution
 invert({expr})			Number	bitwise invert
 isabsolutepath({path})		Number	|TRUE| if {path} is an absolute path
@@ -346,7 +362,8 @@ isnan({expr})			Number	|TRUE| if {expr} is NaN
 items({expr})			List	key/index-value pairs in {expr}
 job_getchannel({job})		Channel	get the channel handle for {job}
 job_info([{job}])		Dict	get information about {job}
-job_setoptions({job}, {options}) none	set options for {job}
+job_setoptions({job}, {options})
+				none	set options for {job}
 job_start({command} [, {options}])
 				Job	start a job
 job_status({job})		String	get the status of {job}
@@ -358,9 +375,10 @@ json_decode({string})		any	decode JSON
 json_encode({expr})		String	encode JSON
 keys({dict})			List	keys in {dict}
 keytrans({string})		String	translate internal keycodes to a form
-					that can be used by |:map|
+					that can be used by `:map`
 len({expr})			Number	the length of {expr}
-libcall({lib}, {func}, {arg})	String	call {func} in library {lib} with {arg}
+libcall({lib}, {func}, {arg})	String	call {func} in library {lib} with
+					{arg}
 libcallnr({lib}, {func}, {arg})	Number	idem, but return a Number
 line({expr} [, {winid}])	Number	line nr of cursor, last line or mark
 line2byte({lnum})		Number	byte count of line {lnum}
@@ -379,7 +397,7 @@ luaeval({expr} [, {expr}])	any	evaluate |Lua| expression
 map({expr1}, {expr2})		List/Dict/Blob/String
 					change each item in {expr1} to {expr2}
 maparg({name} [, {mode} [, {abbr} [, {dict}]]])
-				String or Dict
+				String/Dict
 					rhs of mapping {name} in mode {mode}
 mapcheck({name} [, {mode} [, {abbr}]])
 				String	check for mappings matching {name}
@@ -394,7 +412,7 @@ matchadd({group}, {pattern} [, {priority} [, {id} [, {dict}]]])
 				Number	highlight {pattern} with {group}
 matchaddpos({group}, {pos} [, {priority} [, {id} [, {dict}]]])
 				Number	highlight positions with {group}
-matcharg({nr})			List	arguments of |:match|
+matcharg({nr})			List	arguments of `:match`
 matchbufline({buf}, {pat}, {lnum}, {end}, [, {dict})
 				List	all the {pat} matches in buffer {buf}
 matchdelete({id} [, {win}])	Number	delete match identified by {id}
@@ -405,7 +423,8 @@ matchfuzzy({list}, {str} [, {dict}])
 matchfuzzypos({list}, {str} [, {dict}])
 				List	fuzzy match {str} in {list}
 matchlist({expr}, {pat} [, {start} [, {count}]])
-				List	match and submatches of {pat} in {expr}
+				List	match and submatches of {pat} in
+					{expr}
 matchstr({expr}, {pat} [, {start} [, {count}]])
 				String	{count}'th match of {pat} in {expr}
 matchstrlist({list}, {pat} [, {dict})
@@ -422,11 +441,13 @@ mzeval({expr})			any	evaluate |MzScheme| expression
 nextnonblank({lnum})		Number	line nr of non-blank line >= {lnum}
 ngettext({single}, {plural}, {number}[, {domain}])
 				String	translate text based on {number}
-nr2char({expr} [, {utf8}])	String	single char with ASCII/UTF-8 value {expr}
+nr2char({expr} [, {utf8}])	String	single char with ASCII/UTF-8 value
+					{expr}
 or({expr}, {expr})		Number	bitwise OR
 pathshorten({expr} [, {len}])	String	shorten directory names in a path
 perleval({expr})		any	evaluate |Perl| expression
-popup_atcursor({what}, {options}) Number create popup window near the cursor
+popup_atcursor({what}, {options})
+				Number	create popup window near the cursor
 popup_beval({what}, {options})	Number	create popup window for 'ballooneval'
 popup_clear()			none	close all popup windows
 popup_close({id} [, {result}])	none	close popup window {id}
@@ -446,7 +467,8 @@ popup_menu({what}, {options})	Number	create a popup window used as a menu
 popup_move({id}, {options})	none	set position of popup window {id}
 popup_notification({what}, {options})
 				Number	create a notification popup window
-popup_setbuf({id}, {buf})	Bool	set the buffer for the popup window {id}
+popup_setbuf({id}, {buf})	Bool	set the buffer for the popup window
+					{id}
 popup_setoptions({id}, {options})
 				none	set options for popup window {id}
 popup_settext({id}, {text})	none	set the text of popup window {id}
@@ -456,10 +478,13 @@ preinserted()			Number	whether text is inserted after cursor
 prevnonblank({lnum})		Number	line nr of non-blank line <= {lnum}
 printf({fmt}, {expr1}...)	String	format text
 prompt_getprompt({buf})		String	get prompt text
-prompt_setcallback({buf}, {expr}) none	set prompt callback function
-prompt_setinterrupt({buf}, {text}) none	set prompt interrupt function
+prompt_setcallback({buf}, {expr})
+				none	set prompt callback function
+prompt_setinterrupt({buf}, {text})
+				none	set prompt interrupt function
 prompt_setprompt({buf}, {text}) none	set prompt text
-prop_add({lnum}, {col}, {props})  none	add one text property
+prop_add({lnum}, {col}, {props})
+				none	add one text property
 prop_add_list({props}, [[{lnum}, {col}, {end-lnum}, {end-col}], ...])
 				none	add multiple text properties
 prop_clear({lnum} [, {lnum-end} [, {props}]])
@@ -527,9 +552,10 @@ round({expr})			Float	round off {expr}
 rubyeval({expr})		any	evaluate |Ruby| expression
 screenattr({row}, {col})	Number	attribute at screen position
 screenchar({row}, {col})	Number	character at screen position
-screenchars({row}, {col})	List	List of characters at screen position
+screenchars({row}, {col})	List	list of characters at screen position
 screencol()			Number	current cursor column
-screenpos({winid}, {lnum}, {col}) Dict	screen row and col of a text character
+screenpos({winid}, {lnum}, {col})
+				Dict	screen row and col of a text character
 screenrow()			Number	current cursor row
 screenstring({row}, {col})	String	characters at screen position
 search({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])
@@ -570,7 +596,9 @@ setqflist({list} [, {action}])	Number	modify quickfix list using {list}
 setqflist({list}, {action}, {what})
 				Number	modify specific quickfix list props
 setreg({n}, {v} [, {opt}])	Number	set register to value and type
-settabvar({nr}, {varname}, {val}) none	set {varname} in tab page {nr} to {val}
+settabvar({nr}, {varname}, {val})
+				none	set {varname} in tab page {nr} to
+					{val}
 settabwinvar({tabnr}, {winnr}, {varname}, {val})
 				none	set {varname} in window {winnr} in tab
 					page {tabnr} to {val}
@@ -600,7 +628,8 @@ sign_unplacelist({list})	List	unplace a list of signs
 simplify({filename})		String	simplify filename as much as possible
 sin({expr})			Float	sine of {expr}
 sinh({expr})			Float	hyperbolic sine of {expr}
-slice({expr}, {start} [, {end}])  String, List or Blob
+slice({expr}, {start} [, {end}])
+				String/List/Blob
 					slice of a String, List or Blob
 sort({list} [, {how} [, {dict}]])
 				List	sort {list}, compare with {how}
@@ -630,7 +659,8 @@ strcharpart({str}, {start} [, {len} [, {skipcc}]])
 				String	{len} characters of {str} at
 					character {start}
 strchars({expr} [, {skipcc}])	Number	character count of the String {expr}
-strdisplaywidth({expr} [, {col}]) Number display length of the String {expr}
+strdisplaywidth({expr} [, {col}])
+				Number	display length of the String {expr}
 strftime({format} [, {time}])	String	format time with a specified format
 strgetchar({str}, {index})	Number	get char {index} from {str}
 stridx({haystack}, {needle} [, {start}])
@@ -638,20 +668,24 @@ stridx({haystack}, {needle} [, {start}])
 string({expr})			String	String representation of {expr} value
 strlen({expr})			Number	length of the String {expr}
 strpart({str}, {start} [, {len} [, {chars}]])
-				String	{len} bytes/chars of {str} at
-					byte {start}
+				String	{len} bytes/chars of {str} at byte
+					{start}
 strptime({format}, {timestring})
-				Number	Convert {timestring} to unix timestamp
+				Number	convert {timestring} to unix timestamp
 strridx({haystack}, {needle} [, {start}])
 				Number	last index of {needle} in {haystack}
 strtrans({expr})		String	translate string to make it printable
 strutf16len({string} [, {countcc}])
-				Number	number of UTF-16 code units in {string}
-strwidth({expr})		Number	display cell length of the String {expr}
-submatch({nr} [, {list}])	String or List
-					specific match in ":s" or substitute()
+				Number	number of UTF-16 code units in
+					{string}
+strwidth({expr})		Number	display cell length of the String
+					{expr}
+submatch({nr} [, {list}])	String/List
+					specific match in `:substitute` or
+					substitute()
 substitute({expr}, {pat}, {sub}, {flags})
-				String	all {pat} in {expr} replaced with {sub}
+				String	all {pat} in {expr} replaced with
+					{sub}
 swapfilelist()			List	swap files found in 'directory'
 swapinfo({fname})		Dict	information about swap file {fname}
 swapname({buf})			String	swap file of buffer {buf}
@@ -660,12 +694,14 @@ synIDattr({synID}, {what} [, {mode}])
 				String	attribute {what} of syntax ID {synID}
 synIDtrans({synID})		Number	translated syntax ID of {synID}
 synconcealed({lnum}, {col})	List	info about concealing
-synstack({lnum}, {col})		List	stack of syntax IDs at {lnum} and {col}
+synstack({lnum}, {col})		List	stack of syntax IDs at {lnum} and
+					{col}
 system({expr} [, {input}])	String	output of shell command/filter {expr}
 systemlist({expr} [, {input}])	List	output of shell command/filter {expr}
 tabpagebuflist([{arg}])		List	list of buffer numbers in tab page
 tabpagenr([{arg}])		Number	number of current or last tab page
-tabpagewinnr({tabarg} [, {arg}]) Number	number of current window in tab page
+tabpagewinnr({tabarg} [, {arg}])
+				Number	number of current window in tab page
 tagfiles()			List	tags files used
 taglist({expr} [, {filename}])	List	list of tags matching {expr}
 tan({expr})			Float	tangent of {expr}
@@ -695,7 +731,8 @@ term_setansicolors({buf}, {colors})
 				none	set ANSI palette in GUI color mode
 term_setapi({buf}, {expr})	none	set |terminal-api| function name prefix
 term_setkill({buf}, {how})	none	set signal to stop job in terminal
-term_setrestore({buf}, {command}) none	set command to restore terminal
+term_setrestore({buf}, {command})
+				none	set command to restore terminal
 term_setsize({buf}, {rows}, {cols})
 				none	set the size of a terminal
 term_start({cmd} [, {options}])	Number	open a terminal window and run a job
@@ -735,8 +772,10 @@ timer_start({time}, {callback} [, {options}])
 				Number	create a timer
 timer_stop({timer})		none	stop a timer
 timer_stopall()			none	stop all timers
-tolower({expr})			String	the String {expr} switched to lowercase
-toupper({expr})			String	the String {expr} switched to uppercase
+tolower({expr})			String	the String {expr} switched to
+					lowercase
+toupper({expr})			String	the String {expr} switched to
+					uppercase
 tr({src}, {fromstr}, {tostr})	String	translate chars of {src} in {fromstr}
 					to chars in {tostr}
 trim({text} [, {mask} [, {dir}]])
@@ -755,7 +794,7 @@ utf16idx({string}, {idx} [, {countcc} [, {charidx}]])
 				Number	UTF-16 index of byte {idx} in {string}
 values({dict})			List	values in {dict}
 virtcol({expr} [, {list} [, {winid}])
-				Number or List
+				Number/List
 					screen column of cursor or mark
 virtcol2col({winid}, {lnum}, {col})
 				Number  byte index of a character on screen
@@ -782,7 +821,8 @@ winheight({nr})			Number	height of window {nr}
 winlayout([{tabnr}])		List	layout of windows in tab {tabnr}
 winline()			Number	window line of the cursor
 winnr([{expr}])			Number	number of current window
-winrestcmd()			String	returns command to restore window sizes
+winrestcmd()			String	returns command to restore window
+					sizes
 winrestview({dict})		none	restore view of current window
 winsaveview()			Dict	save view of current window
 winwidth({nr})			Number	width of window {nr}
@@ -4687,7 +4727,7 @@ getloclist({nr} [, {what}])				*getloclist()*
 			:echo getloclist(3, {'all': 0})
 			:echo getloclist(5, {'filewinid': 0})
 <
-		Return type: list<dict<any>> or list<any>
+		Return type: list<dict<any>> or dict<any>
 
 
 getmarklist([{buf}])					*getmarklist()*
@@ -4839,6 +4879,11 @@ getpos({expr})						*getpos()*
 		within the line.  To get the character position in the line,
 		use |getcharpos()|.
 
+		The visual marks |'<| and |'>| refer to the beginning and end
+		of the visual selection relative to the buffer.  Note that
+		this differs from |setpos()|, where they are relative to the
+		cursor position.
+
 		Note that for '< and '> Visual mode matters: when it is "V"
 		(visual line mode) the column of '< is zero and the column of
 		'> is a large number equal to |v:maxcol|.
@@ -4963,7 +5008,7 @@ getqflist([{what}])					*getqflist()*
 			:echo getqflist({'nr': 2, 'title': 1})
 			:echo getqflist({'lines' : ["F1:10:L10"]})
 <
-		Return type: list<dict<any>> or list<any>
+		Return type: list<dict<any>> or dict<any>
 
 
 getreg([{regname} [, 1 [, {list}]]])			*getreg()*
@@ -10112,9 +10157,14 @@ setpos({expr}, {list})					*setpos()*
 		preferred column is not set.  When it is present and setting a
 		mark position it is not used.
 
-		Note that for '< and '> changing the line number may result in
-		the marks to be effectively be swapped, so that '< is always
-		before '>.
+		Note that for |'<| and |'>| changing the line number may
+		result in the marks to be effectively swapped, so that |'<| is
+		always before |'>|.
+
+		The visual marks |'<| and |'>| refer to the beginning and end
+		of the visual selection relative to the cursor position.
+		Note that this differs from |getpos()|, where they are
+		relative to the buffer.
 
 		Returns 0 when the position could be set, -1 otherwise.
 		An error message is given if {expr} is invalid.

runtime/doc/change.txt

@@ -1,4 +1,4 @@
-*change.txt*	For Vim version 9.1.  Last change: 2025 Dec 18
+*change.txt*	For Vim version 9.1.  Last change: 2026 Jan 08
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1777,7 +1777,9 @@ l	Long lines are not broken in insert mode: When a line was longer than
 	automatically format it.
 							*fo-m*
 m	Also break at a multibyte character above 255.  This is useful for
-	Asian text where every character is a word on its own.
+	Asian text where every character is a word on its own.  Note that
+	line breaks may also be added after punctuation characters such as
+	colons to match the CJK linebreaking rules.
 							*fo-M*
 M	When joining lines, don't insert a space before or after a multibyte
 	character.  Overrules the 'B' flag.

runtime/doc/eval.txt

@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 9.1.  Last change: 2025 Dec 21
+*eval.txt*	For Vim version 9.1.  Last change: 2026 Jan 10
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -467,7 +467,13 @@ Changing the order of items in a list: >
 	:call reverse(list)		" reverse the order of items
 	:call uniq(sort(list))		" sort and remove duplicates
 
-
+In a Vim9 script or a def method, a new item can be appended to a List by
+using the list length as the index: >
+    vim9script
+    var l: list<string>
+    l[0] = 'a'
+    l[1] = 'b'
+<
 For loop ~
 
 The |:for| loop executes commands for each item in a List, Tuple, String or
@@ -3718,13 +3724,16 @@ text...
 			matching {pattern} is being thrown and has not yet
 			been caught by a previous `:catch`.  Otherwise, these
 			commands are skipped.
-			When {pattern} is omitted all errors are caught.
-			Examples: >
+			Pattern can start with "Vim({cmd})" to indicate an
+			exception that occurred when executing the Ex command
+			{cmd}.  When {pattern} is omitted all errors are
+			caught. Examples: >
 		:catch /^Vim:Interrupt$/	 " catch interrupts (CTRL-C)
-		:catch /^Vim\%((\a\+)\)\=:E/	 " catch all Vim errors
-		:catch /^Vim\%((\a\+)\)\=:/	 " catch errors and interrupts
+		:catch /^Vim\%((\S\+)\)\=:E/	 " catch all Vim errors
+		:catch /^Vim\%((\S\+)\)\=:/	 " catch errors and interrupts
 		:catch /^Vim(write):/		 " catch all errors in :write
-		:catch /^Vim\%((\a\+)\)\=:E123:/ " catch error E123
+		:catch /^Vim(!):/		 " catch all errors in :!
+		:catch /^Vim\%((\S\+)\)\=:E123:/ " catch error E123
 		:catch /my-exception/		 " catch user exception
 		:catch /.*/			 " catch everything
 		:catch				 " same as /.*/

runtime/doc/evim-ja.UTF-8.1

@@ -1,4 +1,4 @@
-.TH EVIM 1 "2002 February 16"
+.TH EVIM 1 "2024 August 12"
 .SH 名前
 evim \- easy Vim, モードレスエディタ Vim
 .SH 書式
@@ -34,8 +34,13 @@ CTRL-X が切り取り、CTRL-C がコピー、CTRL-V がペーストです。
 vim(1) を参照してください。
 .SH ファイル
 .TP 15
-/usr/local/lib/vim/evim.vim
+/usr/local/share/vim/vim??/evim.vim
 eVim の初期化スクリプト。
+.br
+.I vim??
+は短いバージョン番号で
+.B Vim 9.1
+では vim91 です。
 .SH 別名
 evim は "gumbies のための Vim" とも呼ばれています。
 evim を使っているあなたはきっと、頭にハンカチをかぶっているのです。

runtime/doc/ft_context.txt

@@ -1,8 +1,8 @@
-*ft_context.txt*	For Vim version 9.1.  Last change: 2024 Jan 01
+*ft_context.txt*	For Vim version 9.2.  Last change: 2026 Jan 18
 
 This is the documentation for the ConTeXt filetype plugin.
 
-NOTE: the plugin requires +vim9script.
+NOTE: the plugin requires |+vim9script|.
 
 ==============================================================================
 CONTENTS						*context.vim* *ft-context*
@@ -19,11 +19,11 @@ Introduction ~
 ConTeXt, similarly to LaTeX, is a macro-based typesetting system built on TeX:
 >
 	https://wiki.contextgarden.net
-	https://wiki.contextgarden.net/Vim
+	https://wiki.contextgarden.net/Input_and_compilation/Text_editors/Vim
 <
 The ConTeXt plugin provides syntax highlighting, completion and support for
 typesetting ConTeXt documents. The recommended way to typeset a document is to
-use |:ConTeXt|. This will invoke the `mtxrun` script that is found in `$PATH`.
+use |:ConTeXt|, which invokes the `mtxrun` script that is found in $PATH.
 
 For more fine grained control over the command and its environment,
 `context.Typeset()` can be used directly (or `context#Typeset()` from legacy
@@ -32,26 +32,31 @@ Vim script). For instance, if a version of ConTeXt is installed in
 >
 	import autoload 'context.vim'
 
+	var os = "linux"    # Update to match your system
+	var arch = "arm64"  # Update to match your system
+
 	def MyConTeXt()
-	    const env = {'PATH':
-	      printf("%s/context/tex/texmf-<os>-<arch>/bin:%s", $HOME, $PATH)}
-	    context.Typeset("%", env)
+	  var env = {
+	    'PATH': $'{$HOME}/context/tex/texmf-{os}-{arch}/bin:{$PATH}'
+	  }
+	  context.Typeset("%", env)
 	enddef
 
-This code may go in `~/.vim/after/ftplugin/context.vim`. A mapping can then be
-defined to invoke the custom command:
->
 	nnoremap <silent><buffer><leader>t <scriptcmd>MyConTeXt()<cr>
 <
+This code should go in `~/.vim/after/ftplugin/context.vim`.
+
 `context.Typeset()` accepts a third optional argument to specify a custom
 typesetting command. That must be a function that takes a path and returns the
-command as a List. For example:
+command as a |list|. For example:
 >
 	def ConTeXtCustomCommand(path: string): list<string>
 	  return ['mtxrun', '--script', 'context', '--nonstopmode', path]
 	enddef
 
-	context.ConTeXtTypeset("%", v:none, ConTeXtCustomCommand)
+	def MyContext()
+	    context.Typeset("%", v:none, ConTeXtCustomCommand)
+	enddef
 <
 Large projects are often organized as a root document and various chapter
 files. When editing a chapter file, it is convenient to invoke |:ConTeXt|
@@ -67,7 +72,7 @@ one in the current buffer. The root document does not have to be opened in
 Vim.
 
 To extend completion and syntax highlighting, you may generate supporting
-files using ConTeXt and add them to your configuration. If you configuration
+files using ConTeXt and add them to your configuration. If your configuration
 resides in `~/.vim`, you may use these commands:
 >
 	mkdir -p ~/.vim/syntax/shared
@@ -81,7 +86,8 @@ The last command will create the following syntax files:
 - `context-data-metafun.vim`;
 - `context-data-tex.vim`.
 
-The same command can be used to update those syntax files.
+If present, such files will be automatically loaded to enhance syntax
+highlighting. The same command can be used to update those syntax files.
 
 							*ft-context-commands*
 Commands ~
@@ -109,8 +115,9 @@ and this option is not set, standard `make` is used. If this option is set,
 >
 	g:context_ignore_makefile = 0
 <
-NOTE: before using |:make|, set the working directory of the buffer to the
-directory of the file to be typeset.
+NOTE: before using |:make|, ensure that the working directory of the buffer is
+set to the directory of the file you want to typeset. Additionally, be aware
+that |:make| searches for `mtxrun` in $PATH.
 
 					*'g:context_extra_options'*
 A list of additional options to pass to `mtxrun`.
@@ -135,11 +142,11 @@ When set, do not define any mappings.
 							*ft-context-mappings*
 Mappings ~
 
-tp			"reflow TeX paragraph".
+tp			"reflow TeX paragraph" (motion).
 
-i$			"inside inline math block".
+i$			"inside inline math block" (text object selection).
 
-a$			"around inline math block".
+a$			"around inline math block" (text object selection).
 
 ]]			[count] start of sections forward.
 

runtime/doc/ft_mp.txt

@@ -1,10 +1,10 @@
-*ft_mp.txt*	For Vim version 9.1.  Last change: 2022 Aug 12
+*ft_mp.txt*	For Vim version 9.2.  Last change: 2026 Jan 10
 
 This is the documentation for the METAFONT and MetaPost filetype plugins.
 Unless otherwise specified, the commands, settings and mappings defined below
 apply equally to both filetypes.
 
-NOTE: the plugin requires +vim9script.
+NOTE: the plugin requires |+vim9script|.
 
 ==============================================================================
 CONTENTS						*mp.vim* *ft-metapost*
@@ -38,25 +38,25 @@ next line should not change from whatever it has been manually set.
 
 For example, this is the default indentation of a simple macro:
 >
-   def foo =
-       makepen(
-           subpath(T-n,t) of r
-           shifted .5down
-           --subpath(t,T) of r shifted .5up -- cycle
-       )
-       withcolor black
-   enddef
+	def foo =
+	    makepen(
+	        subpath(T-n,t) of r
+	        shifted .5down
+	        --subpath(t,T) of r shifted .5up -- cycle
+	    )
+	    withcolor black
+	enddef
 <
 By adding the special comments, the indentation can be adjusted arbitrarily:
 >
-   def foo =
-       makepen(
-           subpath(T-n,t) of r  %>
-               shifted .5down   %>
-                   --subpath(t,T) of r shifted .5up -- cycle   %<<<
-       )
-       withcolor black
-   enddef
+	def foo =
+	    makepen(
+	        subpath(T-n,t) of r  %>
+	            shifted .5down   %>
+	                --subpath(t,T) of r shifted .5up -- cycle   %<<<
+	    )
+	    withcolor black
+	enddef
 <
 							*ft-metapost-commands*
 Commands ~

runtime/doc/gui_w32.txt

@@ -1,4 +1,4 @@
-*gui_w32.txt*	For Vim version 9.1.  Last change: 2025 Nov 09
+*gui_w32.txt*	For Vim version 9.1.  Last change: 2025 Dec 21
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -504,4 +504,25 @@ To use the system's default title bar colors, set highlighting groups to
 	hi TitleBar guibg=NONE guifg=NONE
 	hi TitleBarNC guibg=NONE guifg=NONE
 <
+
+Full Screen						*gui-w32-fullscreen*
+
+To enable fullscreen mode in the Windows GUI version of Vim, add the 's' flag
+to the 'guioptions' setting.
+
+For convenience, you can define a command or mapping to toggle fullscreen mode:
+>
+	command! ToggleFullscreen {
+		if &guioptions =~# 's'
+			set guioptions-=s
+		else
+			set guioptions+=s
+		endif
+	}
+
+	map <expr> <F11> &go =~# 's' ? ":se go-=s<CR>" : ":se go+=s<CR>"
+
+The fullscreen mode will occupy the entire screen area while hiding window
+decorations such as the title bar and borders.
+
  vim:tw=78:sw=4:ts=8:noet:ft=help:norl:

runtime/doc/if_pyth.txt

@@ -1,4 +1,4 @@
-*if_pyth.txt*	For Vim version 9.1.  Last change: 2025 Nov 09
+*if_pyth.txt*	For Vim version 9.1.  Last change: 2026 Jan 11
 
 
 		  VIM REFERENCE MANUAL	  by Paul Moore
@@ -183,9 +183,11 @@ vim.eval(str)						*python-eval*
 	Evaluates the expression str using the vim internal expression
 	evaluator (see |expression|).  Returns the expression result as:
 	- a string if the Vim expression evaluates to a string or number
-	- a list if the Vim expression evaluates to a Vim list
-	- a tuple if the Vim expression evaluates to a Vim tuple
-	- a dictionary if the Vim expression evaluates to a Vim dictionary
+	- a list if the Vim expression evaluates to a Vim |list|
+	- a tuple if the Vim expression evaluates to a Vim |tuple|
+	- a dictionary if the Vim expression evaluates to a Vim |dict|
+	- a boolean if Vim exression evaluates to |v:true| or |v:false|
+	- `None` if Vim expression evaluates to |v:null| or |v:none|
 	Dictionaries, lists and tuples are recursively expanded.
 	Examples: >
 	    :" value of the 'textwidth' option

runtime/doc/insert.txt

@@ -1,4 +1,4 @@
-*insert.txt*	For Vim version 9.1.  Last change: 2025 Nov 09
+*insert.txt*	For Vim version 9.1.  Last change: 2026 Jan 07
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1720,7 +1720,7 @@ Complete:
 Notes
 
 - It doesn't complete command arguments that rely on 'shellcmd' completion
-  type in Windows and WSL due to general slowness of canditate gathering,
+  type in Windows and WSL due to general slowness of candidate gathering,
   e.g.
 >
      terminal dir

runtime/doc/options.txt

@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 9.1.  Last change: 2025 Dec 18
+*options.txt*	For Vim version 9.1.  Last change: 2026 Jan 11
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1823,7 +1823,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	prepend, e.g.: >
 		set clipboard^=unnamed
 <	When using the GUI see |'go-A'|.
-	When using the |clipboard-providers| feature, only the "unamed" and
+	When using the |clipboard-providers| feature, only the "unnamed" and
 	"unnamedplus" features will be recognized  If compiled without the
 	|+clipboard| feature but compiled with the |+clipboard_provider|
 	feature, then they will be the only values allowed and the other
@@ -4274,15 +4274,17 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 					*'fsync'* *'fs'* *'nofsync'* *'nofs'*
 'fsync' 'fs'		boolean	(default on)
-			global
+			global or local to buffer |global-local|
 	When on, the library function fsync() will be called after writing a
 	file.  This will flush a file to disk, ensuring that it is safely
 	written even on filesystems which do metadata-only journaling.  This
-	will force the harddrive to spin up on Linux systems running in laptop
-	mode, so it may be undesirable in some situations.  Be warned that
-	turning this off increases the chances of data loss after a crash.  On
-	systems without an fsync() implementation, this variable is always
-	off.
+	will force the hard drive to spin up on Linux systems running in
+	laptop mode, so it may be undesirable in some situations.  Be warned
+	that turning this off increases the chances of data loss after a
+	crash.  On systems without an fsync() implementation, this variable is
+	always off.
+	This is a |global-local| option, so it can be set per buffer, for
+	example when writing to a slow filesystem.
 	Also see 'swapsync' for controlling fsync() on swap files.
 	'fsync' also applies to |writefile()| (unless a flag is used to
 	overrule it) and when writing undo files (see |undo-persistence|).
@@ -4572,6 +4574,12 @@ A jump table for the options with a short description can be found at |Q_op|.
 								*'go-T'*
 	  'T'	Include Toolbar.  Currently only in Win32, GTK+, Motif and
 		Photon GUIs.
+								*'go-s'*
+	  's'	Enable fullscreen mode.  Currently only supported in the
+		MS-Windows GUI version.  When set, the window will occupy the
+		entire screen and remove window decorations.  Define custom
+		mappings to toggle this mode conveniently.  For detailed usage
+		instructions, see |gui-w32-fullscreen|.
 								*'go-r'*
 	  'r'	Right-hand scrollbar is always present.
 								*'go-R'*
@@ -6033,7 +6041,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	When the number of matches exceeds this value, Vim shows ">" instead
 	of the exact count to keep searching fast.
 	Note: larger values may impact performance.
-	The value must be between 1 and 9999.
+	The value must be between 1 and 9999.  See also the |searchcount()|
+	function.
 
 						*'menuitems'* *'mis'*
 'menuitems' 'mis'	number	(default 25)
@@ -6964,6 +6973,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	|lambda| or a |Funcref|.  See |option-value-function| for more
 	information.
 
+	It is not allowed to change text or jump to another window while
+	evaluating 'qftf' |textlock|.
+
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
@@ -7854,7 +7866,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 		"search hit TOP, continuing at BOTTOM" messages are only
 		indicated by a "W" (Mnemonic: Wrapped) letter before the
 		search count statistics.  The maximum limit can be set with
-		the 'maxsearchcount' option.
+		the 'maxsearchcount' option, see also |searchcount()|
+		function.
 
 	This gives you the opportunity to avoid that a change between buffers
 	requires you to hit <Enter>, but still gives as useful a message as
@@ -8131,7 +8144,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	when it is turned off.  It is also reset when 'compatible' is set.
 
 	The 'L' flag in 'cpoptions' alters tab behavior when 'list' is
-	enabled.  See also |ins-expandtab| ans user manual section |30.5| for
+	enabled.  See also |ins-expandtab| and user manual section |30.5| for
 	in-depth explanations.
 
 	If Vim is compiled with the |+vartabs| feature then the value of

runtime/doc/popup.txt

@@ -1,10 +1,10 @@
-*popup.txt*	For Vim version 9.1.  Last change: 2025 Nov 09
+*popup.txt*	For Vim version 9.1.  Last change: 2026 Jan 08
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
 
 
-Displaying text in a floating window.	*popup* *popup-window* *popupwin*
+Displaying text in a popup window.	*popup* *popup-window* *popupwin*
 
 
 1. Introduction			|popup-intro|

runtime/doc/quickfix.txt

@@ -1,4 +1,4 @@
-*quickfix.txt*  For Vim version 9.1.  Last change: 2025 Nov 09
+*quickfix.txt*  For Vim version 9.1.  Last change: 2025 Dec 27
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1654,6 +1654,22 @@ b/g:mypy_makeprg_params variable.  For example: >
 
 The global default is "--strict --ignore-missing-imports".
 
+PYRIGHT TYPE CHECKER					*compiler-pyright*
+
+Commonly used compiler options can be added to 'makeprg' by setting the
+b/g:pyright_makeprg_params variable.
+
+The global default is "pyright".
+
+TY TYPE CHECKER					*compiler-ty*
+
+Commonly used compiler options and executable can be set by the
+b/g:ty_makeprg variable.  For example: >
+
+	let b:ty_makeprg = "uv run ty"
+
+The global default is "ty --no-progress --color=never".
+
 RUFF LINTER						*compiler-ruff*
 
 Commonly used compiler options can be added to 'makeprg' by setting the

runtime/doc/syntax.txt

@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 9.1.  Last change: 2025 Oct 14
+*syntax.txt*	For Vim version 9.1.  Last change: 2026 Jan 23
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1125,6 +1125,7 @@ new-generation language oriented to full-scenario intelligence.
 All highlighting is enabled by default.  To disable highlighting for a
 specific group, set the corresponding variable to 0 in your |vimrc|.
 All options to disable highlighting are: >
+	:let g:cangjie_builtin_color = 0
 	:let g:cangjie_comment_color = 0
 	:let g:cangjie_identifier_color = 0
 	:let g:cangjie_keyword_color = 0
@@ -2701,50 +2702,50 @@ If you don't want to highlight these errors, leave it unset.
 
 NROFF						*nroff.vim* *ft-nroff-syntax*
 
-The nroff syntax file works with AT&T n/troff out of the box.  You need to
-activate the GNU groff extra features included in the syntax file before you
-can use them.
-
-For example, Linux and BSD distributions use groff as their default text
-processing package.  In order to activate the extra syntax highlighting
-features for groff, arrange for files to be recognized as groff (see
+The nroff syntax file works with AT&T n/troff as-is.  To support GNU troff
+(groff), which Linux and BSD distributions use as their default typesetting
+package, arrange for files to be recognized as groff input (see
 |ft-groff-syntax|) or add the following option to your start-up files: >
 
   :let nroff_is_groff = 1
 
-Groff is different from the old AT&T n/troff that you may still find in
-Solaris.  Groff macro and request names can be longer than 2 characters and
-there are extensions to the language primitives.  For example, in AT&T troff
-you access the year as a 2-digit number with the request \(yr.  In groff you
-can use the same request, recognized for compatibility, or you can use groff's
-native syntax, \[yr].  Furthermore, you can use a 4-digit year directly:
-\[year].  Macro requests can be longer than 2 characters, for example, GNU mm
-accepts the requests ".VERBON" and ".VERBOFF" for creating verbatim
-environments.
+GNU troff differs from older AT&T n/troff programs (that you may still find in
+Solaris or Plan 9) by extending the *roff language syntax.  For example, in
+AT&T troff, you access the count of years since 1900 with the escape sequence
+\(yr.  In groff you can do the same, which it recognizes for compatibility, or
+use groff's extended syntax, \[yr].  AT&T troff documented the yr register as
+storing the "last two digits of current year", but had a Y2K problem; in
+groff, you can access the Gregorian year correctly: \[year].  In groff, font,
+register, macro, string, and request names can exceed two characters; for
+example, with groff's mm package, the control lines ".VERBON" and ".VERBOFF"
+call macros of those names to bracket displays of "verbatim" content.
 
 In order to obtain the best formatted output g/troff can give you, you should
 follow a few simple rules about spacing and punctuation.
 
-1. Do not leave empty spaces at the end of lines.
+1. Break the line (put a carriage return) at the end of every sentence.  Don't
+   permit trailing spaces before the newline.
 
-2. Leave one space and one space only after an end-of-sentence period,
-   exclamation mark, etc.
+2. If a line ends with a period, question mark, or exclamation point that does
+   not end a sentence, follow it with the dummy character escape sequence \&.
 
-3. For reasons stated below, it is best to follow all period marks with a
-   carriage return.
+3. If you're using a macro package, employ its paragraphing macros to achieve
+   indentation of paragraphs and spacing between them.
 
-The reason behind these unusual tips is that g/n/troff have a line breaking
-algorithm that can be easily upset if you don't follow the rules given above.
+4. Use the empty request, a '.' on a line by itself, freely to visually
+   separate material for ease of document maintenance.
 
-Unlike TeX, troff fills text line-by-line, not paragraph-by-paragraph and,
-furthermore, it does not have a concept of glue or stretch, all horizontal and
-vertical space input will be output as is.
+The reason for these tips is that g/n/troff attempts to detect the ends of
+sentences, and can use that information to apply inter-sentence space.  Using
+them also minimizes the size of diffs where lines change due only to refilling
+in the text editor.  Macro packages typically employ inter-paragraph spacing
+amounts other than one vee (which is the result of a blank input line), and
+typically store that spacing amount, and that of paragraph indentation, in
+user-configurable registers so that pages lay out consistently.
 
-Therefore, you should be careful about not using more space between sentences
-than you intend to have in your final document.  For this reason, the common
-practice is to insert a carriage return immediately after all punctuation
-marks.  If you want to have "even" text in your final processed output, you
-need to maintain regular spacing in the input text.  To mark both trailing
+Unlike TeX, troff fills text line-by-line, not paragraph-by-paragraph.  If you
+desire consistent spacing between words and sentences in formatted output, you
+must maintain consistent spacing in the input text.  To mark both trailing
 spaces and two or more spaces after a punctuation as an error, use: >
 
   :let nroff_space_errors = 1
@@ -2764,11 +2765,11 @@ file: >
 
 	let b:preprocs_as_sections = 1
 
-As well, the syntax file adds an extra paragraph marker for the extended
-paragraph macro (.XP) in the ms package.
+Further, the syntax file adds an extra paragraph marker for the XP
+paragraphing macro in the ms package, a Berkeley and GNU extension.
 
-Finally, there is a |groff.vim| syntax file that can be used for enabling
-groff syntax highlighting either on a file basis or globally by default.
+Finally, there is a |groff.vim| syntax file that can be used to enable groff
+syntax highlighting either on a per-file basis or globally by default.
 
 
 OCAML						*ocaml.vim* *ft-ocaml-syntax*
@@ -4698,7 +4699,7 @@ the region, but not the contents of the region, are marked as concealable.
 Whether or not they are actually concealed depends on the setting on the
 'conceallevel' option.  The ends of a region can only be concealed separately
 in this way when they have their own highlighting via "matchgroup".  The
-|synconcealed()| function can be used to retrieve information about conealed
+|synconcealed()| function can be used to retrieve information about concealed
 items.
 
 cchar							*:syn-cchar*

runtime/doc/tags

@@ -377,6 +377,7 @@ $quote	eval.txt	/*$quote*
 'go-m'	options.txt	/*'go-m'*
 'go-p'	options.txt	/*'go-p'*
 'go-r'	options.txt	/*'go-r'*
+'go-s'	options.txt	/*'go-s'*
 'go-t'	options.txt	/*'go-t'*
 'go-v'	options.txt	/*'go-v'*
 'gp'	options.txt	/*'gp'*
@@ -6771,6 +6772,7 @@ compiler-mypy	quickfix.txt	/*compiler-mypy*
 compiler-pandoc	quickfix.txt	/*compiler-pandoc*
 compiler-perl	quickfix.txt	/*compiler-perl*
 compiler-pylint	quickfix.txt	/*compiler-pylint*
+compiler-pyright	quickfix.txt	/*compiler-pyright*
 compiler-pytest	quickfix.txt	/*compiler-pytest*
 compiler-pyunit	quickfix.txt	/*compiler-pyunit*
 compiler-ruff	quickfix.txt	/*compiler-ruff*
@@ -6779,6 +6781,7 @@ compiler-spotbugs	quickfix.txt	/*compiler-spotbugs*
 compiler-tex	quickfix.txt	/*compiler-tex*
 compiler-tombi	quickfix.txt	/*compiler-tombi*
 compiler-tsc	quickfix.txt	/*compiler-tsc*
+compiler-ty	quickfix.txt	/*compiler-ty*
 compiler-typst	quickfix.txt	/*compiler-typst*
 compiler-vaxada	ft_ada.txt	/*compiler-vaxada*
 compl-current	insert.txt	/*compl-current*
@@ -8248,6 +8251,7 @@ gui-vert-scroll	gui.txt	/*gui-vert-scroll*
 gui-w32	gui_w32.txt	/*gui-w32*
 gui-w32-cmdargs	gui_w32.txt	/*gui-w32-cmdargs*
 gui-w32-dialogs	gui_w32.txt	/*gui-w32-dialogs*
+gui-w32-fullscreen	gui_w32.txt	/*gui-w32-fullscreen*
 gui-w32-printing	gui_w32.txt	/*gui-w32-printing*
 gui-w32-start	gui_w32.txt	/*gui-w32-start*
 gui-w32-title-bar	gui_w32.txt	/*gui-w32-title-bar*
@@ -10972,6 +10976,7 @@ termcap-cursor-shape	term.txt	/*termcap-cursor-shape*
 termcap-options	term.txt	/*termcap-options*
 termcap-title	term.txt	/*termcap-title*
 termda1-variable	eval.txt	/*termda1-variable*
+termdebug	terminal.txt	/*termdebug*
 termdebug-commands	terminal.txt	/*termdebug-commands*
 termdebug-communication	terminal.txt	/*termdebug-communication*
 termdebug-customizing	terminal.txt	/*termdebug-customizing*

runtime/doc/terminal.txt

@@ -1,4 +1,4 @@
-*terminal.txt*	For Vim version 9.1.  Last change: 2025 Nov 28
+*terminal.txt*	For Vim version 9.1.  Last change: 2026 Jan 18
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1263,7 +1263,8 @@ Alternatively, press "s" to swap the first and second dump.  Do this several
 times so that you can spot the difference in the context of the text.
 
 ==============================================================================
-6. Debugging	*terminal-debug* *terminal-debugger* *package-termdebug*
+6. Debugging				*terminal-debug* *terminal-debugger*
+					*package-termdebug* *termdebug*
 
 The Terminal debugging plugin can be used to debug a program with gdb and view
 the source code in a Vim window.  Since this is completely contained inside

runtime/doc/todo.txt

@@ -1,4 +1,4 @@
-*todo.txt*	For Vim version 9.1.  Last change: 2025 Dec 09
+*todo.txt*	For Vim version 9.1.  Last change: 2025 Dec 26
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -205,11 +205,8 @@ Popup windows:
   positioned?  PopupNew?  Could be used to set some options or move it out of
   the way. (#5737)
   However, it may also cause trouble, changing the popup of another plugin.
-- Should popup_getoptions() also return the mask?  #7774
 - Add a way to use popup_menu() synchronously: instead of invoking the
   callback, return the choice. (Ben Jackson, #6534)
-- When using a popup for the info of a completion menu, and there is not
-  enough space, let the popup overlap with the menu. (#4544)
 - Implement flip option.
 - Make redrawing more efficient and avoid flicker:
     - put popup menu also in popup_mask?
@@ -368,9 +365,6 @@ Can we not request XT key sequences, or reduce them drastically?
 Issue #10512: Dynamic loading broken with Perl 5.36
 Damien has a patch (2022 Dec 4)
 
-Request #11965: Allow several "%=" items in 'statusline', makes it possible
-to have text in the center.
-
 Add some kind of ":whathappend" command and functions to make visible what the
 last few typed keys and executed commands are.  To be used when the user
 wonders what went wrong.  Could also be used for statistics #12046.
@@ -380,10 +374,6 @@ wonders what went wrong.  Could also be used for statistics #12046.
 - executed command lines
 - with more verbosity: what scripts/functions/autocommands were executed
 
-NFA regexp does not handle composing characters well: #10286
-    [ɔ̃] matches both ɔ and ɔ̃
-    \(ɔ\|ɔ̃\) matches ɔ and not ɔ̃
-
 Is there a way to make 'autowriteall' make a clean exit when the xterm is
 closed? (Dennis Nazic says files are preserved, okt 28).  Perhaps handle TERM
 like HUP?
@@ -417,8 +407,6 @@ In a timer callback, when using ":echo" and then input() the message is
 overwritten.  Could use ":echowin" and call redraw_cmd() in get_user_input().
 #11299
 
-Syntax include problem: #11277.  Related to Patch 8.2.2761
-
 To avoid flicker: add an option that when a screen clear is requested, instead
 of clearing it draws everything and uses "clear to end of line" for every line.
 Resetting 't_ut' already causes this?
@@ -517,8 +505,6 @@ there is a match do not scan the directory (possibly speeds up :find a lot).
 
 globpath() does not use 'wildignorecase' at all? (related to #8350)
 
-mksession uses :buffer instead of :edit in one place but not another. #10629
-
 Add 'termguiattr' option, use "gui=" attributes in the terminal?  Would work
 with 'termguicolors'. #1740
 
@@ -5781,7 +5767,6 @@ Argument list:
 
 
 Registers:
-8   Don't display empty registers with ":display". (Etienne)
 8   Add put command that overwrites existing text.  Should also work for
     blocks.  Useful to move text around in a table.  Works like using "R ^R r"
     for every line.

runtime/doc/uganda.txt

@@ -1,4 +1,4 @@
-*uganda.txt*	For Vim version 9.1.  Last change: 2025 Nov 13
+*uganda.txt*	For Vim version 9.1.  Last change: 2026 Jan 07
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -21,7 +21,7 @@ ICCF Holland and Kuwasha~
 
 |Bram| Moolenaar's charity, ICCF Holland, has long supported the education of
 children in Uganda through the Kibaale Children's Centre.  Following Bram's
-passing in 2023, ICCF Holland transfered all activities to its sister charity
+passing in 2023, ICCF Holland transferred all activities to its sister charity
 Kuwasha in Canada and dissolved at the end of 2025.
 
 Donations from Vim users are still welcome and will continue to go directly to

runtime/doc/version9.txt

@@ -1,4 +1,4 @@
-*version9.txt*	For Vim version 9.1.  Last change: 2025 Dec 15
+*version9.txt*	For Vim version 9.1.  Last change: 2026 Jan 07
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -41724,7 +41724,10 @@ Options: ~
   (see also the below platform specific change).
 - 'guioptions': Support darkmode on MS-Windows for menu and title bar using
   |'go-d'| (see also the below platform specific change).
+- 'guioptions': New value |'go-s'| to support fullscreen on MS-Windows GUI
+  (see also the below platform specific change).
 - 'completepopup': Add more values to style popup windows.
+- 'fsync' is now a |global-local| option.
 
 Ex commands: ~
 - allow to specify a priority when defining a new sign |:sign-define|
@@ -41768,6 +41771,7 @@ Platform specific ~
 - MS-Windows: Vim no longer searches the current directory for
   executables when running external commands; prefix a relative or absolute
   path if you want the old behavior |$NoDefaultCurrentDirectoryInExePath|.
+- MS-Windows: New value |'go-s'| to support fullscreen on MS-Windows GUI
 
 - macOS: increase default scheduler priority to TASK_DEFAULT_APPLICATION.
 
@@ -41827,6 +41831,7 @@ Functions: ~
 |id()|			get unique identifier for a Dict, List, Object,
 			Channel or Blob variable
 |list2tuple()|		turn a List of items into a Tuple
+|listener_add()|	add a callback to listen to changes
 |matchbufline()|	all the matches of a pattern in a buffer
 |matchstrlist()|	all the matches of a pattern in a List of strings
 |ngettext()|		lookup single/plural message translation
@@ -41878,11 +41883,13 @@ Commands: ~
 
 Ex-Commands: ~
 
+|:clipreset|		choose a new method for accessing the clipboard
 |:iput|			like |:put| but adjust indent
 |:pbuffer|		Edit buffer [N] from the buffer list in the preview
 			window
 |:redrawtabpanel|	Force updating the 'tabpanel'.
 |:uniq|			Deduplicate text in the current buffer.
+|:wlrestore|		reinitialize the wayland compositor connection
 
 Options: ~
 
@@ -41901,6 +41908,7 @@ Options: ~
 'lhistory'		Size of the location list stack |quickfix-stack|
 'maxsearchcount'	Set the maximum number for search-stat |shm-S|
 'messagesopt'		configure |:messages| and |hit-enter| prompt
+'osctimeoutlen'		OSC terminator receive timeout
 'pumborder'		define popup border and decorations
 'pummaxwidth'		maximum width for the completion popup menu
 'showtabpanel'		When to show the |tabpanel|
@@ -41908,12 +41916,12 @@ Options: ~
 'tabpanel'		Optional vertical panel for displaying tabpages
 			|tabpanel|
 'tabpanelopt'		Optional settings for the |tabpanel|
-'t_xo'			Terminal uses XON/XOFF handshaking (e.g. vt420)
 't_CF'			Support for alternate font highlighting terminal code
+'t_xo'			Terminal uses XON/XOFF handshaking (e.g. vt420)
 'winfixbuf'		Keep buffer focused in a window
 'wlseat'		Specify Wayland seat to use for the |wayland| feature
 'wlsteal'		Steal focus to access the |wayland| clipboard
-'wltimeout'		Specify the connection timeout for the |wayland|
+'wltimeoutlen'		Specify the connection timeout for the |wayland|
 			compositor
 
 Vim Variables: ~
@@ -41921,8 +41929,8 @@ Vim Variables: ~
 |v:clipproviders|	A dictionary containing clipboard providers
 			configuration |clipboard-providers|.
 |v:stacktrace|		The most recent caught exception.
-|v:t_enumvalue|		Value of |enumvalue|.
 |v:t_enum|		Value of |enum| type.
+|v:t_enumvalue|		Value of |enumvalue|.
 |v:t_tuple|		Value of |Tuple| type.
 |v:termda1|		The escape sequence returned for the primary device
 			attribute query (DA1).

runtime/doc/vim-ja.UTF-8.1

@@ -1,4 +1,4 @@
-.TH VIM 1 "2024 Aug 03"
+.TH VIM 1 "2025 Jun 27"
 .SH 名前
 vim \- Vi IMproved, プログラマのテキストエディタ
 .SH 書式
@@ -138,17 +138,6 @@ rvim rview rgvim rgview
 .br
 Note: "+" と "\-c" は合わせて 10 個まで指定できます。
 .TP
-\-S {file}
-一番目のファイルが読み込まれた後に {file} が実行されます。
-これは \-c "source {file}" と同じ動作です。
-{file} の先頭が '\-' の場合は使えません。
-{file} が省略された場合は、"Session.vim" が使われます
-(ただし \-S が最後の引数だった場合のみ)。
-.TP
-\-\-cmd {command}
-"\-c" と同じですが、vimrc を処理する前にコマンドが実行されます。
-これらのコマンドは "\-c" コマンドとは別に、10 個まで指定できます。
-.TP
 \-A
 アラビア語がサポートされていて、アラビア語キーマップがある場合は、アラビア語モードで起動します ('arabic' がオンになります)。
 右横書きのファイルを編集できます。
@@ -196,27 +185,17 @@ Amiga の場合は、新しいウィンドウで再起動しなくなります
 を起動して、編集が終わるまで待機したいような場合に使ってください。
 Amiga では、":sh" と "!" コマンドは機能しなくなります。
 .TP
-\-\-nofork
-フォアグラウンド。GUI バージョンで、プロセスをフォークしなくなります。
-.TP
 \-F
 ペルシア語がサポートされていて、ペルシア語キーマップがある場合は、ペルシア語モードで起動します ('fkmap' と 'rightleft' がオンになります)。
 右横書きのファイルを編集できます。
 サポートされていない場合はエラーメッセージを表示して終了します。
+.br
+注意: ペルシア語サポートはパッチ 8.1.0932 で削除されました。
 .TP
 \-g
 GUI がサポートされている場合は、GUI で起動します。
 サポートされていない場合はエラーメッセージを表示して終了します。
 .TP
-\-\-gui-dialog-file {name}
-GUI の使用時、ダイアログを表示する代わりとして、ファイル {name} へダイアログのタイトルとメッセージを書き込みます。
-ファイルは作成されるか追記されます。
-テストにみ有用で、見ることができないダイアログによってテストが中断されるのを防ぎます。
-GUI 以外ではこの引数は無視されます。
-.TP
-\-\-help, \-h, \-?
-コマンドライン引数やオプションのヘルプを表示して終了します。
-.TP
 \-H
 ヘブライ語がサポートされていて、ヘブライ語キーマップがある場合は、ヘブライ語モードで起動します ('hkmap' と 'rightleft' がオンになります)。
 右横書きのファイルを編集できます。
@@ -226,13 +205,13 @@ GUI 以外ではこの引数は無視されます。
 初期設定の "~/.viminfo" の代わりに、viminfo ファイルを読み書きする際に使うファイル名を指定します。
 "NONE" を指定すると、.viminfo ファイルを使わないように設定できます。
 .TP
-\-L
-\-r と同じです。
-.TP
 \-l
 lisp モード。
 オプションの 'lisp' と 'showmatch' がオンになります。
 .TP
+\-L
+\-r と同じです。
+.TP
 \-m
 ファイルの変更を不可能にします。
 オプション 'write' がオフになります。
@@ -243,12 +222,6 @@ lisp モード。
 オプションの 'modifiable' と 'write' がオフになり、ファイルの変更と保存ができなくなります。
 Note: それらのオプションを設定すれば変更できるようになります。
 .TP
-\-N
-非互換モード。'compatible' オプションがオフになります。
- .vimrc ファイルの有無に関わらず、
-.B Vim
-の改良された機能が有効になります。Vi との互換性が少し失われます。
-.TP
 \-n
 スワップファイルを使用しません。
 クラッシュしてもリカバリできなくなります。
@@ -256,6 +229,12 @@ Note: それらのオプションを設定すれば変更できるようにな
 ":set uc=0" と設定しても同じです。
 戻すには ":set uc=200" と設定してください。
 .TP
+\-N
+非互換モード。'compatible' オプションがオフになります。
+ .vimrc ファイルの有無に関わらず、
+.B Vim
+の改良された機能が有効になります。Vi との互換性が少し失われます。
+.TP
 \-nb
 NetBeans と接続し、エディタサーバーになります。
 詳しくはヘルプを参照してください。
@@ -278,15 +257,6 @@ Win32 のみ。親になるアプリケーションのタイトルを指定し
 {parent-title} が親アプリケーションのウィンドウのタイトルに使われていて、明確に区別できる必要があります。
 Note: まだ簡単に実装されているだけです。全てのアプリケーションで動くわけではありません。メニューは機能しません。
 .TP
-\-R
-読み込み専用モード。
-オプション 'readonly' がオンになります。
-バッファを変更することはできますが、間違ってファイルを上書きしてしまうのを防ぐことができます。
-ファイルを保存したい場合は、":w!" のように、Ex コマンドに感嘆符を付けてください。
-\-R オプションは \-n オプションの効果も含んでいます (上記参照)。
-オプション 'readonly' は ":set noro" でオフにできます。
-詳しくは ":help 'readonly'" を参照してください。
-.TP
 \-r
 スワップファイルの一覧を表示します。リカバリに関する情報も表示されます。
 .TP
@@ -296,6 +266,15 @@ Note: まだ簡単に実装されているだけです。全てのアプリケ
 スワップファイルは、ファイル名に ".swp" を加えた名前のファイルです。
 詳しくは ":help recovery" を参照してください。
 .TP
+\-R
+読み込み専用モード。
+オプション 'readonly' がオンになります。
+バッファを変更することはできますが、間違ってファイルを上書きしてしまうのを防ぐことができます。
+ファイルを保存したい場合は、":w!" のように、Ex コマンドに感嘆符を付けてください。
+\-R オプションは \-n オプションの効果も含んでいます (上記参照)。
+オプション 'readonly' は ":set noro" でオフにできます。
+詳しくは ":help 'readonly'" を参照してください。
+.TP
 \-s
 サイレントモード。"ex" という名前で起動するか、"\-e" オプションの後で
 "\-s" オプションが指定された場合のみ。
@@ -306,6 +285,13 @@ Note: まだ簡単に実装されているだけです。全てのアプリケ
 これは ":source! {scriptin}" と同じ動作です。
 エディタが終了する前にファイルの終わりまで読み込んだ場合、それ以降はキーボードから入力を読み込みます。
 .TP
+\-S {file}
+一番目のファイルが読み込まれた後に {file} が実行されます。
+これは \-c "source {file}" と同じ動作です。
+{file} の先頭が '\-' の場合は使えません。
+{file} が省略された場合は、"Session.vim" が使われます
+(ただし \-S が最後の引数だった場合のみ)。
+.TP
 \-T {terminal}
 端末の名前を指定します。
 端末が自動的に認識されない場合に使ってください。
@@ -313,15 +299,6 @@ Note: まだ簡単に実装されているだけです。全てのアプリケ
 が組み込みでサポートしている名前か、
 termcap または terminfo ファイルで定義されている名前を指定してください。
 .TP
-\-\-not-a-term
-入力と出力(もしくはどちらか一方)が端末に接続されていないことを、ユーザーが把握しているということを
-.B Vim
-に伝えます。
-これにより警告が表示され 2 秒間の遅延が発生するのを避けられます。
-.TP
-\-\-ttyfail
-標準入力か標準出力が端末 (tty) でない場合、すぐに終了します。
-.TP
 \-u {vimrc}
 {vimrc} ファイルを使って初期化します。
 他の初期化処理はスキップされます。
@@ -335,6 +312,11 @@ termcap または terminfo ファイルで定義されている名前を指定
 すべての GUI の初期化をスキップするには "NONE" を指定してください。
 詳しくは ":help gui\-init" を参照してください。
 .TP
+\-v
+Vi モードで起動します。
+実行ファイルの名前が "vi" の場合と同じです。
+実行ファイルの名前が "ex" の場合だけ効果があります。
+.TP
 \-V[N]
 冗長モード。
 スクリプトファイルを実行したり viminfo ファイルを読み書きするたびにメッセージを表示します。
@@ -346,19 +328,6 @@ N に指定した数値が 'verbose' に設定されます。
 その結果、メッセージは表示されずにファイル {filename} に書き出されます。
 {filename} は数字で始まってはいけません。
 .TP
-\-\-log {filename}
-もし
-.B Vim
-がチャネル機能付きでコンパイルされている場合、ログの出力を開始し、ファイル {filename} に書き込みます。
-これは、起動時の非常に早い段階で
-.I ch_logfile({filename}, 'ao')
-を呼び出すのと同様な動作です。
-.TP
-\-v
-Vi モードで起動します。
-実行ファイルの名前が "vi" の場合と同じです。
-実行ファイルの名前が "ex" の場合だけ効果があります。
-.TP
 \-w{number}
 オプション 'window' を {number} に設定します。
 .TP
@@ -379,6 +348,9 @@ Vi モードで起動します。
 X サーバーと通信しません。端末での起動時間を短くできます。
 しかし、ウィンドウタイトルの変更やクリップボードは使えなくなります。
 .TP
+\-Y
+waylandコンポジタに接続しません。
+.TP
 \-y
 簡易モードで起動します。
 実行ファイルの名前が "evim" や "eview" の場合と同じです。
@@ -398,16 +370,48 @@ X サーバーと通信しません。端末での起動時間を短くできま
 一切の個人設定 (vimrc、プラグイン、その他) を使用しません。
 ある問題がクリーンな Vim セットアップで再現するかを確認するのに有用です。
 .TP
+\-\-cmd {command}
+"\-c" と同じですが、vimrc を処理する前にコマンドが実行されます。
+これらのコマンドは "\-c" コマンドとは別に、10 個まで指定できます。
+.TP
 \-\-echo\-wid
 GTK GUI のみ: Window ID を標準出力に出力します。
 .TP
+\-\-gui-\dialog\-file {name}
+GUI の使用時、ダイアログを表示する代わりとして、ファイル {name} へダイアログのタイトルとメッセージを書き込みます。
+ファイルは作成されるか追記されます。
+テストにみ有用で、見ることができないダイアログによってテストが中断されるのを防ぎます。
+GUI 以外ではこの引数は無視されます。
+.TP
+\-\-help, \-h, \-?
+コマンドライン引数やオプションのヘルプを表示して終了します。
+.TP
 \-\-literal
 引数のファイル名をリテラル文字列として扱います。ワイルドカードを展開しません。
 Unix のように、シェルがワイルドカードを展開する場合は機能しません。
 .TP
+\-\-log {filename}
+もし
+.B Vim
+がチャネル機能付きでコンパイルされている場合、ログの出力を開始し、ファイル {filename} に書き込みます。
+これは、起動時の非常に早い段階で
+.I ch_logfile({filename}, 'ao')
+を呼び出すのと同様な動作です。
+.TP
+\-\-nofork
+フォアグラウンド。GUI バージョンで、
+.B Vim
+はプロセスをフォークしなくなり、開始したシェルからデタッチされます。
+.TP
 \-\-noplugin
 プラグインをロードしません。\-u NONE はこの動作を含んでいます。
 .TP
+\-\-not\-a\-term
+入力と出力(もしくはどちらか一方)が端末に接続されていないことを、ユーザーが把握しているということを
+.B Vim
+に伝えます。
+これにより警告が表示され 2 秒間の遅延が発生するのを避けられます。
+.TP
 \-\-remote
 Vim サーバーと通信し、引数に指定されたファイルを Vim サーバーで開きます。
 サーバーが存在しない場合は、エラーメッセージを表示され、起動中の Vim でファイルが開かれます。
@@ -433,18 +437,26 @@ Vim サーバーの一覧を表示します。
 \-\-servername {name}
 サーバーの名前を {name} に設定します。
 \-\-remote 引数を指定しなかった場合は、起動中の Vim の名前として使われるので、後からその名前を使ってサーバー通信できます。
+バックエンドとしてソケットサーバーを使っている場合、"/", "./" または "../" で始まる名前はソケットへのパスとして扱われます。
+.TP
+\-\-clientserver {backend}
+クライアントサーバー機能のバックエンドとして {backend} "socket" か "x11" のどちらかを利用します。
+socketserver と X11 の両方の機能を使ってコンパイルした時にだけ利用可能です。
 .TP
 \-\-socketid {id}
-GTK GUI のみ: GtkPlug メカニズムを使って gvim を別のウィンドウの中で実行します。
+GTK GUI のみ: GtkPlug メカニズムを使って gVim を別のウィンドウの中で実行します。
 .TP
 \-\-startuptime {file}
 起動処理の間、経過時間のメッセージをファイル {fname} に書き出します。
 .TP
+\-\-ttyfail
+標準入力か標準出力が端末 (tty) でない場合、すぐに終了します。
+.TP
 \-\-version
 バージョン情報を表示して終了します。
 .TP
 \-\-windowid {id}
-Win32 GUI の Vim のみ。ウィンドウ {id} を親ウィンドウにしようと試みます。
+Win32 GUI の Vim のみ。ウィンドウ {id} を gVim の親ウィンドウにしようと試みます。
 成功するとそのウィンドウの内側で起動します。
 .SH オンラインヘルプ
 ヘルプを開くには、
@@ -493,14 +505,18 @@ Win32 GUI の Vim のみ。ウィンドウ {id} を親ウィンドウにしよ
 システムの gvim 初期化ファイル。
 .TP
 ~/.gvimrc, ~/.vim/gvimrc, $XDG_CONFIG_HOME/vim/gvimrc
-ユーザーの gvim 初期化ファイル。(最初のものが使われます。)
+ユーザーの
+.B gVim
+初期化ファイル。(最初のものが使われます。)
 .TP
 /usr/local/share/vim/vim??/optwin.vim
 ":options" コマンドで使われるファイル。
 オプションを表示したり設定したりできます。
 .TP
 /usr/local/share/vim/vim??/menu.vim
-システムのメニュー初期化ファイル。gvim で使います。
+システムのメニュー初期化ファイル。
+.B gVim
+で使います。
 .TP
 /usr/local/share/vim/vim??/bugreport.vim
 バグレポートを生成するスクリプト。":help bugs" 参照。

runtime/doc/vim9.txt

@@ -1,4 +1,4 @@
-*vim9.txt*	For Vim version 9.1.  Last change: 2025 Dec 03
+*vim9.txt*	For Vim version 9.1.  Last change: 2026 Jan 19
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1084,8 +1084,11 @@ empty list and dict is falsy:
 	special		true or v:true
 	job		when not NULL
 	channel		when not NULL
-	class		when not NULL
-	object		when not NULL (TODO: when isTrue() returns true)
+	class		not applicable
+	object		when not NULL
+	enum		not applicable
+	enum value	always
+	typealias	not applicable
 
 The boolean operators "||" and "&&" expect the values to be boolean, zero or
 one: >

runtime/doc/vimdiff-ja.UTF-8.1

@@ -1,4 +1,4 @@
-.TH VIMDIFF 1 "2001 March 30"
+.TH VIMDIFF 1 "2021 June 13"
 .SH 名前
 vimdiff \- 2 個から 8 個のファイルを Vim で開いて、その差分を表示する
 .SH 書式

runtime/doc/vimtutor-ja.UTF-8.1

@@ -1,44 +1,99 @@
-.TH VIMTUTOR 1 "2001 April 2"
+.TH VIMTUTOR 1 "2024 December 03"
 .SH 名前
 vimtutor \- Vim チュートリアル
 .SH 書式
 .br
-.B vimtutor [\-g] [language]
+.B vimtutor [\-l | \-\-language ISO639] [\-c | \-\-chapter NUMBER] [\-g | \-\-gui] [ISO639]
+.br
+.B vimtutor [\-h | \-\-help]
+.br
+.B vimtutor [\-\-list]
 .SH 説明
 .B Vim
 のチュートリアルを起動します。
-演習ファイルのコピーを使って実施するので、オリジナルの演習ファイルを壊してしまう心配はありません。
 .PP
 .B Vim
 を初めて学ぶ人向けのチュートリアルです。
+省略可能な [ISO639] 引数は "ja" や "es" のような 2 または 3 文字の言語名です。
 .PP
-引数に \-g を指定すると GUI 版の vim が利用可能であれば vim ではなく gvim
-を使って vimtutor が開始します。gvim が見つからないときは Vim が使用されます。
-.PP
-[language] 引数は "ja" や "es" などの二文字の言語名です。
-[language] 引数を省略した場合はロケールの言語が使われます。
-翻訳された演習ファイルがある場合は、そのファイルが使われます。
-ない場合は英語のファイルが使われます。
+.B vimtutor
+は演習ファイルの一時的なコピーを開くので、オリジナルの演習ファイルを上書きしてしまう心配はありません。
 .PP
 .B Vim
-は Vi 互換モードで起動されます。
+は常に
+.B Vi
+非互換モードで起動されます。
+.SH オプション
+.TP
+.BR \-l ", " \-\-language\ \fIISO639\fR
+2 または 3 文字の言語コードを設定します。
+例: 'ja', 'es', 'bar'
+ロケールの言語が使用可能であればそれが使われ、なければ英語がデフォルトとして使われます。
+.TP
+.BR \-c ", " \-\-chapter\ \fINUMBER\fR
+章番号を設定します。
+デフォルトは第 1 章です。
+.TP
+.BR \-g ", " \-\-gui
+使用可能であれば
+.B vimtutor
+を GUI 版の vim を使って開始します。そうでなければコンソール版の vim を使用します。
+.TP
+.BR \-h ", " \-\-help
+使い方を表示します。
+.TP
+.BR \-\-list
+章と言語の一覧を表示します。
+.SH 例
+.B vimtutor
+をドイツ語の第 1 章で開始するには:
+.PP
+.nf
+.RS
+vimtutor de
+.RE
+.fi
+.PP
+英語の第 2 章の場合は:
+.PP
+.nf
+.RS
+vimtutor -c2
+.RE
+.fi
+.PP
+GUI でバイエルン語の第 1 章を開始する際の長い形式のコマンドは:
+.PP
+.nf
+.RS
+vimtutor --language bar --chapter 1 --gui
+.RE
+.fi
 .SH ファイル
 .TP 15
-/usr/local/lib/vim/tutor/tutor[.language]
+/usr/local/share/vim/vim??/tutor/tutor1[.language]
 .B Vimtutor
-の演習ファイル。
+の第 1 章の演習ファイル。
 .TP 15
-/usr/local/lib/vim/tutor/tutor.vim
-演習ファイルをコピーするための Vim スクリプト。
-.SH 著者
+/usr/local/share/vim/vim??/tutor/tutor2[.language]
 .B Vimtutor
-は、Colorado State University の Charles Smith のアイデアを基に、
+の第 2 章の演習ファイル。
+.TP 15
+/usr/local/share/vim/vim??/tutor/tutor.vim
+.B Vimtutor
+の演習ファイルをコピーするための
+.B Vim
+スクリプト。
+.SH 著者
+.B The Vi Tutorial
+は、元々 Colorado State University の Charles Smith のアイデアを基に、
 Colorado School of Mines の Michael C. Pierce と Robert K. Ware
-の両名によって Vi 向けに作成されたものを基にしています。
-E-mail: bware@mines.colorado.edu (現在は無効).
-.br
+の両名によって Vi 向けに作成されました。
+.B E-mail: bware@mines.colorado.edu (現在は無効).
+.PP
 .B Vim
 に合わせて Bram Moolenaar が変更を加えました。
+.PP
 翻訳者の名前は演習ファイルを参照してください。
 .SH 関連項目
 vim(1)

runtime/doc/xxd-ja.UTF-8.1

@@ -1,4 +1,4 @@
-.TH XXD 1 "August 1996" "Manual page for xxd"
+.TH XXD 1 "May 2024" "Manual page for xxd"
 .\"
 .\" 21st May 1996
 .\" Man page author:
@@ -58,7 +58,8 @@
 1 オクテットが "1" と "0" の 8 文字で出力されます。
 各行の行頭には 16 進数の行番号が表示されます。
 行末には ASCII (または EBCDIC) で表した場合の文字が表示されます。
-このモードでは \-p、\-i は機能しません。
+このモードでは \-p は機能しません。
+\-i と組み合わせることができます。
 .TP
 .IR \-e
 リトルエンディアンの 16 進ダンプに切り替える。
@@ -106,6 +107,7 @@
 C インクルードファイル形式で出力する。
 入力ファイルの名前が付けられた静的配列の定義が出力されます。
 標準入力の場合は定義の中身だけ出力されます。
+\-b と組み合わせることができます。
 .TP
 .IR "\-l len " | " \-len len"
 .RI  < len >
@@ -228,22 +230,24 @@ xxd \-r \-p でプレーン形式 (ポストスクリプト形式) の 16 進ダ
 .br
 \fI% xxd \-s \-0x30 file\fR
 .PP
+注意: 以下の例の結果は 2024 年 5 月時点の xxd.1 マニュアルページに基づいています。
+.PP
 .br
 120 バイトを、平文 16 進ダンプ形式で一行に 20 オクテットずつ出力する。
 .br
 \fI% xxd \-l 120 \-ps \-c 20 xxd.1\fR
 .br
-2e54482058584420312022417567757374203139
+2e544820585844203120224d6179203230323422
 .br
-39362220224d616e75616c207061676520666f72
+20224d616e75616c207061676520666f72207878
 .br
-20787864220a2e5c220a2e5c222032317374204d
+64220a2e5c220a2e5c222032317374204d617920
 .br
-617920313939360a2e5c22204d616e2070616765
+313939360a2e5c22204d616e2070616765206175
 .br
-20617574686f723a0a2e5c2220202020546f6e79
+74686f723a0a2e5c2220202020546f6e79204e75
 .br
-204e7567656e74203c746f6e79407363746e7567
+67656e74203c746f6e79407363746e7567656e2e
 .br
 
 .br
@@ -251,32 +255,32 @@ xxd \-r \-p でプレーン形式 (ポストスクリプト形式) の 16 進ダ
 .br
 \fI% xxd \-l 120 \-c 12 xxd.1\fR
 .br
-0000000: 2e54 4820 5858 4420 3120 2241  .TH XXD 1 "A
+00000000: 2e54 4820 5858 4420 3120 224d  .TH XXD 1 "M
 .br
-000000c: 7567 7573 7420 3139 3936 2220  ugust 1996" 
+0000000c: 6179 2032 3032 3422 2022 4d61  ay 2024" "Ma
 .br
-0000018: 224d 616e 7561 6c20 7061 6765  "Manual page
+00000018: 6e75 616c 2070 6167 6520 666f  nual page fo
 .br
-0000024: 2066 6f72 2078 7864 220a 2e5c   for xxd"..\\
+00000024: 7220 7878 6422 0a2e 5c22 0a2e  r xxd"..\\"..
 .br
-0000030: 220a 2e5c 2220 3231 7374 204d  "..\\" 21st M
+00000030: 5c22 2032 3173 7420 4d61 7920  \\" 21st May 
 .br
-000003c: 6179 2031 3939 360a 2e5c 2220  ay 1996..\\" 
+0000003c: 3139 3936 0a2e 5c22 204d 616e  1996..\\" Man
 .br
-0000048: 4d61 6e20 7061 6765 2061 7574  Man page aut
+00000048: 2070 6167 6520 6175 7468 6f72   page author
 .br
-0000054: 686f 723a 0a2e 5c22 2020 2020  hor:..\\"    
+00000054: 3a0a 2e5c 2220 2020 2054 6f6e  :..\\"    Ton
 .br
-0000060: 546f 6e79 204e 7567 656e 7420  Tony Nugent 
+00000060: 7920 4e75 6765 6e74 203c 746f  y Nugent <to
 .br
-000006c: 3c74 6f6e 7940 7363 746e 7567  <tony@sctnug
+0000006c: 6e79 4073 6374 6e75 6765 6e2e  ny@sctnugen.
 .PP
 .br
 xxd.1 の日付部分だけを出力する。
 .br
-\fI% xxd \-s 0x36 \-l 13 \-c 13 xxd.1\fR
+\fI% xxd \-s 0x33 \-l 13 \-c 13 xxd.1\fR
 .br
-0000036: 3231 7374 204d 6179 2031 3939 36  21st May 1996
+00000033: 3231 7374 204d 6179 2031 3939 36  21st May 1996
 .PP
 .br
 .B input_file
@@ -290,11 +294,11 @@ xxd.1 の日付部分だけを出力する。
 .br
 xxd.1 の日付を修正する。
 .br
-\fI% echo "0000037: 3574 68" | xxd \-r \- xxd.1\fR
+\fI% echo "0000034: 3574 68" | xxd \-r \- xxd.1\fR
 .br
-\fI% xxd \-s 0x36 \-l 13 \-c 13 xxd.1\fR
+\fI% xxd \-s 0x33 \-l 13 \-c 13 xxd.1\fR
 .br
-0000036: 3235 7468 204d 6179 2031 3939 36  25th May 1996
+00000033: 3235 7468 204d 6179 2031 3939 36  25th May 1996
 .PP
 .br
 中身がすべて 0x00 の 65537 バイトのファイルを作成する。
@@ -307,11 +311,11 @@ xxd.1 の日付を修正する。
 .br
 \fI% xxd \-a \-c 12 file\fR
 .br
-0000000: 0000 0000 0000 0000 0000 0000  ............
+00000000: 0000 0000 0000 0000 0000 0000  ............
 .br
 *
 .br
-000fffc: 0000 0000 40                   ....A
+0000fffc: 0000 0000 41                   ....A
 .PP
 一文字の 'A' からなる 1 バイトのファイルを作成する。
  '\-r \-s' の後に指定した数値がファイル中の行番号に加算され、結果、余計なバイトが飛ばされる。
@@ -375,7 +379,7 @@ uuencode(1), uudecode(1), patch(1)
 自己責任で使ってください。ファイルをコピーし、それを調べ、ウィザードたれ。
 .br
 .SH バージョン
-このマニュアルは xxd バージョン 1.7 について説明しています。
+このマニュアルは xxd バージョン 1.7 (2024-05) について説明しています。
 .SH 著者
 .br
 (c) 1990-1997 by Juergen Weigert

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:		2025 Nov 11
+" Last Change:		2026 Jan 20
 " Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " If the filetype can be detected from extension or file name(the final path component),
@@ -435,7 +435,7 @@ au BufNewFile,BufRead *.app			call dist#ft#FTapp()
 au BufNewFile,BufRead *esmtprc			setf esmtprc
 
 " Fennel
-au BufNewFile,BufRead *.fnl,{,.}fennelrc	setf fennel
+au BufNewFile,BufRead {,.}fennelrc	setf fennel
 
 " Flatpak config
 au BufNewFile,BufRead */flatpak/repo/config	setf dosini
@@ -1127,6 +1127,15 @@ au BufNewFile,BufRead */etc/systemd/system/*.d/.#*	setf systemd
 au BufNewFile,BufRead */etc/systemd/system/.#*		setf systemd
 au BufNewFile,BufRead */.config/systemd/user/*.d/.#*	setf systemd
 au BufNewFile,BufRead */.config/systemd/user/.#*	setf systemd
+" Podman Quadlet files
+au BufNewFile,BufRead */containers/systemd/*.{artifact,build,container,image,kube,network,pod,volume}	setf systemd
+" Podman Quadlet rootless files not already captured by previous line
+au BufNewFile,BufRead */etc/containers/systemd/users/*/*.{artifact,build,container,image,kube,network,pod,volume}	setf systemd
+au BufNewFile,BufRead */etc/containers/systemd/users/*.{artifact,build,container,image,kube,network,pod,volume}	setf systemd
+" Podman Quadlet overrides
+au BufNewFile,BufRead */containers/systemd/*.d/*.conf	setf systemd
+au BufNewFile,BufRead */etc/containers/systemd/users/*/*.d/*.conf		setf systemd
+au BufNewFile,BufRead */etc/containers/systemd/users/*.d/*.conf		setf systemd
 
 " Sudoers
 au BufNewFile,BufRead */etc/sudoers,sudoers.tmp	setf sudoers
@@ -1308,7 +1317,7 @@ au BufNewFile,BufRead *.dtml,*.pt,*.cpt		call dist#ft#FThtml()
 "   zsql (zope sql method)
 au BufNewFile,BufRead *.zsql			call dist#ft#SQL()
 
-" Detect by extention
+" Detect by extension
 au BufNewFile,BufRead *				call dist#ft#DetectFromExt()
 augroup END
 
@@ -1539,6 +1548,9 @@ au BufNewFile,BufRead .tcshrc*	call dist#ft#SetFileTypeShell("tcsh")
 " csh scripts ending in a star
 au BufNewFile,BufRead .login*,.cshrc*  call dist#ft#CSH()
 
+" Tiltfile
+au BufNewFile,BufRead Tiltfile.*	call s:StarSetf('tiltfile')
+
 " tmux configuration with arbitrary extension
 au BufNewFile,BufRead {.,}tmux*.conf*		call s:StarSetf('tmux')
 

runtime/ftplugin/asm.vim

@@ -5,12 +5,13 @@
 " 		2023 Aug 28 by Vim Project (undo_ftplugin)
 " 		2024 Apr 09 by Vim Project (add Matchit support)
 " 		2024 May 23 by Riley Bruins <ribru17@gmail.com> ('commentstring')
+" 		2026 Jan 19 by Vim Project (add # as comment symbol)
 
 if exists("b:did_ftplugin") | finish | endif
 let b:did_ftplugin = 1
 
 setl include=^\\s*%\\s*include
-setl comments=:;,s1:/*,mb:*,ex:*/,://
+setl comments=:;,s1:/*,mb:*,ex:*/,://,:#
 setl commentstring=;\ %s
 
 let b:undo_ftplugin = "setl commentstring< comments< include<"

runtime/ftplugin/bicep-params.vim

@@ -0,0 +1,3 @@
+" Placeholder for maximum compatibility. While bicepparam files are treated as distinct filetypes,
+" they are should share the same ftplugin settings as bicep files.
+runtime! ftplugin/bicep.vim

runtime/ftplugin/bicep.vim

@@ -0,0 +1,14 @@
+" Vim filetype plugin
+" Language:	Bicep
+" Maintainer:	Scott McKendry <me@scottmckendry.tech>
+" Last Change:	2025 Dec 27
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal comments=s1:/*,mb:*,ex:*/,://
+setlocal commentstring=//\ %s
+
+let b:undo_ftplugin = "setlocal comments< commentstring<"

runtime/ftplugin/bpftrace.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin
 " Language:     bpftrace
 " Maintainer:	Stanislaw Gruszka <stf_xl@wp.pl>
-" Last Change:	2025 Dec 05
+" Last Change:	2025 Dec 23
 
 if exists('b:did_ftplugin')
   finish
@@ -11,4 +11,6 @@ let b:did_ftplugin = 1
 setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
 setlocal commentstring=//\ %s
 
-let b:undo_ftplugin = "setlocal comments< commentstring<"
+setlocal formatoptions-=t formatoptions+=croql
+
+let b:undo_ftplugin = "setlocal comments< commentstring< formatoptions<"

runtime/ftplugin/cabal.vim

@@ -2,12 +2,17 @@
 " Language:	Haskell Cabal Build file
 " Maintainer:	Riley Bruins <ribru17@gmail.com>
 " Last Change:	2024 Jul 06
+" 2026 Jan 13 by Vim project: set compiler #19152
 
 if exists('b:did_ftplugin')
   finish
 endif
 let b:did_ftplugin = 1
 
+compiler cabal
+
+let b:undo_ftplugin = 'compiler make'
+
 setl comments=:-- commentstring=--\ %s
 
-let b:undo_ftplugin = 'setl com< cms<'
+let b:undo_ftplugin .= '| setl com< cms<'

runtime/ftplugin/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:    2024 Oct 04
+# Latest Revision:    2026 Jan 10
 
 if exists("b:did_ftplugin")
   finish
@@ -110,7 +110,7 @@ endif
 b:undo_ftplugin ..= "| sil! delc -buffer ConTeXt | sil! delc -buffer ConTeXtLog | sil! delc -buffer ConTeXtJobStatus | sil! delc -buffer ConTeXtStopJobs"
 # Commands for asynchronous typesetting
 command! -buffer -nargs=? -complete=buffer ConTeXt          context.Typeset(<q-args>)
-command! -buffer -nargs=0                  ConTeXtLog       context.Log('%')
+command! -buffer -nargs=0                  ConTeXtLog       context.Log(bufname('%'))
 command!         -nargs=0                  ConTeXtJobStatus context.JobStatus()
 command!         -nargs=0                  ConTeXtStopJobs  context.StopJobs()
 

runtime/ftplugin/csh.vim

@@ -3,8 +3,8 @@
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainer:	Dan Sharp
 " Contributor:		Johannes Zellner <johannes@zellner.org>
-" Last Change:		2024 Jan 14
-" 			2024 May 23 by Riley Bruins ('commentstring')
+" 			Riley Bruins <ribru17@gmail.com>
+" Last Change:		2026 Jan 16
 
 if exists("b:did_ftplugin")
   finish
@@ -21,29 +21,52 @@ setlocal formatoptions+=crql
 
 let b:undo_ftplugin = "setlocal com< cms< fo<"
 
-" Csh: thanks to Johannes Zellner
-" - Both foreach and end must appear alone on separate lines.
-" - The words else and endif must appear at the beginning of input lines;
-"   the if must appear alone on its input line or after an else.
-" - Each case label and the default label must appear at the start of a
-"   line.
-" - while and end must appear alone on their input lines.
 if exists("loaded_matchit") && !exists("b:match_words")
-  let s:line_start = '\%(^\s*\)\@<='
-  let b:match_words =
-	\ s:line_start .. 'if\s*(.*)\s*then\>:' ..
-	\   s:line_start .. 'else\s\+if\s*(.*)\s*then\>:' .. s:line_start .. 'else\>:' ..
-	\   s:line_start .. 'endif\>,' ..
-	\ s:line_start .. '\%(\<foreach\s\+\h\w*\|while\)\s*(:' ..
-	\   '\<break\>:\<continue\>:' ..
-	\   s:line_start .. 'end\>,' ..
-	\ s:line_start .. 'switch\s*(:' ..
-	\   s:line_start .. 'case\s\+:' .. s:line_start .. 'default\>:\<breaksw\>:' ..
-	\   s:line_start .. 'endsw\>'
-  unlet s:line_start
-  let b:undo_ftplugin ..= " | unlet! b:match_words"
+  let b:match_ignorecase = 0
+  let b:match_words = "CshMatchWords()"
+  let b:match_skip = "CshMatchSkip()"
+  let b:undo_ftplugin ..= " | unlet! b:match_ignorecase b:match_skip b:match_words"
 endif
 
+" skip single line 'if' commands
+function CshMatchSkip()
+  return getline(".") =~# '^\s*if\>' && !s:CshIsIfThenCommand()
+endfunction
+
+function CshMatchWords()
+  let line_start = '\%(^\s*\)\@<='
+  let match_words =
+	\ line_start .. '\%(foreach\s\+\h\w*\s*(\|while\>\):' ..
+	\   '\<break\>:\<continue\>:' ..
+	\   line_start .. 'end\>,' ..
+	\ line_start .. 'switch\s*(:' ..
+	\   line_start .. 'case\s\+:' .. line_start .. 'default\>:\<breaksw\>:' ..
+	\   line_start .. 'endsw\>'
+
+  if expand("<cword>") =~# '\<if\>' && !s:CshIsIfThenCommand()
+    return match_words
+  else
+    return match_words .. "," ..
+	\ line_start .. 'if\>:' ..
+	\   line_start .. 'else\s\+if\>:' .. line_start .. 'else\>:' ..
+	\   line_start .. 'endif\>'
+  endif
+endfunction
+
+function s:CshIsIfThenCommand()
+  let lnum = line(".")
+  let line = getline(lnum)
+
+  " join continued lines
+  while lnum < line("$") && line =~ '^\%([^\\]\|\\\\\)*\\$'
+    let lnum += 1
+    let line = substitute(line, '\\$', '', '') .. getline(lnum)
+  endwhile
+
+  " TODO: confirm with syntax checks when the highlighting is more accurate
+  return line =~# '^\s*if\>.*\<then\s*\%(#.*\)\=$'
+endfunction
+
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
   let b:browsefilter = "csh Scripts (*.csh)\t*.csh\n"
   if has("win32")

runtime/ftplugin/haskell.vim

@@ -4,6 +4,7 @@
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2018-08-27
 " 2025 Jul 09 by Vim Project revert setting iskeyword #8191
+" 2026 Jan 18 by Vim Project add include-search and define support #19143
 
 if exists("b:did_ftplugin")
   finish
@@ -13,11 +14,19 @@ let b:did_ftplugin = 1
 let s:cpo_save = &cpo
 set cpo&vim
 
-let b:undo_ftplugin = "setl com< cms< fo<"
+let b:undo_ftplugin = "setl com< cms< fo< su< sua< inex< inc< def<"
 
 setlocal comments=s1fl:{-,mb:-,ex:-},:-- commentstring=--\ %s
 setlocal formatoptions-=t formatoptions+=croql
 setlocal omnifunc=haskellcomplete#Complete
 
+setlocal suffixes+=.hi
+setlocal suffixesadd=.hs,.lhs,.hsc
+
+setlocal includeexpr=findfile(tr(v:fname,'.','/'),'.;')
+setlocal include=^import\\>\\%(\\s\\+safe\\>\\)\\?\\%(\\s\\+qualified\\>\\)\\?
+
+setlocal define=^\\%(data\\>\\\|class\\>\\%(.*=>\\)\\?\\\|\\%(new\\)\\?type\\>\\\|\\ze\\k\\+\\s*\\%(::\\\|=\\)\\)
+
 let &cpo = s:cpo_save
 unlet s:cpo_save

runtime/ftplugin/kitty.vim

@@ -0,0 +1,13 @@
+" Vim filetype plugin
+" Language:	kitty
+" Maintainer:	Arvin Verain <arvinverain@proton.me>
+" Last Change:	2026 Jan 22
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+setl comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=rol
+
+let b:undo_ftplugin = 'setl com< cms< fo<'

runtime/ftplugin/logtalk.dict

@@ -72,6 +72,7 @@ deprecated
 discontiguous
 div
 domain_error
+consistency_error
 duplicated_directives
 dynamic
 dynamic_declarations
@@ -144,6 +145,7 @@ min
 missing_directives
 mod
 mode
+mode_non_terminal
 modules
 multifile
 nl

runtime/ftplugin/mf.vim

@@ -4,8 +4,7 @@ vim9script
 # Language:           METAFONT
 # Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
 # Former Maintainers: Nikolai Weibull <now@bitwi.se>
-# Latest Revision:    2022 Aug 12
-#                     2024 Jan 14 by Vim Project (browsefilter)
+# Latest Revision:    2026 Jan 10
 
 if exists("b:did_ftplugin")
   finish

runtime/ftplugin/mp.vim

@@ -4,8 +4,7 @@ vim9script
 # Language:           MetaPost
 # Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
 # Former Maintainers: Nikolai Weibull <now@bitwi.se>
-# Latest Revision:    2022 Aug 12
-#                     2024 Jan 14 by Vim Project (browsefilter)
+# Latest Revision:    2026 Jan 10
 
 if exists("b:did_ftplugin")
   finish

runtime/ftplugin/perl.vim

@@ -1,6 +1,6 @@
 " Vim filetype plugin file
 " Language:      Perl
-" Maintainer:    vim-perl <vim-perl@googlegroups.com>
+" Maintainer:    vim-perl <vim-perl@googlegroups.com> (need to be subscribed to post)
 " Homepage:      https://github.com/vim-perl/vim-perl
 " Bugs/requests: https://github.com/vim-perl/vim-perl/issues
 " License:       Vim License (see :help license)

runtime/ftplugin/pod.vim

@@ -1,6 +1,6 @@
 " Vim filetype plugin file
 " Language:      Perl POD format
-" Maintainer:    vim-perl <vim-perl@googlegroups.com>
+" Maintainer:    vim-perl <vim-perl@googlegroups.com> (need to be subscribed to post)
 " Author:        Doug Kearns <dougkearns@gmail.com>
 " Homepage:      https://github.com/vim-perl/vim-perl
 " Bugs/requests: https://github.com/vim-perl/vim-perl/issues

runtime/ftplugin/raku.vim

@@ -1,6 +1,6 @@
 " Vim filetype plugin file
 " Language:	Raku
-" Maintainer:	vim-perl <vim-perl@googlegroups.com>
+" Maintainer:	vim-perl <vim-perl@googlegroups.com> (need to be subscribed to post)
 " Homepage:	https://github.com/Raku/vim-raku
 " Bugs/requests: https://github.com/Raku/vim-raku/issues
 " Last Change:	2021 Apr 16

runtime/ftplugin/rst.vim

@@ -5,6 +5,7 @@
 " Website: https://github.com/marshallward/vim-restructuredtext
 " Latest Revision: 2020-03-31
 " 2025 Oct 13 by Vim project: update b:undo_ftplugin #18566
+" 2026 Jan 11 by Vim project: set suffixesadd #19149
 
 if exists("b:did_ftplugin")
     finish
@@ -19,10 +20,11 @@ if !exists('g:rst_fold_enabled')
   let g:rst_fold_enabled = 0
 endif
 
-let b:undo_ftplugin = "setlocal comments< commentstring< expandtab< formatoptions<"
+let b:undo_ftplugin = "setlocal comments< commentstring< expandtab< formatoptions< suffixesadd<"
 
 setlocal comments=fb:.. commentstring=..\ %s expandtab
 setlocal formatoptions+=tcroql
+setlocal suffixesadd=.rst
 
 " reStructuredText standard recommends that tabs be expanded to 8 spaces
 " The choice of 3-space indentation is to provide slightly better support for

runtime/ftplugin/sieve.vim

@@ -3,6 +3,7 @@
 " Maintainer:           This runtime file is looking for a new maintainer.
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2025 Feb 20
+" 2026 Jan 09 by Vim Project: preserve line endings for existing files #19144
 
 if exists("b:did_ftplugin")
   finish
@@ -16,4 +17,7 @@ setlocal formatoptions-=t formatoptions+=croql
 
 " https://datatracker.ietf.org/doc/html/rfc5228#section-2.2 says
 " "newlines (CRLF, never just CR or LF)"
-setlocal fileformat=dos
+" Use CRLF for new files only; preserve existing line endings
+if expand('%:p') !=# '' && !filereadable(expand('%:p'))
+  setlocal fileformat=dos
+endif

runtime/ftplugin/sml.vim

@@ -3,6 +3,7 @@
 " Filenames:		*.sml *.sig
 " Maintainer: 		tocariimaa <tocariimaa@firemail.cc>
 " Last Change:		2025 Nov 04
+" 2026 Jan 19 by Vim Project: add 'include' setting
 
 if exists('b:did_ftplugin')
   finish
@@ -12,11 +13,12 @@ let b:did_ftplugin = 1
 let s:cpo_save = &cpo
 set cpo&vim
 
-let b:undo_ftplugin = 'setl com< cms< fo<'
+let b:undo_ftplugin = 'setl com< cms< fo< inc<'
 
 setlocal formatoptions+=croql formatoptions-=t
 setlocal commentstring=(*\ %s\ *)
 setlocal comments=sr:(*,mb:*,ex:*)
+setlocal include=^\\s*use\\>
 
 if exists('loaded_matchit')
   let b:match_ignorecase = 0

runtime/ftplugin/tap.vim

@@ -1,6 +1,6 @@
 " Vim filetype plugin file
 " Language:      Verbose TAP Output
-" Maintainer:    vim-perl <vim-perl@googlegroups.com>
+" Maintainer:    vim-perl <vim-perl@googlegroups.com> (need to be subscribed to post)
 " Homepage:      https://github.com/vim-perl/vim-perl
 " Bugs/requests: https://github.com/vim-perl/vim-perl/issues
 " License:       Vim License (see :help license)

runtime/ftplugin/tt2html.vim

@@ -1,6 +1,6 @@
 " Vim filetype plugin file
 " Language:      TT2 embedded with HTML
-" Maintainer:    vim-perl <vim-perl@googlegroups.com>
+" Maintainer:    vim-perl <vim-perl@googlegroups.com> (need to be subscribed to post)
 " Homepage:      https://github.com/vim-perl/vim-perl
 " Bugs/requests: https://github.com/vim-perl/vim-perl/issues
 " License:       Vim License (see :help license)

runtime/ftplugin/xml.vim

@@ -1,12 +1,11 @@
 " Vim filetype plugin file
 "     Language:	xml
 "   Maintainer:	Christian Brabandt <cb@256bit.org>
-" Last Changed: Dec 07th, 2018
-"		2024 Jan 14 by Vim Project (browsefilter)
-"		2024 May 23 by Riley Bruins <ribru17@gmail.com> ('commentstring')
-"   Repository: https://github.com/chrisbra/vim-xml-ftplugin
-" Previous Maintainer:	Dan Sharp
-"          URL:		      http://dwsharp.users.sourceforge.net/vim/ftplugin
+" Last Changed:	2024 May 24
+"   Repository:	https://github.com/chrisbra/vim-xml-ftplugin
+" Previously
+"    Maintainer:	Dan Sharp <dwsharp at users dot sourceforge dot net>
+"    URL:		http://dwsharp.users.sourceforge.net/vim/ftplugin
 
 if exists("b:did_ftplugin") | finish | endif
 let b:did_ftplugin = 1
@@ -54,12 +53,8 @@ command! -nargs=? XMLent call xmlcomplete#CreateEntConnection(<f-args>)
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
     let  b:browsefilter="XML Files (*.xml)\t*.xml\n" .
     \ "DTD Files (*.dtd)\t*.dtd\n" .
-    \ "XSD Files (*.xsd)\t*.xsd\n"
-    if has("win32")
-	let b:browsefilter .= "All Files (*.*)\t*\n"
-    else
-	let b:browsefilter .= "All Files (*)\t*\n"
-    endif
+    \ "XSD Files (*.xsd)\t*.xsd\n" .
+    \ "All Files (*.*)\t*.*\n"
 endif
 
 " Undo the stuff we changed.

runtime/ftplugin/xs.vim

@@ -1,6 +1,6 @@
 " Vim filetype plugin file
 " Language:      XS (Perl extension interface language)
-" Maintainer:    vim-perl <vim-perl@googlegroups.com>
+" Maintainer:    vim-perl <vim-perl@googlegroups.com> (need to be subscribed to post)
 " Homepage:      https://github.com/vim-perl/vim-perl
 " Bugs/requests: https://github.com/vim-perl/vim-perl/issues
 " License:       Vim License (see :help license)

runtime/ftplugin/zsh.vim

@@ -2,11 +2,9 @@
 " Language:             Zsh shell script
 " Maintainer:           Christian Brabandt <cb@256bit.org>
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2024 Sep 19
+" Latest Revision:      2025 Jul 23
 " License:              Vim (see :h license)
 " Repository:           https://github.com/chrisbra/vim-zsh
-" Last Change:
-" 2025 Jul 23 by Vim Project (use :hor term #17822)
 
 if exists("b:did_ftplugin")
   finish
@@ -20,9 +18,14 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let b:undo_ftplugin = "setl com< cms< fo< "
 
+if get(g:, 'zsh_fold_enable', 0)
+    setlocal foldmethod=syntax
+    let b:undo_ftplugin .= "fdm< "
+endif
+
 if executable('zsh') && &shell !~# '/\%(nologin\|false\)$'
   if exists(':terminal') == 2
-    command! -buffer -nargs=1 ZshKeywordPrg silent exe ':hor term zsh -c "autoload -Uz run-help; run-help <args>"'
+    command! -buffer -nargs=1 ZshKeywordPrg silent exe ':hor :term zsh -c "autoload -Uz run-help; run-help <args>"'
   else
     command! -buffer -nargs=1 ZshKeywordPrg echo system('MANPAGER= zsh -c "autoload -Uz run-help; run-help <args> 2>/dev/null"')
   endif

runtime/indent/bpftrace.vim

@@ -0,0 +1,19 @@
+" Vim indent file
+" Language:     bpftrace
+" Author:       Stanislaw Gruszka <stf_xl@wp.pl>
+" Last Change:  2025 Dec 27
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+    finish
+endif
+let b:did_indent = 1
+
+setlocal noautoindent nosmartindent
+
+setlocal cindent
+setlocal cinoptions=+0,(0,[0,Ws,J1,j1,m1,>s
+setlocal cinkeys=0{,0},!^F,o,O,#0
+setlocal cinwords=
+
+let b:undo_indent = "setlocal autoindent< smartindent< cindent< cinoptions< cinkeys< cinwords<"

runtime/indent/context.vim

@@ -3,7 +3,7 @@ vim9script
 # Language:           ConTeXt typesetting engine
 # Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
 # Former Maintainers: Nikolai Weibull <now@bitwi.se>
-# Latest Revision:    2023 Dec 26
+# Latest Revision:    2026 Jan 10
 
 if exists("b:did_indent")
   finish
@@ -39,10 +39,10 @@ def ConTeXtIndent(): number
     return g:MetaPostIndent()
   endif
 
-  const prevlnum = PrevNotComment(v:lnum - 1)
-  const prevind  = indent(prevlnum)
-  const prevline = getline(prevlnum)
-  const currline = getline(v:lnum)
+  var prevlnum = PrevNotComment(v:lnum - 1)
+  var prevind  = indent(prevlnum)
+  var prevline = getline(prevlnum)
+  var currline = getline(v:lnum)
 
   # If the current line starts with ], match indentation.
   if currline =~# '^\s*\]'

runtime/indent/mf.vim

@@ -1,6 +1,10 @@
-" METAFONT indent file
-" Language:    METAFONT
-" Maintainer:  Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Latest Revision:    2022 Aug 12
+vim9script
+
+# METAFONT indent file
+# Language:           METAFONT
+# Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+# Latest Revision:    2026 Jan 10
 
 runtime! indent/mp.vim
+
+# vim: sw=2 fdm=marker

runtime/indent/mp.vim

@@ -4,7 +4,7 @@ vim9script
 # Language:           MetaPost
 # Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
 # Former Maintainers: Eugene Minkovskii <emin@mccme.ru>
-# Latest Revision:    2022 Aug 12
+# Latest Revision:    2026 Jan 10
 
 if exists("b:did_indent")
   finish

runtime/indent/perl.vim

@@ -1,6 +1,6 @@
 " Vim indent file
 " Language:      Perl
-" Maintainer:    vim-perl <vim-perl@googlegroups.com>
+" Maintainer:    vim-perl <vim-perl@googlegroups.com> (need to be subscribed to post)
 " Homepage:      https://github.com/vim-perl/vim-perl
 " Bugs/requests: https://github.com/vim-perl/vim-perl/issues
 " License:       Vim License (see :help license)

runtime/indent/raku.vim

@@ -1,6 +1,6 @@
 " Vim indent file
 " Language:      Perl 6
-" Maintainer:    vim-perl <vim-perl@googlegroups.com>
+" Maintainer:    vim-perl <vim-perl@googlegroups.com> (need to be subscribed to post)
 " Homepage:      https://github.com/vim-perl/vim-perl
 " Bugs/requests: https://github.com/vim-perl/vim-perl/issues
 " Last Change:   2020 Apr 15

runtime/indent/rust.vim

@@ -2,7 +2,9 @@
 " Language:         Rust
 " Author:           Chris Morgan <me@chrismorgan.info>
 " Last Change:      2023-09-11
-" 2024 Jul 04 by Vim Project: use shiftwidth() instead of hard-coding shifted values (#15138)
+" 2024 Jul 04 by Vim Project: use shiftwidth() instead of hard-coding shifted values #15138
+" 2025 Dec 29 by Vim Project: clean up
+" 2025 Dec 31 by Vim Project: correcly indent after nested array literal #19042
 
 " For bugs, patches and license go to https://github.com/rust-lang/rust.vim
 " Note: upstream seems umaintained: https://github.com/rust-lang/rust.vim/issues/502
@@ -86,16 +88,6 @@ function! s:is_string_comment(lnum, col)
     endif
 endfunction
 
-if exists('*shiftwidth')
-    function! s:shiftwidth()
-        return shiftwidth()
-    endfunc
-else
-    function! s:shiftwidth()
-        return &shiftwidth
-    endfunc
-endif
-
 function GetRustIndent(lnum)
     " Starting assumption: cindent (called at the end) will do it right
     " normally. We just want to fix up a few cases.
@@ -204,6 +196,22 @@ function GetRustIndent(lnum)
         endif
     endif
 
+    " Prevent cindent from becoming confused when pairing square brackets, as
+    " in
+    "
+    " let arr = [[u8; 4]; 2] = [
+    "     [0; 4],
+    "     [1, 3, 5, 9],
+    " ];
+    "     | ← indentation placed here
+    "
+    " for which it calculates too much indentation in the line following the
+    " close of the array.
+    if prevline =~# '^\s*\]' && l:last_prevline_character ==# ';'
+                \ && line !~# '^\s*}'
+        return indent(prevlinenum)
+    endif
+
     if l:last_prevline_character ==# ","
                 \ && s:get_line_trimmed(a:lnum) !~# '^\s*[\[\]{})]'
                 \ && prevline !~# '^\s*fn\s'
@@ -240,43 +248,6 @@ function GetRustIndent(lnum)
         return indent(prevlinenum)
     endif
 
-    if !has("patch-7.4.355")
-        " cindent before 7.4.355 doesn't do the module scope well at all; e.g.::
-        "
-        " static FOO : &'static [bool] = [
-        " true,
-        "	 false,
-        "	 false,
-        "	 true,
-        "	 ];
-        "
-        "	 uh oh, next statement is indented further!
-
-        " Note that this does *not* apply the line continuation pattern properly;
-        " that's too hard to do correctly for my liking at present, so I'll just
-        " start with these two main cases (square brackets and not returning to
-        " column zero)
-
-        call cursor(a:lnum, 1)
-        if searchpair('{\|(', '', '}\|)', 'nbW',
-                    \ 's:is_string_comment(line("."), col("."))') == 0
-            if searchpair('\[', '', '\]', 'nbW',
-                        \ 's:is_string_comment(line("."), col("."))') == 0
-                " Global scope, should be zero
-                return 0
-            else
-                " At the module scope, inside square brackets only
-                "if getline(a:lnum)[0] == ']' || search('\[', '', '\]', 'nW') == a:lnum
-                if line =~# "^\\s*]"
-                    " It's the closing line, dedent it
-                    return 0
-                else
-                    return shiftwidth()
-                endif
-            endif
-        endif
-    endif
-
     " Fall back on cindent, which does it mostly right
     return cindent(a:lnum)
 endfunction

runtime/indent/sh.vim

@@ -7,6 +7,7 @@
 " License:             Vim (see :h license)
 " Repository:          https://github.com/chrisbra/vim-sh-indent
 " Changelog:
+"          20250906  - indent function closing properly on multiline commands
 "          20250318  - Detect local arrays in functions
 "          20241411  - Detect dash character in function keyword for
 "                      bash mode (issue #16049)
@@ -186,6 +187,15 @@ function! GetShIndent()
     endif
   endif
 
+  " Special case: if the current line is a closing '}', align with matching '{'
+  if curline =~ '^\s*}\s*$'
+    let match_lnum = searchpair('{', '', '}', 'bnW',
+      \ 'synIDattr(synID(line("."),col("."), 1),"name") =~? "comment\\|quote"')
+    if match_lnum > 0
+      return indent(match_lnum)
+    endif
+  endif
+
   return ind > 0 ? ind : 0
 endfunction
 

runtime/indent/testdir/rust.in

@@ -0,0 +1,42 @@
+// vim: set ft=rust ts=8 sw=4 sts=4 et :
+// START_INDENT
+use std::fs::File;
+use std::io::prelude::*;
+use std::path::Path;
+
+fn main() {
+    // Create a path to the desired file
+    let path = Path::new("hello.txt");
+    let display = path.display();
+
+    // Open the path in read-only mode, returns `io::Result<File>`
+    let mut file = match File::open(&path) {
+    Err(why) => panic!("couldn't open {}: {}", display, why),
+	Ok(file) => file,
+    };
+
+    // Start doing nothing forever
+    loop {
+        let arr1 = [[u8; 4]; 2] = [
+            [0; 4],
+            [1, 3, 5, 9],
+        ];
+        }
+
+    // Plan for a future that will never come
+    let arr2 = [[u8; 4]; 2] = [
+        [1; 4],
+        [2, 4, 6, 8],
+    ];
+        let arr2_ref = &arr2;
+
+    // Read the file contents into a string, returns `io::Result<usize>`
+    let mut s = String::new();
+        match file.read_to_string(&mut s) {
+        Err(why) => panic!("couldn't read {}: {}", display, why),
+        Ok(_) => print!("{} contains:\n{}", display, s),
+        }
+
+    // file goes out of scope, and the "hello.txt" file gets closed
+}
+// END_INDENT

runtime/indent/testdir/rust.ok

@@ -0,0 +1,42 @@
+// vim: set ft=rust ts=8 sw=4 sts=4 et :
+// START_INDENT
+use std::fs::File;
+use std::io::prelude::*;
+use std::path::Path;
+
+fn main() {
+    // Create a path to the desired file
+    let path = Path::new("hello.txt");
+    let display = path.display();
+
+    // Open the path in read-only mode, returns `io::Result<File>`
+    let mut file = match File::open(&path) {
+        Err(why) => panic!("couldn't open {}: {}", display, why),
+        Ok(file) => file,
+    };
+
+    // Start doing nothing forever
+    loop {
+        let arr1 = [[u8; 4]; 2] = [
+            [0; 4],
+            [1, 3, 5, 9],
+        ];
+    }
+
+    // Plan for a future that will never come
+    let arr2 = [[u8; 4]; 2] = [
+        [1; 4],
+        [2, 4, 6, 8],
+    ];
+    let arr2_ref = &arr2;
+
+    // Read the file contents into a string, returns `io::Result<usize>`
+    let mut s = String::new();
+    match file.read_to_string(&mut s) {
+        Err(why) => panic!("couldn't read {}: {}", display, why),
+        Ok(_) => print!("{} contains:\n{}", display, s),
+    }
+
+    // file goes out of scope, and the "hello.txt" file gets closed
+}
+// END_INDENT

runtime/indent/testdir/yaml.in

@@ -18,3 +18,22 @@ map: |
 line1
 line2
 # END_INDENT
+
+# START_INDENT
+list:
+  - element1:
+    foo: bar
+  - element2:
+      foo: bar
+# END_INDENT
+
+# START_INDENT
+- name: test playbook
+  hosts: localhost
+  gather_facts: false
+
+  tasks:
+    - name: hello world
+      ansible.builtin.debug:
+        msg: "hello world"
+# END_INDENT

runtime/indent/testdir/yaml.ok

@@ -18,3 +18,22 @@ map: |
   line1
   line2
 # END_INDENT
+
+# START_INDENT
+list:
+  - element1:
+      foo: bar
+  - element2:
+      foo: bar
+# END_INDENT
+
+# START_INDENT
+- name: test playbook
+  hosts: localhost
+  gather_facts: false
+
+  tasks:
+    - name: hello world
+      ansible.builtin.debug:
+        msg: "hello world"
+# END_INDENT

runtime/indent/xml.vim

@@ -88,7 +88,9 @@ endfun
 
 " [-- return the sum of indents of a:lnum --]
 fun! <SID>XmlIndentSum(line, style, add)
-    if <SID>IsXMLContinuation(a:line) && a:style == 0 && !<SID>IsXMLEmptyClosingTag(a:line)
+    if <SID>IsXMLContinuation(a:line) &&
+        \ a:style == 0 &&
+        \ !<SID>IsXMLEmptyClosingTag(a:line)
         " no complete tag, add one additional indent level
         " but only for the current line
         return a:add + shiftwidth()
@@ -157,6 +159,17 @@ fun! XmlIndentGet(lnum, use_syntax_check)
             " no extra indent, looks like a text continuation line
            return pind
         endif
+    elseif empty(syn_name_start) && syn_name_end =~? 'xmlTag'
+        " Special case: such a line, shouldn't be indented, just because it
+        " ends with a tag
+        " 'foobar <i>inline tags</i>'
+        if (match(curline, '<\([:a-zA-Z_]\+\)[^>]*>.*</\1>') > -1)
+            return pind
+        endif
+    endif
+
+    if curline =~ '^\s*</[a-zA-Z_]>'
+        return <SID>ReturnIndentForMatchingTag(curline)
     endif
 
     " Get indent from previous tag line
@@ -181,6 +194,21 @@ func! <SID>IsXMLEmptyClosingTag(line)
     return a:line =~? '<[^>]*/>\s*$'
 endfunc
 
+func! <SID>ReturnIndentForMatchingTag(line)
+    " For a line with just a simple closing tag
+    " get the indent from a matching opening tag
+    if a:line =~? '^\s*</[a-z_]*>'
+        let _c = getcursorpos()
+        let pat = matchstr(a:line, '^\s*</\zs[a-z_]\+\ze>')
+        " position cursor before the opening tag
+        norm! 0
+        " get the indent from the matching opening tag
+        let match_line = searchpair('<' .. pat .. '>', '', '</' .. pat .. '>', 'bn')
+        call setpos('.', _c)
+        return indent(match_line)
+    endif
+endfunc
+
 " return indent for a commented line,
 " the middle part might be indented one additional level
 func! <SID>XmlIndentComment(lnum)

runtime/indent/yaml.vim

@@ -5,6 +5,8 @@
 " Last Change:	2022 Jun 17
 " 2024 Feb 29 by Vim project: disable mulitline indent by default
 " 2024 Aug 14 by Vim project: fix re-indenting when commenting out lines
+" 2026 Jan 08 by Vim project: fix object indentation in array
+" 2026 Jan 15 by Vim project: fix double shiftwidth from previous change
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -114,7 +116,13 @@ function GetYAMLIndent(lnum)
         "
         " - |-
         "     Block scalar without indentation indicator
-        return previndent+shiftwidth()
+        if prevline =~# '^\s*-\s.*:$'
+            " Special case: list item with mapping key (- key:)
+            " Need to account for the "- " prefix
+            return previndent + 2 + shiftwidth()
+        else
+            return previndent+shiftwidth()
+        endif
     elseif prevline =~# '\v[:-]\ [|>]%(\d+[+\-]?|[+\-]?\d+)%(\#.*|\s*)$'
         " - |+2
         "   block scalar with indentation indicator
@@ -136,6 +144,9 @@ function GetYAMLIndent(lnum)
         let prevmapline = s:FindPrevLEIndentedLineMatchingRegex(a:lnum,
                     \                                           s:mapkeyregex)
         if getline(prevmapline) =~# '^\s*- '
+            " Previous mapping key is in a list item (- key:)
+            " The key effectively starts at indent + 2 (after "- ")
+            " Content under it should be indented relative to the key position
             return indent(prevmapline) + 2
         else
             return indent(prevmapline)

runtime/lang/menu_ja_jp.euc-jp.vim

@@ -2,9 +2,9 @@
 "
 " Menu Translations:	Japanese (EUC-JP)
 " Last Translator:	MURAOKA Taro <koron.kaoriya@gmail.com>
-" Last Change:		18-Dec-2023.
+" Last Change:		18-Jan-2026.
 "
-" Copyright (C) 2001-2023 MURAOKA Taro <koron.kaoriya@gmail.com>,
+" Copyright (C) 2001-2026 MURAOKA Taro <koron.kaoriya@gmail.com>,
 "			  vim-jp <http://vim-jp.org/>
 "
 " THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
@@ -28,7 +28,7 @@ menutrans &User\ Manual
 menutrans &How-To\ links	&How-toリンク
 menutrans &Credits		クレジット(&C)
 menutrans Co&pying		著作権情報(&P)
-menutrans &Sponsor/Register	スポンサー/登録(&S)
+menutrans &Sponsor		スポンサー(&S)
 menutrans O&rphans		孤児(&R)
 menutrans &Version		バージョン情報(&V)
 menutrans &About		Vimについて(&A)

runtime/lang/menu_ja_jp.utf-8.vim

@@ -2,9 +2,9 @@
 "
 " Menu Translations:	Japanese (UTF-8)
 " Last Translator:	MURAOKA Taro <koron.kaoriya@gmail.com>
-" Last Change:		18-Dec-2023.
+" Last Change:		18-Jan-2026.
 "
-" Copyright (C) 2001-2023 MURAOKA Taro <koron.kaoriya@gmail.com>,
+" Copyright (C) 2001-2026 MURAOKA Taro <koron.kaoriya@gmail.com>,
 "			  vim-jp <http://vim-jp.org/>
 "
 " THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
@@ -28,7 +28,7 @@ menutrans &User\ Manual		ユーザーマニュアル(&U)
 menutrans &How-To\ links	&How-toリンク
 menutrans &Credits		クレジット(&C)
 menutrans Co&pying		著作権情報(&P)
-menutrans &Sponsor/Register	スポンサー/登録(&S)
+menutrans &Sponsor		スポンサー(&S)
 menutrans O&rphans		孤児(&R)
 menutrans &Version		バージョン情報(&V)
 menutrans &About		Vimについて(&A)

runtime/lang/menu_japanese_japan.932.vim

@@ -2,9 +2,9 @@
 "
 " Menu Translations:	Japanese (CP932)
 " Last Translator:	MURAOKA Taro <koron.kaoriya@gmail.com>
-" Last Change:		18-Dec-2023.
+" Last Change:		18-Jan-2026.
 "
-" Copyright (C) 2001-2023 MURAOKA Taro <koron.kaoriya@gmail.com>,
+" Copyright (C) 2001-2026 MURAOKA Taro <koron.kaoriya@gmail.com>,
 "			  vim-jp <http://vim-jp.org/>
 "
 " THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
@@ -28,7 +28,7 @@ menutrans &User\ Manual
 menutrans &How-To\ links	&How-toリンク
 menutrans &Credits		クレジット(&C)
 menutrans Co&pying		著作権情報(&P)
-menutrans &Sponsor/Register	スポンサー/登録(&S)
+menutrans &Sponsor		スポンサー(&S)
 menutrans O&rphans		孤児(&R)
 menutrans &Version		バージョン情報(&V)
 menutrans &About		Vimについて(&A)

runtime/lang/menu_ru_ru.cp1251.vim

@@ -2,15 +2,14 @@
 " Maintainer:		Restorer, <restorer@mail2k.ru>
 " Previous Maintainer:	Sergey Alyoshin, <alyoshin.s@gmail.com>
 "			vassily ragosin, <vrr[at]users.sourceforge.net>
-" Last Change:		23 Aug 2023
-" Generated from menu_ru_ru.utf-8.vim, DO NOT EDIT
+" Last Change:		28 Dec 2025
 " URL:			https://github.com/RestorerZ/RuVim
 "
-"
 " Adopted for RuVim project by Vassily Ragosin.
 " First translation: Tim Alexeevsky, <realtim [at] mail.ru>,
 " based on ukrainian translation by Bohdan Vlasyuk, <bohdan@vstu.edu.ua>
 "
+" Generated from menu_ru_ru.utf-8.vim, DO NOT EDIT
 "
 " Quit when menu translations have already been done.
 "
@@ -44,7 +43,7 @@ menutrans &Find\.\.\.			&
 "--------------------
 menutrans &Credits			Ñî&àâòîðû
 menutrans Co&pying			&Ëèöåíçèÿ
-menutrans &Sponsor/Register		Ñîä&åéñòâèå\ è\ ðåãèñòðàöèÿ
+menutrans &Sponsor			Ñîä&åéñòâèå\ ïðîåêòó
 menutrans O&rphans			&Áëàãîòâîðèòåëüíîñòü
 "--------------------
 menutrans &Version			&Òåêóùàÿ\ âåðñèÿ
@@ -264,7 +263,7 @@ menutrans Cu&t					&
 menutrans &Copy					&Êîïèðîâàòü
 menutrans &Paste				Âñò&àâèòü
 menutrans &Delete				&Óäàëèòü
-menutrans Select\ Blockwise			Áëîêîâîå\ âûäåëåíèå
+menutrans Select\ Blockwise			Áëî÷íîå\ âûäåëåíèå
 menutrans Select\ &Word				Âûäåëèòü\ ñ&ëîâî
 menutrans Select\ &Line				Âûäåëèòü\ ñ&òðîêó
 menutrans Select\ &Block			Âûäåëèòü\ &áëîê
@@ -347,7 +346,7 @@ let menutrans_no_file = "[
 
 " Menus to handle Russian encodings
 " Thanks to Pavlo Bohmat for the idea
-" vassily ragosin <vrr[at]users.sourceforge.net>
+" vassily ragosin, <vrr[at]users.sourceforge.net>
 "
 an 10.355 &File.-SEP-					<Nop>
 an 10.360.20 &File.Îòêðûòü\ â\ êîäèðîâêå\.\.\..CP1251	:browse e ++enc=cp1251<CR>

runtime/lang/menu_ru_ru.koi8-r.vim

@@ -2,15 +2,14 @@
 " Maintainer:		Restorer, <restorer@mail2k.ru>
 " Previous Maintainer:	Sergey Alyoshin, <alyoshin.s@gmail.com>
 "			vassily ragosin, <vrr[at]users.sourceforge.net>
-" Last Change:		23 Aug 2023
-" Generated from menu_ru_ru.utf-8.vim, DO NOT EDIT
+" Last Change:		28 Dec 2025
 " URL:			https://github.com/RestorerZ/RuVim
 "
-"
 " Adopted for RuVim project by Vassily Ragosin.
 " First translation: Tim Alexeevsky, <realtim [at] mail.ru>,
 " based on ukrainian translation by Bohdan Vlasyuk, <bohdan@vstu.edu.ua>
 "
+" Generated from menu_ru_ru.utf-8.vim, DO NOT EDIT
 "
 " Quit when menu translations have already been done.
 "
@@ -44,7 +43,7 @@ menutrans &Find\.\.\.			&
 "--------------------
 menutrans &Credits			óÏ&Á×ÔÏÒÙ
 menutrans Co&pying			&ìÉÃÅÎÚÉÑ
-menutrans &Sponsor/Register		óÏÄ&ÅÊÓÔ×ÉÅ\ É\ ÒÅÇÉÓÔÒÁÃÉÑ
+menutrans &Sponsor			óÏÄ&ÅÊÓÔ×ÉÅ\ ÐÒÏÅËÔÕ
 menutrans O&rphans			&âÌÁÇÏÔ×ÏÒÉÔÅÌØÎÏÓÔØ
 "--------------------
 menutrans &Version			&ôÅËÕÝÁÑ\ ×ÅÒÓÉÑ
@@ -264,7 +263,7 @@ menutrans Cu&t					&
 menutrans &Copy					&ëÏÐÉÒÏ×ÁÔØ
 menutrans &Paste				÷ÓÔ&Á×ÉÔØ
 menutrans &Delete				&õÄÁÌÉÔØ
-menutrans Select\ Blockwise			âÌÏËÏ×ÏÅ\ ×ÙÄÅÌÅÎÉÅ
+menutrans Select\ Blockwise			âÌÏÞÎÏÅ\ ×ÙÄÅÌÅÎÉÅ
 menutrans Select\ &Word				÷ÙÄÅÌÉÔØ\ Ó&ÌÏ×Ï
 menutrans Select\ &Line				÷ÙÄÅÌÉÔØ\ Ó&ÔÒÏËÕ
 menutrans Select\ &Block			÷ÙÄÅÌÉÔØ\ &ÂÌÏË
@@ -347,7 +346,7 @@ let menutrans_no_file = "[
 
 " Menus to handle Russian encodings
 " Thanks to Pavlo Bohmat for the idea
-" vassily ragosin <vrr[at]users.sourceforge.net>
+" vassily ragosin, <vrr[at]users.sourceforge.net>
 "
 an 10.355 &File.-SEP-					<Nop>
 an 10.360.20 &File.ïÔËÒÙÔØ\ ×\ ËÏÄÉÒÏ×ËÅ\.\.\..CP1251	:browse e ++enc=cp1251<CR>

runtime/lang/menu_ru_ru.utf-8.vim

@@ -2,15 +2,14 @@
 " Maintainer:		Restorer, <restorer@mail2k.ru>
 " Previous Maintainer:	Sergey Alyoshin, <alyoshin.s@gmail.com>
 "			vassily ragosin, <vrr[at]users.sourceforge.net>
-" Last Change:		23 Aug 2023
-" Original translations
+" Last Change:		28 Dec 2025
 " URL:			https://github.com/RestorerZ/RuVim
 "
-"
 " Adopted for RuVim project by Vassily Ragosin.
 " First translation: Tim Alexeevsky, <realtim [at] mail.ru>,
 " based on ukrainian translation by Bohdan Vlasyuk, <bohdan@vstu.edu.ua>
 "
+" Original translations
 "
 " Quit when menu translations have already been done.
 "
@@ -44,7 +43,7 @@ menutrans &Find\.\.\.			&Найти\.\.\.
 "--------------------
 menutrans &Credits			Со&авторы
 menutrans Co&pying			&Лицензия
-menutrans &Sponsor/Register		Сод&ействие\ и\ регистрация
+menutrans &Sponsor			Сод&ействие\ проекту
 menutrans O&rphans			&Благотворительность
 "--------------------
 menutrans &Version			&Текущая\ версия
@@ -264,7 +263,7 @@ menutrans Cu&t					&Вырезать
 menutrans &Copy					&Копировать
 menutrans &Paste				Вст&авить
 menutrans &Delete				&Удалить
-menutrans Select\ Blockwise			Блоковое\ выделение
+menutrans Select\ Blockwise			Блочное\ выделение
 menutrans Select\ &Word				Выделить\ с&лово
 menutrans Select\ &Line				Выделить\ с&троку
 menutrans Select\ &Block			Выделить\ &блок
@@ -347,7 +346,7 @@ let menutrans_no_file = "[Безымянный]"
 
 " Menus to handle Russian encodings
 " Thanks to Pavlo Bohmat for the idea
-" vassily ragosin <vrr[at]users.sourceforge.net>
+" vassily ragosin, <vrr[at]users.sourceforge.net>
 "
 an 10.355 &File.-SEP-					<Nop>
 an 10.360.20 &File.Открыть\ в\ кодировке\.\.\..CP1251	:browse e ++enc=cp1251<CR>

runtime/menu.vim

@@ -2,7 +2,7 @@
 " You can also use this as a start for your own set of menus.
 "
 " Maintainer:	The Vim Project <https://github.com/vim/vim>
-" Last Change:	2025 Dec 15
+" Last Change:	2026 Jan 19
 " Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Note that ":an" (short for ":anoremenu") is often used to make a menu work
@@ -84,7 +84,7 @@ an <silent> 9999.40 &Help.&Find\.\.\.	:call <SID>Helpfind()<CR>
 an 9999.45 &Help.-sep1-			<Nop>
 an 9999.50 &Help.&Credits		:help credits<CR>
 an 9999.60 &Help.Co&pying		:help copying<CR>
-an 9999.70 &Help.&Sponsor	  :help sponsor<CR>
+an 9999.70 &Help.&Sponsor		:help sponsor<CR>
 an 9999.70 &Help.O&rphans		:help kcc<CR>
 an 9999.75 &Help.-sep2-			<Nop>
 an 9999.80 &Help.&Version		:version<CR>
@@ -98,7 +98,7 @@ if exists(':tlmenu')
   tlnoremenu 9999.45 &Help.-sep1-			<Nop>
   tlnoremenu 9999.50 &Help.&Credits			<C-W>:help credits<CR>
   tlnoremenu 9999.60 &Help.Co&pying			<C-W>:help copying<CR>
-  tlnoremenu 9999.70 &Help.&Sponsor/Register		<C-W>:help sponsor<CR>
+  tlnoremenu 9999.70 &Help.&Sponsor			<C-W>:help sponsor<CR>
   tlnoremenu 9999.70 &Help.O&rphans			<C-W>:help kcc<CR>
   tlnoremenu 9999.75 &Help.-sep2-			<Nop>
   tlnoremenu 9999.80 &Help.&Version			<C-W>:version<CR>
@@ -175,7 +175,7 @@ vnoremenu 20.340 &Edit.Cu&t<Tab>"+x		"+x
 vnoremenu 20.350 &Edit.&Copy<Tab>"+y		"+y
 cnoremenu 20.350 &Edit.&Copy<Tab>"+y		<C-Y>
 if exists(':tlmenu')
-  tlnoremenu 20.350 &Edit.&Copy<Tab>"+y 	<C-W>:<C-Y><CR>
+  tlnoremenu 20.350 &Edit.&Copy<Tab>"+y		<C-W>:<C-Y><CR>
 endif
 nnoremenu 20.360 &Edit.&Paste<Tab>"+gP		"+gP
 cnoremenu	 &Edit.&Paste<Tab>"+gP		<C-R>+
@@ -748,14 +748,14 @@ def s:BMShow()
 
   # Remove old menu, if it exists; keep one entry to avoid a torn off menu to
   # disappear.  Use try/catch to avoid setting v:errmsg
-  try 
-    unmenu &Buffers 
-  catch 
+  try
+    unmenu &Buffers
+  catch
   endtry
   exe 'noremenu ' .. g:bmenu_priority .. ".1 &Buffers.Dummy l"
-  try 
-    unmenu! &Buffers 
-  catch 
+  try
+    unmenu! &Buffers
+  catch
   endtry
 
   # create new menu

runtime/pack/dist/opt/matchit/autoload/matchit.vim

@@ -1,6 +1,6 @@
 "  matchit.vim: (global plugin) Extended "%" matching
 "  autload script of matchit plugin, see ../plugin/matchit.vim
-"  Last Change: May 20, 2024
+"  Last Change: Jan 09, 2026
 
 " Neovim does not support scriptversion
 if has("vimscript-4")
@@ -69,6 +69,25 @@ function matchit#Match_wrapper(word, forward, mode) range
     let startpos = [line("."), col(".")]
   endif
 
+  " Check for custom match function hook
+  if exists("b:match_function")
+    try
+      let result = call(b:match_function, [a:forward])
+      if !empty(result)
+        call cursor(result)
+        return s:CleanUp(restore_options, a:mode, startpos)
+      endif
+    catch /.*/
+      if exists("b:match_debug")
+        echohl WarningMsg
+        echom 'matchit: b:match_function error: ' .. v:exception
+        echohl NONE
+      endif
+      return s:CleanUp(restore_options, a:mode, startpos)
+    endtry
+    " Empty result: fall through to regular matching
+  endif
+
   " First step:  if not already done, set the script variables
   "   s:do_BR   flag for whether there are backrefs
   "   s:pat     parsed version of b:match_words
@@ -91,7 +110,7 @@ function matchit#Match_wrapper(word, forward, mode) range
     let default = escape(&mps, '[$^.*~\\/?]') .. (strlen(&mps) ? "," : "") ..
       \ '\/\*:\*\/,#\s*if\%(n\=def\)\=:#\s*else\>:#\s*elif\%(n\=def\)\=\>:#\s*endif\>'
     " s:all = pattern with all the keywords
-    let match_words = match_words .. (strlen(match_words) ? "," : "") .. default
+    let match_words = s:Append(match_words, default)
     let s:last_words = match_words
     if match_words !~ s:notslash .. '\\\d'
       let s:do_BR = 0
@@ -101,8 +120,8 @@ function matchit#Match_wrapper(word, forward, mode) range
       let s:pat = s:ParseWords(match_words)
     endif
     let s:all = substitute(s:pat, s:notslash .. '\zs[,:]\+', '\\|', 'g')
-    " un-escape \, to ,
-    let s:all = substitute(s:all, '\\,', ',', 'g')
+    " un-escape \, and \: to , and :
+    let s:all = substitute(s:all, s:notslash .. '\zs\\\(:\|,\)', '\1', 'g')
     " Just in case there are too many '\(...)' groups inside the pattern, make
     " sure to use \%(...) groups, so that error E872 can be avoided
     let s:all = substitute(s:all, '\\(', '\\%(', 'g')
@@ -341,6 +360,18 @@ fun! s:InsertRefs(groupBR, prefix, group, suffix, matchline)
   return ini .. ":" .. tailBR
 endfun
 
+" String append item2 to item and add ',' in between items
+fun! s:Append(item, item2)
+  if a:item == ''
+    return a:item2
+  endif
+  " there is already a trailing comma, don't add another one
+  if a:item[-1:] == ','
+    return a:item .. a:item2
+  endif
+  return a:item .. ',' .. a:item2
+endfun
+
 " Input a comma-separated list of groups with backrefs, such as
 "   a:groups = '\(foo\):end\1,\(bar\):end\1'
 " and return a comma-separated list of groups with backrefs replaced:
@@ -538,8 +569,8 @@ fun! s:Choose(patterns, string, comma, branch, prefix, suffix, ...)
   else
     let currpat = substitute(current, s:notslash .. a:branch, '\\|', 'g')
   endif
-  " un-escape \, to ,
-  let currpat = substitute(currpat, '\\,', ',', 'g')
+  " un-escape \, and \: to , and :
+  let currpat = substitute(currpat, s:notslash .. '\zs\\\(:\|,\)', '\1', 'g')
   while a:string !~ a:prefix .. currpat .. a:suffix
     let tail = strpart(tail, i)
     let i = matchend(tail, s:notslash .. a:comma)
@@ -552,6 +583,8 @@ fun! s:Choose(patterns, string, comma, branch, prefix, suffix, ...)
     else
       let currpat = substitute(current, s:notslash .. a:branch, '\\|', 'g')
     endif
+    " un-escape \, and \: to , and :
+    let currpat = substitute(currpat, s:notslash .. '\zs\\\(:\|,\)', '\1', 'g')
     if a:0
       let alttail = strpart(alttail, j)
       let j = matchend(alttail, s:notslash .. a:comma)
@@ -621,7 +654,7 @@ fun! matchit#MultiMatch(spflag, mode)
     let default = escape(&mps, '[$^.*~\\/?]') .. (strlen(&mps) ? "," : "") ..
       \ '\/\*:\*\/,#\s*if\%(n\=def\)\=:#\s*else\>:#\s*elif\>:#\s*endif\>'
     let s:last_mps = &mps
-    let match_words = match_words .. (strlen(match_words) ? "," : "") .. default
+    let match_words = s:Append(match_words, default)
     let s:last_words = match_words
     if match_words !~ s:notslash .. '\\\d'
       let s:do_BR = 0

runtime/pack/dist/opt/matchit/doc/matchit.txt

@@ -1,13 +1,7 @@
-*matchit.txt*   Extended "%" matching
+*matchit.txt* Extended "%" matching  Last change: 2026 Jan 06
 
-For instructions on installing this file, type
-	`:help matchit-install`
-inside Vim.
+		VIM REFERENCE MANUAL    by Benji Fisher et al
 
-For Vim version 9.1.  Last change:  2024 May 20
-
-
-		  VIM REFERENCE MANUAL    by Benji Fisher et al
 
 *matchit* *matchit.vim*
 
@@ -174,7 +168,7 @@ defined automatically.
 
 2.1 Temporarily disable the matchit plugin	*matchit-disable* *:MatchDisable*
 
-To temporarily disable the matchit plugin, after it hat been loaded,
+To temporarily disable the matchit plugin, after it has been loaded,
 execute this command: >
 	:MatchDisable
 
@@ -259,6 +253,45 @@ Examples:
 	See the $VIMRUNTIME/ftplugin/vim.vim for an example that uses both
 	syntax and a regular expression.
 
+						*b:match_function*
+If b:match_function is defined, matchit.vim will first call this function to
+perform matching.  This is useful for languages with an indentation-based block
+structure (such as Python) or other complex matching requirements that cannot
+be expressed with regular expression patterns.
+
+The function should accept one argument:
+	forward - 1 for forward search (% command)
+	          0 for backward search (g% command)
+
+The function should return a list with one of these values:
+	[line, col]  - Match found at the specified position
+	[]           - No match found; fall through to regular matching
+	               (|b:match_words|, matchpairs, etc.)
+
+The cursor position is not changed by the function; matchit handles cursor
+movement based on the returned position.
+
+If the function throws an error, matchit gives up and doesn't continue.
+Enable |b:match_debug| to see error messages from custom match functions.
+
+Python example (simplified): >
+	let s:keywords = {'if': 'elif\|else', 'elif': 'elif\|else'}
+
+	function! s:PythonMatch(forward) abort
+	  let keyword = matchstr(getline('.'), '^\s*\zs\w\+')
+	  let pattern = get(s:keywords, keyword, '')
+	  if empty(pattern) | return [] | endif
+
+	  " Forward-only. Backwards left as an exercise for the reader.
+	  let [lnum, col] = searchpos('^\s*\%(' . pattern . '\)\>', 'nW' 0, 0,
+	  \                            'indent(".") != ' . indent('.'))
+	  return lnum > 0 ? [lnum, col] : []
+	endfunction
+
+	let b:match_function = function('s:PythonMatch')
+<
+See |matchit-newlang| below for more details on supporting new languages.
+
 ==============================================================================
 4. Supporting a New Language				*matchit-newlang*
 							*b:match_words*
@@ -270,9 +303,9 @@ Vim's |regular-expression|s.
 
 The format for |b:match_words| is similar to that of the 'matchpairs' option:
 it is a comma (,)-separated list of groups; each group is a colon(:)-separated
-list of patterns (regular expressions).  Commas and backslashes that are part
-of a pattern should be escaped with backslashes ('\:' and '\,').  It is OK to
-have only one group; the effect is undefined if a group has only one pattern.
+list of patterns (regular expressions).  Commas and colons that are part of a
+pattern should be escaped with backslashes ('\:' and '\,').  It is OK to have
+only one group; the effect is undefined if a group has only one pattern.
 A simple example is >
 	:let b:match_words = '\<if\>:\<endif\>,'
 		\ . '\<while\>:\<continue\>:\<break\>:\<endwhile\>'
@@ -315,7 +348,7 @@ expression >
 if keywords are only recognized after the start of a line or after a
 semicolon (;), with optional white space.
 
-					*matchit-backref* *matchit-\1*
+						*matchit-backref*
 In any group, the expressions |\1|, |\2|, ..., |\9| refer to parts of the
 INITIAL pattern enclosed in |\(|escaped parentheses|\)|.  These are referred
 to as back references, or backrefs.  For example, >

runtime/pack/dist/opt/matchit/doc/tags

@@ -6,6 +6,7 @@ MatchError	matchit.txt	/*MatchError*
 ]%	matchit.txt	/*]%*
 b:match_col	matchit.txt	/*b:match_col*
 b:match_debug	matchit.txt	/*b:match_debug*
+b:match_function	matchit.txt	/*b:match_function*
 b:match_ignorecase	matchit.txt	/*b:match_ignorecase*
 b:match_ini	matchit.txt	/*b:match_ini*
 b:match_iniBR	matchit.txt	/*b:match_iniBR*
@@ -20,7 +21,6 @@ b:match_words	matchit.txt	/*b:match_words*
 g%	matchit.txt	/*g%*
 matchit	matchit.txt	/*matchit*
 matchit-%	matchit.txt	/*matchit-%*
-matchit-\1	matchit.txt	/*matchit-\\1*
 matchit-activate	matchit.txt	/*matchit-activate*
 matchit-backref	matchit.txt	/*matchit-backref*
 matchit-bugs	matchit.txt	/*matchit-bugs*

runtime/pack/dist/opt/matchit/plugin/matchit.vim

@@ -1,6 +1,6 @@
 "  matchit.vim: (global plugin) Extended "%" matching
 "  Maintainer:  Christian Brabandt
-"  Version:     1.20
+"  Version:     1.21
 "  Last Change: 2024 May 20
 "  Repository:  https://github.com/chrisbra/matchit
 "  Previous URL:http://www.vim.org/script.php?script_id=39

runtime/pack/dist/opt/netrw/README.md

@@ -11,7 +11,7 @@ upstream for distribution with Vim.
 
 # License
 
-To see License informations see the LICENSE.txt file included in this
+To see License information see the LICENSE.txt file included in this
 repository.
 
 # Credits

runtime/pack/dist/opt/netrw/autoload/netrw.vim

@@ -16,6 +16,8 @@
 " 2025 Nov 13 by Vim Project don't wipe unnamed buffers #18740
 " 2025 Nov 18 by Vim Project use UNC paths when using scp and Windows paths #18764
 " 2025 Nov 28 by Vim Project fix undefined variable in *NetrwMenu #18829
+" 2025 Dec 26 by Vim Project fix use of g:netrw_cygwin #19015
+" 2026 Jan 19 by Vim Project do not create swapfiles #18854
 " 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
@@ -213,7 +215,7 @@ call s:NetrwInit("g:netrw_dirhistmax"       , 10)
 call s:NetrwInit("g:netrw_fastbrowse"       , 1)
 call s:NetrwInit("g:netrw_ftp_browse_reject", '^total\s\+\d\+$\|^Trying\s\+\d\+.*$\|^KERBEROS_V\d rejected\|^Security extensions not\|No such file\|: connect to address [0-9a-fA-F:]*: No route to host$')
 if !exists("g:netrw_ftp_list_cmd")
-  if has("unix") || (exists("g:netrw_cygwin") && g:netrw_cygwin)
+  if has("unix") || g:netrw_cygwin
     let g:netrw_ftp_list_cmd     = "ls -lF"
     let g:netrw_ftp_timelist_cmd = "ls -tlF"
     let g:netrw_ftp_sizelist_cmd = "ls -slF"
@@ -320,7 +322,7 @@ call s:NetrwInit("g:netrw_menu"          , 1)
 call s:NetrwInit("g:netrw_mkdir_cmd"     , g:netrw_ssh_cmd." USEPORT HOSTNAME mkdir")
 call s:NetrwInit("g:netrw_mousemaps"     , (exists("+mouse") && &mouse =~# '[anh]'))
 call s:NetrwInit("g:netrw_retmap"        , 0)
-if has("unix") || (exists("g:netrw_cygwin") && g:netrw_cygwin)
+if has("unix") || g:netrw_cygwin
   call s:NetrwInit("g:netrw_chgperm"       , "chmod PERM FILENAME")
 elseif has("win32")
   call s:NetrwInit("g:netrw_chgperm"       , "cacls FILENAME /e /p PERM")
@@ -442,7 +444,7 @@ function netrw#Explore(indx,dosplit,style,...)
 
   " record current directory
   let curdir     = simplify(b:netrw_curdir)
-  if !exists("g:netrw_cygwin") && has("win32")
+  if !g:netrw_cygwin && has("win32")
     let curdir= substitute(curdir,'\','/','g')
   endif
   let curfiledir = substitute(expand("%:p"),'^\(.*[/\\]\)[^/\\]*$','\1','e')
@@ -520,7 +522,7 @@ function netrw#Explore(indx,dosplit,style,...)
   NetrwKeepj norm! 0
 
   if a:0 > 0
-    if a:1 =~ '^\~' && (has("unix") || (exists("g:netrw_cygwin") && g:netrw_cygwin))
+    if a:1 =~ '^\~' && (has("unix") || g:netrw_cygwin)
       let dirname= simplify(substitute(a:1,'\~',expand("$HOME"),''))
     elseif a:1 == '.'
       let dirname= simplify(exists("b:netrw_curdir")? b:netrw_curdir : getcwd())
@@ -3234,7 +3236,7 @@ function s:NetrwFile(fname)
             let b:netrw_curdir= getcwd()
         endif
 
-        if !exists("g:netrw_cygwin") && has("win32")
+        if !g:netrw_cygwin && has("win32")
             if fname =~ '^\' || fname =~ '^\a:\'
                 " windows, but full path given
                 let ret= fname
@@ -4256,12 +4258,12 @@ endfunction
 "    NetrwKeepj [keepalt] <OPT> <CMD> <FILENAME>
 function s:NetrwEditFile(cmd,opt,fname)
     if exists("g:netrw_altfile") && g:netrw_altfile && &ft == "netrw"
-        exe "NetrwKeepj keepalt ".a:opt." ".a:cmd." ".fnameescape(a:fname)
+        exe "NetrwKeepj noswapfile keepalt ".a:opt." ".a:cmd." ".fnameescape(a:fname)
     else
         if a:cmd =~# 'e\%[new]!' && !&hidden && getbufvar(bufname('%'), '&modified', 0)
             call setbufvar(bufname('%'), '&bufhidden', 'hide')
         endif
-        exe "NetrwKeepj ".a:opt." ".a:cmd." ".fnameescape(a:fname)
+        exe "NetrwKeepj noswapfile ".a:opt." ".a:cmd." ".fnameescape(a:fname)
     endif
 endfunction