feat: update vim to 2:9.2.0524-1

Filelist

@@ -18,11 +18,9 @@ SRC_ALL =	\
 		.github/dependabot.yml \
 		.gitignore \
 		.hgignore \
-		.appveyor.yml \
 		.clang-format \
 		.codecov.yml \
 		.editorconfig \
-		ci/appveyor.bat \
 		ci/config.mk*.sed \
 		ci/gen_testset.py \
 		ci/if_ver*.vim \
@@ -147,6 +145,7 @@ SRC_ALL =	\
 		src/session.c \
 		src/sha256.c \
 		src/sign.c \
+		src/socketserver.c \
 		src/sound.c \
 		src/spell.c \
 		src/spell.h \
@@ -346,6 +345,7 @@ SRC_ALL =	\
 		src/proto/session.pro \
 		src/proto/sha256.pro \
 		src/proto/sign.pro \
+		src/proto/socketserver.pro \
 		src/proto/sound.pro \
 		src/proto/spell.pro \
 		src/proto/spellfile.pro \
@@ -500,6 +500,9 @@ SRC_UNIX =	\
 		src/gui_gtk_f.c \
 		src/gui_gtk_f.h \
 		src/gui_gtk_x11.c \
+		src/gui_gtk4.c \
+		src/gui_gtk4_f.c \
+		src/gui_gtk4_f.h \
 		src/gui_gtk_res.xml \
 		src/gui_motif.c \
 		src/gui_xmdlg.c \
@@ -529,6 +532,7 @@ SRC_UNIX =	\
 		src/proto/gui_gtk.pro \
 		src/proto/gui_gtk_x11.pro \
 		src/proto/gui_gtk_gresources.pro \
+		src/proto/gui_gtk4.pro \
 		src/proto/gui_motif.pro \
 		src/proto/gui_xmdlg.pro \
 		src/proto/gui_x11.pro \
@@ -1195,7 +1199,6 @@ LANG_DOS = \
 # be excluded from distribution tarballs and the like.
 # This excludes them from the CI check for unlisted files.
 IGNORE = \
-		.appveyor.yml \
 		.github/FUNDING.yml \
 		.github/labeler.yml \
 		.github/workflows/label.yml \

README.md

@@ -1,7 +1,6 @@
 # [![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)
-[![Appveyor Build status](https://ci.appveyor.com/api/projects/status/o2qht2kjm02sgghk?svg=true)](https://ci.appveyor.com/project/chrisbra/vim)
 [![Cirrus Build Status](https://api.cirrus-ci.com/github/vim/vim.svg)](https://cirrus-ci.com/github/vim/vim)
 [![Coverage Status](https://codecov.io/gh/vim/vim/coverage.svg?branch=master)](https://codecov.io/gh/vim/vim?branch=master)
 [![Coverity Scan](https://scan.coverity.com/projects/241/badge.svg)](https://scan.coverity.com/projects/vim)

debian/changelog

@@ -1,8 +1,22 @@
-vim (2:9.2.0461-1deepin1) unstable; urgency=medium
+vim (2:9.2.0524-1deepin1) unstable; urgency=medium
 
   * Set-NoDisplay-true-for-vim-desktop.patch
 
- -- Tianyu Chen <sweetyfish@deepin.org>  Thu, 14 May 2026 11:50:36 +0800
+ -- lichenggang <lichenggang@deepin.org>  Tue, 16 Jun 2026 20:27:15 +0800
+
+vim (2:9.2.0524-1) unstable; urgency=medium
+
+  * New upstream tag
+    + Security fixes
+      - 9.2.0479: command injection in tar plugin (Closes: #1136803,
+        CVE-2026-46483)
+      - 9.2.0480: command injection in netrw via mf command (Closes: #1136828,
+        CVE-2026-43961)
+  * debian/rules:
+    + Disable gtk4 configure check until new UI stabilizes
+    + Remove obsolete --enable-sockerserver switch
+
+ -- James McCoy <jamessan@debian.org>  Sat, 23 May 2026 22:34:42 -0400
 
 vim (2:9.2.0461-1) unstable; urgency=medium
 

debian/rules

@@ -44,6 +44,7 @@ CFGFLAGS += --with-modified-by="$(BUILDER)"
 CFGFLAGS += --with-compiledby="$(BUILDER)"
 CFGFLAGS += --enable-fail-if-missing
 CFGFLAGS += --with-global-runtime='/var/lib/vim/addons,/etc/vim,$$VIM/vimfiles'
+CFGFLAGS += --disable-gtk4-check
 
 TINYFLAGS = --with-features=small
 TINYFLAGS += --disable-gui
@@ -73,7 +74,6 @@ OPTFLAGS += --enable-libsodium
 NOXFLAGS = --without-x
 NOXFLAGS += --enable-gui=no
 NOXFLAGS += --disable-canberra
-NOXFLAGS += --enable-socketserver
 NOXFLAGS += --without-wayland
 
 GUIFLAGS = --with-x
@@ -91,7 +91,6 @@ GTK3FLAGS += --disable-gnome-check
 GTK3FLAGS += --disable-motif-check
 GTK3FLAGS += --disable-motif-check
 GTK3FLAGS += --disable-fontset
-GTK3FLAGS += --enable-socketserver
 
 MOTIFFLAGS = --enable-gui=motif
 MOTIFFLAGS += --disable-gtk2-check

nsis/gvim.nsi

@@ -90,7 +90,7 @@ Unicode true  ; !include defaults to UTF-8 after Unicode True since 3.0 Alpha 2
 # ----------- No configurable settings below this line -----------
 
 ##########################################################
-# Installer Attributes, Including headers, Plugins and etc. 
+# Installer Attributes, Including headers, Plugins and etc.
 
 CRCCheck force
 
@@ -638,21 +638,23 @@ SectionGroupEnd
 	!undef LIBRARY_X64
       ${EndIf}
 
-      # Install DLLs for 32-bit gvimext.dll into the GvimExt32 directory.
-      SetOutPath $0\GvimExt32
-      ClearErrors
-      !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
-	  "${GETTEXT}\gettext32\libintl-8.dll" \
-	  "$0\GvimExt32\libintl-8.dll" "$0\GvimExt32"
-      !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
-	  "${GETTEXT}\gettext32\libiconv-2.dll" \
-	  "$0\GvimExt32\libiconv-2.dll" "$0\GvimExt32"
-      # Install libgcc_s_sjlj-1.dll only if it is needed.
-      !if ${INCLUDE_LIBGCC}
-	!if /FileExists "${GETTEXT}\gettext32\libgcc_s_sjlj-1.dll"
-	    !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
-		"${GETTEXT}\gettext32\libgcc_s_sjlj-1.dll" \
-		"$0\GvimExt32\libgcc_s_sjlj-1.dll" "$0\GvimExt32"
+      !if !${ARM64}
+	# Install DLLs for 32-bit gvimext.dll into the GvimExt32 directory.
+	SetOutPath $0\GvimExt32
+	ClearErrors
+	!insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
+	    "${GETTEXT}\gettext32\libintl-8.dll" \
+	    "$0\GvimExt32\libintl-8.dll" "$0\GvimExt32"
+	!insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
+	    "${GETTEXT}\gettext32\libiconv-2.dll" \
+	    "$0\GvimExt32\libiconv-2.dll" "$0\GvimExt32"
+	# Install libgcc_s_sjlj-1.dll only if it is needed.
+	!if ${INCLUDE_LIBGCC}
+	  !if /FileExists "${GETTEXT}\gettext32\libgcc_s_sjlj-1.dll"
+	      !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED \
+		  "${GETTEXT}\gettext32\libgcc_s_sjlj-1.dll" \
+		  "$0\GvimExt32\libgcc_s_sjlj-1.dll" "$0\GvimExt32"
+	  !endif
 	!endif
       !endif
     ${EndIf}

runtime/autoload/context.vim

@@ -3,9 +3,7 @@ vim9script
 # Language:           ConTeXt typesetting engine
 # Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
 # Former Maintainers: Nikolai Weibull <now@bitwi.se>
-# Latest Revision:    2026 Feb 03
-# Last Change:
-# 2026 Mar 30 by Vim project: Use fnameescape for the Log command
+# Latest Revision:    2026 May 20
 
 # Typesetting {{{
 import autoload './typeset.vim'
@@ -35,7 +33,7 @@ export def Log(bufname: string)
   var logpath = typeset.LogPath(bufname)
 
   if filereadable(logpath)
-    execute 'edit' .. fnameescape(typeset.LogPath(bufname))
+    execute 'edit' fnameescape(typeset.LogPath(bufname))
     return
   endif
 

runtime/autoload/dist/ft.vim

@@ -3,7 +3,7 @@ vim9script
 # Vim functions for file type detection
 #
 # Maintainer:		The Vim Project <https://github.com/vim/vim>
-# Last Change:		2026 Apr 23
+# Last Change:		2026 May 18
 # Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 # These functions are moved here from runtime/filetype.vim to make startup
@@ -547,7 +547,7 @@ export def FThtml()
 
   while n < 40 && n <= line("$")
     # Check for Angular
-    if getline(n) =~ '@\(if\|for\|defer\|switch\)\|\*\(ngIf\|ngFor\|ngSwitch\|ngTemplateOutlet\)\|ng-template\|ng-content'
+    if getline(n) =~ '@\(if\|for\|defer\|switch\)\|\*\(ngIf\|ngFor\|ngSwitch\|ngTemplateOutlet\)\|\<ng-template\|\<ng-content'
       setf htmlangular
       return
     endif
@@ -798,9 +798,14 @@ export def FTnroff(): number
 enddef
 
 export def FTmm()
+  if exists("g:filetype_mm")
+    exe "setf " .. g:filetype_mm
+    return
+  endif
+
   var n = 1
   while n < 20
-    if getline(n) =~ '^\s*\(#\s*\(include\|import\)\>\|@import\>\|/\*\)'
+    if getline(n) =~ '^\s*\(//\|#\s*\(include\|import\)\>\|@import\>\|/\*\)'
       setf objcpp
       return
     endif