diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-11-23 14:23:28 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-11-23 14:23:28 +0800 |
| commit | 12645ae6912e7627d71ebbc7c37d9335cd0a429e (patch) | |
| tree | 022f580eb0c30f786eddbfee883eee50d0edb8d5 | |
| parent | 15c9d04ea4b75254aef346161998e08509736fc0 (diff) | |
| download | emacs-12645ae6912e7627d71ebbc7c37d9335cd0a429e.tar.gz | |
* xftfont.c (xftfont_open): Remove duplicate assignment.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xftfont.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2e485f1b87b..d0f4ad6869d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-11-23 Chong Yidong <cyd@gnu.org> + + * xftfont.c (xftfont_open): Remove duplicate assignment. + 2012-11-22 Dmitry Antipov <dmantipov@yandex.ru> * alloc.c (Fgarbage_collect): Unblock input after clearing 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) ASET (font_object, FONT_FORMAT_INDEX, ftfont_font_format (xftfont->pattern, filename)); font = XFONT_OBJECT (font_object); - font->pixel_size = pixel_size; + font->pixel_size = size; font->driver = &xftfont_driver; font->encoding_charset = font->repertory_charset = -1; @@ -387,8 +387,6 @@ xftfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size) xftfont_info->matrix.xy = 0x10000L * matrix->xy; xftfont_info->matrix.yx = 0x10000L * matrix->yx; } - font->pixel_size = size; - font->driver = &xftfont_driver; if (INTEGERP (AREF (entity, FONT_SPACING_INDEX))) spacing = XINT (AREF (entity, FONT_SPACING_INDEX)); else |