Merge remote-tracking branch 'vim/master'

Author: ychin

.github/MAINTAINERS

@@ -136,6 +136,7 @@ runtime/ftplugin/chatito.vim				@ObserverOfTime
 runtime/ftplugin/chicken.vim				@evhan
 runtime/ftplugin/clojure.vim				@axvr
 runtime/ftplugin/cmakecache.vim				@ribru17
+runtime/ftplugin/codeowners.vim				@jparise
 runtime/ftplugin/cook.vim				@ribru17
 runtime/ftplugin/cs.vim					@nickspoons
 runtime/ftplugin/csh.vim				@dkearns
@@ -187,8 +188,8 @@ runtime/ftplugin/gyp.vim				@ObserverOfTime
 runtime/ftplugin/haml.vim				@tpope
 runtime/ftplugin/hare.vim				@selenebun
 runtime/ftplugin/haredoc.vim				@selenebun
-runtime/ftplugin/heex.vim				@cvincent
 runtime/ftplugin/hcl.vim				@gpanders
+runtime/ftplugin/heex.vim				@cvincent
 runtime/ftplugin/hgcommit.vim				@k-takata
 runtime/ftplugin/hlsplaylist.vim			@avidseeker
 runtime/ftplugin/hog.vim				@wtfbbqhax
@@ -205,24 +206,25 @@ runtime/ftplugin/javacc.vim				@ribru17
 runtime/ftplugin/javascript.vim				@dkearns
 runtime/ftplugin/javascriptreact.vim			@dkearns
 runtime/ftplugin/jjdescription.vim			@gpanders
+runtime/ftplugin/jq.vim					@vito-c
 runtime/ftplugin/json.vim				@dbarnett
 runtime/ftplugin/json5.vim				@dkearns
 runtime/ftplugin/jsonc.vim				@izhakjakov
 runtime/ftplugin/julia.vim				@carlobaldassi
 runtime/ftplugin/just.vim				@pbnj
-runtime/ftplugin/jq.vim					@vito-c
 runtime/ftplugin/kconfig.vim				@chrisbra
 runtime/ftplugin/kdl.vim				@imsnif @jiangyinzuo
+runtime/ftplugin/kerml.vim			    @daumantas-kavolis-sensmetry
 runtime/ftplugin/kivy.vim				@ribru17
 runtime/ftplugin/kotlin.vim				@udalov
+runtime/ftplugin/lc.vim					@ribru17
 runtime/ftplugin/ldapconf.vim				@ribru17
 runtime/ftplugin/leo.vim				@ribru17
 runtime/ftplugin/less.vim				@genoma
 runtime/ftplugin/lex.vim				@ribru17
 runtime/ftplugin/lf.vim					@andis-sprinkis
 runtime/ftplugin/liquid.vim				@tpope
 runtime/ftplugin/lua.vim				@dkearns
-runtime/ftplugin/lc.vim					@ribru17
 runtime/ftplugin/lynx.vim				@dkearns
 runtime/ftplugin/m17ndb.vim				@dseomn
 runtime/ftplugin/m3build.vim				@dkearns
@@ -295,6 +297,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/systemverilog.vim			@Kocha
 runtime/ftplugin/swig.vim				@jmarrec
 runtime/ftplugin/tap.vim				@petdance
@@ -456,6 +459,7 @@ runtime/syntax/chatito.vim				@ObserverOfTime
 runtime/syntax/chicken.vim				@evhan
 runtime/syntax/chuck.vim				@andreacfromtheapp
 runtime/syntax/clojure.vim				@axvr
+runtime/syntax/codeowners.vim				@jparise
 runtime/syntax/cs.vim					@nickspoons
 runtime/syntax/csv.vim					@habamax
 runtime/syntax/cucumber.vim				@tpope
@@ -536,16 +540,18 @@ runtime/syntax/just.vim					@pbnj
 runtime/syntax/jq.vim					@vito-c
 runtime/syntax/karel.vim				@kirillmorozov
 runtime/syntax/kconfig.vim				@chrisbra
+runtime/syntax/kitty.vim				@OXY2DEV
 runtime/syntax/kivy.vim					@prophittcorey
 runtime/syntax/kotlin.vim				@udalov
 runtime/syntax/kdl.vim					@imsnif @jiangyinzuo
 runtime/syntax/krl.vim					@KnoP-01
 runtime/syntax/less.vim					@genoma
 runtime/syntax/lf.vim					@andis-sprinkis
 runtime/syntax/liquid.vim				@tpope
+runtime/syntax/log.vim					@mao-yining
 runtime/syntax/lua.vim					@marcuscf
-runtime/syntax/lyrics.vim				@ObserverOfTime
 runtime/syntax/lynx.vim					@dkearns
+runtime/syntax/lyrics.vim				@ObserverOfTime
 runtime/syntax/m17ndb.vim				@dseomn
 runtime/syntax/m3build.vim				@dkearns
 runtime/syntax/m3quake.vim				@dkearns
@@ -581,6 +587,7 @@ runtime/syntax/pbtxt.vim				@lakshayg
 runtime/syntax/pdf.vim					@tpope
 runtime/syntax/perl.vim					@petdance
 runtime/syntax/php.vim					@TysonAndre
+runtime/syntax/pkl.vim					@jclsn
 runtime/syntax/plsql.vim				@lee-lindley
 runtime/syntax/pod.vim					@petdance
 runtime/syntax/poefilter.vim				@ObserverOfTime
@@ -666,7 +673,6 @@ runtime/syntax/zsh.vim					@chrisbra
 runtime/tutor/tutor1.eo					@dpelle
 runtime/tutor/tutor1.fr					@dpelle
 runtime/tutor/tutor1.ru					@RestorerZ
-runtime/tutor/tutor2.fr					@dlejay
 src/iscygpty.*						@k-takata
 src/libvterm/						@leonerd
 src/po/ca.po						@nfdisco
@@ -683,4 +689,7 @@ src/po/ru.po						@RestorerZ
 src/po/sr.po						@eevan78
 src/po/tr.po						@bitigchi
 src/po/uk.po						@sakhnik
+src/proto/gen_prototypes.py				@h-east
 src/xxd/						@jnweiger
+
+# vim:ft=codeowners

.github/labeler.yml

@@ -45,9 +45,7 @@ if_perl:
     - changed-files:
       - any-glob-to-any-file:
         - 'src/if_perl.xs'
-        - 'src/if_perlsfio.c'
         - 'src/proto/if_perl.pro'
-        - 'src/proto/if_perlsfio.pro'
         - 'runtime/doc/if_perl.txt'
 
 if_python:

.gitignore

@@ -11,6 +11,7 @@ src/objects
 src/po/big5corr
 src/po/sjiscorr
 src/types.vim
+src/tmp_make
 
 # We do need src/auto/configure.
 src/auto/config.cache

Filelist

@@ -251,6 +251,7 @@ SRC_ALL =	\
 		src/testdir/viewdumps.vim \
 		src/proto.h \
 		src/protodef.h \
+		src/proto/gen_prototypes.py \
 		src/proto/alloc.pro \
 		src/proto/arabic.pro \
 		src/proto/arglist.pro \
@@ -537,6 +538,7 @@ SRC_UNIX =	\
 		src/vimtutor \
 		src/gvimtutor \
 		src/wayland.c \
+		src/wayland.h \
 		src/which.sh \
 		src/gen-wayland-protocols.sh \
 		src/xxd/Makefile \
@@ -549,7 +551,6 @@ SRC_DOS_UNIX =	\
 		src/if_mzsch.c \
 		src/if_mzsch.h \
 		src/if_perl.xs \
-		src/if_perlsfio.c \
 		src/if_python.c \
 		src/if_python3.c \
 		src/if_py_both.h \
@@ -560,7 +561,6 @@ SRC_DOS_UNIX =	\
 		src/proto/if_lua.pro \
 		src/proto/if_mzsch.pro \
 		src/proto/if_perl.pro \
-		src/proto/if_perlsfio.pro \
 		src/proto/if_python.pro \
 		src/proto/if_python3.pro \
 		src/proto/if_ruby.pro \
@@ -638,8 +638,8 @@ SRC_DOS =	\
 		src/tee/tee.c \
 		src/xxd/Make_ming.mak \
 		src/xxd/Make_mvc.mak \
+		nsis/auxiliary.nsh \
 		nsis/gvim.nsi \
-		nsis/gvim_version.nsh \
 		nsis/Makefile \
 		nsis/Make_mvc.mak \
 		nsis/README.txt \

Makefile

@@ -105,7 +105,7 @@ MINOR = 1
 # - Update Vim version number.  For a test version in: src/version.h,
 #   READMEdir/Contents, MAJOR/MINOR above, VIMMAJOR and VIMMINOR in
 #   src/Makefile, README.txt, README.md, src/README.md, READMEdir/README*.txt,
-#   runtime/doc/*.txt and make nsis/gvim_version.nsh.
+#   runtime/doc/*.txt.
 #   For a minor/major version: src/GvimExt/GvimExt.reg, src/vim.manifest.
 # - Compile Vim with GTK, Perl, Python, Python3, TCL, Ruby, Lua, Cscope and
 #   "huge" features.  Add MZscheme if you can make it work.
@@ -410,7 +410,7 @@ amisrc: dist prepare
 	mv dist/vim$(VERSION)src.tar.gz dist/vim$(VERSION)src.tgz
 
 # MS-DOS sources
-dossrc: dist dist/$(COMMENT_SRC) license nsis/gvim_version.nsh
+dossrc: dist dist/$(COMMENT_SRC) license
 	-rm -rf dist/vim$(VERSION)src.zip
 	-rm -rf dist/vim
 	mkdir dist/vim
@@ -423,7 +423,6 @@ dossrc: dist dist/$(COMMENT_SRC) license nsis/gvim_version.nsh
 		$(SRC_DOS_UNIX) \
 		lang/LICENSE.*.txt \
 		lang/README.*.txt \
-		nsis/gvim_version.nsh \
 		| (cd dist/vim/$(VIMRTDIR); tar xf -)
 	mv dist/vim/$(VIMRTDIR)/runtime/* dist/vim/$(VIMRTDIR)
 	rmdir dist/vim/$(VIMRTDIR)/runtime
@@ -432,9 +431,6 @@ dossrc: dist dist/$(COMMENT_SRC) license nsis/gvim_version.nsh
 license:
 	cd nsis && $(MAKE) -f Makefile $@
 
-nsis/gvim_version.nsh: Makefile
-	cd nsis && $(MAKE) -f Makefile $(@F)
-
 dosrt: dist dist/$(COMMENT_RT) dosrt_files
 	-rm -rf dist/vim$(VERSION)rt.zip
 	cd dist && zip -9 -rD -z vim$(VERSION)rt.zip vim <$(COMMENT_RT)

ci/hlgroups.ignore

@@ -33,6 +33,7 @@ Pmenu
 PmenuSbar
 PmenuSel
 PmenuThumb
+PmenuShadow
 Question
 Scrollbar
 Search
@@ -51,6 +52,8 @@ TabLineFill
 TabLineSel
 Terminal
 Title
+TitleBar
+TitleBarNC
 TOhtmlProgress
 TOhtml-progress-color
 ToolbarButton

nsis/Make_mvc.mak

@@ -1,60 +1,12 @@
 #
 # Makefile for MS Windows for create self-installing exe of Vim.
-# 2024‐04-05, Restorer, restorer@mail2k.ru
+# 2025-10-03, Restorer, restorer@mail2k.ru
 #
 
 
 # included common tools
 !INCLUDE ..\src\auto\nmake\tools.mak
 
-# Read MAJOR and MINOR from version.h.
-!IFNDEF MAJOR
-! IF ![for /F "tokens=3" %G in \
-	('findstr /RC:"VIM_VERSION_MAJOR[	^]*[0-9^]" ..\src\version.h') \
-	do @(echo:MAJOR=%G>> .\_major.tmp)]
-!  INCLUDE .\_major.tmp
-!  IF [$(RM) .\_major.tmp]
-!  ENDIF
-! ELSE
-MAJOR = 9
-! ENDIF
-!ENDIF
-
-!IFNDEF MINOR
-! IF ![for /F "tokens=3" %G in \
-	('findstr /RC:"VIM_VERSION_MINOR[	^]*[0-9^]" ..\src\version.h') \
-	do @(echo:MINOR=%G>> .\_minor.tmp)]
-!  INCLUDE .\_minor.tmp
-!  IF [$(RM) .\_minor.tmp]
-!  ENDIF
-! ELSE
-MINOR = 1
-! ENDIF
-!ENDIF
-
-# Read PATCHLEVEL from version.c
-!IFNDEF PATCHLEVEL
-! IF ![for /F %G in \
-	('findstr /NBLC:"static int included_patches" ..\src\version.c \
-	^| (set /p "_t=" ^& set /a _t+=2 ^)') do \
-	@$(CMD) $(CMDFLAGS) "for /F "skip=%G delims=, " %H in \
-	(..\src\version.c) do (echo:PATCHLEVEL=%H> .\_patchlvl.tmp & exit /b)"]
-!  INCLUDE .\_patchlvl.tmp
-!  IF [$(RM) .\_patchlvl.tmp]
-!  ENDIF
-! ELSE
-PATCHLEVEL = 0
-! ENDIF
-!ENDIF
-
-!IF $(PATCHLEVEL) < 10
-PATCHLEVEL = 000$(PATCHLEVEL)
-!ELSEIF $(PATCHLEVEL) < 100
-PATCHLEVEL = 00$(PATCHLEVEL)
-!ELSEIF $(PATCHLEVEL) < 1000
-PATCHLEVEL = 0$(PATCHLEVEL)
-!ENDIF
-
 .SUFFIXES :
 
 !IFDEF PROGRAMW6432
@@ -119,23 +71,13 @@ all : makeinst
 makeinst : prepare
 	^"$(MKNSIS)" $(MKNSISFLAGS) gvim.nsi $(XX)
 
-prepare : unzipicons gvim_version.nsh license rename
+prepare : unzipicons license rename
 
 unzipicons : icons.zip
 	@ if exist %|fF\nul $(RD) %|fF
 	@ $(PS) $(PSFLAGS) \
 		Add-Type -AssemblyName 'System.IO.Compression.FileSystem'; \
-		[System.IO.Compression.ZipFile]::ExtractToDirectory(\"$**\", \
-		\".\")
-
-gvim_version.nsh : Make_mvc.mak
-	@ 1> $@ echo:^# Generated from Makefile: define the version numbers
-	@ 1>> $@ echo:^!ifndef __GVIM_VER__NSH__
-	@ 1>> $@ echo:^!define __GVIM_VER__NSH__
-	@ 1>> $@ echo:^!define VER_MAJOR $(MAJOR)
-	@ 1>> $@ echo:^!define VER_MINOR $(MINOR)
-	@ 1>> $@ echo:^!define PATCHLEVEL $(PATCHLEVEL)
-	@ 1>> $@ echo:^!endif
+		[System.IO.Compression.ZipFile]::ExtractToDirectory('$**', '.')
 
 license : ..\lang\LICENSE.*.txt ..\LICENSE
 	!@ $(PS) $(PSFLAGS) \
@@ -146,7 +88,6 @@ rename :
 	@ ..\tools\rename.bat "$(SRC)" "$(DST)" 1> nul
 
 clean :
-	@ if exist .\gvim_version.nsh $(RM) .\gvim_version.nsh
 	@ if exist ..\lang\LICENSE*.nsis.txt $(RM) ..\lang\LICENSE*.nsis.txt
 	@ if exist .\icons\nul $(RD) .\icons
 	@ if exist .\gvim??.exe $(RM) .\gvim??.exe

nsis/Makefile

@@ -1,6 +1,6 @@
 #
 # Makefile for UNIX-like for create self-installing exe of Vim.
-# 15/12/2024, Restorer restorer@mail2k.ru
+# 2025-10-03, Restorer, restorer@mail2k.ru
 #
 
 
@@ -51,35 +51,19 @@ ifdef X
 XX := -X"$(X:;=" -X")"
 endif
 
-MAJOR != grep -E 'VIM_VERSION_MAJOR\s{2,}' ../src/version.h | \
-	awk '{ printf "%d",$$3 }'
-MINOR != grep -E 'VIM_VERSION_MINOR\s{2,}' ../src/version.h | \
-	awk '{ printf "%d",$$3 }'
-PATCH != awk '/number below this line/,/,/' ../src/version.c | \
-	awk 'NR == 3 { printf "%04d",$$1 }' | sed -e 's/[ ,]//g'
-
 MKNSISFLAGS := -INPUTCHARSET UTF8 $(MKNSISFLAGS)
 
 all: makeinst
 
 makeinst: prepare
 	makensis $(MKNSISFLAGS) gvim.nsi $(XX)
 
-prepare: unzipicons gvim_version.nsh license rename
+prepare: unzipicons license rename
 
 unzipicons: icons.zip
 	if test -d `basename $? .zip` ; then rm -rf `basename $? .zip` ; fi
 	unzip $?
 
-gvim_version.nsh: Makefile
-	echo "# Generated from Makefile: define the version numbers" > $@
-	echo "!ifndef __GVIM_VER__NSH__"  >> $@
-	echo "!define __GVIM_VER__NSH__"  >> $@
-	echo "!define VER_MAJOR $(MAJOR)" >> $@
-	echo "!define VER_MINOR $(MINOR)" >> $@
-	echo "!define PATCHLEVEL $(PATCH)" >> $@
-	echo "!endif" >> $@
-
 license: ../lang/LICENSE.*.txt ../LICENSE
 	for lic in $? ; do \
 		bn=`basename $$lic .txt` ; \
@@ -91,7 +75,6 @@ rename:
 	../tools/rename.bat "$(SRC)" "$(DST)"
 
 clean:
-	if test -f gvim_version.nsh ; then rm -f gvim_version.nsh ; fi
 	rm -f ../lang/LICENSE*.nsis.txt
 	if test -d icons ; then rm -rf icons ; fi
 	if test -f gvim??.exe ; then rm -f gvim??.exe ; fi

nsis/README.txt

@@ -108,3 +108,5 @@ Variables and their values available for building the installer (not mandatory):
 			    Example "X=OutFile MyVim.exe;XPMode on"
     "MKNSIS=<dir>"	— the directory where the "makensis.exe" program is
 			    located.
+
+Note: for icons used in the installer, see the README.txt in the icons.zip