Mercurial > emacs
changeset 91907:21cc6c5f4996
(xftfont_default_fid): Delete it.
(xftfont_open): Set xfont->fid to 0.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Sun, 17 Feb 2008 02:03:32 +0000 |
| parents | a18321dbb8fa |
| children | 6916adc8df33 |
| files | src/xftfont.c |
| diffstat | 1 files changed, 1 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xftfont.c Sun Feb 17 02:03:19 2008 +0000 +++ b/src/xftfont.c Sun Feb 17 02:03:32 2008 +0000 @@ -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;