Skip to content

Commit 6e8d127

Browse files
committed
Fixes #1969: Enhance ElDoc integration
1 parent 334a636 commit 6e8d127

File tree

1 file changed

+24
-1
lines changed

1 file changed

+24
-1
lines changed

evil-integration.el

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,8 +454,31 @@ Based on `evil-enclose-ace-jump-for-motion'."
454454

455455
;;; ElDoc
456456
(eval-after-load 'eldoc
457+
;; The following prevents ElDoc help from disappearing in the minibuffer when
458+
;; executing certain Evil commands in Emacs, such as
459+
;; `evil-delete-back-to-indentation', `evil-delete-backward-word',
460+
;; `evil-insert', `evil-insert-line', `evil-append', `evil-append-line'...
457461
'(when (fboundp 'eldoc-add-command-completions)
458-
(eldoc-add-command-completions "evil-window-")))
462+
(eldoc-add-command-completions "evil-window-")
463+
464+
;; Add evil delete, substitute, and change commands
465+
;; - `evil-delete'
466+
;; - `evil-delete-backward-word' (C-w)
467+
;; - `evil-delete-back-to-indentation' (C-u)
468+
;; - `evil-delete-backward-char-and-join' (C-h)
469+
;; - And others.
470+
(eldoc-add-command-completions "evil-delete")
471+
(eldoc-add-command-completions "evil-substitute")
472+
(eldoc-add-command-completions "evil-change")
473+
474+
;; Add insert and append commands (`evil-insert', `evil-insert-resume',
475+
;; `evil-append'...) to ElDoc to display help after switching to insert
476+
;; mode.
477+
(eldoc-add-command-completions "evil-insert")
478+
(eldoc-add-command-completions "evil-append")
479+
480+
;; Add yank commands (`evil-yank' and `evil-yank-line')
481+
(eldoc-add-command-completions "evil-yank")))
459482

460483
;;; XRef
461484
(eval-after-load 'xref

0 commit comments

Comments
 (0)