From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 15 Apr 1996 15:48:51 +0000 (+0000)
Subject: (x_set_frame_parameters): Get height and width from
X-Git-Tag: emacs-19.34~839
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=093dd95bf5cac843a9b3f019052e90061737d5c8;p=emacs.git

(x_set_frame_parameters): Get height and width from
FRAME_NEW_WIDTH and FRAME_NEW_HEIGHT if nonzero.
---

diff --git a/src/xfns.c b/src/xfns.c
index 344fb921a5b..36d164a45c8 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -831,9 +831,19 @@ x_set_frame_parameters (f, alist)
 
   /* Don't die if just one of these was set.  */
   if (EQ (width, Qunbound))
-    XSETINT (width, FRAME_WIDTH (f));
+    {
+      if (FRAME_NEW_WIDTH (f))
+	XSETINT (width, FRAME_NEW_WIDTH (f));
+      else
+	XSETINT (width, FRAME_WIDTH (f));
+    }
   if (EQ (height, Qunbound))
-    XSETINT (height, FRAME_HEIGHT (f));
+    {
+      if (FRAME_NEW_HEIGHT (f))
+	XSETINT (height, FRAME_NEW_HEIGHT (f));
+      else
+	XSETINT (height, FRAME_HEIGHT (f));
+    }
 
   /* Don't set these parameters unless they've been explicitly
      specified.  The window might be mapped or resized while we're in