From f44184f1c34fed8e6e1db93de37d3ea76419c5ac Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Thu, 31 Aug 2017 09:36:46 +0200 Subject: [PATCH] Restrict fix of Bug#24963 and Bug#25887 to GTK builds * src/xterm.c (handle_one_xevent): Restrict earlier fix of Bug#24963 and Bug#25887 to avoid that a non-GTK Emacs won't react to state changes received via ConfigureNotify. --- src/xterm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/xterm.c b/src/xterm.c index 64e89708b2e..b7dc884fa69 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -8723,9 +8723,11 @@ handle_one_xevent (struct x_display_info *dpyinfo, #endif if (f) { - /* Don't call x_net_wm_state for the scroll bar window. - (Bug#24963, Bug#25887) */ +#ifdef USE_GTK + /* For GTK+ don't call x_net_wm_state for the scroll bar + window. (Bug#24963, Bug#25887) */ if (configureEvent.xconfigure.window == FRAME_X_WINDOW (f)) +#endif x_net_wm_state (f, configureEvent.xconfigure.window); #ifdef USE_X_TOOLKIT -- 2.39.2