diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-11-28 20:22:40 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-11-28 20:22:40 -0500 |
| commit | 7cdf484be3f4408b2bdf58db5bd4ae896cf262e5 (patch) | |
| tree | 3ee6b7c62a3385518f09e5ade6a879bd1b41f53c /src/window.c | |
| parent | ef869611180c862f67ef1e004553668523615d37 (diff) | |
| download | emacs-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/window.c')
| -rw-r--r-- | src/window.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/window.c b/src/window.c index ea2618fe94d..89fcb490412 100644 --- a/src/window.c +++ b/src/window.c @@ -5554,7 +5554,6 @@ the return value is nil. Otherwise the value is t. */) || data->frame_cols != previous_frame_cols) change_frame_size (f, data->frame_lines, data->frame_cols, 0, 0, 0); -#ifdef HAVE_MENUS if (data->frame_menu_bar_lines != previous_frame_menu_bar_lines) { @@ -5567,7 +5566,6 @@ the return value is nil. Otherwise the value is t. */) set_menu_bar_lines (f, make_number (data->frame_menu_bar_lines), make_number (0)); } -#endif #ifdef HAVE_WINDOW_SYSTEM if (data->frame_tool_bar_lines != previous_frame_tool_bar_lines) @@ -5752,7 +5750,6 @@ the return value is nil. Otherwise the value is t. */) || previous_frame_cols != FRAME_COLS (f)) change_frame_size (f, previous_frame_lines, previous_frame_cols, 0, 0, 0); -#ifdef HAVE_MENUS if (previous_frame_menu_bar_lines != FRAME_MENU_BAR_LINES (f)) { #ifdef HAVE_WINDOW_SYSTEM @@ -5765,7 +5762,6 @@ the return value is nil. Otherwise the value is t. */) set_menu_bar_lines (f, make_number (previous_frame_menu_bar_lines), make_number (0)); } -#endif #ifdef HAVE_WINDOW_SYSTEM if (previous_frame_tool_bar_lines != FRAME_TOOL_BAR_LINES (f)) x_set_tool_bar_lines (f, make_number (previous_frame_tool_bar_lines), @@ -5799,7 +5795,7 @@ the return value is nil. Otherwise the value is t. */) /* This `select_window' calls record_buffer which calls Fdelq which invokes QUIT, so we do it here at the end rather than earlier, to minimize the risk of interrupting the Fset_window_configuration - in an inconsistent state (e.g. before frame-focus redirection is + in an inconsistent state (e.g. before frame-focus redirection is canceled). */ select_window (data->current_window, Qnil, 1); BVAR (XBUFFER (XWINDOW (selected_window)->contents), |