aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii1999-07-30 08:24:02 +0000
committerEli Zaretskii1999-07-30 08:24:02 +0000
commit4314246fcfa282fcc0bcfd6913a4b6471a597eeb (patch)
tree6589726f4095422b4f60433721e4ce823f488a6e
parent44747bd00a9ad0b01f776f5dcd0ed0810112d771 (diff)
downloademacs-4314246fcfa282fcc0bcfd6913a4b6471a597eeb.tar.gz
emacs-4314246fcfa282fcc0bcfd6913a4b6471a597eeb.zip
(Fset_window_configuration) [MSDOS]: Don't call
x_set_toolbar_lines.
-rw-r--r--src/window.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/window.c b/src/window.c
index db7d06056e3..f29bbd82823 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3740,10 +3740,12 @@ the return value is nil. Otherwise the value is t.")
3740 if (XFASTINT (data->frame_menu_bar_lines) 3740 if (XFASTINT (data->frame_menu_bar_lines)
3741 != previous_frame_menu_bar_lines) 3741 != previous_frame_menu_bar_lines)
3742 x_set_menu_bar_lines (f, data->frame_menu_bar_lines, make_number (0)); 3742 x_set_menu_bar_lines (f, data->frame_menu_bar_lines, make_number (0));
3743#ifdef HAVE_WINDOW_SYSTEM
3743 if (XFASTINT (data->frame_toolbar_lines) 3744 if (XFASTINT (data->frame_toolbar_lines)
3744 != previous_frame_toolbar_lines) 3745 != previous_frame_toolbar_lines)
3745 x_set_toolbar_lines (f, data->frame_toolbar_lines, make_number (0)); 3746 x_set_toolbar_lines (f, data->frame_toolbar_lines, make_number (0));
3746#endif 3747#endif
3748#endif
3747 3749
3748 if (! NILP (XWINDOW (selected_window)->buffer)) 3750 if (! NILP (XWINDOW (selected_window)->buffer))
3749 { 3751 {
@@ -3905,10 +3907,12 @@ the return value is nil. Otherwise the value is t.")
3905 if (previous_frame_menu_bar_lines != FRAME_MENU_BAR_LINES (f)) 3907 if (previous_frame_menu_bar_lines != FRAME_MENU_BAR_LINES (f))
3906 x_set_menu_bar_lines (f, make_number (previous_frame_menu_bar_lines), 3908 x_set_menu_bar_lines (f, make_number (previous_frame_menu_bar_lines),
3907 make_number (0)); 3909 make_number (0));
3910#ifdef HAVE_WINDOW_SYSTEM
3908 if (previous_frame_toolbar_lines != FRAME_TOOLBAR_LINES (f)) 3911 if (previous_frame_toolbar_lines != FRAME_TOOLBAR_LINES (f))
3909 x_set_toolbar_lines (f, make_number (previous_frame_toolbar_lines), 3912 x_set_toolbar_lines (f, make_number (previous_frame_toolbar_lines),
3910 make_number (0)); 3913 make_number (0));
3911#endif 3914#endif
3915#endif
3912 3916
3913 /* Now, free glyph matrices in windows that were not reused. */ 3917 /* Now, free glyph matrices in windows that were not reused. */
3914 for (i = 0; i < n_leaf_windows; ++i) 3918 for (i = 0; i < n_leaf_windows; ++i)