diff options
| author | Kenichi Handa | 2011-02-17 16:47:29 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2011-02-17 16:47:29 +0900 |
| commit | dbc0543206eafc2e3bcad46e19629d817f496cf5 (patch) | |
| tree | 241659354e8239452b6a9ee7c3c67be57bd1d900 /src/font.c | |
| parent | 4648b91b097ad9f3dfbd8a988846293ea5a5c78c (diff) | |
| download | emacs-dbc0543206eafc2e3bcad46e19629d817f496cf5.tar.gz emacs-dbc0543206eafc2e3bcad46e19629d817f496cf5.zip | |
Fix font-size handling bug.
Diffstat (limited to 'src/font.c')
| -rw-r--r-- | src/font.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
| 3042 | Lisp_Object objlist, size, val, font_object; | 3042 | Lisp_Object objlist, size, val, font_object; |
| 3043 | struct font *font; | 3043 | struct font *font; |
| 3044 | int min_width, height; | 3044 | int min_width, height; |
| 3045 | int scaled_pixel_size; | 3045 | int scaled_pixel_size = pixel_size; |
| 3046 | 3046 | ||
| 3047 | font_assert (FONT_ENTITY_P (entity)); | 3047 | font_assert (FONT_ENTITY_P (entity)); |
| 3048 | size = AREF (entity, FONT_SIZE_INDEX); | 3048 | size = AREF (entity, FONT_SIZE_INDEX); |
| @@ -3422,7 +3422,7 @@ font_find_for_lface (f, attrs, spec, c) | |||
| 3422 | XSETFRAME (frame, f); | 3422 | XSETFRAME (frame, f); |
| 3423 | size = AREF (spec, FONT_SIZE_INDEX); | 3423 | size = AREF (spec, FONT_SIZE_INDEX); |
| 3424 | pixel_size = font_pixel_size (f, spec); | 3424 | pixel_size = font_pixel_size (f, spec); |
| 3425 | if (pixel_size == 0) | 3425 | if (pixel_size == 0 && INTEGERP (attrs[LFACE_HEIGHT_INDEX])) |
| 3426 | { | 3426 | { |
| 3427 | double pt = XINT (attrs[LFACE_HEIGHT_INDEX]); | 3427 | double pt = XINT (attrs[LFACE_HEIGHT_INDEX]); |
| 3428 | 3428 | ||