master ab17e35325 2/2: Merge from origin/emacs-28

[Po Lu]

branch: master
commit ab17e353253a88d92f68b3909b27ded9e536fb28
Merge: 5205be5106 f393d0d441
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Merge from origin/emacs-28
    
    f393d0d441 Fix regression leading to flickering tooltips when the mou...
---
 lisp/tooltip.el | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index 1cf16fdb5d..b859052959 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -383,9 +383,12 @@ 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-including-properties previous-help msg)
-              ;; Same help as before (but possibly the mouse has moved).
-              ;; Keep what we have.
+             ((equal previous-help msg)
+              ;; Same help as before (but possibly the mouse has
+              ;; moved or the text properties have changed).  Keep
+              ;; what we have.  If only text properties have changed,
+              ;; the tooltip won't be updated, but that shouldn't
+              ;; occur.
               )
              (t
               ;; A different help.  Remove a previous tooltip, and