* font.c (font_close_object): Check for live frame (Bug#16128).

[gnu-emacs] / src / font.h

diff --git a/src/font.h b/src/font.h
index 539ebeba52a395167b245aaad884e22909a25365..7781816860a6aa5d83c8be0c81fd8356eda9733e 100644 (file)
--- a/src/font.h
+++ b/src/font.h
@@ -265,6 +265,9 @@ 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
@@ -316,6 +319,9 @@ 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;
@@ -735,6 +741,7 @@ 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 **,