diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index 3d91836882..63e9429a31 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]+' \
@@ -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+$' \
@@ -984,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' \
@@ -1041,6 +1050,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}")
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
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]\+\*