From 99df815c153265706edc839b7467fb3ae3b6e1b1 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 1 Mar 2023 17:35:51 +0200 Subject: [PATCH] Revert "Don't disable eldoc when doing edebug" This reverts commit 6fd1fb8a6837acde8e1c9ab26618ec0f36121c72. It turns out ElDoc does show messages inside Edebug, if you are (un)lucky enough to have point where ElDoc has something to show. Bug#56459 needs to be fixed in some more complex way. --- lisp/emacs-lisp/eldoc.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index 83948ad00d4..a175edcc671 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -388,6 +388,7 @@ 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. -- 2.39.2