[Emacs-diffs] master f22346f: With tooltip-mode disabled, don't unconditionally clear the echo area

[Lars Ingebrigtsen]

branch: master
commit f22346fe5abdbdac2ba5f690c11fda4d4f5d22d6
Author: Mauro Aranda <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    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).
---
 lisp/tooltip.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index b1c69ae..eac510b 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)