[Emacs-diffs] Changes to emacs/src/xdisp.c

[Kim F . Storm]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.1067 emacs/src/xdisp.c:1.1068
*** emacs/src/xdisp.c:1.1067    Mon Nov  7 11:55:20 2005
--- emacs/src/xdisp.c   Fri Nov 11 15:33:23 2005
***************
*** 2978,2988 ****
       struct it *it;
  {
    enum prop_handled handled;
!   int handle_overlay_change_p = 1;
    struct props *p;
  
    it->dpvec = NULL;
    it->current.dpvec_index = -1;
  
    /* Use face of preceding text for ellipsis (if invisible) */
    if (it->selective_display_ellipsis_p)
--- 2978,2990 ----
       struct it *it;
  {
    enum prop_handled handled;
!   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,5691 ****
--- 5688,5696 ----
            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);
            }