diff options
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. */) | |||
| 5554 | || data->frame_cols != previous_frame_cols) | 5554 | || data->frame_cols != previous_frame_cols) |
| 5555 | change_frame_size (f, data->frame_lines, | 5555 | change_frame_size (f, data->frame_lines, |
| 5556 | data->frame_cols, 0, 0, 0); | 5556 | data->frame_cols, 0, 0, 0); |
| 5557 | #ifdef HAVE_MENUS | ||
| 5558 | if (data->frame_menu_bar_lines | 5557 | if (data->frame_menu_bar_lines |
| 5559 | != previous_frame_menu_bar_lines) | 5558 | != previous_frame_menu_bar_lines) |
| 5560 | { | 5559 | { |
| @@ -5567,7 +5566,6 @@ the return value is nil. Otherwise the value is t. */) | |||
| 5567 | set_menu_bar_lines (f, make_number (data->frame_menu_bar_lines), | 5566 | set_menu_bar_lines (f, make_number (data->frame_menu_bar_lines), |
| 5568 | make_number (0)); | 5567 | make_number (0)); |
| 5569 | } | 5568 | } |
| 5570 | #endif | ||
| 5571 | #ifdef HAVE_WINDOW_SYSTEM | 5569 | #ifdef HAVE_WINDOW_SYSTEM |
| 5572 | if (data->frame_tool_bar_lines | 5570 | if (data->frame_tool_bar_lines |
| 5573 | != previous_frame_tool_bar_lines) | 5571 | != previous_frame_tool_bar_lines) |
| @@ -5752,7 +5750,6 @@ the return value is nil. Otherwise the value is t. */) | |||
| 5752 | || previous_frame_cols != FRAME_COLS (f)) | 5750 | || previous_frame_cols != FRAME_COLS (f)) |
| 5753 | change_frame_size (f, previous_frame_lines, previous_frame_cols, | 5751 | change_frame_size (f, previous_frame_lines, previous_frame_cols, |
| 5754 | 0, 0, 0); | 5752 | 0, 0, 0); |
| 5755 | #ifdef HAVE_MENUS | ||
| 5756 | if (previous_frame_menu_bar_lines != FRAME_MENU_BAR_LINES (f)) | 5753 | if (previous_frame_menu_bar_lines != FRAME_MENU_BAR_LINES (f)) |
| 5757 | { | 5754 | { |
| 5758 | #ifdef HAVE_WINDOW_SYSTEM | 5755 | #ifdef HAVE_WINDOW_SYSTEM |
| @@ -5765,7 +5762,6 @@ the return value is nil. Otherwise the value is t. */) | |||
| 5765 | set_menu_bar_lines (f, make_number (previous_frame_menu_bar_lines), | 5762 | set_menu_bar_lines (f, make_number (previous_frame_menu_bar_lines), |
| 5766 | make_number (0)); | 5763 | make_number (0)); |
| 5767 | } | 5764 | } |
| 5768 | #endif | ||
| 5769 | #ifdef HAVE_WINDOW_SYSTEM | 5765 | #ifdef HAVE_WINDOW_SYSTEM |
| 5770 | if (previous_frame_tool_bar_lines != FRAME_TOOL_BAR_LINES (f)) | 5766 | if (previous_frame_tool_bar_lines != FRAME_TOOL_BAR_LINES (f)) |
| 5771 | x_set_tool_bar_lines (f, make_number (previous_frame_tool_bar_lines), | 5767 | 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. */) | |||
| 5799 | /* This `select_window' calls record_buffer which calls Fdelq which | 5795 | /* This `select_window' calls record_buffer which calls Fdelq which |
| 5800 | invokes QUIT, so we do it here at the end rather than earlier, | 5796 | invokes QUIT, so we do it here at the end rather than earlier, |
| 5801 | to minimize the risk of interrupting the Fset_window_configuration | 5797 | to minimize the risk of interrupting the Fset_window_configuration |
| 5802 | in an inconsistent state (e.g. before frame-focus redirection is | 5798 | in an inconsistent state (e.g. before frame-focus redirection is |
| 5803 | canceled). */ | 5799 | canceled). */ |
| 5804 | select_window (data->current_window, Qnil, 1); | 5800 | select_window (data->current_window, Qnil, 1); |
| 5805 | BVAR (XBUFFER (XWINDOW (selected_window)->contents), | 5801 | BVAR (XBUFFER (XWINDOW (selected_window)->contents), |