(xftfont_default_fid): Delete it.

(xftfont_open): Set xfont->fid to 0.

diff --git a/src/xftfont.c b/src/xftfont.c
index 5694508dd65d86175cc10938ddf4871a7570dee5..3d854364617c0ead30c02d4e6f0aacb602efe506 100644 (file)
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -67,7 +67,6 @@ struct xftface_info
 static void xftfont_get_colors P_ ((FRAME_PTR, struct face *, GC gc,
                                    struct xftface_info *,
                                    XftColor *fg, XftColor *bg));
-static Font xftfont_default_fid P_ ((FRAME_PTR));
 
 
 /* Setup foreground and background colors of GC into FG and BG.  If
@@ -135,31 +134,6 @@ xftfont_get_colors (f, face, gc, xftface_info, fg, bg)
     }
 }
 
-/* Return the default Font ID on frame F.  The Returned Font ID is
-   stored in the GC of the frame F, but the font is never used.  So,
-   any ID is ok as long as it is valid.  */
-
-static Font
-xftfont_default_fid (f)
-     FRAME_PTR f;
-{
-  static int fid_known;
-  static Font fid;
-
-  if (! fid_known)
-    {
-      fid = XLoadFont (FRAME_X_DISPLAY (f), "fixed");
-      if (! fid)
-       {
-         fid = XLoadFont (FRAME_X_DISPLAY (f), "*");
-         if (! fid)
-           abort ();
-       }
-      fid_known = 1;
-    }
-  return fid;
-}
-
 
 static Lisp_Object xftfont_list P_ ((Lisp_Object, Lisp_Object));
 static Lisp_Object xftfont_match P_ ((Lisp_Object, Lisp_Object));
@@ -342,7 +316,7 @@ xftfont_open (f, entity, pixel_size)
   font->font.vertical_centering = 0;
 
   /* Setup pseudo XFontStruct */
-  xfont->fid = xftfont_default_fid (f);
+  xfont->fid = 0;
   xfont->ascent = font->ascent;
   xfont->descent = font->descent;
   xfont->max_bounds.descent = font->descent;