procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* xterm.c (x_draw_image_relief): Remove unused locals.

Browse source 
Fixes: debbugs:10500
This commit is contained in:
Paul Eggert 2012-12-01 17:06:14 -06:00
parent ba12ad69f1
commit 3e5490f7a5
2 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2012-12-01 Paul Eggert <eggert@cs.ucla.edu>
* xterm.c (x_draw_image_relief): Remove unused locals (Bug#10500).
2012-12-01 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* xterm.c (x_draw_relief_rect, x_draw_image_relief): Fix relief

15
src/xterm.c
View file

@ -2258,7 +2258,6 @@ static void
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 @@ x_draw_image_relief (struct glyph_string *s)
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;