diff options
| author | Kenichi Handa <handa@m17n.org> | 2008-12-16 11:30:23 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2008-12-16 11:30:23 +0000 |
| commit | a35dd56b8832c67d3ab0d8dc73002045593615d3 (patch) | |
| tree | 23d3eb4efaf7e32b64c2974ba2234ddde4fc2dd4 /src | |
| parent | 58d8c5cd845ceeb45f7de4e5c526b835cdc34fab (diff) | |
| download | emacs-a35dd56b8832c67d3ab0d8dc73002045593615d3.tar.gz | |
(font_open_entity): Fix previous change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/font.c | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 213cc707efa..95cbce4dbb0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2008-12-16 Kenichi Handa <handa@m17n.org> + + * font.c (font_open_entity): Fix previous change. + 2008-12-16 Dan Nicolaescu <dann@ics.uci.edu> * process.c: Include <limits.h>. diff --git a/src/font.c b/src/font.c index d428b9e830c..2f98141b53d 100644 --- a/src/font.c +++ b/src/font.c @@ -2877,13 +2877,14 @@ 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; font_assert (FONT_ENTITY_P (entity)); size = AREF (entity, FONT_SIZE_INDEX); if (XINT (size) != 0) - pixel_size = XINT (size); + scaled_pixel_size = pixel_size = XINT (size); else if (CONSP (Vface_font_rescale_alist)) - pixel_size *= font_rescale_ratio (entity); + scaled_pixel_size = pixel_size * font_rescale_ratio (entity); for (objlist = AREF (entity, FONT_OBJLIST_INDEX); CONSP (objlist); objlist = XCDR (objlist)) @@ -2898,7 +2899,8 @@ font_open_entity (f, entity, pixel_size) if (! driver_list) return Qnil; - font_object = driver_list->driver->open (f, entity, pixel_size); + font_object = driver_list->driver->open (f, entity, scaled_pixel_size); + ASET (font_object, FONT_SIZE_INDEX, make_number (pixel_size)); font_add_log ("open", entity, font_object); if (NILP (font_object)) return Qnil; |