From c6e9f7838aaf2efbb519c7401a60caffa36a4f9d Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 3 Jan 2015 12:19:00 -0800 Subject: [PATCH] Pacify gcc -Wparentheses * frame.c (x_set_frame_parameters): Add parens (Bug#19428). --- src/ChangeLog | 5 +++++ src/frame.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 6d25fc21f3b..12852b89b12 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2015-01-03 Paul Eggert + + Pacify gcc -Wparentheses + * frame.c (x_set_frame_parameters): Add parens (Bug#19428). + 2015-01-03 Martin Rudalics * frame.c (x_set_frame_parameters): Call Fset_frame_size only if diff --git a/src/frame.c b/src/frame.c index bdc914f75c5..5a0d142afbb 100644 --- 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 -- 2.39.2