* xdisp.c (draw_glyphs): Update `start' for left_overwritten case as in Emacs 22.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5589b7f34a2925b4701e541969eb103fffad74be..62337d8db63662df8db4245772c11be95a6cfb67 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-23  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * xdisp.c (draw_glyphs): Update `start' for left_overwritten case
+       as in Emacs 22.
+
 2010-01-22  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * lisp.h (make_pure_string): String pointer arg now points to const.

diff --git a/src/xdisp.c b/src/xdisp.c
index 7d43f2d8bef4d3d1afd4790feaf68cbbddf5e996..8e356224c8a4ad452fb05a89e8ba9dec8981353d 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -20401,6 +20401,7 @@ draw_glyphs (w, x, row, area, start, end, hl, overlaps)
          j = i;
          BUILD_GLYPH_STRINGS (j, start, h, t,
                               overlap_hl, dummy_x, last_x);
+         start = i;
          compute_overhangs_and_x (t, head->x, 1);
          prepend_glyph_string_lists (&head, &tail, h, t);
          clip_head = head;
@@ -20450,6 +20451,8 @@ draw_glyphs (w, x, row, area, start, end, hl, overlaps)
 
          BUILD_GLYPH_STRINGS (end, i, h, t,
                               overlap_hl, x, last_x);
+         /* Because BUILD_GLYPH_STRINGS updates the first argument,
+            we don't have `end = i;' here.  */
          compute_overhangs_and_x (h, tail->x + tail->width, 0);
          append_glyph_string_lists (&head, &tail, h, t);
          clip_tail = tail;