summaryrefslogtreecommitdiff
path: root/lisp/tooltip.el
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2014-04-24 18:02:56 +0300
committerEli Zaretskii <eliz@gnu.org>2014-04-24 18:02:56 +0300
commitbc0650fdb6476da2d0fcb563955d848479b14959 (patch)
treecc6a41d0a56dc88b75b16f301b3e92ecc89f101d /lisp/tooltip.el
parentc0b9bc72cc3488a89d774afe94c3a5f630c6f563 (diff)
downloademacs-bc0650fdb6476da2d0fcb563955d848479b14959.tar.gz
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.
Diffstat (limited to 'lisp/tooltip.el')
-rw-r--r--lisp/tooltip.el8
1 files changed, 4 insertions, 4 deletions
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.
)