* xdisp.c (rows_from_pos_range): Add parens as per gcc -Wparentheses.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4fbfa52df3a918e85054d48e623cc75c34aa207b..28910c5a556a1afcc7b19899de88f8504a3a798b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * xdisp.c (rows_from_pos_range): Add parens as per gcc -Wparentheses.
+
 2012-01-11  Eli Zaretskii  <eliz@gnu.org>
 
        * xdisp.c (rows_from_pos_range): Handle the case where the

diff --git a/src/xdisp.c b/src/xdisp.c
index dc046886039c52cedba976dfa9b575a5cabffec0..c90184f4a4c3f778470c49fe4eab51135b466301 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -25932,14 +25932,14 @@ rows_from_pos_range (struct window *w,
          while (g < e)
            {
              if (((BUFFERP (g->object) || INTEGERP (g->object))
-                  && (start_charpos <= g->charpos && g->charpos < end_charpos
+                  && ((start_charpos <= g->charpos && g->charpos < end_charpos)
                       /* If the buffer position of the first glyph in
                          the row is equal to END_CHARPOS, it means
                          the last character to be highlighted is the
                          newline of ROW, and we must consider NEXT as
                          END, not END+1.  */
-                      || ((!next->reversed_p && g == s
-                           || next->reversed_p && g == e - 1)
+                      || (((!next->reversed_p && g == s)
+                           || (next->reversed_p && g == e - 1))
                           && (g->charpos == end_charpos
                               /* Special case for when NEXT is an
                                  empty line at ZV.  */