# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 829583331 0
# Node ID 3f5642bda41ccfab7cad3892269d90fe708437a9
# Parent  af36df262fc5963b737d465dbcb6524b13473e2f
(x_set_frame_parameters): Get height and width from
FRAME_NEW_WIDTH and FRAME_NEW_HEIGHT if nonzero.

diff -r af36df262fc5 -r 3f5642bda41c src/xfns.c
--- a/src/xfns.c	Sun Apr 14 17:45:31 1996 +0000
+++ b/src/xfns.c	Mon Apr 15 15:48:51 1996 +0000
@@ -831,9 +831,19 @@
 
   /* 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