From 85c3e9081ff2c6865dddc714f2086972c1001b60 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Fri, 24 Nov 2006 01:48:49 +0000 Subject: [PATCH] *** empty log message *** --- src/ChangeLog.unicode | 18 ++++++++++++++++++ src/xfont.c | 1 + 2 files changed, 19 insertions(+) diff --git a/src/ChangeLog.unicode b/src/ChangeLog.unicode index 65e5b5b89ea..60213746248 100644 --- a/src/ChangeLog.unicode +++ b/src/ChangeLog.unicode @@ -1,3 +1,21 @@ +2006-11-24 Kenichi Handa + + * xfont.c (xfont_open): Set font->format. + + * xftfont.c (xftfont_open): Set font->format. + + * ftfont.c (ftfont_pattern_entity): Add fontformat in a pattern. + (ftfont_list): Include FC_FONTFORMAT in FcObject. + (ftfont_open): Set font->format. + (ftfont_font_format): New function. + + * font.h (struct font): New memeber format. + + * font.c (Qopentype): New variable. + (syms_of_font): Defsym it. + (Fquery_font): Change the format of the last element of the return + value. + 2006-11-22 Kenichi Handa * search.c (simple_search): Fix sync with HEAD. diff --git a/src/xfont.c b/src/xfont.c index 9941fb2655a..0ea677cdeec 100644 --- a/src/xfont.c +++ b/src/xfont.c @@ -592,6 +592,7 @@ xfont_open (f, entity, pixel_size) if (! xfont) return NULL; font = malloc (sizeof (struct font)); + font->format = Qx; font->font.font = xfont; font->entity = entity; font->pixel_size = pixel_size; -- 2.39.5