From 39a7b685395db67dc7f8abafa32f14369ddc8a65 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <janedmundlazo@hotmail.com>
Date: Fri, 21 Aug 2026 22:42:45 -0400
Subject: [PATCH] feat(vim-patch): ignore vim-patch tokens from commit list

Sort vimpatch_commit_ignore.txt based on "git log" order
else "diff" fails to filter out reverted vim-patch tokens.
Put latest commit to revert on top of file.
---
 scripts/vim-patch.sh               | 12 +++++++-----
 scripts/vimpatch_commit_ignore.txt |  5 +++++
 scripts/vimpatch_token_reverts.txt |  4 ----
 3 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 scripts/vimpatch_commit_ignore.txt
 delete mode 100644 scripts/vimpatch_token_reverts.txt

diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index add2e41c3f..176c78c843 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -597,15 +597,17 @@ list_vimpatch_tokens() {
 # Filter reverted Vim tokens.
 list_vimpatch_numbers() {
   local patch_pat='(8\.[12]|9\.[0-9])\.[0-9]{1,4}'
-  diff "${NVIM_SOURCE_DIR}/scripts/vimpatch_token_reverts.txt" <(
-    _git -C "${NVIM_SOURCE_DIR}" log --format="%s%n%b" -E --grep="^[* ]*vim-patch:${patch_pat}" |
+  diff "${NVIM_SOURCE_DIR}/scripts/vimpatch_commit_ignore.txt" <(
+    _git -C "${NVIM_SOURCE_DIR}" log --format="%H" -E --grep="^[* ]*vim-patch:${patch_pat}"
+  ) |
+    grep -e '^> ' |
+    sed -e 's/^> //' |
+    _git -C "${NVIM_SOURCE_DIR}" log --no-walk --stdin --format="%s%n%b" |
     grep -oE "^[* ]*vim-patch:${patch_pat}" |
     sed -nEe 's/^[* ]*vim-patch:('"${patch_pat}"').*$/\1/p' |
     awk '{split($0, a, "."); printf "%d.%d.%04d\n", a[1], a[2], a[3]}' |
     sort |
-    uniq ) |
-    grep -e '^> ' |
-    sed -e 's/^> //'
+    uniq
 }
 
 declare -A tokens
diff --git a/scripts/vimpatch_commit_ignore.txt b/scripts/vimpatch_commit_ignore.txt
new file mode 100644
index 0000000000..9f5dc60d95
--- /dev/null
+++ b/scripts/vimpatch_commit_ignore.txt
@@ -0,0 +1,5 @@
+bcf116cc2f2f59e6c0f5ce5a644f832476f77384
+72bc6c5801867e8f99a87737a64c1713ceac1e01
+43c137c3d8473ab87b5dad5c4c2414dd1016f663
+89a9745a1a55dc9ffd0f8292735e45bae6c7b01e
+910bbc3cca796f7fa941e0f6176cd0061de0e01c
diff --git a/scripts/vimpatch_token_reverts.txt b/scripts/vimpatch_token_reverts.txt
deleted file mode 100644
index e50f03fbb6..0000000000
--- a/scripts/vimpatch_token_reverts.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-8.1.2294
-9.1.0055
-9.2.0405
-9.2.1731