[Emacs-diffs] emacs/src ChangeLog nsfont.m [EMACS_23_1_RC]

[Adrian Robert]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_23_1_RC
Changes by:     Adrian Robert <arobert> 09/07/29 16:04:33

Modified files:
        src            : ChangeLog nsfont.m 

Log message:
        * nsfont.m (ns_findfonts): Fix 2009-07-24 change to return only one 
element, not a list, for match case.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.7586.2.36&r2=1.7586.2.37
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsfont.m?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.26.2.5&r2=1.26.2.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7586.2.36
retrieving revision 1.7586.2.37
diff -u -b -r1.7586.2.36 -r1.7586.2.37
--- ChangeLog   28 Jul 2009 15:00:51 -0000      1.7586.2.36
+++ ChangeLog   29 Jul 2009 16:04:30 -0000      1.7586.2.37
@@ -1,3 +1,8 @@
+2009-07-29  Adrian Robert  <address@hidden>
+
+       * 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  <address@hidden>
 
        * xfaces.c (face_with_height): Call font_clear_prop.

Index: nsfont.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsfont.m,v
retrieving revision 1.26.2.5
retrieving revision 1.26.2.6
diff -u -b -r1.26.2.5 -r1.26.2.6
--- nsfont.m    26 Jul 2009 12:50:13 -0000      1.26.2.5
+++ nsfont.m    29 Jul 2009 16:04:33 -0000      1.26.2.6
@@ -464,7 +464,7 @@
     /* 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 @@
        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 @@
       }
 
     /* 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)));