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

I had confused && with ||.

diff --git a/src/ChangeLog b/src/ChangeLog
index f3ab7f9b99029487c9339bde9d98d4ab7f09a9c2..9dbd7c97a53448c19bebf891c4c451ac3766fb46 100644 (file)
--- 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 1b9f818292f95987b375c4013d8b235d9590375a..4dd70f00ef7132eb74a10be73c4d7eb2de482ca9 100644 (file)
--- 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