Mercurial > emacs
diff src/font.c @ 98451:db015b441c0c
* nsfont.m (nsfont_spec_to_traits): Use UnXX masks only for non-normal styles. (nsfont_open): Reenable the cache.
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Wed, 01 Oct 2008 17:12:49 +0000 |
| parents | 5d2542d6df18 |
| children | bd9b20fa24a6 |
line wrap: on
line diff
--- a/src/font.c Wed Oct 01 16:23:28 2008 +0000 +++ b/src/font.c Wed Oct 01 17:12:49 2008 +0000 @@ -2770,9 +2770,9 @@ XSETFRAME (frame, f); ftype = AREF (spec, FONT_TYPE_INDEX); size = AREF (spec, FONT_SIZE_INDEX); + if (FLOATP (size)) - ASET (spec, FONT_SIZE_INDEX, make_number (font_pixel_size (f, spec))); - + ASET (work, FONT_SIZE_INDEX, make_number (font_pixel_size (f, spec))); FONT_SET_STYLE (work, FONT_WEIGHT_INDEX, attrs[LFACE_WEIGHT_INDEX]); FONT_SET_STYLE (work, FONT_SLANT_INDEX, attrs[LFACE_SLANT_INDEX]); FONT_SET_STYLE (work, FONT_WIDTH_INDEX, attrs[LFACE_SWIDTH_INDEX]); @@ -2799,8 +2799,6 @@ if (! NILP (entity)) break; } - ASET (spec, FONT_TYPE_INDEX, ftype); - ASET (spec, FONT_SIZE_INDEX, size); font_add_log ("match", work, entity); return entity; }