diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index fba6961682..22b1fbaab8 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\|' \ @@ -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 = ' \ 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