diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-09-06 08:07:30 +0200 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-09-06 08:07:30 +0200 |
| commit | 805563346613af1f13ecd1bf96ffd8efe4816b47 (patch) | |
| tree | 568434f474dd247c732f096e9e3c6e23c493a1b7 /lisp/emacs-lisp/eldoc.el | |
| parent | 67c53691560616598f746491347bd223480e6172 (diff) | |
| parent | 669b46e6a39bb5ba5d2ed14baebd585af6130ec9 (diff) | |
| download | emacs-805563346613af1f13ecd1bf96ffd8efe4816b47.tar.gz emacs-805563346613af1f13ecd1bf96ffd8efe4816b47.tar.bz2 emacs-805563346613af1f13ecd1bf96ffd8efe4816b47.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp/eldoc.el')
| -rw-r--r-- | lisp/emacs-lisp/eldoc.el | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index 4825b5c5e6c..772c907c284 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -5,7 +5,7 @@ ;; Author: Noah Friedman <friedman@splode.com> ;; Keywords: extensions ;; Created: 1995-10-06 -;; Version: 1.8.0 +;; Version: 1.10.0 ;; Package-Requires: ((emacs "26.3")) ;; This is a GNU ELPA :core package. Avoid functionality that is not @@ -573,7 +573,8 @@ Meant as a value for `eldoc-documentation-strategy'." (let* ((callback (eldoc--make-callback :enthusiast)) (str (funcall f callback))) (if (stringp str) (funcall callback str)) - nil)))) + nil))) + t) ;; JT@2020-07-10: ElDoc is pre-loaded, so in Emacs < 28 we can't ;; make the "old" `eldoc-documentation-function' point to the new @@ -739,14 +740,14 @@ should endeavour to display the docstrings eventually produced." (when (and string (cl-loop for (p) in docs-registered never (< p pos))) (setq docs-registered '()) - (register-doc pos string plist) - (when (and (timerp eldoc--enthusiasm-curbing-timer) - (memq eldoc--enthusiasm-curbing-timer - timer-list)) - (cancel-timer eldoc--enthusiasm-curbing-timer)) - (setq eldoc--enthusiasm-curbing-timer - (run-at-time (unless (zerop pos) 0.3) - nil #'display-doc))) + (register-doc pos string plist)) + (when (and (timerp eldoc--enthusiasm-curbing-timer) + (memq eldoc--enthusiasm-curbing-timer + timer-list)) + (cancel-timer eldoc--enthusiasm-curbing-timer)) + (setq eldoc--enthusiasm-curbing-timer + (run-at-time (unless (zerop pos) 0.3) + nil #'display-doc)) t)) (:patient (cl-incf want) |