[Emacs-diffs] /srv/bzr/emacs/trunk r100166: * xterm.c (x_draw_image_relief): Move declaration of extra to beginning.

[Jan D.]

------------------------------------------------------------
revno: 100166
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Thu 2010-05-06 11:34:56 +0200
message:
  * xterm.c (x_draw_image_relief): Move declaration of extra to beginning.
modified:
  src/ChangeLog
  src/xterm.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-06 07:24:18 +0000
+++ b/src/ChangeLog     2010-05-06 09:34:56 +0000
@@ -1,3 +1,7 @@
+2010-05-06  Jan Djärv  <address@hidden>
+
+       * xterm.c (x_draw_image_relief): Move declaration of extra to beginning.
+
 2010-05-06  Glenn Morris  <address@hidden>
 
        * Makefile.in (CPP, LN_S): Remove unused variables.

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2010-05-02 18:44:04 +0000
+++ b/src/xterm.c       2010-05-06 09:34:56 +0000
@@ -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;