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

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

Browse source 
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.
This commit is contained in:
Eli Zaretskii 2011-10-17 19:03:20 +02:00
parent 5a7c536b92
commit 2c91f553b7
2 changed files with 8 additions and 1 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-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

3
src/xdisp.c
View file

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