summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/eldoc.el
diff options
context:
space:
mode:
authorAndrea Corallo <akrl@sdf.org>2020-12-20 22:07:48 +0100
committerAndrea Corallo <akrl@sdf.org>2020-12-20 22:08:42 +0100
commitf244c2190259875d095be8508a959a61339263b8 (patch)
tree4e32bd399f4abe168bf3f18086cd36acfbca3df8 /lisp/emacs-lisp/eldoc.el
parent72c1a41573a96a39482a001bfeb3230c471a5681 (diff)
parent1a7033f1f3de4ad8c1bfd68b54e6c9d8444a3bcc (diff)
downloademacs-f244c2190259875d095be8508a959a61339263b8.tar.gz
emacs-f244c2190259875d095be8508a959a61339263b8.tar.bz2
emacs-f244c2190259875d095be8508a959a61339263b8.zip
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp/eldoc.el')
-rw-r--r--lisp/emacs-lisp/eldoc.el6
1 files changed, 1 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 6a976841038..c9d5521e502 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -867,11 +867,7 @@ the docstrings eventually produced, using
eldoc--last-request-state))
(let ((non-essential t))
(setq eldoc--last-request-state token)
- ;; Only keep looking for the info as long as the user hasn't
- ;; requested our attention. This also locally disables
- ;; inhibit-quit.
- (while-no-input
- (eldoc--invoke-strategy nil)))))))
+ (eldoc--invoke-strategy nil))))))
;; This section only affects ElDoc output to the echo area, as in