From 552fb90f74f6e9333ac33eb1cfe3db6bc86622b6 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Fri, 4 Sep 2026 22:02:40 -0400 Subject: [PATCH 1/4] build(vim-patch): v9.1.0681 should be auto-n/a Vim screendump files and Vim9script screendump code are N/A. vim-patch.sh cannot auto-N/A the entire patch because of "src/testdir/README.txt". --- scripts/vim_na_files.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/vim_na_files.txt b/scripts/vim_na_files.txt index bf89613346..c38e21993e 100644 --- a/scripts/vim_na_files.txt +++ b/scripts/vim_na_files.txt @@ -106,6 +106,7 @@ src/testdir/Make_amiga.mak src/testdir/Make_dos.mak src/testdir/Make_ming.mak src/testdir/Make_mvc.mak +src/testdir/commondumps.vim src/testdir/crash/heap_overflow3 src/testdir/lsan-suppress.txt src/testdir/samples/combining_chars.txt @@ -151,6 +152,7 @@ src/testdir/util/amiga.vim src/testdir/util/dos.vim src/testdir/util/socketserver.vim src/testdir/util/vms.vim +src/testdir/viewdumps.vim src/typemap src/uninstall.c src/version.h From e475939fcfc3262bf8638f6bdd8efafe675d709d Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sat, 5 Sep 2026 10:34:54 -0400 Subject: [PATCH 2/4] build(vim-patch): 015c84ce541495fad568c66b0dd17faefe1c1389 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 fba6961682..6457f5f270 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -949,6 +949,7 @@ is_na_patch() { '-I\*\s+For Vim version [0-9]\.[0-9]\.\s+Last change: [0-9]+ [A-Z][a-z]+ [0-9]+' \ '-I compiled (with|without) .*\(\|.+\|\) feature\.$' \ '-I\{.+ (available|compiled) (with|without) .+\}' \ + '-I\|52\.6\|' \ '-I\|channel-open-[^|]+\|' \ '-I\|comment-install\|' \ '-I\|popup-windows\|' \ From 53b372d4430aaa15cebeed8b39f08d050e2843c8 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Mon, 7 Sep 2026 00:39:50 -0400 Subject: [PATCH 3/4] build(vim-patch): n/a patches for src/po/ "vim.pot" file and tasks are N/A. "clean" task is N/A after migrating to CMake. N/A patches: - 59bd74ed4c9ab366182c93bdc430b186729abbad - 5d552d652b0197063565ab937d30f92a9ed28545 - 3c8d32e4fc17b4b38b17d7c039ee6203d1b01078 --- scripts/vim-patch.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index 6457f5f270..171ba32e25 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -961,6 +961,17 @@ is_na_patch() { test "$HUNK_NUM_FINAL" -ne 0 && return 1 fi ;; + src/po/Make*) + HUNKS=$(git -C "${VIM_SOURCE_DIR}" diff-tree --no-commit-id -r -b -U0 \ + '-I^\$\([_A-Z]+\)\.pot:' \ + "$patch" -- "${file}") + if test -n "$HUNKS"; then + HUNK_NUM_FINAL=$(echo "$HUNKS" | grep '^@@ .* @@' | sed 's/^@@ .* @@ //' | grep -cv \ + -e '^\$([_A-Z]\+)\.pot:' \ + -e '^clean:') + test "$HUNK_NUM_FINAL" -ne 0 && return 1 + fi + ;; src/testdir/Makefile) HUNKS=$(git -C "${VIM_SOURCE_DIR}" diff-tree --no-commit-id -r -b -U0 \ '-IREDIR_TEST_TO_NULL = ' \ From cb81d878a2dfcfa6b113e0b2faf238d6210e0d57 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Mon, 7 Sep 2026 13:26:35 -0400 Subject: [PATCH 4/4] build(vim-patch): de10c87bed5a79ed80f1bb428a391faefdff13c9 is almost n/a Vim desktop files are N/A. "src/po/zh_CN.UTF-8.po" is applicable. --- scripts/vim-patch.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index 171ba32e25..22b1fbaab8 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -966,9 +966,12 @@ is_na_patch() { '-I^\$\([_A-Z]+\)\.pot:' \ "$patch" -- "${file}") if test -n "$HUNKS"; then + # shellcheck disable=SC2016 HUNK_NUM_FINAL=$(echo "$HUNKS" | grep '^@@ .* @@' | sed 's/^@@ .* @@ //' | grep -cv \ -e '^\$([_A-Z]\+)\.pot:' \ - -e '^clean:') + -e '^clean:' \ + -e '^g\?vim\.desktop:' \ + ) test "$HUNK_NUM_FINAL" -ne 0 && return 1 fi ;;