From: Gerd Moellmann <gerd@gnu.org>
Date: Fri, 31 Dec 1999 15:35:03 +0000 (+0000)
Subject: (next_element_from_buffer): Change assertion at the end
X-Git-Tag: emacs-pretest-21.0.90~5581
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c880678e3e327af3cd1d4230843a84bbe6303964;p=emacs.git

(next_element_from_buffer): Change assertion at the end
because it doesn't hold when there's an overlay string at the end
from which we deliver an image.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 34e6123607c..079be7210c9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+1999-12-31  Gerd Moellmann  <gerd@gnu.org>
+
+	* xdisp.c (next_element_from_buffer): Change assertion at the end
+	because it doesn't hold when there's an overlay string at the end
+	from which we deliver an image.
+
 1999-12-31  William M. Perry <wmperry@gnu.org>
 
 	* xfns.c (enum jpeg_keyword_index): Add JPEG_DATA.
diff --git a/src/xdisp.c b/src/xdisp.c
index 46240dfc30c..ddce21eb951 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3916,8 +3916,7 @@ next_element_from_buffer (it)
 	  else
 	    {
 	      it->overlay_strings_at_end_processed_p = 1;
-	      overlay_strings_follow_p
-		= get_overlay_strings (it);
+	      overlay_strings_follow_p = get_overlay_strings (it);
 	    }
 
 	  if (overlay_strings_follow_p)
@@ -3994,7 +3993,7 @@ next_element_from_buffer (it)
     }
 
   /* Value is zero if end of buffer reached.  */
-  xassert (!success_p || it->len > 0);
+  xassert (!success_p || it->what != IT_CHARACTER || it->len > 0);
   return success_p;
 }