* 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.

1 files changed, 0 insertions, 1 deletions

diff --git a/src/xftfont.c b/src/xftfont.c
index 6423f8e19b3..37b33b3ead8 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -365,7 +365,6 @@ xftfont_open (struct frame *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->frame = f;
   font->pixel_size = size;
   font->driver = &xftfont_driver;
   font->encoding_charset = font->repertory_charset = -1;