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)

diff --git a/src/xdisp.c b/src/xdisp.c
index 41b84469fe3bc71a1d1056f0e50fef9b9be6d7d0..bc76384a4f996f69720259d25497b395906ee3d7 100644 (file)
--- 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