summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/NEWS7
-rw-r--r--lisp/emacs-lisp/eldoc.el1
2 files changed, 6 insertions, 2 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 4c92c32987..5bbe34a573 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -462,7 +462,10 @@ and `desktop-restore-forces-onscreen' offer further customization.
** New Dired minor mode `dired-hide-details-mode' toggles whether details,
such as file ownership or permissions, are visible.
-** Eldoc Mode works properly in the minibuffer.
+---
+** You can enable ElDoc inside the `eval-expression' minibuffer with:
+ (add-hook 'eval-expression-minibuffer-setup-hook 'eldoc-mode)
+The results display in the mode line.
** Electric Pair mode
@@ -623,7 +626,7 @@ are lined up to the first one.
*** Completion in Octave file buffers.
-*** Eldoc support.
+*** ElDoc support.
*** Jump to definition.
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 28e80d0e2b..cedfd44dd1 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -39,6 +39,7 @@
;; (add-hook 'emacs-lisp-mode-hook 'eldoc-mode)
;; (add-hook 'lisp-interaction-mode-hook 'eldoc-mode)
;; (add-hook 'ielm-mode-hook 'eldoc-mode)
+;; (add-hook 'eval-expression-minibuffer-setup-hook 'eldoc-mode)
;; Major modes for other languages may use ElDoc by defining an
;; appropriate function as the buffer-local value of