From: Mauro Aranda <maurooaranda@gmail.com>
Date: Mon, 16 Sep 2019 20:17:51 +0000 (+0200)
Subject: With tooltip-mode disabled, don't unconditionally clear the echo area
X-Git-Tag: emacs-27.0.90~1551^2~35
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f22346fe5abdbdac2ba5f690c11fda4d4f5d22d6;p=emacs.git

With tooltip-mode disabled, don't unconditionally clear the echo area

* lisp/tooltip.el (tooltip-show-help-non-mode): Only clear the
echo area when the current message displayed is a tooltip message
(Bug#3192).
---

diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index b1c69ae7368..eac510ba7ba 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -365,7 +365,10 @@ It is also called if Tooltip mode is on, for text-only displays."
       (let ((message-log-max nil))
         (message "%s" tooltip-previous-message)
         (setq tooltip-previous-message nil)))
-     (t
+     ;; Only stop displaying the message when the current message is our own.
+     ;; This has the advantage of not clearing the echo area when
+     ;; running after an error message was displayed (Bug#3192).
+     ((equal-including-properties tooltip-help-message (current-message))
       (message nil)))))
 
 (defun tooltip-show-help (msg)