build(vim-patch): n/a patches from vim_na_regexp.txt #42017

* build(vim-patch): 06a604dc8ed0159773e0d6515a239f22e0cf0b5a is n/a

runtime/xdg.vim is always N/A.

* build(vim-patch): 07dc94023ca9e6cecb139d855814bda8a985d98c is n/a

GTK4 GUI is n/a.

* build(vim-patch): 3f53a2ce2fa96e865b9f4d2c818f34ccf9ff720f is n/a

server2client() is n/a.

* build(vim-patch): 44021be4852e665b06357d6739c4f00faa447b3d is n/a

2 files changed, 8 insertions, 7 deletions

diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index abce5cd18f..5925f9c31b 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -942,8 +942,8 @@ is_na_patch() {
         HUNKS=$(git -c core.attributesfile="$NVIM_SOURCE_DIR"/.gitattributes -c 'diff.helphelp.xfuncname=^.*\*[^*[:space:]]+\*$' -C "${VIM_SOURCE_DIR}" \
           diff-tree --no-commit-id -r -b -U0 \
           '-I^\s+$' \
-          '-I^=+$' \
-          '-I^Functions:\s~$' \
+          '-I^[-=]+$' \
+          '-I^(Functions:|GUI|Other)\s~$' \
           '-I^\|(ch|popup)_[_a-z]+\(\)\|' \
           '-I^popup_[_a-z]+\(' \
           '-I\*\s+For Vim version [0-9]\.[0-9]\.\s+Last change: [0-9]+ [A-Z][a-z]+ [0-9]+' \
@@ -956,8 +956,11 @@ is_na_patch() {
           '-I\|os_haiku.txt\|' \
           '-I\|popup-windows\|' \
           '-I\|tabpanel\|' \
+          '-I\|xdg\.vim\|' \
+          '-I\sGTK\s?4\s' \
           '-I\spopup window\s' \
           '-I\sterm_start\(\)\s' \
+          '-I\-gui=gtk' \
           "$patch" -- "${file}")
         if test -n "$HUNKS"; then
           HUNK_NUM_FINAL=$(echo "$HUNKS" | grep '^@@ .* @@' | sed 's/^@@ .* @@ //' | grep -cv -f "$NA_HUNKS_HELP")
diff --git a/scripts/vim_na_hunks_help.txt b/scripts/vim_na_hunks_help.txt
index fa6532d462..4c10a8d243 100644
--- a/scripts/vim_na_hunks_help.txt
+++ b/scripts/vim_na_hunks_help.txt
@@ -84,6 +84,7 @@
 \*:Vimuntar\*
 \*:X\*
 \*:behave\*
+\*:<client>\*
 \*:fixdel\*
 \*:helpfind\*
 \*:open\*
@@ -108,6 +109,7 @@
 \*TerminalOpen\*
 \*TerminalWinOpen\*
 \*XLFD\*
+\*\(job\|sound\|term\|test_gui\)_[_a-zA-Z0-9]\+()\*
 \*autocommand-events\*
 \*blowfish\*
 \*builtin-function-list\*
@@ -117,18 +119,14 @@
 \*global-ime\*
 \*gui-start\*
 \*help-toc-install\*
-\*job_[a-zA-Z0-9]\+()\*
 \*multibyte-ime\*
 \*os-support\*
 \*patches-\(after-\)\?[0-9].*\*
 \*pkzip\*
 \*popup-window-functions\*
 \*sound-functions\*
-\*sound_[a-zA-Z0-9]\+()\*
 \*tabpanel[-a-z]*\*
 \*term++\(close\|open\)\*
-\*term_start()\*
-\*terminal-\(bufname\|nospecial\)\*
-\*test_gui_[a-zA-Z0-9_]\+()\*
+\*terminal-\(api\|bufname\|nospecial\)\*
 \*v:none\*
 \*v:sizeof[a-z]\+\*