diff options
| author | Stefan Monnier | 2013-11-28 20:22:40 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2013-11-28 20:22:40 -0500 |
| commit | 7cdf484be3f4408b2bdf58db5bd4ae896cf262e5 (patch) | |
| tree | 3ee6b7c62a3385518f09e5ade6a879bd1b41f53c /src/xmenu.c | |
| parent | ef869611180c862f67ef1e004553668523615d37 (diff) | |
| download | emacs-7cdf484be3f4408b2bdf58db5bd4ae896cf262e5.tar.gz emacs-7cdf484be3f4408b2bdf58db5bd4ae896cf262e5.zip | |
* 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.c | 4 |
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_ | |||
| 2440 | doc: /* Return t if a menu or popup dialog is active. */) | 2440 | doc: /* Return t if a menu or popup dialog is active. */) |
| 2441 | (void) | 2441 | (void) |
| 2442 | { | 2442 | { |
| 2443 | #ifdef HAVE_MENUS | ||
| 2444 | return (popup_activated ()) ? Qt : Qnil; | 2443 | return (popup_activated ()) ? Qt : Qnil; |
| 2445 | #else | ||
| 2446 | return Qnil; | ||
| 2447 | #endif /* HAVE_MENUS */ | ||
| 2448 | } | 2444 | } |
| 2449 | 2445 | ||
| 2450 | void | 2446 | void |