From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 30 Sep 2015 19:43:42 +0000 (+0300)
Subject: Avoid assertion violations in push_prefix_prop
X-Git-Tag: emacs-25.0.90~1223^2~47
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4a6780ea89009806928617a5ccf0e21d646452a7;p=emacs.git

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 41b84469fe3..bc76384a4f9 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