diff options
| author | Paul Eggert <[email protected]> | 2012-01-12 13:33:25 -0800 |
|---|---|---|
| committer | Paul Eggert <[email protected]> | 2012-01-12 13:33:25 -0800 |
| commit | 5944709e7724ac3a685596944c71c27caeea7e22 (patch) | |
| tree | 2939522b5969af6fc89c7599ccb2678eabcd657e | |
| parent | e7a8cb8f8212d717147d561a78f6322e951b14e3 (diff) | |
* xdisp.c (rows_from_pos_range): Add parens as per gcc -Wparentheses.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xdisp.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4fbfa52df3..28910c5a55 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-01-12 Paul Eggert <[email protected]> + + * xdisp.c (rows_from_pos_range): Add parens as per gcc -Wparentheses. + 2012-01-11 Eli Zaretskii <[email protected]> * xdisp.c (rows_from_pos_range): Handle the case where the diff --git a/src/xdisp.c b/src/xdisp.c index dc04688603..c90184f4a4 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. */ |