mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-30 08:09:04 +00:00
Code Issues Releases Activity

(next_element_from_buffer): Change assertion at the end

Browse Source 
because it doesn't hold when there's an overlay string at the end
from which we deliver an image.
This commit is contained in:
Gerd Moellmann 1999-12-31 15:35:03 +00:00
parent 3bd37feb63
commit c880678e3e
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@ -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.

5
src/xdisp.c
View File

@ -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;
}