From: Kim F. Storm <storm@cua.dk>
Date: Wed, 17 May 2006 22:37:25 +0000 (+0000)
Subject: (display_tool_bar_line): Eliminate x_before variable.
X-Git-Tag: emacs-pretest-22.0.90~2527
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=59367bff6b65cb1992c43e1b57fdd9d4592b0a24;p=emacs.git

(display_tool_bar_line): Eliminate x_before variable.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 87764e5ecb6..d74b6d04aa5 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9491,7 +9491,7 @@ display_tool_bar_line (it, height)
 
   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 @@ display_tool_bar_line (it, height)
 	}
 
       /* 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;