aboutsummaryrefslogtreecommitdiffstats
path: root/src/ftxfont.c
diff options
context:
space:
mode:
authorDmitry Antipov2013-12-13 19:55:23 +0400
committerDmitry Antipov2013-12-13 19:55:23 +0400
commit5035fbc19e2f569674237c61e6ffdd4719e092d5 (patch)
tree86e7b51ececff332f6bd3bebd92f389cc4024ce8 /src/ftxfont.c
parentb6c888cc7afed65f24c023b8e90b73649f438e14 (diff)
downloademacs-5035fbc19e2f569674237c61e6ffdd4719e092d5.tar.gz
emacs-5035fbc19e2f569674237c61e6ffdd4719e092d5.zip
* alloc.c, font.c, font.h, ftfont.c, ftxfont.c, macfont.m,
* nsfont.m, w32font.c, xfont.c, xftfont.c: Revert last and 2013-12-12 font-related change to avoid Bug#16128, which is quite hard to fix without even more substantial changes.
Diffstat (limited to 'src/ftxfont.c')
-rw-r--r--src/ftxfont.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/ftxfont.c b/src/ftxfont.c
index b44905d88cd..d1aa3e40403 100644
--- a/src/ftxfont.c
+++ b/src/ftxfont.c
@@ -255,7 +255,6 @@ ftxfont_open (struct frame *f, Lisp_Object entity, int pixel_size)
255 if (NILP (font_object)) 255 if (NILP (font_object))
256 return Qnil; 256 return Qnil;
257 font = XFONT_OBJECT (font_object); 257 font = XFONT_OBJECT (font_object);
258 eassert (font->frame == f);
259 font->driver = &ftxfont_driver; 258 font->driver = &ftxfont_driver;
260 return font_object; 259 return font_object;
261} 260}