* 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.

1 files changed, 0 insertions, 6 deletions

diff --git a/src/editfns.c b/src/editfns.c
index c5267d1e038..8e47d1f82e4 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3473,7 +3473,6 @@ usage: (message-box FORMAT-STRING &rest ARGS)  */)
   else
     {
       Lisp_Object val = Fformat (nargs, args);
-#ifdef HAVE_MENUS
       Lisp_Object pane, menu;
       struct gcpro gcpro1;
 
@@ -3482,9 +3481,6 @@ usage: (message-box FORMAT-STRING &rest ARGS)  */)
       menu = Fcons (val, pane);
       Fx_popup_dialog (Qt, menu, Qt);
       UNGCPRO;
-#else /* !HAVE_MENUS */
-      message3 (val);
-#endif
       return val;
     }
 }
@@ -3503,11 +3499,9 @@ message; let the minibuffer contents show.
 usage: (message-or-box FORMAT-STRING &rest ARGS)  */)
   (ptrdiff_t nargs, Lisp_Object *args)
 {
-#ifdef HAVE_MENUS
   if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event))
       && use_dialog_box)
     return Fmessage_box (nargs, args);
-#endif
   return Fmessage (nargs, args);
 }