From: Kenichi Handa <handa@m17n.org>
Date: Thu, 8 Dec 2011 02:34:09 +0000 (+0900)
Subject: ftfont.c (get_adstyle_property): Fix previous change (Bug#10233).
X-Git-Tag: emacs-pretest-24.0.93~210
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=745fff94a04a8a959a0c3cf1a1d2db8531d38576;p=emacs.git

ftfont.c (get_adstyle_property): Fix previous change (Bug#10233).
---

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  <handa@m17n.org>
+
+	* ftfont.c (get_adstyle_property): Fix previous change
+	(Bug#10233).
+
 2011-12-07  Juanma Barranquero  <lekktu@gmail.com>
 
 	* 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