[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/eldoc-eval 4a1cf92dc5 22/28: Merge pull request #6 from
From: |
Stefan Monnier |
Subject: |
[elpa] externals/eldoc-eval 4a1cf92dc5 22/28: Merge pull request #6 from lattfein/move-definition |
Date: |
Thu, 6 Jan 2022 08:34:57 -0500 (EST) |
branch: externals/eldoc-eval
commit 4a1cf92dc5c4eca7519eb32f61b95e9e9f5755e4
Merge: 17946951b9 e646f28a88
Author: Thierry Volpiatto <thierry.volpiatto@gmail.com>
Commit: GitHub <noreply@github.com>
Merge pull request #6 from lattfein/move-definition
Move definition
---
eldoc-eval.el | 68 +++++++++++++++++++++++++++++------------------------------
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/eldoc-eval.el b/eldoc-eval.el
index 48ebc41e13..7de448488a 100644
--- a/eldoc-eval.el
+++ b/eldoc-eval.el
@@ -99,6 +99,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
@@ -109,11 +143,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.
@@ -178,35 +207,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
- [elpa] externals/eldoc-eval updated (b4fb63726b -> cff4170b4a), Stefan Monnier, 2022/01/06
- [elpa] externals/eldoc-eval 4924bfb1cc 02/28: * eldoc-eval.el (eldoc-in-minibuffer-mode): remove/add-hook `eval-expression-minibuffer-setup-hook'., Stefan Monnier, 2022/01/06
- [elpa] externals/eldoc-eval af5d4ddfe6 03/28: * eldoc-eval.el: Issue #2 Remap eval-expression., Stefan Monnier, 2022/01/06
- [elpa] externals/eldoc-eval a0d5c41505 07/28: * eldoc-eval.el: Fix redisplay of mode-line in emacs-24.4., Stefan Monnier, 2022/01/06
- [elpa] externals/eldoc-eval cf49d3324e 06/28: * eldoc-eval.el: Remove rolling function., Stefan Monnier, 2022/01/06
- [elpa] externals/eldoc-eval f59a1ae7ec 16/28: Merge pull request #4 from wyuenho/patch-1, Stefan Monnier, 2022/01/06
- [elpa] externals/eldoc-eval df03315658 15/28: Give group to eldoc-in-minibuffer-mode, Stefan Monnier, 2022/01/06
- [elpa] externals/eldoc-eval cc37666378 11/28: Make timer not accessible within body., Stefan Monnier, 2022/01/06
- [elpa] externals/eldoc-eval 17946951b9 18/28: Merge pull request #5 from mix-yasuno/remove-warnings, Stefan Monnier, 2022/01/06
- [elpa] externals/eldoc-eval 4a1cf92dc5 22/28: Merge pull request #6 from lattfein/move-definition,
Stefan Monnier <=
- [elpa] externals/eldoc-eval a67fe36373 24/28: Merge branch 'master' of github.com:thierryvolpiatto/eldoc-eval, Stefan Monnier, 2022/01/06
- [elpa] externals/eldoc-eval 9ce3ca7d2c 12/28: * README.md: Update., Stefan Monnier, 2022/01/06
- [elpa] externals/eldoc-eval 6710179584 08/28: * eldoc-eval.el: Use lexical-binding., Stefan Monnier, 2022/01/06
- [elpa] externals/eldoc-eval e0e6ea1af0 17/28: Remove warnings from byte compilation, Stefan Monnier, 2022/01/06
- [elpa] externals/eldoc-eval 7903b1e863 01/28: * eldoc-eval.el: Merge Stefan changes on ELPA., Stefan Monnier, 2022/01/06
- [elpa] externals/eldoc-eval e646f28a88 21/28: Move eldoc-in-minibuffer-mode-map definition, Stefan Monnier, 2022/01/06
- [elpa] externals/eldoc-eval 6514b3377f 20/28: Silence the warning, Stefan Monnier, 2022/01/06
- [elpa] externals/eldoc-eval 475d68155b 23/28: Remove :version no more needed, Stefan Monnier, 2022/01/06
- [elpa] externals/eldoc-eval 99a055e2de 19/28: Move the minor mode definition, Stefan Monnier, 2022/01/06
- [elpa] externals/eldoc-eval e2d9805592 05/28: * eldoc-eval.el (eldoc-mode-line-stop-rolling-on-input): New user var., Stefan Monnier, 2022/01/06