diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index 4b47d79e4c..eaaab1c28f 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -927,7 +927,7 @@ is_na_patch() {
   for file in $FILES_REMAINING; do
     case ${file} in
       runtime/doc/*.txt | runtime/pack/dist/opt/*/doc/*.txt)
-        HUNKS=$(git -c core.attributesfile="$NVIM_SOURCE_DIR"/.gitattributes -c 'diff.helphelp.xfuncname=^.*\*[.a-zA-Z0-9\-]+\*$' -C "${VIM_SOURCE_DIR}" \
+        HUNKS=$(git -c core.attributesfile="$NVIM_SOURCE_DIR"/.gitattributes -c 'diff.helphelp.xfuncname=^.*\*[^*]+\*$' -C "${VIM_SOURCE_DIR}" \
           diff-tree --no-commit-id -r -b -U0 \
           '-I\*\s+For Vim version [0-9]\.[0-9]\.\s+Last change: [0-9]+ [A-Z][a-z]+ [0-9]+' \
           '-I compiled \(with\|without\) .*(\|.*\|) feature\.$' \
diff --git a/scripts/vim_na_hunks_vim.txt b/scripts/vim_na_hunks_vim.txt
index b981445621..6c6cc14b55 100644
--- a/scripts/vim_na_hunks_vim.txt
+++ b/scripts/vim_na_hunks_vim.txt
@@ -21,6 +21,56 @@
 ^test_settime(.\+test_settime(
 ^test_srand_seed(.\+test_srand_seed(
 ^test_void(.\+test_void(
+\*'aleph'\*
+\*'antialias'\*
+\*'balloon[a-z]\+'\*
+\*'bioskey'\*
+\*'compatible'\*
+\*'conskey'\*
+\*'cryptmethod'\*
+\*'cscope[a-z]\+'\*
+\*'edcompatible'\*
+\*'esckeys'\*
+\*'guifontset'\*
+\*'guiheadroom'\*
+\*'guiligatures'\*
+\*'guipty'\*
+\*'hkmap\(p\)\?'\*
+\*'highlight'\*
+\*'imactivatekey'\*
+\*'imcmdline'\*
+\*'imdisable'\*
+\*'insertmode'\*
+\*'keyprotocol'\*
+\*'macatsui'\*
+\*'maxmem'\*
+\*'maxmemtot'\*
+\*'opendevice'\*
+\*'pastetoggle'\*
+\*'print[a-z]\+'\*
+\*'prompt'\*
+\*'remap'\*
+\*'restorescreen'\*
+\*'shelltype'\*
+\*'shortname'\*
+\*'swapsync'\*
+\*'t_.\+'\*
+\*'termcap[a-zA-Z-]*'\*
+\*'termencoding'\*
+\*'terse'\*
+\*'textauto'\*
+\*'toolbar'\*
+\*'toolbariconsize'\*
+\*'ttybuiltin'\*
+\*'ttymouse'\*
+\*'ttyscroll'\*
+\*'ttytype'\*
+\*'weirdinvert'\*
+\*'[a-z]\+dll'\*
+\*--literal\*
+\*--serverlist\*
+\*--servername\*
+\*-v\*
 \*:Print\*
 \*:Vimuntar\*
 \*:behave\*
@@ -32,5 +82,13 @@
 \*:scriptversion\*
 \*:shell\*
 \*:smile\*
-\*test_gui_[a-zA-Z0-9_]\+()\*
+\*HelpToc-mappings\*
+\*SafeStateAgain\*
+\*SigUSR1\*
+\*builtin-function-list\*
+\*emacs[_-]tags\*
+\*help-toc-install\*
 \*patches-\(after-\)\?[0-9].*\*
+\*test_gui_[a-zA-Z0-9_]\+()\*
+\*v:none\*
+\*v:sizeof[a-z]\+\*
diff --git a/scripts/vim_na_regexp.txt b/scripts/vim_na_regexp.txt
index 9588285bc4..bdaf33e6d9 100644
--- a/scripts/vim_na_regexp.txt
+++ b/scripts/vim_na_regexp.txt
@@ -96,6 +96,7 @@ _example\.vim$
 /tags$
 README_[a-z]\+\.txt$
 [_.]cp125[0-1]
+helptoc
 netbeans
 textprop
 vimtutor