[Emacs-diffs] emacs-24 r117017: Fix bug #17331 with display properties on help-echo strings.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117017
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17331
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Thu 2014-04-24 18:02:56 +0300
message:
  Fix bug #17331 with display properties on help-echo strings.
  
   lisp/tooltip.el (tooltip-show-help-non-mode, tooltip-show-help): Use
   equal-including-properties to compare help-echo strings.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/tooltip.el                tooltip.el-20091113204419-o5vbwnq5f7feedwu-1322

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-04-24 00:55:18 +0000
+++ b/lisp/ChangeLog    2014-04-24 15:02:56 +0000
@@ -1,3 +1,8 @@
+2014-04-24  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * emacs-lisp/lisp-mode.el (emacs-lisp-mode-syntax-table):

=== modified file 'lisp/tooltip.el'
--- a/lisp/tooltip.el   2014-01-01 07:43:34 +0000
+++ b/lisp/tooltip.el   2014-04-24 15:02:56 +0000
@@ -343,10 +343,10 @@
      ((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 @@
               ;; 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.
               )