emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r99397: * xdisp.c (draw_glyphs): Upda


From: YAMAMOTO Mitsuharu
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r99397: * xdisp.c (draw_glyphs): Update `start' for left_overwritten case as in Emacs 22.
Date: Sat, 23 Jan 2010 14:20:38 +0900
User-agent: Bazaar (2.0.2)

------------------------------------------------------------
revno: 99397
committer: YAMAMOTO Mitsuharu <address@hidden>
branch nick: trunk
timestamp: Sat 2010-01-23 14:20:38 +0900
message:
  * xdisp.c (draw_glyphs): Update `start' for left_overwritten case as in Emacs 
22.
modified:
  src/ChangeLog
  src/xdisp.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-01-22 09:10:04 +0000
+++ b/src/ChangeLog     2010-01-23 05:20:38 +0000
@@ -1,3 +1,8 @@
+2010-01-23  YAMAMOTO Mitsuharu  <address@hidden>
+
+       * xdisp.c (draw_glyphs): Update `start' for left_overwritten case
+       as in Emacs 22.
+
 2010-01-22  YAMAMOTO Mitsuharu  <address@hidden>
 
        * lisp.h (make_pure_string): String pointer arg now points to const.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2010-01-16 11:58:42 +0000
+++ b/src/xdisp.c       2010-01-23 05:20:38 +0000
@@ -20401,6 +20401,7 @@
          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 @@
 
          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;


reply via email to

[Prev in Thread] Current Thread [Next in Thread]