From: Paul Eggert Date: Thu, 12 Jan 2012 21:33:25 +0000 (-0800) Subject: * xdisp.c (rows_from_pos_range): Add parens as per gcc -Wparentheses. X-Git-Tag: emacs-pretest-24.0.93~97^2~21 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5944709e7724ac3a685596944c71c27caeea7e22;p=emacs.git * xdisp.c (rows_from_pos_range): Add parens as per gcc -Wparentheses. --- diff --git a/src/ChangeLog b/src/ChangeLog index 4fbfa52df3a..28910c5a556 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-01-12 Paul Eggert + + * xdisp.c (rows_from_pos_range): Add parens as per gcc -Wparentheses. + 2012-01-11 Eli Zaretskii * xdisp.c (rows_from_pos_range): Handle the case where the diff --git a/src/xdisp.c b/src/xdisp.c index dc046886039..c90184f4a4c 100644 --- 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. */