]> git.eshelyaron.com Git - emacs.git/commitdiff
Skip mouse-face overlap check when mouse-face is hidden (Bug#30519)
authorMartin Rudalics <rudalics@gmx.at>
Thu, 22 Feb 2018 07:50:47 +0000 (08:50 +0100)
committerMartin Rudalics <rudalics@gmx.at>
Thu, 22 Feb 2018 07:50:47 +0000 (08:50 +0100)
* 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

index da9c31314cabd648ec7232f68d7581a3c47475df..b003a2f9ccc29a5dd6840812def64c674c46be22 100644 (file)
@@ -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.  */