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

(font_open_for_lface): Handle unspecified height attribute.

Browse source
This commit is contained in:
Chong Yidong 2009-01-08 13:34:44 +00:00
parent 14ccea62ca
commit 50b0cd29f7
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/font.c
View file

@ -3382,7 +3382,18 @@ font_open_for_lface (f, entity, attrs, spec)
size = font_pixel_size (f, spec);
else
{
double pt = XINT (attrs[LFACE_HEIGHT_INDEX]);
double pt;
if (INTEGERP (attrs[LFACE_HEIGHT_INDEX]))
pt = XINT (attrs[LFACE_HEIGHT_INDEX]);
else
{
struct face *def = FACE_FROM_ID (f, DEFAULT_FACE_ID);
Lisp_Object height = def->lface[LFACE_HEIGHT_INDEX];
if (INTEGERP (height))
pt = XINT (height);
else
abort(); /* We should never end up here. */
}
pt /= 10;
size = POINT_TO_PIXEL (pt, f->resy);