diff options
| author | Eli Zaretskii | 2015-09-30 22:43:42 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2015-09-30 22:43:42 +0300 |
| commit | 4a6780ea89009806928617a5ccf0e21d646452a7 (patch) | |
| tree | 7c5586fb374ebc196a29126a8f5d0f9a7bdbf3bb | |
| parent | 80a86074a8cbbfc8dffb54c9d872b47e2bdfd701 (diff) | |
| download | emacs-4a6780ea89009806928617a5ccf0e21d646452a7.tar.gz emacs-4a6780ea89009806928617a5ccf0e21d646452a7.zip | |
Avoid assertion violations in push_prefix_prop
* src/xdisp.c (push_prefix_prop): Avoid assertion violations when
a line that has a line-prefix defined starts with an image. (Bug#21428)
| -rw-r--r-- | src/xdisp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 41b84469fe3..bc76384a4f9 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -19836,7 +19836,8 @@ push_prefix_prop (struct it *it, Lisp_Object prop) | |||
| 19836 | 19836 | ||
| 19837 | eassert (it->method == GET_FROM_BUFFER | 19837 | eassert (it->method == GET_FROM_BUFFER |
| 19838 | || it->method == GET_FROM_DISPLAY_VECTOR | 19838 | || it->method == GET_FROM_DISPLAY_VECTOR |
| 19839 | || it->method == GET_FROM_STRING); | 19839 | || it->method == GET_FROM_STRING |
| 19840 | || it->method == GET_FROM_IMAGE); | ||
| 19840 | 19841 | ||
| 19841 | /* We need to save the current buffer/string position, so it will be | 19842 | /* We need to save the current buffer/string position, so it will be |
| 19842 | restored by pop_it, because iterate_out_of_display_property | 19843 | restored by pop_it, because iterate_out_of_display_property |