diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2018-12-04 18:15:44 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2018-12-04 18:15:44 -0500 |
| commit | 12e922156c86a26fa4bb2cb9e7d2b3fd639e4707 (patch) | |
| tree | 0b95b71ddfd95a487cc4791d9b3d14687f5c5db6 /lisp/emacs-lisp/eldoc.el | |
| parent | 6d898918980be4cb29a182ecde7f8e1f95a08462 (diff) | |
| download | emacs-12e922156c86a26fa4bb2cb9e7d2b3fd639e4707.tar.gz emacs-12e922156c86a26fa4bb2cb9e7d2b3fd639e4707.tar.bz2 emacs-12e922156c86a26fa4bb2cb9e7d2b3fd639e4707.zip | |
* lisp/emacs-lisp/eldoc.el: Let the user interrupt the search
(eldoc-print-current-symbol-info): Use while-no-input and non-essential.
Diffstat (limited to 'lisp/emacs-lisp/eldoc.el')
| -rw-r--r-- | lisp/emacs-lisp/eldoc.el | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index 49ba71fb1b8..21be4f3ce32 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -357,12 +357,15 @@ return any documentation.") ;; This is run from post-command-hook or some idle timer thing, ;; so we need to be careful that errors aren't ignored. (with-demoted-errors "eldoc error: %s" - (and (or (eldoc-display-message-p) - ;; Erase the last message if we won't display a new one. - (when eldoc-last-message - (eldoc-message nil) - nil)) - (eldoc-message (funcall eldoc-documentation-function))))) + (if (not (eldoc-display-message-p)) + ;; Erase the last message if we won't display a new one. + (when eldoc-last-message + (eldoc-message nil)) + (let ((non-essential t)) + ;; 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-message (funcall eldoc-documentation-function))))))) ;; If the entire line cannot fit in the echo area, the symbol name may be ;; truncated or eliminated entirely from the output to make room for the |