From: Erik Naggum <erik@naggum.no>
Date: Thu, 22 Aug 1996 08:23:30 +0000 (+0000)
Subject: (change_frame_size_1): Clean up conditional.
X-Git-Tag: emacs-20.1~4048
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ae19c6f24c7161fb86a0df91910d0017ec86c72a;p=emacs.git

(change_frame_size_1): Clean up conditional.
---

diff --git a/src/dispnew.c b/src/dispnew.c
index c45649deb1e..96d513b8e59 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -2134,8 +2134,10 @@ change_frame_size_1 (frame, newheight, newwidth, pretend, delay)
   FRAME_NEW_WIDTH  (frame) = 0;
 
   /* If an argument is zero, set it to the current value.  */
-  newheight || (newheight = FRAME_HEIGHT (frame));
-  newwidth  || (newwidth  = FRAME_WIDTH  (frame));
+  if (newheight == 0)
+    newheight = FRAME_HEIGHT (frame);
+  if (newwidth == 0)
+    newwidth  = FRAME_WIDTH  (frame);
 
   /* Round up to the smallest acceptable size.  */
   check_frame_size (frame, &newheight, &newwidth);