* 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, 7 deletions

diff --git a/src/font.h b/src/font.h
index 7781816860a..539ebeba52a 100644
--- a/src/font.h
+++ b/src/font.h
@@ -265,9 +265,6 @@ struct font_entity
 {
   struct vectorlike_header header;
   Lisp_Object props[FONT_ENTITY_MAX];
-#ifdef HAVE_NS
-  struct font_driver *driver;
-#endif
 };
 
 /* A value which may appear in the member `encoding' of struct font
@@ -319,9 +316,6 @@ struct font
 
 #if defined (HAVE_WINDOW_SYSTEM)
 
-  /* The frame where the font was opened.  */
-  struct frame *frame;
-
   /* Vertical pixel width of the underline.  If is zero if that
      information is not in the font.  */
   int underline_thickness;
@@ -741,7 +735,6 @@ extern Lisp_Object merge_font_spec (Lisp_Object, Lisp_Object);
 
 extern Lisp_Object font_make_entity (void);
 extern Lisp_Object font_make_object (int, Lisp_Object, int);
-extern void font_close_object (Lisp_Object);
 
 extern Lisp_Object find_font_encoding (Lisp_Object);
 extern int font_registry_charsets (Lisp_Object, struct charset **,