Mercurial > emacs
changeset 90697:444b40002533
(ftfont_driver): Initialize ftfont_driver.type by 0.
(ftfont_font_format): Fix previous change.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Wed, 29 Nov 2006 12:17:27 +0000 |
| parents | 46ca345eec0b |
| children | a31984e21969 |
| files | src/ftfont.c |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ftfont.c Wed Nov 29 12:10:30 2006 +0000 +++ b/src/ftfont.c Wed Nov 29 12:17:27 2006 +0000 @@ -278,7 +278,7 @@ struct font_driver ftfont_driver = { - (Lisp_Object) NULL, /* Qfreetype */ + 0, /* Qfreetype */ ftfont_get_cache, ftfont_list, ftfont_match, @@ -966,7 +966,7 @@ if (strcmp ((char *) str, "BDF") == 0) return intern ("bdf"); #else /* not FC_FONTFORMAT */ - if (FcPatternGetString (pattern, FC_FILE, 0, &file) != FcResultMatch) + if (FcPatternGetString (pattern, FC_FILE, 0, &str) != FcResultMatch) return Qnil; if (strcasestr ((char *) str, ".ttf") == 0) return intern ("truetype");