Commit 2c91f553 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Fix part 4 of bug#9771 with assertion violation when wrap-prefix is used

for a line that begins with control characters.

 src/xdisp.c (push_display_prop): Determine whether to record string
 or buffer position by IT->string, not by IT->method.  Allow
 GET_FROM_DISPLAY_VECTOR as IT->method on entry.
parent 5a7c536b
2011-10-17 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (push_display_prop): Determine whether to record string
or buffer position by IT->string, not by IT->method. Allow
GET_FROM_DISPLAY_VECTOR as IT->method on entry. (Bug#9771, part 4)
2011-10-15 Martin Rudalics <rudalics@gmx.at>
* window.c (coordinates_in_window): Rewrite and delabelize
......
......@@ -18427,9 +18427,10 @@ static int
push_display_prop (struct it *it, Lisp_Object prop)
{
struct text_pos pos =
(it->method == GET_FROM_STRING) ? it->current.string_pos : it->current.pos;
STRINGP (it->string) ? it->current.string_pos : it->current.pos;
xassert (it->method == GET_FROM_BUFFER
|| it->method == GET_FROM_DISPLAY_VECTOR
|| it->method == GET_FROM_STRING);
/* We need to save the current buffer/string position, so it will be
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment