From a8f5927e64f80c5179ed58d87eab4c4c40dfdc05 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gerd=20M=C3=B6llmann?= Date: Sun, 4 May 2025 08:17:27 +0200 Subject: [PATCH] Fix support of 'mouse-highlight' on X (bug#78218) * src/xterm.c (handle_one_xevent): Fix comparison with tool-bar and tab-bar window. (cherry picked from commit 6ccfc8977821d02e8d589c801e6cad2e74ab699b) --- src/xterm.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/xterm.c b/src/xterm.c index 249916cf954..03064acbe6c 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -20201,13 +20201,14 @@ handle_one_xevent (struct x_display_info *dpyinfo, /* If mouse-highlight is an integer, input clears out mouse highlighting. */ - if (!hlinfo->mouse_face_hidden && FIXNUMP (Vmouse_highlight) - && (f == 0 + if (!hlinfo->mouse_face_hidden + && FIXNUMP (Vmouse_highlight) + && (f == NULL + || (!EQ (f->tab_bar_window, hlinfo->mouse_face_window) #if ! defined (USE_GTK) - || !EQ (f->tool_bar_window, hlinfo->mouse_face_window) + && !EQ (f->tool_bar_window, hlinfo->mouse_face_window) #endif - || !EQ (f->tab_bar_window, hlinfo->mouse_face_window)) - ) + ))) { mouse_frame = hlinfo->mouse_face_mouse_frame; -- 2.39.5