feat: update vim to 2:9.1.1230-1

.editorconfig

@@ -20,6 +20,14 @@ indent_size = 2
 # https://spec.commonmark.org/0.31.2/#hard-line-breaks
 trim_trailing_whitespace = false
 
+[*.vim]
+indent_style = space
+indent_size = 2
+
+[runtime/pack/dist/opt/{comment,nohlsearch}/**.vim]
+indent_style = space
+indent_size = 4
+
 [runtime/doc/**.txt]
 # It can mess up some documentation by trying to strip trailing whitespaces
 trim_trailing_whitespace = false

.gitignore

@@ -96,6 +96,13 @@ 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
+
 # Generated by "make install"
 runtime/doc/doctags
 runtime/doc/tags-*

.hgignore

@@ -98,21 +98,35 @@ 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
+
 # Generated by "make install"
 runtime/doc/doctags
 runtime/doc/tags-*
 
+# Temporarily generated by "runtime/syntax/generator/make"
+runtime/syntax/generator/generator.err
+runtime/syntax/generator/sanity_check.err
+runtime/syntax/generator/vim.vim.rc
+
 # Generated by "make shadow".  The directory names could be anything but we
 # restrict them to shadow (the default) or shadow-*
 src/shadow
 src/shadow-*
 src/runtime
 src/pixmaps
+src/LICENSE
+src/README.txt
 
 # other files possibly created by tools
 src/cscope.out
 
 # Linter/language server files
-/.cache/clangd/
-/.ccls-cache/
-/compile_commands.json
+.cache/clangd/
+.ccls-cache/
+compile_commands.json

Filelist

@@ -223,6 +223,7 @@ SRC_ALL =	\
 		src/testdir/samples/*.html \
 		src/testdir/samples/*.txt \
 		src/testdir/samples/*.vim \
+		src/testdir/samples/poc.zip \
 		src/testdir/samples/test000 \
 		src/testdir/samples/test.zip \
 		src/testdir/samples/test_undo.txt.undo \
@@ -771,16 +772,16 @@ RT_ALL =	\
 		runtime/tools/[a-z]*[a-z0-9] \
 		runtime/tutor/README.txt \
 		runtime/tutor/tutor1 \
+		runtime/tutor/tutor1.utf-8 \
 		runtime/tutor/en/vim-01-beginner.tutor \
 		runtime/tutor/en/vim-01-beginner.tutor.json \
-		runtime/tutor/it/vim-01-beginner.tutor \
-		runtime/tutor/it/vim-01-beginner.tutor.json \
-		runtime/tutor/sr/vim-01-beginner.tutor \
-		runtime/tutor/sr/vim-01-beginner.tutor.json \
+		runtime/tutor/en/vim-02-beginner.tutor \
+		runtime/tutor/en/vim-02-beginner.tutor.json \
 		runtime/tutor/tutor.tutor \
 		runtime/tutor/tutor.tutor.json \
 		runtime/tutor/tutor.vim \
 		runtime/tutor/tutor2 \
+		runtime/tutor/tutor2.utf-8 \
 		runtime/vimrc_example.vim \
 		runtime/pack/dist/opt/cfilter/plugin/cfilter.vim \
 		runtime/pack/dist/opt/comment/plugin/comment.vim \
@@ -804,6 +805,7 @@ RT_ALL =	\
 		runtime/pack/dist/opt/editorconfig/plugin/editorconfig.vim \
 		runtime/pack/dist/opt/helptoc/autoload/helptoc.vim \
 		runtime/pack/dist/opt/helptoc/plugin/helptoc.vim \
+		runtime/pack/dist/opt/hlyank/plugin/hlyank.vim \
 		runtime/pack/dist/opt/justify/plugin/justify.vim \
 		runtime/pack/dist/opt/matchit/plugin/matchit.vim \
 		runtime/pack/dist/opt/matchit/doc/matchit.txt \
@@ -816,7 +818,9 @@ RT_ALL =	\
 		runtime/pack/dist/opt/netrw/LICENSE.txt \
 		runtime/pack/dist/opt/netrw/README.md \
 		runtime/pack/dist/opt/netrw/autoload/netrw.vim \
-		runtime/pack/dist/opt/netrw/autoload/netrw/own.vim \
+		runtime/pack/dist/opt/netrw/autoload/netrw/fs.vim \
+		runtime/pack/dist/opt/netrw/autoload/netrw/os.vim \
+		runtime/pack/dist/opt/netrw/autoload/netrw/msg.vim \
 		runtime/pack/dist/opt/netrw/autoload/netrwSettings.vim \
 		runtime/pack/dist/opt/netrw/autoload/netrw_gitignore.vim \
 		runtime/pack/dist/opt/netrw/doc/netrw.txt \
@@ -876,6 +880,7 @@ RT_SCRIPTS =	\
 		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 \
 		runtime/syntax/generator/gen_syntax_vim.vim \
@@ -1074,7 +1079,16 @@ LANG_GEN = \
 		runtime/tutor/README.*.txt \
 		runtime/tutor/Makefile \
 		runtime/tutor/Make_all.mak \
-		runtime/tutor/tutor1.utf-8 \
+		runtime/tutor/it/vim-01-beginner.tutor \
+		runtime/tutor/it/vim-01-beginner.tutor.json \
+		runtime/tutor/ru/vim-01-beginner.tutor \
+		runtime/tutor/ru/vim-01-beginner.tutor.json \
+		runtime/tutor/ru/vim-02-beginner.tutor \
+		runtime/tutor/ru/vim-02-beginner.tutor.json \
+		runtime/tutor/sr/vim-01-beginner.tutor \
+		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/tutor1.?? \
 		runtime/tutor/tutor1.??.utf-8 \
 		runtime/tutor/tutor1.??.euc \
@@ -1087,7 +1101,6 @@ LANG_GEN = \
 		runtime/tutor/tutor1.??_??.utf-8 \
 		runtime/tutor/tutor1.bar \
 		runtime/tutor/tutor1.bar.utf-8 \
-		runtime/tutor/tutor2.utf-8 \
 		runtime/tutor/tutor2.?? \
 		runtime/tutor/tutor2.??.utf-8 \
 		runtime/spell/README.txt \
@@ -1148,6 +1161,8 @@ IGNORE = \
 		.github/workflows/label.yml \
 		SECURITY.md \
 		ci/unlisted.make \
+		ci/hlgroups.make \
+		ci/hlgroups.ignore \
 		src/libvterm/CODE-MAP \
 		runtime/syntax/testdir/input/html_html \
 

Makefile

@@ -63,6 +63,7 @@ VIM_FOR_SYNTAXTEST = ../../src/vim
 
 # (For local testing only with GNU Make.)
 VIM_SYNTAX_TEST_FILTER =
+VIM_SYNTAX_TEST_WAIT_TIME =
 
 syntaxtest:
 	cd runtime/syntax && \

ci/hlgroups.ignore

@@ -0,0 +1,66 @@
+ColorColumn
+ComplMatchIns
+Conceal
+Cursor
+CursorColumn
+CursorIM
+CursorLine
+CursorLineNr
+debugBreakpoint
+debugPC
+DiffAdd
+DiffChange
+DiffDelete
+DiffText
+Directory
+ErrorMsg
+FoldColumn
+Folded
+Ignore
+IncSearch
+lCursor
+LineNr
+LineNrAbove
+LineNrBelow
+MatchParen
+Menu
+ModeMsg
+MoreMsg
+MsgArea
+NonText
+Normal
+Pmenu
+PmenuSbar
+PmenuSel
+PmenuThumb
+Question
+Scrollbar
+Search
+SignColumn
+SpecialKey
+SpellBad
+SpellCap
+SpellLocal
+SpellRare
+StatusLine
+StatusLineNC
+StatusLineTerm
+StatusLineTermNC
+TabLine
+TabLineFill
+TabLineSel
+Terminal
+Title
+TOhtmlProgress
+TOhtml-progress-color
+ToolbarButton
+ToolbarLine
+Tooltip
+User1
+User1..9
+User9
+VertSplit
+Visual
+VisualNOS
+WarningMsg
+WildMenu

ci/hlgroups.make

@@ -0,0 +1,18 @@
+# vim: ft=make
+SHELL = /bin/bash
+
+# Default target to actually run the comparison:
+.PHONY: check
+.INTERMEDIATE: hlgroups deflinks hlgroups.stripped
+
+check: hlgroups.stripped deflinks
+	diff hlgroups.stripped deflinks
+
+hlgroups:
+	grep '\*hl-' ../runtime/doc/*txt | sed -E -e 's/.*:<?\s*//' -e 's/hl-//g' -e 's/\*//g' -e 's/ /\n/g' | sort > hlgroups
+
+deflinks: ../src/highlight.c
+	grep '"default link'  $< | sed 's/.*default link\s*\(.*\)\s.*/\1/' | sort > deflinks
+
+hlgroups.stripped: hlgroups.ignore hlgroups
+	grep -v -x -F -f hlgroups.ignore hlgroups > hlgroups.stripped

ci/unlisted.make

@@ -21,7 +21,7 @@ $(eval all_patterns := $(shell \
 			p; \
 		}'))
 
-# In Makefile's `prepeare` target, all the IN_README_DIR files are moved from
+# In Makefile's `prepare` target, all the IN_README_DIR files are moved from
 # READMEdir to the root, so add those files in their Git-tracked location:
 all_patterns := $(all_patterns) \
 	$(foreach readme, $(IN_README_DIR), READMEdir/$(readme))

debian/changelog

@@ -1,8 +1,14 @@
-vim (2:9.1.1113-1deepin1) unstable; urgency=medium
+vim (2:9.1.1230-1) unstable; urgency=medium
 
-  * Set NoDisplay=true for vim.desktop
+  * Merge upstream tag v9.1.1230
+    + Security fixes:
+      - 9.1.1115: use-after-free in str_to_reg(), CVE-2025-26603
+      - 9.1.1164: editing a specially crafted tar file allows code execution,
+        (Closes: #1099610, CVE-2025-27423)
+      - 9.1.1198: potential data loss with zip.vim and crafted zip files,
+        (Closes: #1101016, CVE-2025-29768)
 
- -- Tianyu Chen <sweetyfish@deepin.org>  Wed, 19 Mar 2025 09:21:18 +0800
+ -- James McCoy <jamessan@debian.org>  Mon, 24 Mar 2025 20:59:06 -0400
 
 vim (2:9.1.1113-1) unstable; urgency=medium
 

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

@@ -16,7 +16,7 @@ Closes: #1091729
  4 files changed, 19 insertions(+), 33 deletions(-)
 
 diff --git a/runtime/doc/popup.txt b/runtime/doc/popup.txt
-index 06acf39..d4c0bb7 100644
+index ba87b31..e7526ec 100644
 --- a/runtime/doc/popup.txt
 +++ b/runtime/doc/popup.txt
 @@ -705,6 +705,7 @@ The second argument of |popup_create()| is a dictionary with options:
@@ -28,10 +28,10 @@ index 06acf39..d4c0bb7 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 4045490..8c56717 100644
+index 76ebf38..33bff26 100644
 --- a/src/popupwin.c
 +++ b/src/popupwin.c
-@@ -1434,7 +1434,17 @@ popup_adjust_position(win_T *wp)
+@@ -1433,7 +1433,17 @@ popup_adjust_position(win_T *wp)
  	len = linetabsize(wp, lnum);
  	wp->w_width = w_width;
 
@@ -50,15 +50,15 @@ index 4045490..8c56717 100644
  		&& allow_adjust_left
  		&& (wp->w_popup_pos == POPPOS_TOPLEFT
  		    || wp->w_popup_pos == POPPOS_BOTLEFT))
-@@ -1446,6 +1456,7 @@ popup_adjust_position(win_T *wp)
+@@ -1445,6 +1455,7 @@ popup_adjust_position(win_T *wp)
  	    {
  		int truncate_shift = shift_by - wp->w_wincol;
 
 +		len -= truncate_shift;
  		shift_by -= truncate_shift;
  	    }
 
-@@ -1453,16 +1464,6 @@ popup_adjust_position(win_T *wp)
+@@ -1452,16 +1463,6 @@ popup_adjust_position(win_T *wp)
  	    maxwidth += shift_by;
  	    wp->w_width = maxwidth;
  	}
@@ -76,7 +76,7 @@ index 4045490..8c56717 100644
  	{
  	    wp->w_width = len + margin_width;
 diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
-index 8b6b78f..d345b3e 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 8b6b78f..d345b3e 100644
  	\     wrap: 0,
  	\     fixed: 1,
 diff --git a/src/version.c b/src/version.c
-index 5fe6254..265d068 100644
+index f50c414..11ba12a 100644
 --- a/src/version.c
 +++ b/src/version.c
-@@ -1032,8 +1032,6 @@ static int included_patches[] =
+@@ -1266,8 +1266,6 @@ static int included_patches[] =
      951,
  /**/
      950,

debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch

@@ -15,10 +15,10 @@ Signed-off-by: James McCoy <jamessan@debian.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
-index 94fb739..7c086ba 100644
+index a824536..6d790bf 100644
 --- a/runtime/doc/options.txt
 +++ b/runtime/doc/options.txt
-@@ -5729,7 +5729,7 @@ A jump table for the options with a short description can be found at |Q_op|.
+@@ -5756,7 +5756,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
  				   *'modeline'* *'ml'* *'nomodeline'* *'noml'*
  'modeline' 'ml'		boolean	(Vim default: on (off for root),

debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch

@@ -86,10 +86,10 @@ index 39c9304..fbc5c64 100644
  # define SYS_VIMRC_FILE "$VIM/vimrc"
  #endif
 diff --git a/src/structs.h b/src/structs.h
-index 03c28e2..a4a5ffa 100644
+index ce98bce..dc7e649 100644
 --- a/src/structs.h
 +++ b/src/structs.h
-@@ -4626,6 +4626,9 @@ typedef struct
+@@ -4627,6 +4627,9 @@ typedef struct
  #ifdef FEAT_DIFF
      int		diff_mode;		// start with 'diff' set
  #endif