diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index 7f5d7f8628..3a4b39ce2e 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -947,15 +947,18 @@ is_na_patch() {
           '-I^\s+$' \
           '-I^#\s*(ifdef|if.*defined\().*FEAT_' \
           '-I^#\s*(else|endif)' \
+          '-I#\s*define\s+XDG_' \
           '-I^EXTERN type_T t_.* INIT[2-9]\(' \
           '-I^EXTERN char e_(abstract|class|enum|interface|type)_' \
           '-I^EXTERN char e_.*def_function' \
           '-I^EXTERN char e_.*enddef' \
           '-I^EXTERN char e_.*vim9' \
-          '-I^\s*INIT\(= .+"E[0-9]+: (Abstract|Class|Enum|Interface|Type) ' \
-          '-I^\s*INIT\(= .+"E[0-9]+: .*:def ' \
-          '-I^\s*INIT\(= .+"E[0-9]+: .*enddef"' \
-          '-I^\s*INIT\(= .+"E[0-9]+: .*[vV]im9' \
+          '-I^EXTERN char e_cannot_declare_.*variable_str' \
+          '-I\sINIT\(= .+"E[0-9]+: (Abstract|Class|Enum|Interface|Type) ' \
+          '-I\sINIT\(= .+"E[0-9]+: .*:def ' \
+          '-I\sINIT\(= .+"E[0-9]+: .*enddef"' \
+          '-I\sINIT\(= .+"E[0-9]+: .*[vV]im9' \
+          '-I\sINIT\(= .+"E1016: Cannot declare .* variable: ' \
           "$patch" -- "${file}" |
           grep '^@@ .* @@')
         if test -n "$HUNKS"; then
@@ -966,6 +969,7 @@ is_na_patch() {
       *.c)
         HUNKS=$(git -C "${VIM_SOURCE_DIR}" diff-tree --no-commit-id -r -b -U0 \
           '-I^\s+$' \
+          '-I^#\s*include\s+<proto/' \
           '-I^#\s*(ifdef|if.*defined\().*FEAT_' \
           '-I^#\s*(else|endif)' \
           '-I^\s+\{"prop_[a-z]+",.*f_prop_[a-z]+},$' \
diff --git a/scripts/vim_na_hunks_c.txt b/scripts/vim_na_hunks_c.txt
index 9cea517cf5..1ff04b3d6b 100644
--- a/scripts/vim_na_hunks_c.txt
+++ b/scripts/vim_na_hunks_c.txt
@@ -42,6 +42,7 @@
 ^f_test_settime(
 ^f_test_srand_seed(
 ^f_test_void(
+^init_longVersion(
 ^l\?alloc(size_t
 ^l\?alloc[a-zA-Z0-9_]\+(size_t
 ^mch_job_[a-z]\+(
diff --git a/scripts/vim_na_hunks_vim.txt b/scripts/vim_na_hunks_vim.txt
index b7177fd02a..b8243097d8 100644
--- a/scripts/vim_na_hunks_vim.txt
+++ b/scripts/vim_na_hunks_vim.txt
@@ -96,6 +96,7 @@
 \*builtin-function-list\*
 \*emacs[_-]tags\*
 \*help-toc-install\*
+\*os-support\*
 \*patches-\(after-\)\?[0-9].*\*
 \*test_gui_[a-zA-Z0-9_]\+()\*
 \*v:none\*