Mercurial > emacs
comparison src/xdisp.c @ 27056:8cf3702104b5
(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.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Fri, 31 Dec 1999 15:34:21 +0000 |
| parents | 526f3b2398ce |
| children | 0f307c7f49ba |
comparison
equal
deleted
inserted
replaced
| 27055:f43dabd831f2 | 27056:8cf3702104b5 |
|---|---|
| 3914 if (it->overlay_strings_at_end_processed_p) | 3914 if (it->overlay_strings_at_end_processed_p) |
| 3915 overlay_strings_follow_p = 0; | 3915 overlay_strings_follow_p = 0; |
| 3916 else | 3916 else |
| 3917 { | 3917 { |
| 3918 it->overlay_strings_at_end_processed_p = 1; | 3918 it->overlay_strings_at_end_processed_p = 1; |
| 3919 overlay_strings_follow_p | 3919 overlay_strings_follow_p = get_overlay_strings (it); |
| 3920 = get_overlay_strings (it); | |
| 3921 } | 3920 } |
| 3922 | 3921 |
| 3923 if (overlay_strings_follow_p) | 3922 if (overlay_strings_follow_p) |
| 3924 success_p = get_next_display_element (it); | 3923 success_p = get_next_display_element (it); |
| 3925 else | 3924 else |
| 3992 } | 3991 } |
| 3993 } | 3992 } |
| 3994 } | 3993 } |
| 3995 | 3994 |
| 3996 /* Value is zero if end of buffer reached. */ | 3995 /* Value is zero if end of buffer reached. */ |
| 3997 xassert (!success_p || it->len > 0); | 3996 xassert (!success_p || it->what != IT_CHARACTER || it->len > 0); |
| 3998 return success_p; | 3997 return success_p; |
| 3999 } | 3998 } |
| 4000 | 3999 |
| 4001 | 4000 |
| 4002 /* Run the redisplay end trigger hook for IT. */ | 4001 /* Run the redisplay end trigger hook for IT. */ |