aboutsummaryrefslogtreecommitdiffstats
path: root/src/menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/menu.c')
-rw-r--r--src/menu.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/menu.c b/src/menu.c
index 96b8f73824a..9ef3b88fe86 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1178,7 +1178,6 @@ no quit occurs and `x-popup-menu' returns nil. */)
1178 keybinding equivalents, but we don't do that any more anyway. */ 1178 keybinding equivalents, but we don't do that any more anyway. */
1179 return Qnil; 1179 return Qnil;
1180 1180
1181#ifdef HAVE_MENUS
1182 { 1181 {
1183 bool get_current_pos_p = 0; 1182 bool get_current_pos_p = 0;
1184 1183
@@ -1315,7 +1314,6 @@ no quit occurs and `x-popup-menu' returns nil. */)
1315 1314
1316 XSETFRAME (Vmenu_updating_frame, f); 1315 XSETFRAME (Vmenu_updating_frame, f);
1317 } 1316 }
1318#endif /* HAVE_MENUS */
1319 1317
1320 /* Now parse the lisp menus. */ 1318 /* Now parse the lisp menus. */
1321 record_unwind_protect_void (unuse_menu_items); 1319 record_unwind_protect_void (unuse_menu_items);
@@ -1398,7 +1396,6 @@ no quit occurs and `x-popup-menu' returns nil. */)
1398 1396
1399 unbind_to (specpdl_count, Qnil); 1397 unbind_to (specpdl_count, Qnil);
1400 1398
1401#ifdef HAVE_MENUS
1402#ifdef HAVE_WINDOW_SYSTEM 1399#ifdef HAVE_WINDOW_SYSTEM
1403 /* Hide a previous tip, if any. */ 1400 /* Hide a previous tip, if any. */
1404 if (!FRAME_TERMCAP_P (f)) 1401 if (!FRAME_TERMCAP_P (f))
@@ -1460,16 +1457,12 @@ no quit occurs and `x-popup-menu' returns nil. */)
1460 FRAME_DISPLAY_INFO (f)->grabbed = 0; 1457 FRAME_DISPLAY_INFO (f)->grabbed = 0;
1461#endif 1458#endif
1462 1459
1463#endif /* HAVE_MENUS */
1464
1465 UNGCPRO; 1460 UNGCPRO;
1466 1461
1467 if (error_name) error ("%s", error_name); 1462 if (error_name) error ("%s", error_name);
1468 return selection; 1463 return selection;
1469} 1464}
1470 1465
1471#ifdef HAVE_MENUS
1472
1473DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 3, 0, 1466DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 3, 0,
1474 doc: /* Pop up a dialog box and return user's selection. 1467 doc: /* Pop up a dialog box and return user's selection.
1475POSITION specifies which frame to use. 1468POSITION specifies which frame to use.
@@ -1605,8 +1598,6 @@ for instance using the window manager, then this produces a quit and
1605 } 1598 }
1606} 1599}
1607 1600
1608#endif /* HAVE_MENUS */
1609
1610void 1601void
1611syms_of_menu (void) 1602syms_of_menu (void)
1612{ 1603{