diff options
| author | Martin Rudalics | 2018-02-22 08:50:47 +0100 |
|---|---|---|
| committer | Martin Rudalics | 2018-02-22 08:50:47 +0100 |
| commit | 83187cd900c799865c967620eef3b7c18f3d168f (patch) | |
| tree | e6445d5166cf5c07ea8fccaebc5b17494b0798b3 /src | |
| parent | a6d8f2ba02934249fb831d00dde8d3885026a160 (diff) | |
| download | emacs-83187cd900c799865c967620eef3b7c18f3d168f.tar.gz emacs-83187cd900c799865c967620eef3b7c18f3d168f.zip | |
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).
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index da9c31314ca..b003a2f9ccc 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -31357,10 +31357,12 @@ note_mouse_highlight (struct frame *f, int x, int y) | |||
| 31357 | /* Check mouse-face highlighting. */ | 31357 | /* Check mouse-face highlighting. */ |
| 31358 | if (! same_region | 31358 | if (! same_region |
| 31359 | /* If there exists an overlay with mouse-face overlapping | 31359 | /* If there exists an overlay with mouse-face overlapping |
| 31360 | the one we are currently highlighting, we have to | 31360 | the one we are currently highlighting, we have to check |
| 31361 | check if we enter the overlapping overlay, and then | 31361 | if we enter the overlapping overlay, and then highlight |
| 31362 | highlight only that. */ | 31362 | only that. Skip the check when mouse-face highlighting |
| 31363 | || (OVERLAYP (hlinfo->mouse_face_overlay) | 31363 | is currently hidden to avoid Bug#30519. */ |
| 31364 | || (!hlinfo->mouse_face_hidden | ||
| 31365 | && OVERLAYP (hlinfo->mouse_face_overlay) | ||
| 31364 | && mouse_face_overlay_overlaps (hlinfo->mouse_face_overlay))) | 31366 | && mouse_face_overlay_overlaps (hlinfo->mouse_face_overlay))) |
| 31365 | { | 31367 | { |
| 31366 | /* Find the highest priority overlay with a mouse-face. */ | 31368 | /* Find the highest priority overlay with a mouse-face. */ |