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

Avoid assertion violations in push_prefix_prop

Browse source 
* src/xdisp.c (push_prefix_prop): Avoid assertion violations when
a line that has a line-prefix defined starts with an image.  (Bug#21428)
This commit is contained in:
Eli Zaretskii 2015-09-30 22:43:42 +03:00
parent 80a86074a8
commit 4a6780ea89
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/xdisp.c
View file

@ -19836,7 +19836,8 @@ push_prefix_prop (struct it *it, Lisp_Object prop)
eassert (it->method == GET_FROM_BUFFER
|| it->method == GET_FROM_DISPLAY_VECTOR
|| it->method == GET_FROM_STRING);
|| it->method == GET_FROM_STRING
|| it->method == GET_FROM_IMAGE);
/* We need to save the current buffer/string position, so it will be
restored by pop_it, because iterate_out_of_display_property