diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2014-04-25 18:11:07 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2014-04-25 18:11:07 +0200 |
| commit | dff4a9f6a4e9e42de6177e29faa7e3524b47e6d4 (patch) | |
| tree | 60924b65da522416f928b436f8525f5bc8bfc3d7 /lisp/tooltip.el | |
| parent | 8de17fac97652d77bffd24e41b0097c863bd752b (diff) | |
| parent | 844465d6cac7c243e37e446067b1a2e06be293da (diff) | |
| download | emacs-dff4a9f6a4e9e42de6177e29faa7e3524b47e6d4.tar.gz emacs-dff4a9f6a4e9e42de6177e29faa7e3524b47e6d4.tar.bz2 emacs-dff4a9f6a4e9e42de6177e29faa7e3524b47e6d4.zip | |
Merge from emacs-24; up to 2014-04-25T10:35:01Z!michael.albinus@gmx.de
Diffstat (limited to 'lisp/tooltip.el')
| -rw-r--r-- | lisp/tooltip.el | 8 |
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. ) |