diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index 8558e29f93..49b7e42fb4 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -962,7 +962,7 @@ 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*(//|/?\*).*\s([vV]im9|E[0-9]{4} - |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)_' \
@@ -979,6 +979,7 @@ is_na_patch() {
           '-I^EXTERN char e_.*enddef' \
           '-I^EXTERN char e_.*vim9' \
           '-I^EXTERN char e_cannot_declare_.*variable_str' \
+          '-I^EXTERN char e_cannot_define_new_.+_as_static' \
           '-I^EXTERN char e_dictionary_not_set' \
           '-I^EXTERN char e_dictnull' \
           '-I\sINIT\(= .+"E[0-9]+: (Abstract|Class|Enum|Interface|Type) ' \
@@ -987,6 +988,7 @@ is_na_patch() {
           '-I\sINIT\(= .+"E[0-9]+: .*[vV]im9' \
           '-I\sINIT\(= .+"E1016: Cannot declare .* variable: ' \
           '-I\s+INIT\(= .+"E1103: Dictionary not set' \
+          '-I\s+INIT\(= .+"E1370: Cannot define a .+ as static' \
           '-I\schar.*\s+\*w_popup_title;' \
           '-I\sint\s+ch_[_a-zA-Z]+;' \
           '-I\sint\s+w_(filter_mode|firstline|popup_drag|want_scrollbar);' \