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

Fix bugs #9738 & 9739 with a display string that ends in 2 newlines.

Browse source 
src/xdisp.c (find_row_edges): Handle the case where ROW comes from a
 display string and the previous row comes from the same string and
 is empty.
This commit is contained in:
Eli Zaretskii 2011-10-12 22:07:59 +02:00
parent 8fe012c4e6
commit b00eea75d3
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2011-10-12 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (find_row_edges): Handle the case where ROW comes from a
display string and the previous row comes from the same string and
is empty. (Bug#9739) (Bug#9738)
2011-10-12 Stefan Monnier <monnier@iro.umontreal.ca>
* doc.c (get_doc_string): Encode file name (bug#9735).

9
src/xdisp.c
View file

@ -18646,7 +18646,12 @@ find_row_edges (struct it *it, struct glyph_row *row,
seen_this_string = 1;
}
else
abort ();
/* If all the glyphs of the previous row were inserted
by redisplay, it means the previous row was
produced from a single newline, which is only
possible if that newline came from the same string
as the one which produced this ROW. */
seen_this_string = 1;
}
else
{
@ -18662,7 +18667,7 @@ find_row_edges (struct it *it, struct glyph_row *row,
seen_this_string = 1;
}
else
abort ();
seen_this_string = 1;
}
}
/* Take note of each display string that covers a newline only