From d7f0bbaa9870b5e22c45535a0cbf296b1e12ae72 Mon Sep 17 00:00:00 2001
From: James Cherti <60946298+jamescherti@users.noreply.github.com>
Date: Wed, 30 Apr 2025 12:02:46 -0400
Subject: [PATCH] Fixes #1969: Enhance ElDoc integration

---
 evil-integration.el | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/evil-integration.el b/evil-integration.el
index 710d69d5..3c72b762 100644
--- a/evil-integration.el
+++ b/evil-integration.el
@@ -454,8 +454,24 @@ Based on `evil-enclose-ace-jump-for-motion'."
 
 ;;; ElDoc
 (eval-after-load 'eldoc
+  ;; The following prevents ElDoc help from disappearing in the minibuffer when
+  ;; executing certain Evil commands in Emacs, such as
+  ;; `evil-delete-back-to-indentation', `evil-delete-backward-word',
+  ;; `evil-insert', `evil-insert-line', `evil-append', `evil-append-line'...
   '(when (fboundp 'eldoc-add-command-completions)
-     (eldoc-add-command-completions "evil-window-")))
+     (eldoc-add-command-completions "evil-window-")
+
+     ;; Add evil-delete commands to ElDoc to display help while deleting using:
+     ;; - evil-delete-backward-word (C-w)
+     ;; - evil-delete-back-to-indentation (C-u)
+     ;; - evil-delete-backward-char-and-join (C-h)
+     ;; - And other evil-delete-* commands.
+     (eldoc-add-command-completions "evil-delete-")
+
+     ;; Add insert and append commands to ElDoc to display help after switching
+     ;; to insert mode.
+     (eldoc-add-command-completions "evil-insert-")
+     (eldoc-add-command-completions "evil-append-")))
 
 ;;; XRef
 (eval-after-load 'xref