diff options
| author | Philip Kaludercic <philipk@posteo.net> | 2022-08-12 16:05:05 +0200 |
|---|---|---|
| committer | Philip Kaludercic <philipk@posteo.net> | 2022-08-12 16:05:05 +0200 |
| commit | 1823349e6a61b2997b27cdb1ff42c69739693455 (patch) | |
| tree | ed09268f8e57ab9196ff59df000c5f1268e09853 /lisp/emacs-lisp/eldoc.el | |
| parent | faa7f03b0c5b6d2c51bb185cf5a0f422ba0fb956 (diff) | |
| parent | 829b131e5b3ad3b077be9d31215770b251341c68 (diff) | |
| download | emacs-1823349e6a61b2997b27cdb1ff42c69739693455.tar.gz emacs-1823349e6a61b2997b27cdb1ff42c69739693455.tar.bz2 emacs-1823349e6a61b2997b27cdb1ff42c69739693455.zip | |
Merge remote-tracking branch 'origin/master' into feature/package+vc
Diffstat (limited to 'lisp/emacs-lisp/eldoc.el')
| -rw-r--r-- | lisp/emacs-lisp/eldoc.el | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index 8d7f182e0cd..6fd89a690dc 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -381,7 +381,6 @@ Also store it in `eldoc-last-message' and return that value." (defun eldoc-display-message-no-interference-p () "Return nil if displaying a message would cause interference." (not (or executing-kbd-macro - (bound-and-true-p edebug-active) ;; The following configuration shows "Matches..." in the ;; echo area when point is after a closing bracket, which ;; conflicts with eldoc. |