aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1996-06-10 21:00:11 +0000
committerRichard M. Stallman1996-06-10 21:00:11 +0000
commit6ba86f3775c8b1eb81c3cc4a43410324de40eed2 (patch)
tree627c8b736dbb2db23484ebc29311ae7dff727127 /src
parent50e3dcf5de907e4915fe99ce28ce69f4ed05323a (diff)
downloademacs-6ba86f3775c8b1eb81c3cc4a43410324de40eed2.tar.gz
emacs-6ba86f3775c8b1eb81c3cc4a43410324de40eed2.zip
(Fset_window_configuration) [HAVE_WINDOW_SYSTEM]: Call
`x_set_menu_bar_lines' on MSDOS as well.
Diffstat (limited to 'src')
-rw-r--r--src/window.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/window.c b/src/window.c
index 50cab20e0fe..d111bbb8523 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3086,7 +3086,7 @@ by `current-window-configuration' (which see).")
3086 if (XFASTINT (data->frame_height) != previous_frame_height 3086 if (XFASTINT (data->frame_height) != previous_frame_height
3087 || XFASTINT (data->frame_width) != previous_frame_width) 3087 || XFASTINT (data->frame_width) != previous_frame_width)
3088 change_frame_size (f, data->frame_height, data->frame_width, 0, 0); 3088 change_frame_size (f, data->frame_height, data->frame_width, 0, 0);
3089#ifdef HAVE_WINDOW_SYSTEM 3089#if defined(HAVE_WINDOW_SYSTEM) || (defined(MSDOS) && defined(MULTI_FRAME))
3090 if (XFASTINT (data->frame_menu_bar_lines) 3090 if (XFASTINT (data->frame_menu_bar_lines)
3091 != previous_frame_menu_bar_lines) 3091 != previous_frame_menu_bar_lines)
3092 x_set_menu_bar_lines (f, data->frame_menu_bar_lines, 0); 3092 x_set_menu_bar_lines (f, data->frame_menu_bar_lines, 0);
@@ -3224,7 +3224,7 @@ by `current-window-configuration' (which see).")
3224#if 0 /* I don't understand why this is needed, and it causes problems 3224#if 0 /* I don't understand why this is needed, and it causes problems
3225 when the frame's old selected window has been deleted. */ 3225 when the frame's old selected window has been deleted. */
3226#ifdef MULTI_FRAME 3226#ifdef MULTI_FRAME
3227 if (f != selected_frame && ! FRAME_TERMCAP_P (f)) 3227 if (f != selected_frame && ! FRAME_TERMCAP_P (f) && ! FRAME_MSDOS_P (f))
3228 do_switch_frame (WINDOW_FRAME (XWINDOW (data->root_window)), 3228 do_switch_frame (WINDOW_FRAME (XWINDOW (data->root_window)),
3229 Qnil, 0); 3229 Qnil, 0);
3230#endif 3230#endif
@@ -3235,7 +3235,7 @@ by `current-window-configuration' (which see).")
3235 || previous_frame_width != FRAME_WIDTH (f)) 3235 || previous_frame_width != FRAME_WIDTH (f))
3236 change_frame_size (f, previous_frame_height, previous_frame_width, 3236 change_frame_size (f, previous_frame_height, previous_frame_width,
3237 0, 0); 3237 0, 0);
3238#ifdef HAVE_WINDOW_SYSTEM 3238#if defined(HAVE_WINDOW_SYSTEM) || (defined(MSDOS) && defined(MULTI_FRAME))
3239 if (previous_frame_menu_bar_lines != FRAME_MENU_BAR_LINES (f)) 3239 if (previous_frame_menu_bar_lines != FRAME_MENU_BAR_LINES (f))
3240 x_set_menu_bar_lines (f, previous_frame_menu_bar_lines, 0); 3240 x_set_menu_bar_lines (f, previous_frame_menu_bar_lines, 0);
3241#endif 3241#endif