diff options
| author | Kenichi Handa | 2012-11-23 23:36:24 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-11-23 23:36:24 +0900 |
| commit | 2aaec2d9be5cec44ea3b59cba476fd3e091f2fc9 (patch) | |
| tree | 3711b97807201b7eeaa066003b1c3a4ce929e5bb /src/xftfont.c | |
| parent | e1d276cbf9e18f13101328f56bed1a1c0a66e63a (diff) | |
| parent | e7d0e5ee247a155a268ffbf80bedbe25e15b5032 (diff) | |
| download | emacs-2aaec2d9be5cec44ea3b59cba476fd3e091f2fc9.tar.gz emacs-2aaec2d9be5cec44ea3b59cba476fd3e091f2fc9.zip | |
Diffstat (limited to 'src/xftfont.c')
| -rw-r--r-- | src/xftfont.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/xftfont.c b/src/xftfont.c index 372ed87705f..181a1da9b38 100644 --- a/src/xftfont.c +++ b/src/xftfont.c | |||
| @@ -369,7 +369,7 @@ xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size) | |||
| 369 | ASET (font_object, FONT_FORMAT_INDEX, | 369 | ASET (font_object, FONT_FORMAT_INDEX, |
| 370 | ftfont_font_format (xftfont->pattern, filename)); | 370 | ftfont_font_format (xftfont->pattern, filename)); |
| 371 | font = XFONT_OBJECT (font_object); | 371 | font = XFONT_OBJECT (font_object); |
| 372 | font->pixel_size = pixel_size; | 372 | font->pixel_size = size; |
| 373 | font->driver = &xftfont_driver; | 373 | font->driver = &xftfont_driver; |
| 374 | font->encoding_charset = font->repertory_charset = -1; | 374 | font->encoding_charset = font->repertory_charset = -1; |
| 375 | 375 | ||
| @@ -387,8 +387,6 @@ xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size) | |||
| 387 | xftfont_info->matrix.xy = 0x10000L * matrix->xy; | 387 | xftfont_info->matrix.xy = 0x10000L * matrix->xy; |
| 388 | xftfont_info->matrix.yx = 0x10000L * matrix->yx; | 388 | xftfont_info->matrix.yx = 0x10000L * matrix->yx; |
| 389 | } | 389 | } |
| 390 | font->pixel_size = size; | ||
| 391 | font->driver = &xftfont_driver; | ||
| 392 | if (INTEGERP (AREF (entity, FONT_SPACING_INDEX))) | 390 | if (INTEGERP (AREF (entity, FONT_SPACING_INDEX))) |
| 393 | spacing = XINT (AREF (entity, FONT_SPACING_INDEX)); | 391 | spacing = XINT (AREF (entity, FONT_SPACING_INDEX)); |
| 394 | else | 392 | else |