summaryrefslogtreecommitdiff
path: root/src/xmenu.c
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2013-11-28 20:22:40 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2013-11-28 20:22:40 -0500
commit7cdf484be3f4408b2bdf58db5bd4ae896cf262e5 (patch)
tree3ee6b7c62a3385518f09e5ade6a879bd1b41f53c /src/xmenu.c
parentef869611180c862f67ef1e004553668523615d37 (diff)
downloademacs-7cdf484be3f4408b2bdf58db5bd4ae896cf262e5.tar.gz
* 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/xmenu.c')
-rw-r--r--src/xmenu.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/xmenu.c b/src/xmenu.c
index b2c7fb5f073..cdc63cbaa96 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -2440,11 +2440,7 @@ DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_
doc: /* Return t if a menu or popup dialog is active. */)
(void)
{
-#ifdef HAVE_MENUS
return (popup_activated ()) ? Qt : Qnil;
-#else
- return Qnil;
-#endif /* HAVE_MENUS */
}
void