From: Kenichi Handa <handa@m17n.org>
Date: Tue, 1 Aug 2006 02:40:50 +0000 (+0000)
Subject: (ftfont_pattern_entity): If the pattern doesn't contain
X-Git-Tag: emacs-pretest-23.0.90~8295^2~782
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f0432f81a1d96a237f933ac82c1705bb5ca4cdf9;p=emacs.git

(ftfont_pattern_entity): If the pattern doesn't contain
FC_SPACING, don't assuce FC_MONO.
---

diff --git a/src/ftfont.c b/src/ftfont.c
index 6c85bbf7896..9bdb2146d2c 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -140,7 +140,7 @@ ftfont_pattern_entity (p, frame, registry)
     ASET (entity, FONT_SIZE_INDEX, make_number (0));
 
   if (FcPatternGetInteger (p, FC_SPACING, 0, &numeric) != FcResultMatch)
-    numeric = FC_MONO;
+    numeric = -1;
   file = FcStrCopy (file);
   if (! file)
     return Qnil;
@@ -151,7 +151,8 @@ ftfont_pattern_entity (p, frame, registry)
 
   if (FcPatternAddString (p, FC_FILE, file) == FcFalse
       || (charset && FcPatternAddCharSet (p, FC_CHARSET, charset) == FcFalse)
-      || FcPatternAddInteger (p, FC_SPACING, numeric) == FcFalse)
+      || (numeric >= 0
+	  && FcPatternAddInteger (p, FC_SPACING, numeric) == FcFalse))
     {
       FcPatternDestroy (p);
       return Qnil;