diff options
| author | Paul Eggert | 2011-02-24 22:42:06 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-02-24 22:42:06 -0800 |
| commit | a07b892ff17e95e513c4bfe6e2dd73df1e589bf3 (patch) | |
| tree | a3d1a40c919618c9a452a405838cff23819777fe /src/font.c | |
| parent | ae0d725005539d9259efac6a81ff8fdd45eb69a6 (diff) | |
| parent | b18947669cd182ec8487b317460f6df5878d0f11 (diff) | |
| download | emacs-a07b892ff17e95e513c4bfe6e2dd73df1e589bf3.tar.gz emacs-a07b892ff17e95e513c4bfe6e2dd73df1e589bf3.zip | |
Merge from mainline.
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 d77eafb6ad2..35821ae34f9 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -2806,7 +2806,7 @@ font_open_entity (FRAME_PTR f, Lisp_Object entity, int pixel_size) | |||
| 2806 | Lisp_Object objlist, size, val, font_object; | 2806 | Lisp_Object objlist, size, val, font_object; |
| 2807 | struct font *font; | 2807 | struct font *font; |
| 2808 | int min_width, height; | 2808 | int min_width, height; |
| 2809 | int scaled_pixel_size; | 2809 | int scaled_pixel_size = pixel_size; |
| 2810 | 2810 | ||
| 2811 | font_assert (FONT_ENTITY_P (entity)); | 2811 | font_assert (FONT_ENTITY_P (entity)); |
| 2812 | size = AREF (entity, FONT_SIZE_INDEX); | 2812 | size = AREF (entity, FONT_SIZE_INDEX); |
| @@ -3121,7 +3121,7 @@ font_find_for_lface (FRAME_PTR f, Lisp_Object *attrs, Lisp_Object spec, int c) | |||
| 3121 | XSETFRAME (frame, f); | 3121 | XSETFRAME (frame, f); |
| 3122 | size = AREF (spec, FONT_SIZE_INDEX); | 3122 | size = AREF (spec, FONT_SIZE_INDEX); |
| 3123 | pixel_size = font_pixel_size (f, spec); | 3123 | pixel_size = font_pixel_size (f, spec); |
| 3124 | if (pixel_size == 0) | 3124 | if (pixel_size == 0 && INTEGERP (attrs[LFACE_HEIGHT_INDEX])) |
| 3125 | { | 3125 | { |
| 3126 | double pt = XINT (attrs[LFACE_HEIGHT_INDEX]); | 3126 | double pt = XINT (attrs[LFACE_HEIGHT_INDEX]); |
| 3127 | 3127 | ||