aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-11-22 23:09:27 -0800
committerGlenn Morris2011-11-22 23:09:27 -0800
commitb6e64c4136905ab4f00194c360bd6cd3cd767b9c (patch)
treeb805129450152a5f43bafa81f97faf3df1b770c4
parentee7683ebb70c308e596103e379ef6b91d001eebc (diff)
downloademacs-b6e64c4136905ab4f00194c360bd6cd3cd767b9c.tar.gz
emacs-b6e64c4136905ab4f00194c360bd6cd3cd767b9c.zip
* src/font.c (font_find_for_lface) [HAVE_NS]: Ignore case.
Fixes: debbugs:2526
-rw-r--r--src/ChangeLog4
-rw-r--r--src/font.c9
2 files changed, 5 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 1dca6864986..ade7eaec1e0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12011-11-23 Glenn Morris <rgm@gnu.org>
2
3 * font.c (font_find_for_lface) [HAVE_NS]: Ignore case. (Bug#2526)
4
12011-11-23 Chong Yidong <cyd@gnu.org> 52011-11-23 Chong Yidong <cyd@gnu.org>
2 6
3 * xdisp.c (compute_stop_pos): Check validity of end_charpos before 7 * xdisp.c (compute_stop_pos): Check validity of end_charpos before
diff --git a/src/font.c b/src/font.c
index 9559c65e7ed..35f5703e32e 100644
--- a/src/font.c
+++ b/src/font.c
@@ -3160,14 +3160,7 @@ font_find_for_lface (FRAME_PTR f, Lisp_Object *attrs, Lisp_Object spec, int c)
3160 else 3160 else
3161 { 3161 {
3162 Lisp_Object alters 3162 Lisp_Object alters
3163 = Fassoc_string (val, Vface_alternative_font_family_alist, 3163 = Fassoc_string (val, Vface_alternative_font_family_alist, Qt);
3164 /* Font family names are case-sensitive under NS. */
3165#ifndef HAVE_NS
3166 Qt
3167#else
3168 Qnil
3169#endif
3170 );
3171 3164
3172 if (! NILP (alters)) 3165 if (! NILP (alters))
3173 { 3166 {