* nsfont.m (ns_findfonts): Fix 2009-07-24 change to return only one element, not...

diff --git a/src/ChangeLog b/src/ChangeLog
index 523f19ff0c00d399c6fc68f3c336c002a71950af..989831d67639ed56fb4f344a7d781f937e0b883b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-29  Adrian Robert  <Adrian.B.Robert@gmail.com>
+
+       * nsfont.m (ns_findfonts): Fix 2009-07-24 change to return only one
+       element, not a list, for match case.
+
 2009-07-28  Kenichi Handa  <handa@m17n.org>
 
        * font.c (font_parse_xlfd): Check DPI and AVGWIDTH properties more

diff --git a/src/nsfont.m b/src/nsfont.m
index 89b42901f42cf4f82dbf2685553e989551e2c242..a4c4444069ba95a67e1330bcb8155070c0034970 100644 (file)
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -464,7 +464,7 @@ ns_findfonts (Lisp_Object font_spec, BOOL isMatch)
     /* If has non-unicode registry, give up. */
     tem = AREF (font_spec, FONT_REGISTRY_INDEX);
     if (! NILP (tem) && !EQ (tem, Qiso10646_1) && !EQ (tem, Qunicode_bmp))
-       return isMatch ? Fcons (ns_fallback_entity (), list) : Qnil;
+       return isMatch ? ns_fallback_entity () : Qnil;
 
     cFamilies = ns_get_covering_families (ns_get_req_script (font_spec), 0.90);
 
@@ -483,9 +483,12 @@ ns_findfonts (Lisp_Object font_spec, BOOL isMatch)
        if (![cFamilies containsObject:
                 [desc objectForKey: NSFontFamilyAttribute]])
            continue;
-       list = Fcons (ns_descriptor_to_entity (desc,
+        tem = ns_descriptor_to_entity (desc,
                                         AREF (font_spec, FONT_EXTRA_INDEX),
-                                        NULL), list);
+                                       NULL);
+        if (isMatch)
+          return tem;
+       list = Fcons (tem, list);
        if (fabs (ns_attribute_fvalue (desc, NSFontSlantTrait)) > 0.05)
            foundItal = YES;
       }
@@ -503,8 +506,8 @@ ns_findfonts (Lisp_Object font_spec, BOOL isMatch)
       }
 
     /* Return something if was a match and nothing found. */
-    if (isMatch && XINT (Flength (list)) == 0)
-      list = Fcons (ns_fallback_entity (), Qnil);
+    if (isMatch)
+      return ns_fallback_entity ();
 
     if (NSFONT_TRACE)
        fprintf (stderr, "    Returning %d entities.\n", XINT (Flength (list)));