From c6ba487b89479301f71b06007b82e37cf8329095 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Mon, 24 Aug 2026 23:16:02 -0400 Subject: [PATCH 1/6] build(vim-patch): n/a ba43008a2d6788eeb8ff78ae39dedd28598ae658 --- scripts/vim-patch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index 3d91836882..9b3a5fe3b4 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -943,7 +943,7 @@ is_na_patch() { diff-tree --no-commit-id -r -b -U0 \ '-I^\s+$' \ '-I^=+$' \ - '-I^\|:redrawtabpanel\|' \ + '-I^\|:(export|import|redrawtabpanel)\|' \ '-I^\|popup_[_a-z]+\(\)\|' \ '-I^popup_[_a-z]+\(' \ '-I\*\s+For Vim version [0-9]\.[0-9]\.\s+Last change: [0-9]+ [A-Z][a-z]+ [0-9]+' \ From f88655b527aed3a64172ab74ecb69a3def18cbfc Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Tue, 25 Aug 2026 22:59:44 -0400 Subject: [PATCH 2/6] build(vim-patch): v8.2.0922 is n/a --- scripts/vim-patch.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index 9b3a5fe3b4..2a6780790e 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -969,6 +969,14 @@ is_na_patch() { "$patch" -- "${file}") test -n "$HUNKS" && return 1 ;; + src/testdir/*.vim) + HUNKS=$(git -C "${VIM_SOURCE_DIR}" diff-tree --no-commit-id -r -b -U0 \ + "$patch" -- "${file}") + if test -n "$HUNKS"; then + HUNK_NUM_FINAL=$(echo "$HUNKS" | grep '^@@ .* @@' | sed 's/^@@ .* @@ //' | grep -cv -e '^func RunVimInTerminal(') + test "$HUNK_NUM_FINAL" -ne 0 && return 1 + fi + ;; *.h) HUNKS=$(git -C "${VIM_SOURCE_DIR}" diff-tree --no-commit-id -r -b -U0 \ '-I^\s+$' \ From 8ae46cbd81ee80497fe2d74b623953e5a19764dd Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Wed, 26 Aug 2026 20:25:11 -0400 Subject: [PATCH 3/6] build(vim-patch): v8.2.3589 is n/a termopen() and term_start() are not 1-1 because of Windows. See Vim's ":h job_start". ``` {command} can be a String. This works best on MS-Windows. On Unix it is split up in white space separated parts to be passed to execvp(). Arguments in double quotes can contain white space. {command} can be a List, where the first item is the executable and further items are the arguments. All items are converted to String. This works best on Unix. ``` --- scripts/vim_na_hunks_vim.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/vim_na_hunks_vim.txt b/scripts/vim_na_hunks_vim.txt index d7e32dd62e..f7e0e2dca2 100644 --- a/scripts/vim_na_hunks_vim.txt +++ b/scripts/vim_na_hunks_vim.txt @@ -116,6 +116,7 @@ \*sound-functions\* \*sound_[a-zA-Z0-9]\+()\* \*term++\(close\|open\)\* +\*term_start()\* \*test_gui_[a-zA-Z0-9_]\+()\* \*v:none\* \*v:sizeof[a-z]\+\* From 38039e639b927376df0dbc0bdb779c9400d35a6c Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Wed, 26 Aug 2026 20:37:43 -0400 Subject: [PATCH 4/6] build(vim-patch): v8.2.3761 is n/a --- scripts/vim-patch.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index 2a6780790e..1ba444b62e 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -1049,6 +1049,7 @@ is_na_patch() { '-Icheck_typval_type\(.+\)' \ '-Icrypt_get_method_nr\(.+\)' \ '-I\spopup_set_firstline\(.+\);' \ + '-I\sterm_focus_change\(.+\);$' \ '-I\supdate_vim9_script_var\(.+\);$' \ '-I\svim_free\(.*w_popup_title\);' \ "$patch" -- "${file}") From 0b52504cd8dcaa3ce59a088f4ecc6852d17ad38e Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Wed, 26 Aug 2026 20:42:55 -0400 Subject: [PATCH 5/6] build(vim-patch): v8.2.4157 is n/a --- scripts/vim-patch.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index 1ba444b62e..63e9429a31 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -992,6 +992,7 @@ is_na_patch() { '-I^\s+POPCLOSE_[A-Z]+,?$' \ '-I^\} popclose_T;$' \ '-I^EXTERN\schar\s+\*popup_transparent' \ + '-I^EXTERN\sint\s+disable_vterm_title_for_testing' \ '-I^EXTERN type_T static_types\[' \ '-I^EXTERN type_T t_.* INIT[2-9]\(' \ '-I^EXTERN\swin_T\s+\*popup_dragwin' \ From 19516b78b9891392d28c8d32236e8bbf51d23db2 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Wed, 26 Aug 2026 23:30:46 -0400 Subject: [PATCH 6/6] build(vim-patch): v9.2.0565 is n/a --- scripts/vim_na_files.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/vim_na_files.txt b/scripts/vim_na_files.txt index 09f5a38bf8..785f1b71f7 100644 --- a/scripts/vim_na_files.txt +++ b/scripts/vim_na_files.txt @@ -104,6 +104,7 @@ src/testdir/Make_ming.mak src/testdir/Make_mvc.mak src/testdir/crash/heap_overflow3 src/testdir/lsan-suppress.txt +src/testdir/samples/combining_chars.txt src/testdir/samples/terminal_max_combining_chars.txt src/testdir/samples/uncrypt_utf8_test.txt src/testdir/test_alot_latin.vim