feat: update vim to 2:9.1.1230-2

.git-blame-ignore-revs

@@ -13,13 +13,3 @@
 # change indentation style of netrw plugin
 c363ca1ecd1f8db03663ef98dcf41eeacc3c22c7
 c673b805ad80d0aef07e745d412a2bf298ba1c07
-# fix indentation style in insexpand.c v9.1.1352
-355db99d12a89f05765948b33eecd6d9733e16bb
-# fix indentation styles in various files v9.1.1363
-c2a9000bc1b4a2cbcfeef55450c184b16906d910
-# indentation style in various files v9.1.1364
-562610cfa327c8ebff12a1700525e17a070d5e2c
-# Patch v9.1.1371
-19e1dd6b6aeb96d64122332a8c3d17b9d5ca007b
-# Patch v9.1.1372
-a4a00a7ad0cfa26685c057c11a09bec2c962346a

.gitignore

@@ -96,7 +96,9 @@ src/json_test
 src/message_test
 src/kword_test
 
+runtime/syntax/testdir/Xfilter
 runtime/syntax/testdir/done/
+runtime/syntax/testdir/failed/
 runtime/syntax/testdir/messages
 runtime/syntax/testdir/testdeps.mk
 runtime/syntax/testdir/vimcmd

.hgignore

@@ -98,7 +98,9 @@ src/json_test
 src/message_test
 src/kword_test
 
+runtime/syntax/testdir/Xfilter
 runtime/syntax/testdir/done/
+runtime/syntax/testdir/failed/
 runtime/syntax/testdir/messages
 runtime/syntax/testdir/testdeps.mk
 runtime/syntax/testdir/vimcmd

CONTRIBUTING.md

@@ -21,31 +21,6 @@ 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
 does not cause us trouble with trademarks or patents.  There is no CLA to sign.
 
-## Signing-off commits
-
-While not required, it's recommended to use **Signed-off commits** to ensure
-transparency, accountability, and compliance with open-source best practices.
-Signed-off commits follow the [Developer Certificate of Origin (DCO)][15],
-which confirms that contributors have the right to submit their changes under
-the project's license.  This process adds a `Signed-off-by` line to commit
-messages, verifying that the contributor agrees to the project's licensing
-terms.  To sign off a commit, simply use the -s flag when committing:
-
-```sh
-git commit -s
-```
-
-This ensures that every contribution is properly documented and traceable,
-aligning with industry standards used in projects like the Linux Kernel or
-the git project.  By making Signed-off commits a standard practice, we help
-maintain a legally compliant and well-governed codebase while fostering trust
-within our contributor community.
-
-When merging PRs into Vim, the current maintainer @chrisbra usually adds missing
-`Signed-off-by` trailers for the author user name and email address as well for
-anybody that explicitly *ACK*s a pull request as a statement that those
-approvers are happy with that particular change.
-
 # Reporting issues
 
 We use GitHub issues, but that is not a requirement.  Writing to the Vim
@@ -71,7 +46,7 @@ Or open [the todo file][todo list] on GitHub to see the latest version.
 # Syntax, indent and other runtime files
 
 The latest version of these files can be obtained from the repository.
-They are usually not updated with numbered patches. However, they may
+They are usually not updated with numbered patches. However, they may 
 or may not work with older Vim releases (since they may contain new features).
 
 If you find a problem with one of these files or have a suggestion for
@@ -138,4 +113,3 @@ mailing list. For other questions please use the [Vi Stack Exchange][8] website,
 [12]: https://github.com/vim/vim/blob/master/src/testdir/test_filetype.vim
 [13]: https://github.com/vim/vim/blob/master/runtime/doc/filetype.txt
 [14]: https://github.com/vim/vim/blob/master/runtime/doc/syntax.txt
-[15]: https://en.wikipedia.org/wiki/Developer_Certificate_of_Origin

Filelist

@@ -23,12 +23,8 @@ SRC_ALL =	\
 		ci/appveyor.bat \
 		ci/config.mk*.sed \
 		ci/if_ver*.vim \
-		ci/if_feat_check.vim \
 		ci/setup-xvfb.sh \
-		ci/setup-sway.sh \
 		ci/remove_snap.sh \
-		ci/ddebs.list \
-		ci/pinned-pkgs \
 		src/Make_all.mak \
 		src/README.md \
 		src/alloc.c \
@@ -161,7 +157,6 @@ SRC_ALL =	\
 		src/textobject.c \
 		src/textprop.c \
 		src/time.c \
-		src/tuple.c \
 		src/typval.c \
 		src/ui.c \
 		src/undo.c \
@@ -344,7 +339,6 @@ SRC_ALL =	\
 		src/proto/textobject.pro \
 		src/proto/textprop.pro \
 		src/proto/time.pro \
-		src/proto/tuple.pro \
 		src/proto/typval.pro \
 		src/proto/ui.pro \
 		src/proto/undo.pro \
@@ -810,8 +804,6 @@ RT_ALL =	\
 		runtime/pack/dist/opt/editorconfig/ftdetect/editorconfig.vim \
 		runtime/pack/dist/opt/editorconfig/plugin/editorconfig.vim \
 		runtime/pack/dist/opt/helptoc/autoload/helptoc.vim \
-		runtime/pack/dist/opt/helptoc/doc/helptoc.txt \
-		runtime/pack/dist/opt/helptoc/doc/tags \
 		runtime/pack/dist/opt/helptoc/plugin/helptoc.vim \
 		runtime/pack/dist/opt/hlyank/plugin/hlyank.vim \
 		runtime/pack/dist/opt/justify/plugin/justify.vim \
@@ -868,7 +860,6 @@ RT_SCRIPTS =	\
 		runtime/indent/testdir/*.vim \
 		runtime/indent/testdir/*.in \
 		runtime/indent/testdir/*.ok \
-		runtime/indent/testdir/tools/* \
 		runtime/ftplugin/*.vim \
 		runtime/ftplugin/logtalk.dict \
 		runtime/ftplugin/README.txt \

ci/appveyor.bat

@@ -71,7 +71,7 @@ cd src
 echo "Building MSVC 64bit console Version"
 nmake -f Make_mvc.mak CPU=AMD64 ^
     OLE=no GUI=no IME=yes ICONV=yes DEBUG=no ^
-    FEATURES=%FEATURE% CI_CFLAGS=/we4267
+    FEATURES=%FEATURE%
 if not exist vim.exe (
     echo Build failure.
     exit 1
@@ -85,11 +85,11 @@ if "%FEATURE%" == "HUGE" (
         OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no POSTSCRIPT=yes ^
         PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 ^
         PYTHON3_VER=%PYTHON3_VER% DYNAMIC_PYTHON3=yes PYTHON3=%PYTHON3_DIR% ^
-        FEATURES=%FEATURE% CI_CFLAGS=/we4267
+        FEATURES=%FEATURE%
 ) ELSE (
     nmake -f Make_mvc.mak CPU=AMD64 ^
         OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no ^
-        FEATURES=%FEATURE% CI_CFLAGS=/we4267
+        FEATURES=%FEATURE%
 )
 if not exist gvim.exe (
     echo Build failure.

ci/if_ver-1.vim

@@ -1,6 +1,6 @@
-" Print all interface versions. Part 1.
+" Print all interface versions for Ubuntu. Part 1.
 
-if 1 " This prevents it from being run in tiny versions
+if 1
   execute 'source' expand('<sfile>:h') .. '/if_ver-cmd.vim'
 
   echo "*** Interface versions ***\n"

ci/if_ver-2.vim

@@ -1,8 +1,6 @@
-" Print py3 interface versions. Part 2.
-" This is done separately from part 1 because Vim cannot concurrently load
-" Python 2 and 3 together.
+" Print py3 interface versions for Ubuntu. Part 2.
 
-if 1 " This prevents it from being run in tiny versions
+if 1
   execute 'source' expand('<sfile>:h') .. '/if_ver-cmd.vim'
 
   echo 'Python 3:'

debian/changelog

@@ -1,15 +1,9 @@
-vim (2:9.1.1385-1deepin1) experimental; urgency=medium
+vim (2:9.1.1230-2) unstable; urgency=medium
 
-  [ James McCoy ]
-  * Merge upstream tag v9.1.1385
-
-  [ Kirill Rekhov ]
-  * d/upstream/metadata: add metadata
-  * Fix day-of-week for changelog entries 1:6.3-015+1, 1:6.3-010+1, 4.6-2.
-
-  * Set NoDisplay=true for vim.desktop
+  * Backport v9.1.1242 and v9.1.1244 to fix crash when evaluating a variable
+    name. (Closes: #1106133)
 
- -- lhdjply <[email protected]>  Wed, 21 Mar 2025 15:27:16 +0800
+ -- James McCoy <[email protected]>  Thu, 22 May 2025 20:48:59 -0400
 
 vim (2:9.1.1230-1) unstable; urgency=medium
 
@@ -4487,7 +4481,7 @@ vim (1:6.3-015+1) unstable; urgency=medium
     and fixes svn commit file highlighting.
   * Added a new patch which adds s390 and amd64 to debcontrol.vim.
 
- -- Norbert Tretkowski <[email protected]>  Tue, 17 Aug 2004 19:34:13 +0200
+ -- Norbert Tretkowski <[email protected]>  Wed, 17 Aug 2004 19:34:13 +0200
 
 vim (1:6.3-013+2) unstable; urgency=low
 
@@ -4534,7 +4528,7 @@ vim (1:6.3-010+1) unstable; urgency=low
     + updated kvim patch to apply without conflicts to new vim upstream
       patches
 
- -- Norbert Tretkowski <[email protected]>  Wed, 30 Jun 2004 18:35:26 +0200
+ -- Norbert Tretkowski <[email protected]>  Thu, 30 Jun 2004 18:35:26 +0200
 
 vim (1:6.3-004+1) unstable; urgency=low
 
@@ -7559,7 +7553,7 @@ vim (4.6-2) unstable; urgency=low
   * Built with libc6, ncurses3.4, and xlib6g
   * Updated menu entry
 
- -- Galen Hazelwood <[email protected]>  Tue, 09 Sep 1997 12:44:30 -0600
+ -- Galen Hazelwood <[email protected]>  Thu,  9 Sep 1997 12:44:30 -0600
 
 vim (4.6-1) frozen unstable; urgency=low
 

debian/patches/Revert-patch-9.1.0949-popups-inconsistently-shifted-to-th.patch

@@ -28,7 +28,7 @@ index ba87b31..e7526ec 100644
  			   the screen, then
  			the popup is moved to the left so as to fit the
 diff --git a/src/popupwin.c b/src/popupwin.c
-index 60a54d7..bb4c550 100644
+index 76ebf38..33bff26 100644
 --- a/src/popupwin.c
 +++ b/src/popupwin.c
 @@ -1433,7 +1433,17 @@ popup_adjust_position(win_T *wp)
@@ -76,7 +76,7 @@ index 60a54d7..bb4c550 100644
  	{
  	    wp->w_width = len + margin_width;
 diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
-index 3c8e5d7..7920443 100644
+index 5082676..e182505 100644
 --- a/src/testdir/test_popupwin.vim
 +++ b/src/testdir/test_popupwin.vim
 @@ -31,7 +31,7 @@ func Test_simple_popup()
@@ -152,10 +152,10 @@ index 3c8e5d7..7920443 100644
  	\     wrap: 0,
  	\     fixed: 1,
 diff --git a/src/version.c b/src/version.c
-index a2cfb00..6091dcd 100644
+index f50c414..11ba12a 100644
 --- a/src/version.c
 +++ b/src/version.c
-@@ -1576,8 +1576,6 @@ static int included_patches[] =
+@@ -1266,8 +1266,6 @@ static int included_patches[] =
      951,
  /**/
      950,

debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch

@@ -13,10 +13,10 @@ Signed-off-by: James McCoy <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
-index 95135c8..38e1cad 100644
+index a740305..3155be1 100644
 --- a/runtime/autoload/dist/ft.vim
 +++ b/runtime/autoload/dist/ft.vim
-@@ -1193,7 +1193,7 @@ export def FTtex()
+@@ -1140,7 +1140,7 @@ export def FTtex()
      var firstNC = search('^\s*[^[:space:]%]', 'c', 1000)
      if firstNC > 0
        # Check the next thousand lines for a LaTeX or ConTeXt keyword.

debian/patches/debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch

@@ -8,10 +8,10 @@ Closes: #382541
  1 file changed, 8 insertions(+)
 
 diff --git a/runtime/autoload/dist/script.vim b/runtime/autoload/dist/script.vim
-index c184bd0..02e4605 100644
+index 859126f..7534ef4 100644
 --- a/runtime/autoload/dist/script.vim
 +++ b/runtime/autoload/dist/script.vim
-@@ -424,6 +424,14 @@ def DetectFromText(line1: string)
+@@ -423,6 +423,14 @@ def DetectFromText(line1: string)
    elseif line1 =~ 'exec\s\+\S*scheme' || line2 =~ 'exec\s\+\S*scheme'
      setl ft=scheme