diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index fea280656d..e22e4701b0 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -962,10 +962,11 @@ is_na_patch() {
         HUNKS=$(git -C "${VIM_SOURCE_DIR}" diff-tree --no-commit-id -r -b -U0 \
           '-I^\s+$' \
           '-I^\s*/?\*/?$' \
-          '-I^\s*(//|/?\*).*\s([vV]im9|E[0-9]{4} - |channel|job|popup|sound|terminal)' \
+          '-I^\s*(//|/?\*).*\s([vV]im9|E[0-9]{4} - |FEAT_|channel|job|popup|sound|terminal)' \
           '-I^#\s*((ifdef|ifndef|undef)|(if|elif)\s.*defined\().*FEAT_[^_]' \
           '-I^#\s*(else|endif)' \
           '-I^#\s*define\s+(FEAT|POPUPWIN|XDG|t)_[^_]' \
+          '-I^\s+(&&|\|\|)\s.*defined\(.*FEAT_[^_]' \
           '-IEVENT_TERMINALWINOPEN' \
           '-I^#\s*define\s+POPF_CURSORLINE\s' \
           '-I^typedef enum \{$' \
@@ -1007,10 +1008,11 @@ is_na_patch() {
         HUNKS=$(git -C "${VIM_SOURCE_DIR}" diff-tree --no-commit-id -r -b -U0 \
           '-I^\s+$' \
           '-I^\s*/?\*/?$' \
-          '-I^\s*(//|/?\*).*\s([vV]im9|channel|job|popup|sound|terminal)' \
-          '-I^#\s*((ifdef|ifndef|undef)|(if|elif)\s.*defined\().*FEAT_' \
+          '-I^\s*(//|/?\*).*\s([vV]im9|E[0-9]{4} - |FEAT_|channel|job|popup|sound|terminal)' \
+          '-I^#\s*((ifdef|ifndef|undef)|(if|elif)\s.*defined\().*FEAT_[^_]' \
           '-I^#\s*(else|endif)' \
-          '-I^#\s*define\s+(FEAT|POPUPWIN|XDG)_' \
+          '-I^#\s*define\s+(FEAT|POPUPWIN|XDG|t)_[^_]' \
+          '-I^\s+(&&|\|\|)\s.*defined\(.*FEAT_[^_]' \
           '-IEVENT_TERMINALWINOPEN' \
           '-I^#\s*include\s+<proto/' \
           '-I^\s+\{"(popup|prop|sound)_[_a-z]+",.*f_(popup|prop|sound)_[_a-z]+},$' \
diff --git a/scripts/vim_na_hunks_vim.txt b/scripts/vim_na_hunks_vim.txt
index 835f3f2909..0e38f1e598 100644
--- a/scripts/vim_na_hunks_vim.txt
+++ b/scripts/vim_na_hunks_vim.txt
@@ -100,8 +100,10 @@
 \*autocommand-events\*
 \*builtin-function-list\*
 \*emacs[_-]tags\*
+\*global-ime\*
 \*help-toc-install\*
 \*job_[a-zA-Z0-9]\+()\*
+\*multibyte-ime\*
 \*os-support\*
 \*patches-\(after-\)\?[0-9].*\*
 \*popup-window-functions\*
diff --git a/scripts/vim_na_regexp.txt b/scripts/vim_na_regexp.txt
index 6980c1e06b..ce7f61b82c 100644
--- a/scripts/vim_na_regexp.txt
+++ b/scripts/vim_na_regexp.txt
@@ -46,6 +46,7 @@
 ^src/config\.[a-z]
 ^src/configure
 ^src/crypt
+^src/glbl_ime\.
 ^src/gui[_.]
 ^src/gvim
 ^src/if_
@@ -89,6 +90,7 @@
 \.desktop$
 \.diff$
 \.ico$
+\.idl$
 \.info$
 \.man$
 \.mms$