[elpa] externals/eldoc-eval a67fe36373 24/28: Merge branch 'master' of github.com:thierryvolpiatto/eldoc-eval

[Stefan Monnier]

branch: externals/eldoc-eval
commit a67fe3637378dcb6c5f9e140acc8131f0d2346b3
Merge: 475d68155b 4a1cf92dc5
Author: Thierry Volpiatto <thierry.volpiatto@gmail.com>
Commit: Thierry Volpiatto <thierry.volpiatto@gmail.com>

    Merge branch 'master' of github.com:thierryvolpiatto/eldoc-eval
---
 eldoc-eval.el | 68 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/eldoc-eval.el b/eldoc-eval.el
index 226df25b32..2acbb79240 100644
--- a/eldoc-eval.el
+++ b/eldoc-eval.el
@@ -98,6 +98,40 @@ Should take one arg: the string to display"
 (defconst eldoc-eval--old-message-function
   (and (boundp 'eldoc-message-function) eldoc-message-function))
 
+;; Internal.
+(defvar eldoc-active-minibuffers-list nil
+  "List of active minibuffers with eldoc enabled.")
+(defvar eldoc-mode-line-rolling-flag nil)
+
+(defvar eldoc-in-minibuffer-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map [remap eval-expression] 'eldoc-eval-expression)
+    map))
+
+;;;###autoload
+(define-minor-mode eldoc-in-minibuffer-mode
+    "Show eldoc for current minibuffer input."
+  :global t
+  :group 'eldoc-eval
+  (if eldoc-in-minibuffer-mode
+      (progn
+        (add-hook 'minibuffer-exit-hook
+                  (lambda ()
+                    (setq eldoc-mode-line-rolling-flag nil)))
+        (when (boundp 'eldoc-post-insert-mode)
+          (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-in-minibuffer-mode-lighter))
+      (setq eldoc-minor-mode-string " Eldoc")
+      (when (boundp 'eldoc-post-insert-mode)
+        (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)))
+
 (defadvice eldoc-display-message-no-interference-p
     (after eldoc-eval activate)
   (when eldoc-in-minibuffer-mode
@@ -108,11 +142,6 @@ Should take one arg: the string to display"
                (not cursor-in-echo-area)
                (not (eq (selected-window) (minibuffer-window)))))))
 
-;; Internal.
-(defvar eldoc-active-minibuffers-list nil
-  "List of active minibuffers with eldoc enabled.")
-(defvar eldoc-mode-line-rolling-flag nil)
-
 (defun eldoc-store-minibuffer ()
   "Store minibuffer buffer name in `eldoc-active-minibuffers-list'.
 This function is called by each minibuffer started with eldoc support.
@@ -177,35 +206,6 @@ See `with-eldoc-in-minibuffer'."
             (sit-for eldoc-show-in-mode-line-delay))))
     (force-mode-line-update)))
 
-(defvar eldoc-in-minibuffer-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map [remap eval-expression] 'eldoc-eval-expression)
-    map))
-
-;;;###autoload
-(define-minor-mode eldoc-in-minibuffer-mode
-    "Show eldoc for current minibuffer input."
-  :global t
-  :group 'eldoc-eval
-  (if eldoc-in-minibuffer-mode
-      (progn
-        (add-hook 'minibuffer-exit-hook
-                  (lambda ()
-                    (setq eldoc-mode-line-rolling-flag nil)))
-        (when (boundp 'eldoc-post-insert-mode)
-          (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-in-minibuffer-mode-lighter))
-      (setq eldoc-minor-mode-string " Eldoc")
-      (when (boundp 'eldoc-post-insert-mode)
-        (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-mode-line-toggle-rolling ()
   (interactive)
   (if (and eldoc-in-minibuffer-mode