Merge #41708 from janlazo/na-patch-v901

build(vim-patch): n/a patches since Vim version v9.1
This commit is contained in:
Justin M. Keyes
2026-09-07 15:10:24 -04:00
committed by GitHub
2 changed files with 17 additions and 0 deletions

View File

@@ -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\|' \
@@ -960,6 +961,20 @@ 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
# shellcheck disable=SC2016
HUNK_NUM_FINAL=$(echo "$HUNKS" | grep '^@@ .* @@' | sed 's/^@@ .* @@ //' | grep -cv \
-e '^\$([_A-Z]\+)\.pot:' \
-e '^clean:' \
-e '^g\?vim\.desktop:' \
)
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 = ' \

View File

@@ -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