]> git.eshelyaron.com Git - emacs.git/commitdiff
Restrict fix of Bug#24963 and Bug#25887 to GTK builds
authorMartin Rudalics <rudalics@gmx.at>
Thu, 31 Aug 2017 07:36:46 +0000 (09:36 +0200)
committerMartin Rudalics <rudalics@gmx.at>
Thu, 31 Aug 2017 07:36:46 +0000 (09:36 +0200)
* 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

index 64e89708b2e5d2f3bfd022b5e1b494f7b8f4f591..b7dc884fa693169b78be6d0aac4d6d58e84a1891 100644 (file)
@@ -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