From 1b79a5ff6145e161e70c6690f0f885c728eae02c Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <janedmundlazo@hotmail.com>
Date: Wed, 12 Aug 2026 08:32:21 -0400
Subject: [PATCH] build(vim-patch): n/a popup_ api #41270

- enums
- macros
- struct members
- popup_.*()

8.1.1523

* build(vim-patch): 8.1.0863 is almost auto n/a

Can't ignore os_unix.c hunk for "failed:" .
---
 scripts/vim-patch.sh         | 23 ++++++++++++++++++-----
 scripts/vim_na_files.txt     |  1 +
 scripts/vim_na_hunks_c.txt   |  1 +
 scripts/vim_na_hunks_h.txt   |  1 +
 scripts/vim_na_hunks_vim.txt |  2 ++
 5 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index 867201d767..59ad932548 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -958,11 +958,16 @@ 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|sound)' \
-          '-I^#\s*((ifdef|ifndef|define|undef)|(if|elif)\s.*defined\().*FEAT_' \
+          '-I^\s*(//|/?\*).*\s([vV]im9|channel|job|popup|sound)' \
+          '-I^#\s*((ifdef|ifndef|undef)|(if|elif)\s.*defined\().*FEAT_' \
           '-I^#\s*(else|endif)' \
-          '-I#\s*define\s+XDG_' \
+          '-I^#\s*define\s+(FEAT|POPUPWIN|XDG)_' \
+          '-I^typedef enum \{$' \
+          '-I^\s+POPCLOSE_[A-Z]+,?$' \
+          '-I^\} popclose_T;$' \
+          '-I^EXTERN\schar\s+\*popup_transparent' \
           '-I^EXTERN type_T t_.* INIT[2-9]\(' \
+          '-I^EXTERN\swin_T\s+\*popup_dragwin' \
           '-I^EXTERN char e_(abstract|class|enum|interface|type)_' \
           '-I^EXTERN char e_.*def_function' \
           '-I^EXTERN char e_.*enddef' \
@@ -976,6 +981,12 @@ is_na_patch() {
           '-I\sINIT\(= .+"E[0-9]+: .*[vV]im9' \
           '-I\sINIT\(= .+"E1016: Cannot declare .* variable: ' \
           '-I\s+INIT\(= .+"E1103: Dictionary not set' \
+          '-I\schar.*\s+\*w_popup_title;' \
+          '-I\sint\s+ch_[_a-zA-Z]+;' \
+          '-I\sint\s+w_(filter_mode|firstline|popup_drag|want_scrollbar);' \
+          '-I\slist_T\s+\*w_popup_mask;' \
+          '-I\spopclose_T\sw_popup_close;' \
+          '-I\s\*?w_popup_prop_[_a-z]+;' \
           "$patch" -- "${file}" |
           grep '^@@ .* @@')
         if test -n "$HUNKS"; then
@@ -988,15 +999,17 @@ is_na_patch() {
           '-I^\s+$' \
           '-I^\s*/?\*/?$' \
           '-I^\s*(//|/?\*).*\s([vV]im9|sound)' \
-          '-I^#\s*((ifdef|ifndef|define|undef)\s|(if|elif)\s.*defined\().*FEAT_' \
+          '-I^#\s*((ifdef|ifndef|undef)|(if|elif)\s.*defined\().*FEAT_' \
           '-I^#\s*(else|endif)' \
+          '-I^#\s*define\s+(FEAT|POPUPWIN|XDG)_' \
           '-I^#\s*include\s+<proto/' \
-          '-I^\s+\{"(prop|sound)_[a-z]+",.*f_(prop|sound)_[a-z]+},$' \
+          '-I^\s+\{"(popup|prop|sound)_[_a-z]+",.*f_(popup|prop|sound)_[_a-z]+},$' \
           '-I#\s*define.*ex_ni$' \
           '-I[_.>]sc_version = ' \
           '-I[_.>]uf_script_ctx_version = ' \
           '-I = skip_type\(.+\);$' \
           '-Icheck_typval_type\(.+\)' \
+          '-I\svim_free\(.*w_popup_title\);' \
           "$patch" -- "${file}" |
           grep '^@@ .* @@')
         if test -n "$HUNKS"; then
diff --git a/scripts/vim_na_files.txt b/scripts/vim_na_files.txt
index c8edd47ce6..09f5a38bf8 100644
--- a/scripts/vim_na_files.txt
+++ b/scripts/vim_na_files.txt
@@ -35,6 +35,7 @@ runtime/doc/os_risc.txt
 runtime/doc/os_unix.txt
 runtime/doc/os_vms.txt
 runtime/doc/pi_logipat.txt
+runtime/doc/popup.txt
 runtime/doc/print.txt
 runtime/doc/quotes.txt
 runtime/doc/test_urls.vim
diff --git a/scripts/vim_na_hunks_c.txt b/scripts/vim_na_hunks_c.txt
index 299a7d18b4..33d627a0f7 100644
--- a/scripts/vim_na_hunks_c.txt
+++ b/scripts/vim_na_hunks_c.txt
@@ -47,6 +47,7 @@
 ^l\?alloc[a-zA-Z0-9_]\+(size_t
 ^mch_create_pty_channel(
 ^mch_job_[a-z]\+(
+^mch_[_a-z]\+_job(job_T
 ^mem_[a-zA-Z0-9_]\+(
 ^parse_queued_messages(
 ^restore_buffer(bufref_T
diff --git a/scripts/vim_na_hunks_h.txt b/scripts/vim_na_hunks_h.txt
index 57310a1f2a..39cbe1e02d 100644
--- a/scripts/vim_na_hunks_h.txt
+++ b/scripts/vim_na_hunks_h.txt
@@ -1 +1,2 @@
+^struct jobvar_S
 ^struct type_S {
diff --git a/scripts/vim_na_hunks_vim.txt b/scripts/vim_na_hunks_vim.txt
index c98b140c44..470669bc77 100644
--- a/scripts/vim_na_hunks_vim.txt
+++ b/scripts/vim_na_hunks_vim.txt
@@ -96,8 +96,10 @@
 \*builtin-function-list\*
 \*emacs[_-]tags\*
 \*help-toc-install\*
+\*job_[a-zA-Z0-9]\+()\*
 \*os-support\*
 \*patches-\(after-\)\?[0-9].*\*
+\*popup-window-functions\*
 \*sound-functions\*
 \*sound_[a-zA-Z0-9]\+()\*
 \*test_gui_[a-zA-Z0-9_]\+()\*