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

[Adrian Robert]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Adrian Robert <arobert> 09/07/24 15:43:24

Modified files:
        src            : ChangeLog nsfont.m 

Log message:
        * nsfont.m (ns_findfonts): Correctly return fallback in match case.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7663&r2=1.7664
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsfont.m?cvsroot=emacs&r1=1.30&r2=1.31

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7663
retrieving revision 1.7664
diff -u -b -r1.7663 -r1.7664
--- ChangeLog   23 Jul 2009 14:41:05 -0000      1.7663
+++ ChangeLog   24 Jul 2009 15:43:22 -0000      1.7664
@@ -1,3 +1,7 @@
+2009-07-24  Adrian Robert  <address@hidden>
+
+       * nsfont.m (ns_findfonts): Correctly return fallback in match case.
+
 2009-07-23  Yavor Doganov  <address@hidden>
 
        * nsfont.m (NSFontDescriptor.h): Explicitly include under GNUstep.

Index: nsfont.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsfont.m,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- nsfont.m    23 Jul 2009 14:41:06 -0000      1.30
+++ nsfont.m    24 Jul 2009 15:43:24 -0000      1.31
@@ -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 ? ns_fallback_entity () : Qnil;
+       return isMatch ? Fcons (ns_fallback_entity (), list) : Qnil;
 
     cFamilies = ns_get_covering_families (ns_get_req_script (font_spec), 0.90);
 
@@ -502,6 +502,10 @@
                                         "synthItal"), list);
       }
 
+    /* Return something if was a match and nothing found. */
+    if (isMatch && XINT (Flength (list)) == 0)
+      list = Fcons (ns_fallback_entity (), Qnil);
+
     if (NSFONT_TRACE)
        fprintf (stderr, "    Returning %d entities.\n", XINT (Flength (list)));