[elpa] externals/eldoc-eval 4924bfb1cc 02/28: * eldoc-eval.el (eldoc-in-minibuffer-mode): remove/add-hook `eval-expression-minibuffer-setup-hook'.

[Stefan Monnier]

branch: externals/eldoc-eval
commit 4924bfb1ccbc74087d9045b13e5c9f9ec8a802c2
Author: Thierry Volpiatto <thierry.volpiatto@gmail.com>
Commit: Thierry Volpiatto <thierry.volpiatto@gmail.com>

    * eldoc-eval.el (eldoc-in-minibuffer-mode): remove/add-hook 
`eval-expression-minibuffer-setup-hook'.
---
 eldoc-eval.el | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/eldoc-eval.el b/eldoc-eval.el
index bf208e041e..735d424f6c 100644
--- a/eldoc-eval.el
+++ b/eldoc-eval.el
@@ -182,14 +182,18 @@ See `with-eldoc-in-minibuffer'."
         (add-hook 'minibuffer-exit-hook
                   (lambda ()
                     (setq eldoc-mode-line-rolling-flag nil)))
-        (and (boundp 'eldoc-message-function)
-             (setq eldoc-message-function 'message))
+        (when (boundp 'eldoc-message-function)
+          (setq eldoc-message-function 'message)
+          (remove-hook 'eval-expression-minibuffer-setup-hook
+                     'eldoc-post-insert-mode))
         (define-key minibuffer-local-map (kbd "C-@")
           'eldoc-mode-line-toggle-rolling)
         (setq eldoc-minor-mode-string " Eldoc-eval"))
       (setq eldoc-minor-mode-string " Eldoc")
-      (and (boundp 'eldoc-message-function)
-           (setq eldoc-message-function eldoc-eval--old-message-function))
+      (when (boundp 'eldoc-message-function)
+        (setq eldoc-message-function eldoc-eval--old-message-function)
+        (add-hook 'eval-expression-minibuffer-setup-hook
+                  'eldoc-post-insert-mode))
       (define-key minibuffer-local-map (kbd "C-@") 'set-mark-command)))
 
 (defun eldoc-run-in-minibuffer ()