Commit 2be8f184 authored by Gerd Moellmann's avatar Gerd Moellmann
Browse files

(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.
parent 105602b1
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>
......
......@@ -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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment