[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xftfont.c,v
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] Changes to emacs/src/xftfont.c,v |
Date: |
Sun, 17 Feb 2008 02:03:33 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kenichi Handa <handa> 08/02/17 02:03:33
Index: xftfont.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xftfont.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- xftfont.c 6 Feb 2008 04:24:12 -0000 1.3
+++ xftfont.c 17 Feb 2008 02:03:32 -0000 1.4
@@ -67,7 +67,6 @@
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 @@
}
}
-/* 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 @@
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;