From 745fff94a04a8a959a0c3cf1a1d2db8531d38576 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 8 Dec 2011 11:34:09 +0900 Subject: [PATCH] ftfont.c (get_adstyle_property): Fix previous change (Bug#10233). --- src/ChangeLog | 5 +++++ src/ftfont.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 9ee5ccc1f5e..71b1b3fa82c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-12-08 Kenichi Handa + + * ftfont.c (get_adstyle_property): Fix previous change + (Bug#10233). + 2011-12-07 Juanma Barranquero * w32.c (init_environment): If no_site_lisp, remove site-lisp diff --git a/src/ftfont.c b/src/ftfont.c index ec1a4ca6a78..bab97e44fab 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -166,8 +166,8 @@ get_adstyle_property (FcPattern *p) #ifdef FC_FONTFORMAT if ((FcPatternGetString (p, FC_FONTFORMAT, 0, &fcstr) == FcResultMatch) - && (xstrcasecmp ((char *) fcstr, "bdf") != 0 - || xstrcasecmp ((char *) fcstr, "pcf") != 0)) + && xstrcasecmp ((char *) fcstr, "bdf") != 0 + && xstrcasecmp ((char *) fcstr, "pcf") != 0) /* Not a BDF nor PCF font. */ return Qnil; #endif -- 2.39.2