[Emacs-diffs] emacs-26 83187cd: Skip mouse-face overlap check when mouse-face is hidden (Bug#30519)

[Martin Rudalics]

branch: emacs-26
commit 83187cd900c799865c967620eef3b7c18f3d168f
Author: Martin Rudalics <address@hidden>
Commit: Martin Rudalics <address@hidden>

    Skip mouse-face overlap check when mouse-face is hidden (Bug#30519)
    
    * src/xdisp.c (note_mouse_highlight): Skip check whether
    mouse-face highlighting overlay overlaps other mouse-face
    overlays when mouse-face highlighting is hidden (Bug#30519).
---
 src/xdisp.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index da9c313..b003a2f 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -31357,10 +31357,12 @@ note_mouse_highlight (struct frame *f, int x, int y)
       /* Check mouse-face highlighting.  */
       if (! same_region
          /* If there exists an overlay with mouse-face overlapping
-            the one we are currently highlighting, we have to
-            check if we enter the overlapping overlay, and then
-            highlight only that.  */
-         || (OVERLAYP (hlinfo->mouse_face_overlay)
+            the one we are currently highlighting, we have to check
+            if we enter the overlapping overlay, and then highlight
+            only that.  Skip the check when mouse-face highlighting
+            is currently hidden to avoid Bug#30519.  */
+         || (!hlinfo->mouse_face_hidden
+             && OVERLAYP (hlinfo->mouse_face_overlay)
              && mouse_face_overlay_overlaps (hlinfo->mouse_face_overlay)))
        {
          /* Find the highest priority overlay with a mouse-face.  */