Mercurial > emacs
changeset 58095:fbc455eba14e
(produce_image_glyph): Remove unused variable 'face_ascent'.
(pint2hrstr): Add extra braces to silence compiler.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Tue, 09 Nov 2004 13:26:01 +0000 |
| parents | 1f8360dd535b |
| children | b32fa5b7492d |
| files | src/xdisp.c |
| diffstat | 1 files changed, 24 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xdisp.c Tue Nov 09 13:24:35 2004 +0000 +++ b/src/xdisp.c Tue Nov 09 13:26:01 2004 +0000 @@ -16041,27 +16041,31 @@ { tenths = remainder / 100; if (50 <= remainder % 100) - if (tenths < 9) - tenths++; - else - { - quotient++; - if (quotient == 10) - tenths = -1; - else - tenths = 0; - } + { + if (tenths < 9) + tenths++; + else + { + quotient++; + if (quotient == 10) + tenths = -1; + else + tenths = 0; + } + } } else if (500 <= remainder) - if (quotient < 999) - quotient++; - else - { - quotient = 1; - exponent++; - tenths = 0; - } + { + if (quotient < 999) + quotient++; + else + { + quotient = 1; + exponent++; + tenths = 0; + } + } } /* Calculate the LENGTH of QUOTIENT.TENTHS as a string. */ @@ -18348,7 +18352,7 @@ { struct image *img; struct face *face; - int face_ascent, glyph_ascent; + int glyph_ascent; struct glyph_slice slice; xassert (it->what == IT_IMAGE); @@ -18431,7 +18435,7 @@ #if 0 /* this breaks image tiling */ /* If this glyph is alone on the last line, adjust it.ascent to minimum row ascent. */ - face_ascent = face->font ? FONT_BASE (face->font) : FRAME_BASELINE_OFFSET (it->f); + int face_ascent = face->font ? FONT_BASE (face->font) : FRAME_BASELINE_OFFSET (it->f); if (face_ascent > it->ascent) it->ascent = it->phys_ascent = face_ascent; #endif