]> git.eshelyaron.com Git - emacs.git/commitdiff
Revert "Don't disable eldoc when doing edebug"
authorEli Zaretskii <eliz@gnu.org>
Wed, 1 Mar 2023 15:35:51 +0000 (17:35 +0200)
committerEli Zaretskii <eliz@gnu.org>
Wed, 1 Mar 2023 15:35:51 +0000 (17:35 +0200)
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

index 83948ad00d4d36b77b02a8c5f09d55940e4715fe..a175edcc671ff7035166f78f221b9e17e095ab54 100644 (file)
@@ -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.