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

(produce_image_glyph): Remove unused variable 'face_ascent'.

Browse source 
(pint2hrstr): Add extra braces to silence compiler.
This commit is contained in:
Kim F. Storm 2004-11-09 13:26:01 +00:00
parent 44455197d9
commit 0162fa4ea6
1 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/xdisp.c
View file

@ -16041,27 +16041,31 @@ pint2hrstr (buf, width, d)
{
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 @@ produce_image_glyph (it)
{
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 @@ produce_image_glyph (it)
#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