Commit 310316cf authored by Kim F. Storm's avatar Kim F. Storm
Browse files

(handle_stop): Skip overlay string handling if

ignore_overlay_strings_at_pos_p is set.
(set_iterator_to_next): At end of display vector, set
ignore_overlay_strings_at_pos_p if dpvec came from an overlay
string, so we skip those overlay strings at current pos.
parent 6a77a9f5
......@@ -2978,11 +2978,13 @@ handle_stop (it)
struct it *it;
{
enum prop_handled handled;
int handle_overlay_change_p = 1;
int handle_overlay_change_p;
struct props *p;
 
it->dpvec = NULL;
it->current.dpvec_index = -1;
handle_overlay_change_p = !it->ignore_overlay_strings_at_pos_p;
it->ignore_overlay_strings_at_pos_p = 0;
 
/* Use face of preceding text for ellipsis (if invisible) */
if (it->selective_display_ellipsis_p)
......@@ -5686,6 +5688,9 @@ set_iterator_to_next (it, reseat_p)
reseat_at_next_visible_line_start (it, 1);
else if (it->dpvec_char_len > 0)
{
if (it->method == GET_FROM_STRING
&& it->n_overlay_strings > 0)
it->ignore_overlay_strings_at_pos_p = 1;
it->len = it->dpvec_char_len;
set_iterator_to_next (it, reseat_p);
}
......
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