diff options
| author | Stefan Monnier <[email protected]> | 2013-11-28 20:22:40 -0500 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2013-11-28 20:22:40 -0500 |
| commit | 7cdf484be3f4408b2bdf58db5bd4ae896cf262e5 (patch) | |
| tree | 3ee6b7c62a3385518f09e5ade6a879bd1b41f53c /src/menu.c | |
| parent | ef869611180c862f67ef1e004553668523615d37 (diff) | |
* configure.ac (HAVE_MENUS): Remove.
* src/xmenu.c (Fmenu_or_popup_active_p):
* src/window.c (Fset_window_configuration):
* src/menu.c (Fx_popup_menu, Fx_popup_dialog):
* src/keyboard.c (record_menu_key, read_char_x_menu_prompt):
* src/fns.c (Fyes_or_no_p):
* src/editfns.c (Fmessage_box, Fmessage_or_box):
* src/alloc.c (make_save_ptr_ptr):
* src/xdisp.c, src/w32menu.c, src/term.c, src/xterm.h, src/xterm.c:
Remove HAVE_MENUS.
Diffstat (limited to 'src/menu.c')
| -rw-r--r-- | src/menu.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/menu.c b/src/menu.c index 96b8f73824..9ef3b88fe8 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1178,7 +1178,6 @@ no quit occurs and `x-popup-menu' returns nil. */) keybinding equivalents, but we don't do that any more anyway. */ return Qnil; -#ifdef HAVE_MENUS { bool get_current_pos_p = 0; @@ -1315,7 +1314,6 @@ no quit occurs and `x-popup-menu' returns nil. */) XSETFRAME (Vmenu_updating_frame, f); } -#endif /* HAVE_MENUS */ /* Now parse the lisp menus. */ record_unwind_protect_void (unuse_menu_items); @@ -1398,7 +1396,6 @@ no quit occurs and `x-popup-menu' returns nil. */) unbind_to (specpdl_count, Qnil); -#ifdef HAVE_MENUS #ifdef HAVE_WINDOW_SYSTEM /* Hide a previous tip, if any. */ if (!FRAME_TERMCAP_P (f)) @@ -1460,16 +1457,12 @@ no quit occurs and `x-popup-menu' returns nil. */) FRAME_DISPLAY_INFO (f)->grabbed = 0; #endif -#endif /* HAVE_MENUS */ - UNGCPRO; if (error_name) error ("%s", error_name); return selection; } -#ifdef HAVE_MENUS - DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 3, 0, doc: /* Pop up a dialog box and return user's selection. POSITION specifies which frame to use. @@ -1605,8 +1598,6 @@ for instance using the window manager, then this produces a quit and } } -#endif /* HAVE_MENUS */ - void syms_of_menu (void) { |