Commit 12645ae6 authored by Chong Yidong's avatar Chong Yidong
Browse files

* xftfont.c (xftfont_open): Remove duplicate assignment.

parent 15c9d04e
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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment