From 042e33786130bef2da62ac8fc4678b76c2c038ad Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <janedmundlazo@hotmail.com>
Date: Sun, 23 Aug 2026 07:37:03 -0400
Subject: [PATCH] fix(vim-patch): sync list_vimpatch_tokens(),
 list_vimpatch_numbers() #41440

Developer and CI may think a Vim patch is merged
but list_vimpatch_numbers() and the "version.c" update suggest
otherwise.
---
 scripts/vim-patch.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index 176c78c843..51a917c7f0 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -582,7 +582,12 @@ list_vim_commits() { (
 # Prints all (sorted) "vim-patch:xxx" tokens found in the Nvim git log.
 list_vimpatch_tokens() {
   # Use sed…{7,7} to normalize (internal) Git hashes (for tokens caches).
-  _git -C "${NVIM_SOURCE_DIR}" log -E --grep='vim-patch:[^ ,{]{7,}' \
+  diff "${NVIM_SOURCE_DIR}/scripts/vimpatch_commit_ignore.txt" <(
+    _git -C "${NVIM_SOURCE_DIR}" log --format="%H" -E --grep='vim-patch:[^ ,{]{7,}'
+  ) |
+    grep -e '^> ' |
+    sed -e 's/^> //' |
+    _git -C "${NVIM_SOURCE_DIR}" log --no-walk --stdin \
     | grep -oE 'vim-patch:[^ ,{:]{7,}' \
     | sort \
     | uniq \