branch: externals/eldoc-eval
commit 99a055e2ded02d1c9bb27cd58d23864e155b7792
Author: lattfein <[email protected]>
Commit: lattfein <[email protected]>
Move the minor mode definition
---
eldoc-eval.el | 58 +++++++++++++++++++++++++++++-----------------------------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/eldoc-eval.el b/eldoc-eval.el
index 48ebc41e13..541e3b9d43 100644
--- a/eldoc-eval.el
+++ b/eldoc-eval.el
@@ -91,6 +91,35 @@ Should take one arg: the string to display"
"When rolling mode-line is enabled, stop rolling on input when non--nil."
:type 'boolean)
+;; Internal.
+(defvar eldoc-active-minibuffers-list nil
+ "List of active minibuffers with eldoc enabled.")
+(defvar eldoc-mode-line-rolling-flag nil)
+
+;;;###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)))
+
;;; Compatibility with Emacs-24.4
;; New implementation of eldoc in minibuffer that come
;; with Emacs-24.4 show the eldoc info of current-buffer while
@@ -109,11 +138,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.
@@ -183,30 +207,6 @@ See `with-eldoc-in-minibuffer'."
(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
