frame.c (Fdelete_frame): Don't call font_update_drviers if

HAVE_WINDOW_SYSTEM is not defined.
xfaces.c (merge_face_ref, merge_face_vectors)
(Finternal_set_lisp_face_attribute): Use FONT_*_INDEX only when
HAVE_WINDOW_SYSTEM is defined.
(Fface_font): Fix non-HAVE_WINDOW_SYSTEM case.

1 files changed, 2 insertions, 0 deletions

diff --git a/src/frame.c b/src/frame.c
index 44bf4da5a87..c83caf460de 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1459,8 +1459,10 @@ But FORCE inhibits this too.  */)
      memory. */
   free_glyphs (f);
 
+#ifdef HAVE_WINDOW_SYSTEM
   /* Give chance to each font driver to free a frame specific data.  */
   font_update_drivers (f, Qnil);
+#endif
 
   /* Mark all the windows that used to be on FRAME as deleted, and then
      remove the reference to them.  */