[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src ChangeLog nsfont.m [EMACS_23_1_RC]
From: |
Adrian Robert |
Subject: |
[Emacs-diffs] emacs/src ChangeLog nsfont.m [EMACS_23_1_RC] |
Date: |
Fri, 24 Jul 2009 15:46:59 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Branch: EMACS_23_1_RC
Changes by: Adrian Robert <arobert> 09/07/24 15:46:58
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&only_with_tag=EMACS_23_1_RC&r1=1.7586.2.32&r2=1.7586.2.33
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsfont.m?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.26.2.3&r2=1.26.2.4
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7586.2.32
retrieving revision 1.7586.2.33
diff -u -b -r1.7586.2.32 -r1.7586.2.33
--- ChangeLog 23 Jul 2009 14:42:45 -0000 1.7586.2.32
+++ ChangeLog 24 Jul 2009 15:46:56 -0000 1.7586.2.33
@@ -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.26.2.3
retrieving revision 1.26.2.4
diff -u -b -r1.26.2.3 -r1.26.2.4
--- nsfont.m 23 Jul 2009 14:42:47 -0000 1.26.2.3
+++ nsfont.m 24 Jul 2009 15:46:58 -0000 1.26.2.4
@@ -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)));