From: Jason Rumney <jasonr@gnu.org>
Date: Mon, 1 Jan 2001 22:25:57 +0000 (+0000)
Subject: (x_figure_window_size): Do not allow new_height and
X-Git-Tag: emacs-pretest-21.0.95~218
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=35b41202eda7fd41ce89c8091f1d22e64f85e33d;p=emacs.git

(x_figure_window_size): Do not allow new_height and
new_width of frame to override specified values.
---

diff --git a/src/w32fns.c b/src/w32fns.c
index 7e22b084ff8..657d5dd6612 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -3210,6 +3210,11 @@ x_figure_window_size (f, parms)
   f->output_data.w32->top_pos = 0;
   f->output_data.w32->left_pos = 0;
 
+  /* Ensure that old new_width and new_height will not override the
+     values set here.  */
+  FRAME_NEW_WIDTH (f) = 0;
+  FRAME_NEW_HEIGHT (f) = 0;
+
   tem0 = w32_get_arg (parms, Qheight, 0, 0, RES_TYPE_NUMBER);
   tem1 = w32_get_arg (parms, Qwidth, 0, 0, RES_TYPE_NUMBER);
   tem2 = w32_get_arg (parms, Quser_size, 0, 0, RES_TYPE_NUMBER);