(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 34e6123607c8867ec2c09b0e83c65933860258f8..079be7210c957988b87ffa80a9b2d361db12d66c 100644 (file)
--- 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 46240dfc30cab43233d3c3f2a8ac472226fa39ca..ddce21eb951432f2c9e96527de1a56e146a7132e 100644 (file)
--- 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;
 }