From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 1 Aug 2014 00:01:44 +0000 (-0700)
Subject: * frame.c (x_set_frame_parameters): Fix typo in previous patch.
X-Git-Tag: emacs-25.0.90~2635^2~679^2~554
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=43a762dae9b0d6c6285c0a28cc88b54895912276;p=emacs.git

* frame.c (x_set_frame_parameters): Fix typo in previous patch.

I had confused && with ||.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index f3ab7f9b990..9dbd7c97a53 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* frame.c (x_set_frame_parameters): Fix typo in previous patch.
+	I had confused && with ||.
+
 2014-07-31  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Simplify timerfd configuration and fix some minor glitches.
diff --git a/src/frame.c b/src/frame.c
index 1b9f818292f..4dd70f00ef7 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3200,7 +3200,7 @@ x_set_frame_parameters (struct frame *f, Lisp_Object alist)
 
     if (((width_change && width != FRAME_TEXT_WIDTH (f))
 	 || (height_change && height != FRAME_TEXT_HEIGHT (f)))
-	&& (f->new_height || f->new_width))
+	 || f->new_height || f->new_width)
       {
 	/* If necessary provide default values for HEIGHT and WIDTH.  Do
 	   that here since otherwise a size change implied by an