[Emacs-diffs] /srv/bzr/emacs/trunk r106855: * xdisp.c (rows_from_pos_range): Add parens as per gcc -Wparentheses.

[Paul Eggert]

------------------------------------------------------------
revno: 106855
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2012-01-12 13:33:25 -0800
message:
  * xdisp.c (rows_from_pos_range): Add parens as per gcc -Wparentheses.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-01-11 19:45:42 +0000
+++ b/src/ChangeLog     2012-01-12 21:33:25 +0000
@@ -1,3 +1,7 @@
+2012-01-12  Paul Eggert  <address@hidden>
+
+       * xdisp.c (rows_from_pos_range): Add parens as per gcc -Wparentheses.
+
 2012-01-11  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (rows_from_pos_range): Handle the case where the

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2012-01-11 19:45:42 +0000
+++ b/src/xdisp.c       2012-01-12 21:33:25 +0000
@@ -25932,14 +25932,14 @@
          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.  */