Mercurial > emacs
changeset 37107:2225c7aa0a64
(get_overlay_strings): Set iterator's end_charpos.
(set_iterator_to_next): If a string from a display property ends,
consider the case that this might also be the end of an
overlay string having the display property.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Fri, 30 Mar 2001 18:35:15 +0000 |
| parents | 3fd2176c610c |
| children | 932f6c5dc934 |
| files | src/xdisp.c |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xdisp.c Fri Mar 30 17:52:51 2001 +0000 +++ b/src/xdisp.c Fri Mar 30 18:35:15 2001 +0000 @@ -3595,8 +3595,9 @@ /* Set up IT to deliver display elements from the first overlay string. */ IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = 0; + it->string = it->overlay_strings[0]; it->stop_charpos = 0; - it->string = it->overlay_strings[0]; + it->end_charpos = XSTRING (it->string)->size; it->multibyte_p = STRING_MULTIBYTE (it->string); xassert (STRINGP (it->string)); it->method = next_element_from_string; @@ -4375,6 +4376,8 @@ pop_it (it); if (!STRINGP (it->string)) it->method = next_element_from_buffer; + else + goto consider_string_end; } } }