From aa8c31cf080692ca27960cd9a880ff9faf09e8c8 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Wed, 21 Aug 2024 12:57:28 -0400
Subject: [PATCH 1/3] fix(vc-gutter): wrong-number-of-args error

A regression introduced in ded3f5e.

Fix: #8009
Amend: ded3f5ec8349
---
 modules/ui/vc-gutter/config.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/ui/vc-gutter/config.el b/modules/ui/vc-gutter/config.el
index 80b3f2314..d54f44a50 100644
--- a/modules/ui/vc-gutter/config.el
+++ b/modules/ui/vc-gutter/config.el
@@ -190,6 +190,7 @@ Respects `diff-hl-disable-on-remote'."
   ;; HACK: This advice won't work in *all* cases (it's a C function, and any
   ;;   calls to it from C won't trigger advice), but the thread issues above are
   ;;   triggered from Elisp's buffer API (from what I can tell).
-  (defadvice! +vc-gutter--kill-diff-hl-thread-a (buf)
+  (defadvice! +vc-gutter--kill-diff-hl-thread-a (&optional buf)
     :before #'kill-buffer
-    (with-current-buffer buf (+vc-gutter--kill-thread t))))
+    (with-current-buffer (or buf (current-buffer))
+      (+vc-gutter--kill-thread t))))

From 122e3732f70f21ff9bd6f5e263642fd1793e08b1 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Wed, 21 Aug 2024 13:38:15 -0400
Subject: [PATCH 2/3] fix(markdown): disable meta keybinds if
 evil-disable-insert-state-bindings

While I don't intend to respect `evil-disable-insert-state-bindings`
everywhere, exhaustively (such as org's rebinding of return or tab), I
will do it for non-essential keybinds that have a high likeliness of
overwriting navigation commands (like meta keys).
---
 modules/lang/markdown/config.el | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/lang/markdown/config.el b/modules/lang/markdown/config.el
index 450341a70..8df215bca 100644
--- a/modules/lang/markdown/config.el
+++ b/modules/lang/markdown/config.el
@@ -134,11 +134,12 @@ capture, the end position, and the output buffer.")
   (map! :map evil-markdown-mode-map
         :n "TAB" #'markdown-cycle
         :n [backtab] #'markdown-shifttab
-        :i "M-*" #'markdown-insert-list-item
-        :i "M-b" #'markdown-insert-bold
-        :i "M-i" #'markdown-insert-italic
-        :i "M-`" #'+markdown/insert-del
-        :i "M--" #'markdown-insert-hr
+        (:unless evil-disable-insert-state-bindings
+          :i "M-*" #'markdown-insert-list-item
+          :i "M-b" #'markdown-insert-bold
+          :i "M-i" #'markdown-insert-italic
+          :i "M-`" #'+markdown/insert-del
+          :i "M--" #'markdown-insert-hr)
         :n "M-r" #'browse-url-of-file
         :m "]h"  #'markdown-next-visible-heading
         :m "[h"  #'markdown-previous-visible-heading

From dbcd30820bccc79680ad83f8a09cdc1614027c5a Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Wed, 21 Aug 2024 14:53:23 -0400
Subject: [PATCH 3/3] fix(eshell): eshell-did-you-mean: sequencep 771 error

Also removes obsolete hack for eshell-did-you-mean (see
xuchunyang/eshell-did-you-mean#2).

Ref: xuchunyang/eshell-did-you-mean#2
---
 modules/term/eshell/config.el | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/modules/term/eshell/config.el b/modules/term/eshell/config.el
index f8e69ed2b..9cabb61b1 100644
--- a/modules/term/eshell/config.el
+++ b/modules/term/eshell/config.el
@@ -226,13 +226,17 @@ Emacs versions < 29."
 
 (use-package! eshell-did-you-mean
   :after esh-mode ; Specifically esh-mode, not eshell
-  :config
-  (eshell-did-you-mean-setup)
-  ;; HACK There is a known issue with `eshell-did-you-mean' where it does not
-  ;;      work on first invocation, so we invoke it once manually by setting the
-  ;;      last command and then calling the output filter.
-  (setq eshell-last-command-name "catt")
-  (eshell-did-you-mean-output-filter "catt: command not found"))
+  :config (eshell-did-you-mean-setup)
+
+  ;; HACK: `pcomplete-completions' returns a function, but
+  ;;   `eshell-did-you-mean--get-all-commands' unconditionally expects it to
+  ;;   return a list of strings, causing wrong-type-arg errors in many cases.
+  ;;   `all-completions' handles all these cases.
+  (defadvice! +eshell--fix-eshell-did-you-mean-a (&rest _)
+    :override #'eshell-did-you-mean--get-all-commands
+    (unless eshell-did-you-mean--all-commands
+      (setq eshell-did-you-mean--all-commands
+            (all-completions "" (pcomplete-completions))))))
 
 
 (use-package eshell-syntax-highlighting