Mercurial > emacs
changeset 108270:d9345841fefd
* xterm.c (x_draw_image_relief): Move declaration of extra to beginning.
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Thu, 06 May 2010 11:34:56 +0200 |
| parents | 96984953f99e |
| children | bfec7501a1f0 00dd71f829e6 |
| files | src/ChangeLog src/xterm.c |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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;