mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-15 09:47:20 +00:00
Code Issues Releases Activity

(xftfont_default_fid): Delete it.

Browse Source 
(xftfont_open): Set xfont->fid to 0.
This commit is contained in:
Kenichi Handa 2008-02-17 02:03:32 +00:00
parent 559474f12d
commit 3370d9f5b3
1 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/xftfont.c
View File

@ -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;