mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-17 17:58:46 +00:00
Code Issues Releases Activity

(init_from_display_pos): If POS says we're already after

Browse Source 
an overlay string ending at POS, make sure to pop the iterator
because it will be in front of that overlay string.  When POS is
ZV, we've thereby also ``processed'' overlay strings at ZV.
This commit is contained in:
Gerd Moellmann 2000-11-24 19:29:26 +00:00
parent 105602b171
commit 2be8f18448
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,5 +1,10 @@
2000-11-24 Gerd Moellmann <gerd@gnu.org>
* xdisp.c (init_from_display_pos): If POS says we're already after
an overlay string ending at POS, make sure to pop the iterator
because it will be in front of that overlay string. When POS is
ZV, we've thereby also ``processed'' overlay strings at ZV.
* xfaces.c (lface_from_face_name): Function comment fix.
2000-11-24 Miles Bader <miles@gnu.org>

15
src/xdisp.c
View File

@ -1730,7 +1730,20 @@ init_from_display_pos (it, w, pos)
it->current.string_pos = pos->string_pos;
it->method = next_element_from_string;
}
else if (CHARPOS (pos->string_pos) >= 0)
else if (it->current.overlay_string_index >= 0)
{
/* If POS says we're already after an overlay string ending at
POS, make sure to pop the iterator because it will be in
front of that overlay string. When POS is ZV, we've thereby
also ``processed'' overlay strings at ZV. */
pop_it (it);
it->current.overlay_string_index = -1;
it->method = next_element_from_buffer;
if (CHARPOS (pos->pos) == ZV)
it->overlay_strings_at_end_processed_p = 1;
}
if (CHARPOS (pos->string_pos) >= 0)
{
/* Recorded position is not in an overlay string, but in another
string. This can only be a string from a `display' property.