# HG changeset patch
# User Jan D. <jan.h.d@swipnet.se>
# Date 1273138496 -7200
# Node ID d9345841fefd7ad7ae12e6564a145e04be9d4d62
# Parent  96984953f99ead256538198b9b4cd95c7a6d4669
* xterm.c (x_draw_image_relief): Move declaration of extra to beginning.

diff -r 96984953f99e -r d9345841fefd src/ChangeLog
--- a/src/ChangeLog	Thu May 06 10:40:06 2010 +0200
+++ b/src/ChangeLog	Thu May 06 11:34:56 2010 +0200
@@ -1,3 +1,7 @@
+2010-05-06  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* xterm.c (x_draw_image_relief): Move declaration of extra to beginning.
+
 2010-05-06  Glenn Morris  <rgm@gnu.org>
 
 	* Makefile.in (CPP, LN_S): Remove unused variables.
diff -r 96984953f99e -r d9345841fefd src/xterm.c
--- a/src/xterm.c	Thu May 06 10:40:06 2010 +0200
+++ b/src/xterm.c	Thu May 06 11:34:56 2010 +0200
@@ -2291,7 +2291,7 @@
 x_draw_image_relief (s)
      struct glyph_string *s;
 {
-  int x0, y0, x1, y1, thick, raised_p;
+  int x0, y0, x1, y1, thick, raised_p, extra;
   XRectangle r;
   int x = s->x;
   int y = s->ybase - image_ascent (s->img, s->face, &s->slice);
@@ -2322,7 +2322,7 @@
       raised_p = s->img->relief > 0;
     }
 
-  int extra = s->face->id == TOOL_BAR_FACE_ID
+  extra = s->face->id == TOOL_BAR_FACE_ID
     ? XINT (Vtool_bar_button_margin) : 0;
   
   x0 = x - thick - extra;