[Emacs-diffs] /srv/bzr/emacs/trunk r106635: ftfont.c (get_adstyle_property): Fix previous change (Bug#10233).

[Kenichi Handa]

------------------------------------------------------------
revno: 106635 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: trunk
timestamp: Thu 2011-12-08 11:34:47 +0900
message:
  ftfont.c (get_adstyle_property): Fix previous change (Bug#10233).
modified:
  src/ChangeLog
  src/ftfont.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-12-07 23:14:13 +0000
+++ b/src/ChangeLog     2011-12-08 02:34:09 +0000
@@ -1,3 +1,8 @@
+2011-12-08  Kenichi Handa  <address@hidden>
+
+       * ftfont.c (get_adstyle_property): Fix previous change
+       (Bug#10233).
+
 2011-12-07  Juanma Barranquero  <address@hidden>
 
        * w32.c (init_environment): If no_site_lisp, remove site-lisp

=== modified file 'src/ftfont.c'
--- a/src/ftfont.c      2011-12-05 07:48:29 +0000
+++ b/src/ftfont.c      2011-12-08 02:34:09 +0000
@@ -166,8 +166,8 @@
 
 #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