[Emacs-diffs] master 4a6780e: Avoid assertion violations in push_prefix_prop

[Eli Zaretskii]

branch: master
commit 4a6780ea89009806928617a5ccf0e21d646452a7
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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)
---
 src/xdisp.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index 41b8446..bc76384 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -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