2 files changed, 9 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4286c378b88..60543c67f8c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-24  Eli Zaretskii  <eliz@gnu.org>
+
+        * tooltip.el (tooltip-show-help-non-mode, tooltip-show-help): Use
+        equal-including-properties to compare help-echo strings.  (Bug#17331)
+
 2014-04-24  Leo Liu  <sdl.web@gmail.com>
 
         * emacs-lisp/lisp-mode.el (emacs-lisp-mode-syntax-table):
diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index 059370f2eee..9d0954fc5dc 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -343,10 +343,10 @@ It is also called if Tooltip mode is on, for text-only displays."
      ((stringp help)
       (setq help (replace-regexp-in-string "\n" ", " help))
       (unless (or tooltip-previous-message
-                  (string-equal help (current-message))
+                  (equal-including-properties help (current-message))
                   (and (stringp tooltip-help-message)
-                       (string-equal tooltip-help-message
-                                     (current-message))))
+                       (equal-including-properties tooltip-help-message
+                                                   (current-message))))
         (setq tooltip-previous-message (current-message)))
       (setq tooltip-help-message help)
       (let ((message-truncate-lines t)
@@ -369,7 +369,7 @@ MSG is either a help string to display, or nil to cancel the display."
                ;; Cancel display.  This also cancels a delayed tip, if
                ;; there is one.
                (tooltip-hide))
-              ((equal previous-help msg)
+              ((equal-including-properties previous-help msg)
                ;; Same help as before (but possibly the mouse has moved).
                ;; Keep what we have.
                )