Merge remote-tracking branch 'vim/master'

Author: ychin

.cirrus.yml

@@ -5,12 +5,12 @@ env:
 freebsd_task:
   name: FreeBSD
   matrix:
-    - name: FreeBSD 14.3
+    - name: FreeBSD 15.0
       freebsd_instance:
-        image_family: freebsd-14-3
+        image_family: freebsd-15-0-amd64-ufs
   timeout_in: 20m
   install_script:
-    - pkg install -y gettext
+    - pkg install -y gettext diffutils
   build_script:
     - NPROC=$(getconf _NPROCESSORS_ONLN)
     - ./configure --with-features=${FEATURES}

.gitattributes

@@ -38,3 +38,5 @@ src/po/vim.pot diff=ignore_vim_pot
 #
 # 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
@@ -128,7 +132,7 @@ 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/bicep-params.vim			@scottmckendry
 runtime/ftplugin/brighterscript.vim			@ribru17
 runtime/ftplugin/brightscript.vim			@ribru17
 runtime/ftplugin/bst.vim				@tpope
@@ -142,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
@@ -219,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
@@ -230,8 +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/logtalk.dict				@pmoura
+runtime/ftplugin/logtalk.vim				@pmoura
 runtime/ftplugin/lua.vim				@dkearns
 runtime/ftplugin/lynx.vim				@dkearns
 runtime/ftplugin/m17ndb.vim				@dseomn
@@ -241,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
@@ -253,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
@@ -307,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
@@ -346,6 +354,7 @@ 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
@@ -392,8 +401,10 @@ 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
@@ -474,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
@@ -506,6 +519,7 @@ runtime/syntax/forth.vim				@jkotlinski
 runtime/syntax/fpcmake.vim				@dkearns
 runtime/syntax/freebasic.vim				@dkearns
 runtime/syntax/fstab.vim				@rid9
+runtime/syntax/gdb.vim					@dkearns
 runtime/syntax/gdresource.vim				@habamax
 runtime/syntax/gdscript.vim				@habamax
 runtime/syntax/gdshader.vim				@habamax
@@ -573,18 +587,19 @@ runtime/syntax/m17ndb.vim				@dseomn
 runtime/syntax/m3build.vim				@dkearns
 runtime/syntax/m3quake.vim				@dkearns
 runtime/syntax/mailcap.vim				@dkearns
-runtime/syntax/make.vim					@rohieb
 runtime/syntax/mallard.vim				@jhradilek
 runtime/syntax/markdown.vim				@tpope
 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
@@ -643,6 +658,7 @@ runtime/syntax/scss.vim					@tpope
 runtime/syntax/sed.vim					@dkearns
 runtime/syntax/shared/debversions.vim			@jamessan
 runtime/syntax/shaderslang.vim				@mTvare6
+runtime/syntax/skhd.vim					@kiyoon
 runtime/syntax/solidity.vim				@coti-z
 runtime/syntax/spajson.vim				@dseomn
 runtime/syntax/spec.vim					@ignatenkobrain
@@ -687,6 +703,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

Filelist

@@ -27,7 +27,6 @@ SRC_ALL =	\
 		ci/if_feat_check.vim \
 		ci/lychee.toml \
 		ci/setup-xvfb.sh \
-		ci/setup-sway.sh \
 		ci/remove_snap.sh \
 		ci/ddebs.list \
 		ci/pinned-pkgs \
@@ -248,6 +247,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 \
@@ -540,7 +540,6 @@ SRC_UNIX =	\
 		src/wayland.c \
 		src/wayland.h \
 		src/which.sh \
-		src/gen-wayland-protocols.sh \
 		src/xxd/Makefile \
 
 # Source files for both MS Windows and Unix-like.
@@ -804,6 +803,10 @@ RT_ALL =	\
 		runtime/tutor/en/vim-01-beginner.tutor.json \
 		runtime/tutor/en/vim-02-beginner.tutor \
 		runtime/tutor/en/vim-02-beginner.tutor.json \
+		runtime/tutor/sv/vim-01-beginner.tutor \
+		runtime/tutor/sv/vim-01-beginner.tutor.json \
+		runtime/tutor/sv/vim-02-beginner.tutor \
+		runtime/tutor/sv/vim-02-beginner.tutor.json \
 		runtime/tutor/tutor.tutor \
 		runtime/tutor/tutor.tutor.json \
 		runtime/tutor/tutor.vim \
@@ -821,7 +824,6 @@ RT_ALL =	\
 		runtime/pack/dist/opt/editorconfig/.editorconfig \
 		runtime/pack/dist/opt/editorconfig/CONTRIBUTORS \
 		runtime/pack/dist/opt/editorconfig/LICENSE* \
-		runtime/pack/dist/opt/editorconfig/mkzip.sh \
 		runtime/pack/dist/opt/editorconfig/README.md \
 		runtime/pack/dist/opt/editorconfig/autoload/*.vim \
 		runtime/pack/dist/opt/editorconfig/autoload/editorconfig_core/*.vim \
@@ -915,7 +917,6 @@ RT_SCRIPTS =	\
 		runtime/syntax/testdir/input/selftestdir/* \
 		runtime/syntax/testdir/input/setup/*.* \
 		runtime/syntax/testdir/dumps/*.dump \
-		runtime/syntax/testdir/dumps/*.vim \
 		runtime/syntax/testdir/tools/* \
 		runtime/syntax/generator/Makefile \
 		runtime/syntax/generator/README.md \
@@ -987,8 +988,7 @@ RT_AMI =	\
 		runtime/macros/maze/*.info \
 		runtime/macros/urm/*.info \
 		runtime/tools.info \
-		runtime/tutor.info \
-		runtime/tutor/*.info \
+		runtime/tutor.info
 
 # Runtime files in extra archive.
 RT_EXTRA =	\
@@ -1103,6 +1103,8 @@ LANG_GEN = \
 		runtime/doc/*-pl.UTF-8.1 \
 		runtime/doc/*-ru.1 \
 		runtime/doc/*-ru.UTF-8.1 \
+		runtime/doc/*-sv.1 \
+		runtime/doc/*-sv.UTF-8.1 \
 		runtime/doc/*-tr.1 \
 		runtime/doc/*-tr.UTF-8.1 \
 		runtime/lang/README.txt \
@@ -1122,6 +1124,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 \

Makefile

@@ -98,7 +98,7 @@ syntaxtest:
 #    Before creating an archive first delete all backup files, *.orig, etc.
 
 MAJOR = 9
-MINOR = 1
+MINOR = 2
 
 # CHECKLIST for creating a new version:
 #

README.txt

@@ -1,4 +1,4 @@
-README.txt for version 9.1 of Vim: Vi IMproved.
+README.txt for version 9.2 of Vim: Vi IMproved.
 
 
 WHAT IS VIM?

README_VIM9.md

@@ -28,7 +28,7 @@ way:
 * Local variables are not available in an l: dictionary.
 * A few more things that slow us down, such as exception handling details.
 
-I Implemented a "proof of concept" and measured the time to run a simple
+I implemented a "proof of concept" and measured the time to run a simple
 for loop with an addition (Justin used this example in his presentation,
 full code is below):
 
@@ -224,7 +224,7 @@ Eventually this will lead to Vim 9!
 
 ## Code for sum time measurements
 
-Vim was build with -O2.
+Vim was built with -O2.
 
 ``` vim
 func VimOld()

README_vim.md

@@ -154,4 +154,4 @@ Most of Vim was created by Bram Moolenaar `<Bram@vim.org>`
 Send any other comments, patches, flowers and suggestions to the vim-dev mailing list:
 	`<vim-dev@vim.org>`
 
-This is `README.md` for version 9.1 of Vim: Vi IMproved.
+This is `README.md` for version 9.2 of Vim: Vi IMproved.

READMEdir/Contents

@@ -9,15 +9,15 @@ Vim		Vi IMproved.  A clone of the UNIX text editor Vi.  Very useful
 		messages, shows current file name in window title, on-line
 		help, rectangular cut/paste, etc., etc., etc...
 
-		Version 9.1.  Also runs under UNIX, MS-Windows, Mac, etc.
-		vim91rt.tgz  contains the documentation and syntax files.
-		vim91bin.tgz contains the binaries.
-		vim91src.tgz contains the sources.
+		Version 9.2.  Also runs under UNIX, MS-Windows, Mac, etc.
+		vim92rt.tgz  contains the documentation and syntax files.
+		vim92bin.tgz contains the binaries.
+		vim92src.tgz contains the sources.
 		Author: Bram Moolenaar et al.
 
 
 Xxd		Hex dumper and reader.  Can be used to view files as hex, edit
 		them and write them back.  Can also be used to patch files.
 
-		Version 2023 Oct 25
-		Author: Juergen Weigert
+		Version 2025 Nov 26
+		Author: Juergen Weigert et al.

READMEdir/README_ami.txt

@@ -1,4 +1,4 @@
-README_ami.txt for version 9.1 of Vim: Vi IMproved.
+README_ami.txt for version 9.2 of Vim: Vi IMproved.
 
 This file explains the installation of Vim on Amiga systems.
 See README.txt for general information about Vim.
@@ -16,8 +16,8 @@ easily upgrade to a new version.  For example:
 You would then unpack the archives like this:
 
   cd dh0:editors
-  tar xf t:vim91bin.tar
-  tar xf t:vim91rt.tar
+  tar xf t:vim92bin.tar
+  tar xf t:vim92rt.tar
 
 Set the $VIM environment variable to point to the top directory of your Vim
 files.  For the above example: