procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Paul Eggert 2012-01-12 13:33:25 -08:00
parent e7a8cb8f82
commit 5944709e77
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -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

6
src/xdisp.c
View file

@ -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. */