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 b1c69ae7368e6efa969994fdc54a5747ddb7d917..eac510ba7ba06fd521585b89de3274d0ba3566b8 100644 (file)
--- 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)