Pacify gcc -Wparentheses

* frame.c (x_set_frame_parameters): Add parens (Bug#19428).

diff --git a/src/ChangeLog b/src/ChangeLog
index 6d25fc21f3b475997c27950e0644ff41ae1eaf87..12852b89b12aeb171b0026b55f563402948b5d32 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Pacify gcc -Wparentheses
+       * frame.c (x_set_frame_parameters): Add parens (Bug#19428).
+
 2015-01-03  Martin Rudalics  <rudalics@gmx.at>
 
        * frame.c (x_set_frame_parameters): Call Fset_frame_size only if

diff --git a/src/frame.c b/src/frame.c
index bdc914f75c51178a3d77a6e514d9828b92b7da83..5a0d142afbbd220d69e0db1d1345a14ecfa3ed54 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -3219,7 +3219,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->can_x_set_window_size && (f->new_height || f->new_width))
+       || (f->can_x_set_window_size && (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