[Emacs-diffs] /srv/bzr/emacs/trunk r106131: Fix part 2 of bug #9771 with lines that start with a display vector.

[Eli Zaretskii]

------------------------------------------------------------
revno: 106131
fixes bug(s): http://debbugs.gnu.org/9771
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2011-10-19 11:48:35 +0200
message:
  Fix part 2 of bug #9771 with lines that start with a display vector.
  
   src/xdisp.c (start_display): If the character at POS is displayed
   via a display vector, reset IT->current.dpvec_index to zero.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-10-18 21:07:56 +0000
+++ b/src/ChangeLog     2011-10-19 09:48:35 +0000
@@ -1,3 +1,9 @@
+2011-10-19  Eli Zaretskii  <address@hidden>
+
+       * xdisp.c (start_display): If the character at POS is displayed
+       via a display vector, reset IT->current.dpvec_index to zero.
+       (Bug#9771, part 2)
+
 2011-10-18  Chong Yidong  <address@hidden>
 
        * xdisp.c (get_next_display_element): Handle U+2010 and U+2011

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-10-18 21:07:56 +0000
+++ b/src/xdisp.c       2011-10-19 09:48:35 +0000
@@ -2851,6 +2851,13 @@
 
              it->continuation_lines_width += it->current_x;
            }
+         /* If the character at POS is displayed via a display
+            vector, move_it_to above stops at the final glyph of
+            IT->dpvec.  To make the caller redisplay that character
+            again (a.k.a. start at POS), we need to reset the
+            dpvec_index to the beginning of IT->dpvec.  */
+         else if (it->current.dpvec_index >= 0)
+           it->current.dpvec_index = 0;
 
          /* We're starting a new display line, not affected by the
             height of the continued line, so clear the appropriate