[Emacs-diffs] /srv/bzr/emacs/trunk r111059: * xterm.c (x_draw_image_relief): Remove unused locals.

[Paul Eggert]

------------------------------------------------------------
revno: 111059
fixes bug: http://debbugs.gnu.org/10500
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2012-12-01 17:06:14 -0600
message:
  * xterm.c (x_draw_image_relief): Remove unused locals.
modified:
  src/ChangeLog
  src/xterm.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-12-01 02:38:11 +0000
+++ b/src/ChangeLog     2012-12-01 23:06:14 +0000
@@ -1,3 +1,7 @@
+2012-12-01  Paul Eggert  <address@hidden>
+
+       * xterm.c (x_draw_image_relief): Remove unused locals (Bug#10500).
+
 2012-12-01  YAMAMOTO Mitsuharu  <address@hidden>
 
        * xterm.c (x_draw_relief_rect, x_draw_image_relief): Fix relief

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2012-12-01 02:38:11 +0000
+++ b/src/xterm.c       2012-12-01 23:06:14 +0000
@@ -2258,7 +2258,6 @@
 x_draw_image_relief (struct glyph_string *s)
 {
   int x1, y1, thick, raised_p, top_p, bot_p, left_p, right_p;
-  int extra_x, extra_y;
   XRectangle r;
   int x = s->x;
   int y = s->ybase - image_ascent (s->img, s->face, &s->slice);
@@ -2289,20 +2288,6 @@
       raised_p = s->img->relief > 0;
     }
 
-  extra_x = extra_y = 0;
-  if (s->face->id == TOOL_BAR_FACE_ID)
-    {
-      if (CONSP (Vtool_bar_button_margin)
-         && INTEGERP (XCAR (Vtool_bar_button_margin))
-         && INTEGERP (XCDR (Vtool_bar_button_margin)))
-       {
-         extra_x = XINT (XCAR (Vtool_bar_button_margin));
-         extra_y = XINT (XCDR (Vtool_bar_button_margin));
-       }
-      else if (INTEGERP (Vtool_bar_button_margin))
-       extra_x = extra_y = XINT (Vtool_bar_button_margin);
-    }
-
   x1 = x + s->slice.width - 1;
   y1 = y + s->slice.height - 1;
   top_p = bot_p = left_p = right_p = 0;