diff options
| author | Kenichi Handa <handa@m17n.org> | 2011-02-17 16:47:29 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2011-02-17 16:47:29 +0900 |
| commit | dbc0543206eafc2e3bcad46e19629d817f496cf5 (patch) | |
| tree | 241659354e8239452b6a9ee7c3c67be57bd1d900 | |
| parent | 4648b91b097ad9f3dfbd8a988846293ea5a5c78c (diff) | |
| download | emacs-dbc0543206eafc2e3bcad46e19629d817f496cf5.tar.gz | |
Fix font-size handling bug.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/font.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 68e9c76a437..6b3c5bc3ab4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2011-02-17 Kenichi Handa <handa@m17n.org> + + * font.c (font_open_entity): Be sure to set scaled_pixel_size. + (font_find_for_lface): Check if attrs[LFACE_HEIGHT_INDEX] is + integer. + 2011-02-13 Eli Zaretskii <eliz@gnu.org> * xdisp.c (redisplay_internal): Resynchronize `w' if the selected diff --git a/src/font.c b/src/font.c index ebf0b547b9f..08309d3697b 100644 --- a/src/font.c +++ b/src/font.c @@ -3042,7 +3042,7 @@ font_open_entity (f, entity, pixel_size) Lisp_Object objlist, size, val, font_object; struct font *font; int min_width, height; - int scaled_pixel_size; + int scaled_pixel_size = pixel_size; font_assert (FONT_ENTITY_P (entity)); size = AREF (entity, FONT_SIZE_INDEX); @@ -3422,7 +3422,7 @@ font_find_for_lface (f, attrs, spec, c) XSETFRAME (frame, f); size = AREF (spec, FONT_SIZE_INDEX); pixel_size = font_pixel_size (f, spec); - if (pixel_size == 0) + if (pixel_size == 0 && INTEGERP (attrs[LFACE_HEIGHT_INDEX])) { double pt = XINT (attrs[LFACE_HEIGHT_INDEX]); |