aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2008-10-04 09:22:56 +0000
committerEli Zaretskii2008-10-04 09:22:56 +0000
commit48e482e6161266672796dea2b3e0c9ed8cf52f50 (patch)
treee8bb29baec173f66a4bbb53d60c7d826a7f68a1f /src
parentbf784417de59427b321d2fd20f1e777bd731d7bd (diff)
downloademacs-48e482e6161266672796dea2b3e0c9ed8cf52f50.tar.gz
emacs-48e482e6161266672796dea2b3e0c9ed8cf52f50.zip
(change_frame_size_1): Set FrameRows and FrameCols for MSDOS frames as well.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/dispnew.c8
2 files changed, 11 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4b18b9412dc..484dfc605d8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12008-10-04 Eli Zaretskii <eliz@gnu.org>
2
3 * dispnew.c (change_frame_size_1): Set FrameRows and FrameCols for
4 MSDOS frames as well.
5
12008-10-02 Adrian Robert <Adrian.B.Robert@gmail.com> 62008-10-02 Adrian Robert <Adrian.B.Robert@gmail.com>
2 7
3 * image.c (x_clear_image_1): Under NS, call ns_free_indexed_color with 8 * image.c (x_clear_image_1): Under NS, call ns_free_indexed_color with
diff --git a/src/dispnew.c b/src/dispnew.c
index 33bbdca6700..afb60ab89d0 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6356,7 +6356,9 @@ change_frame_size_1 (f, newheight, newwidth, pretend, delay, safe)
6356 set_window_height (FRAME_ROOT_WINDOW (f), 6356 set_window_height (FRAME_ROOT_WINDOW (f),
6357 newheight - FRAME_TOP_MARGIN (f), 2); 6357 newheight - FRAME_TOP_MARGIN (f), 2);
6358 6358
6359 if (FRAME_TERMCAP_P (f) && !pretend) 6359 /* MSDOS frames cannot PRETEND, as they change frame size by
6360 manipulating video hardware. */
6361 if ((FRAME_TERMCAP_P (f) && !pretend) || FRAME_MSDOS_P (f))
6360 FrameRows (FRAME_TTY (f)) = newheight; 6362 FrameRows (FRAME_TTY (f)) = newheight;
6361 } 6363 }
6362 6364
@@ -6366,7 +6368,9 @@ change_frame_size_1 (f, newheight, newwidth, pretend, delay, safe)
6366 if (FRAME_HAS_MINIBUF_P (f)) 6368 if (FRAME_HAS_MINIBUF_P (f))
6367 set_window_width (FRAME_MINIBUF_WINDOW (f), new_frame_total_cols, 0); 6369 set_window_width (FRAME_MINIBUF_WINDOW (f), new_frame_total_cols, 0);
6368 6370
6369 if (FRAME_TERMCAP_P (f) && !pretend) 6371 /* MSDOS frames cannot PRETEND, as they change frame size by
6372 manipulating video hardware. */
6373 if ((FRAME_TERMCAP_P (f) && !pretend) || FRAME_MSDOS_P (f))
6370 FrameCols (FRAME_TTY (f)) = newwidth; 6374 FrameCols (FRAME_TTY (f)) = newwidth;
6371 6375
6372 if (WINDOWP (f->tool_bar_window)) 6376 if (WINDOWP (f->tool_bar_window))