[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/eldoc-eval 7903b1e863 01/28: * eldoc-eval.el: Merge Ste
From: |
Stefan Monnier |
Subject: |
[elpa] externals/eldoc-eval 7903b1e863 01/28: * eldoc-eval.el: Merge Stefan changes on ELPA. |
Date: |
Thu, 6 Jan 2022 08:34:53 -0500 (EST) |
branch: externals/eldoc-eval
commit 7903b1e863ed839bd4eefc878a4ddc7db5242c16
Author: Stefan Monnier <monnier@IRO.UMontreal.CA>
Commit: Thierry Volpiatto <thierry.volpiatto@gmail.com>
* eldoc-eval.el: Merge Stefan changes on ELPA.
Put the custom vars in the eldoc-eval
group, where they seem to belong. Fix up naming conventions.
(eldoc-eval-preferred-function): Rename from eval-preferred-function.
(eldoc-display-message-no-interference-p): Use an advice again, but this
time
I think I wrote it correctly.
(eldoc-in-minibuffer-mode-map): Rename from eldoc-mode-in-minibuffer-map.
(eldoc-in-minibuffer-mode): Don't bother specifying the keymap now that
we're
using the standard name.
(eldoc-run-in-minibuffer): Rename from run-eldoc-in-minibuffer.
(eldoc-eval-expression): Rename from eval-expression-with-eldoc.
---
eldoc-eval.el | 55 +++++++++++++++++++++++--------------------------------
1 file changed, 23 insertions(+), 32 deletions(-)
diff --git a/eldoc-eval.el b/eldoc-eval.el
index 02158e7e73..bf208e041e 100644
--- a/eldoc-eval.el
+++ b/eldoc-eval.el
@@ -30,7 +30,7 @@
;;
;; By default with this package `M-:' will use `pp-eval-expression'
;; instead of `eval-expression'; you can change that by setting
-;; `eval-preferred-function'.
+;; `eldoc-eval-preferred-function'.
;;
;; It also provides a convenient macro to enable eldoc support
;; in your own functions using minibuffer or in your defadvices,
@@ -63,22 +63,18 @@
(defcustom eldoc-in-minibuffer-show-fn 'eldoc-show-in-mode-line
"A function to display eldoc info.
Should take one arg: the string to display"
- :group 'eldoc
:type 'function)
(defcustom eldoc-show-in-mode-line-delay 12
"The time we show eldoc when Emacs is idle."
- :group 'eldoc
:type 'number)
-(defcustom eval-preferred-function 'pp-eval-expression
+(defcustom eldoc-eval-preferred-function 'pp-eval-expression
"Preferred function to use with `M-:'."
- :group 'lisp
:type 'function)
(defcustom eldoc-in-minibuffer-own-frame-p nil
"Whether minibuffer has its own frame or not."
- :group 'lisp
:type 'boolean)
;;; Compatibility with Emacs-24.4
@@ -86,22 +82,18 @@ Should take one arg: the string to display"
;; with Emacs-24.4 show the eldoc info of current-buffer while
;; minibuffer is in use, disable this and inline old Emacs behavior.
;;
-(defconst eldoc-eval--old-message-function (and (boundp
'eldoc-message-function)
- eldoc-message-function))
-
-(defun eldoc-display-message-no-interference-p ()
- (let (result)
- (and eldoc-mode
- (not executing-kbd-macro)
- (setq result (not (and (boundp 'edebug-active) edebug-active)))
- (if (and (not eldoc-in-minibuffer-mode)
- ;; If this is non--nil we are in emacs-24.4
- eldoc-eval--old-message-function)
- result
- ;; Having this mode operate in an active minibuffer/echo area
causes
- ;; interference with what's going on there.
- (not cursor-in-echo-area)
- (not (eq (selected-window) (minibuffer-window)))))))
+(defconst eldoc-eval--old-message-function
+ (and (boundp 'eldoc-message-function) eldoc-message-function))
+
+(defadvice eldoc-display-message-no-interference-p
+ (after eldoc-eval activate)
+ (when eldoc-in-minibuffer-mode
+ (setq ad-return-value
+ (and ad-return-value
+ ;; Having this mode operate in an active minibuffer/echo area
+ ;; causes interference with what's going on there.
+ (not cursor-in-echo-area)
+ (not (eq (selected-window) (minibuffer-window)))))))
;; Internal.
(defvar eldoc-active-minibuffers-list nil
@@ -121,12 +113,11 @@ See `with-eldoc-in-minibuffer'."
`(let ((timer (and eldoc-in-minibuffer-mode
(run-with-idle-timer
eldoc-idle-delay
- 'repeat 'run-eldoc-in-minibuffer))))
+ 'repeat #'eldoc-run-in-minibuffer))))
(unwind-protect
(minibuffer-with-setup-hook
- ;; When minibuffer is activated in body,
- ;; store it.
- 'eldoc-store-minibuffer
+ ;; When minibuffer is activated in body, store it.
+ #'eldoc-store-minibuffer
,@body)
(and timer (cancel-timer timer))
;; Each time a minibuffer exits or aborts
@@ -176,16 +167,16 @@ See `with-eldoc-in-minibuffer'."
(setq eldoc-mode-line-rolling-flag (not eldoc-mode-line-rolling-flag))
(error "No active minibuffer found")))
-(defvar eldoc-mode-in-minibuffer-map
+(defvar eldoc-in-minibuffer-mode-map
(let ((map (make-sparse-keymap)))
- (define-key map (kbd "M-:") 'eval-expression-with-eldoc)
+ ;; FIXME: Should we use [remap eval-expression] instead?
+ (define-key map (kbd "M-:") 'eldoc-eval-expression)
map))
;;;###autoload
(define-minor-mode eldoc-in-minibuffer-mode
"Show eldoc for current minibuffer input."
:global t
- :keymap eldoc-mode-in-minibuffer-map
(if eldoc-in-minibuffer-mode
(progn
(add-hook 'minibuffer-exit-hook
@@ -201,7 +192,7 @@ See `with-eldoc-in-minibuffer'."
(setq eldoc-message-function eldoc-eval--old-message-function))
(define-key minibuffer-local-map (kbd "C-@") 'set-mark-command)))
-(defun run-eldoc-in-minibuffer ()
+(defun eldoc-run-in-minibuffer ()
(let ((buf (window-buffer (active-minibuffer-window))))
;; If this minibuffer have been started with
;;`with-eldoc-in-minibuffer' give it eldoc support
@@ -223,11 +214,11 @@ See `with-eldoc-in-minibuffer'."
(error (message "Eldoc in minibuffer error: %S" err)))))
;;;###autoload
-(defun eval-expression-with-eldoc ()
+(defun eldoc-eval-expression ()
"Eval expression with eldoc support in mode-line."
(interactive)
(with-eldoc-in-minibuffer
- (call-interactively eval-preferred-function)))
+ (call-interactively eldoc-eval-preferred-function)))
(provide 'eldoc-eval)
- [elpa] externals/eldoc-eval cf49d3324e 06/28: * eldoc-eval.el: Remove rolling function., (continued)
- [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, 2022/01/06
- [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 <=
- [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
- [elpa] externals/eldoc-eval e87b89f89a 14/28: Update readme., Stefan Monnier, 2022/01/06
- [elpa] externals/eldoc-eval 9e7a1660f5 09/28: * eldoc-eval.el: Fix, eldoc-post-insert-mode doesn't exists anymore., Stefan Monnier, 2022/01/06
- [elpa] externals/eldoc-eval deca5e39f3 13/28: Fix eldoc compat with emacs-25., Stefan Monnier, 2022/01/06
- [elpa] externals/eldoc-eval de6f4523db 10/28: * eldoc-eval.el: Fix compatibility with emacs-25., Stefan Monnier, 2022/01/06
- [elpa] externals/eldoc-eval 5ecafc2b3d 26/28: Better fix to prevent error with composition-function-table, Stefan Monnier, 2022/01/06