aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2025-12-08 10:37:22 -0800
committerPaul Eggert2025-12-08 10:41:50 -0800
commit1c43511dbc856509f50642f6a8bfb88f5ff5d96d (patch)
treee29d862ce68682e10a7692781503ed91f08cd18c
parent855ad6d870852144221a15d04f4b31969689bffb (diff)
downloademacs-1c43511dbc856509f50642f6a8bfb88f5ff5d96d.tar.gz
emacs-1c43511dbc856509f50642f6a8bfb88f5ff5d96d.zip
Fix xmenu.c USE_X_TOOLKIT duplication
* src/xmenu.c (Fx_menu_bar_open_internal): Don’t say ‘#ifdef USE_X_TOOLKIT’ inside an #if where it is already known that USE_X_TOOLKIT is defined.
-rw-r--r--src/xmenu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xmenu.c b/src/xmenu.c
index f95c50b1833..1a58b1e1427 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -474,7 +474,7 @@ DEFUN ("x-menu-bar-open-internal", Fx_menu_bar_open_internal, Sx_menu_bar_open_i
474{ 474{
475 XEvent ev; 475 XEvent ev;
476 struct frame *f = decode_window_system_frame (frame); 476 struct frame *f = decode_window_system_frame (frame);
477#if defined USE_X_TOOLKIT && defined HAVE_XINPUT2 477#ifdef HAVE_XINPUT2
478 struct x_display_info *dpyinfo = FRAME_DISPLAY_INFO (f); 478 struct x_display_info *dpyinfo = FRAME_DISPLAY_INFO (f);
479#endif 479#endif
480 Widget menubar; 480 Widget menubar;
@@ -489,7 +489,7 @@ DEFUN ("x-menu-bar-open-internal", Fx_menu_bar_open_internal, Sx_menu_bar_open_i
489 Window child; 489 Window child;
490 bool error_p = false; 490 bool error_p = false;
491 491
492#if defined USE_X_TOOLKIT && defined HAVE_XINPUT2 492#ifdef HAVE_XINPUT2
493 /* Clear the XI2 grab so Motif or lwlib can set a core grab. 493 /* Clear the XI2 grab so Motif or lwlib can set a core grab.
494 Otherwise some versions of Motif will emit a warning and hang, 494 Otherwise some versions of Motif will emit a warning and hang,
495 and lwlib will fail to destroy the menu window. */ 495 and lwlib will fail to destroy the menu window. */