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

[Kim F. Storm]

Index: emacs/src/xdisp.c
diff -u emacs/src/xdisp.c:1.1098 emacs/src/xdisp.c:1.1099
--- emacs/src/xdisp.c:1.1098    Wed May 17 22:24:13 2006
+++ emacs/src/xdisp.c   Wed May 17 22:37:25 2006
@@ -9491,7 +9491,7 @@
 
   while (it->current_x < max_x)
     {
-      int x_before, x, n_glyphs_before, i, nglyphs;
+      int x, n_glyphs_before, i, nglyphs;
       struct it it_before;
 
       /* Get the next display element.  */
@@ -9504,14 +9504,14 @@
        }
 
       /* Produce glyphs.  */
-      x_before = it->current_x;
-      n_glyphs_before = it->glyph_row->used[TEXT_AREA];
+      n_glyphs_before = row->used[TEXT_AREA];
       it_before = *it;
+
       PRODUCE_GLYPHS (it);
 
       nglyphs = row->used[TEXT_AREA] - n_glyphs_before;
       i = 0;
-      x = x_before;
+      x = it_before.current_x;
       while (i < nglyphs)
        {
          struct glyph *glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i;