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.

diff --git a/src/ChangeLog b/src/ChangeLog
index ce049ebfc84bab056a61c79b66f90ab532f02595..9abbe450d3d25b89bf469a0485858ed98e601af1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-19  Eli Zaretskii  <eliz@gnu.org>
+
+       * 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  <cyd@gnu.org>
 
        * xdisp.c (get_next_display_element): Handle U+2010 and U+2011

diff --git a/src/xdisp.c b/src/xdisp.c
index 75763616f7289ab3bd1c8cd44048ea9dced9def4..50ddd6b08b806d1c304ccf965943fc0626008f73 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2851,6 +2851,13 @@ start_display (struct it *it, struct window *w, struct text_pos pos)
 
              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