From d95b0fc12c6fc17a06b122c53d4d7a4f2ad85a00 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <janedmundlazo@hotmail.com>
Date: Sat, 1 Aug 2026 08:51:39 -0400
Subject: [PATCH 1/4] build(vim-patch): n/a vim9 struct from *.h

Target v8.2.0543
This can catch stray '#define' but they're most likely 'TTFLAG' for
Vim9 types. N/A.
TTFLAG is used in 'static_types[]'.
See v9.0.0623.
---
 scripts/vim-patch.sh       | 9 +++++++--
 scripts/vim_na_hunks_h.txt | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 scripts/vim_na_hunks_h.txt

diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index ce2eebbd69..7f5d7f8628 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -917,6 +917,7 @@ is_na_patch() {
   local NA_REGEXP="$NVIM_SOURCE_DIR/scripts/vim_na_regexp.txt"
   local NA_FILELIST="$NVIM_SOURCE_DIR/scripts/vim_na_files.txt"
   local NA_HUNKS_C="$NVIM_SOURCE_DIR/scripts/vim_na_hunks_c.txt"
+  local NA_HUNKS_H="$NVIM_SOURCE_DIR/scripts/vim_na_hunks_h.txt"
   local NA_HUNKS_VIM="$NVIM_SOURCE_DIR/scripts/vim_na_hunks_vim.txt"
 
   local FILES_REMAINING HUNKS HUNK_NUM_FINAL
@@ -955,8 +956,12 @@ is_na_patch() {
           '-I^\s*INIT\(= .+"E[0-9]+: .*:def ' \
           '-I^\s*INIT\(= .+"E[0-9]+: .*enddef"' \
           '-I^\s*INIT\(= .+"E[0-9]+: .*[vV]im9' \
-          "$patch" -- "$file")
-        test -n "${HUNKS}" && return 1
+          "$patch" -- "${file}" |
+          grep '^@@ .* @@')
+        if test -n "$HUNKS"; then
+          HUNK_NUM_FINAL=$(echo "$HUNKS" | sed 's/^@@ .* @@ \?//' | grep -cv -f "$NA_HUNKS_H")
+          test "$HUNK_NUM_FINAL" -ne 0 && return 1
+        fi
         ;;
       *.c)
         HUNKS=$(git -C "${VIM_SOURCE_DIR}" diff-tree --no-commit-id -r -b -U0 \
diff --git a/scripts/vim_na_hunks_h.txt b/scripts/vim_na_hunks_h.txt
new file mode 100644
index 0000000000..57310a1f2a
--- /dev/null
+++ b/scripts/vim_na_hunks_h.txt
@@ -0,0 +1 @@
+^struct type_S {

From af1b82fc7bc747ad916408fb01b64c1500f68193 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <janedmundlazo@hotmail.com>
Date: Sat, 1 Aug 2026 01:07:59 -0400
Subject: [PATCH 2/4] build(vim-patch): vim "mch_job_" api is n/a

---
 scripts/vim_na_hunks_c.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/vim_na_hunks_c.txt b/scripts/vim_na_hunks_c.txt
index 720d1d7ed6..b0521b6d2d 100644
--- a/scripts/vim_na_hunks_c.txt
+++ b/scripts/vim_na_hunks_c.txt
@@ -43,6 +43,7 @@
 ^f_test_void(
 ^l\?alloc(size_t
 ^l\?alloc[a-zA-Z0-9_]\+(size_t
+^mch_job_[a-z]\+(
 ^mem_[a-zA-Z0-9_]\+(
 ^restore_buffer(bufref_T
 ^static int included_patches\[\] =

From 92544471e04fd439e8a04380bd205e80c459d9c8 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <janedmundlazo@hotmail.com>
Date: Sat, 1 Aug 2026 13:03:20 -0400
Subject: [PATCH 3/4] build(vim-patch): "build_argv_from_" api is n/a

Meant for Vim job, terminal, cscope, etc.
Incompatible with Nvim implementation.
---
 scripts/vim_na_hunks_c.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/vim_na_hunks_c.txt b/scripts/vim_na_hunks_c.txt
index b0521b6d2d..9cea517cf5 100644
--- a/scripts/vim_na_hunks_c.txt
+++ b/scripts/vim_na_hunks_c.txt
@@ -1,3 +1,4 @@
+^build_argv_from_[a-zA-Z0-9_]\+(
 ^change_compatible(
 ^check_restricted(
 ^compatible_set(void)

From 51da48c8f89751ebb7e36aee42c55ae480872ada Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <janedmundlazo@hotmail.com>
Date: Sat, 1 Aug 2026 13:22:49 -0400
Subject: [PATCH 4/4] build(vim-patch): libvterm color_ramp.vim is n/a for nvim

---
 scripts/vim_na_regexp.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/vim_na_regexp.txt b/scripts/vim_na_regexp.txt
index bdaf33e6d9..43266bc9bd 100644
--- a/scripts/vim_na_regexp.txt
+++ b/scripts/vim_na_regexp.txt
@@ -65,6 +65,7 @@
 ^src/po/.*\.desktop
 ^src/po/.*sjis
 ^src/proto
+^src/testdir/.*_ramp.vim
 ^src/testdir/dumps/
 ^src/testdir/keycode_check\.
 ^src/testdir/python