summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-11-22 23:09:27 -0800
committerGlenn Morris <rgm@gnu.org>2011-11-22 23:09:27 -0800
commitb6e64c4136905ab4f00194c360bd6cd3cd767b9c (patch)
treeb805129450152a5f43bafa81f97faf3df1b770c4 /src
parentee7683ebb70c308e596103e379ef6b91d001eebc (diff)
downloademacs-b6e64c4136905ab4f00194c360bd6cd3cd767b9c.tar.gz
* src/font.c (font_find_for_lface) [HAVE_NS]: Ignore case.
Fixes: debbugs:2526
Diffstat (limited to 'src')
-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 @@
+2011-11-23 Glenn Morris <rgm@gnu.org>
+
+ * font.c (font_find_for_lface) [HAVE_NS]: Ignore case. (Bug#2526)
+
2011-11-23 Chong Yidong <cyd@gnu.org>
* 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)
else
{
Lisp_Object alters
- = Fassoc_string (val, Vface_alternative_font_family_alist,
- /* Font family names are case-sensitive under NS. */
-#ifndef HAVE_NS
- Qt
-#else
- Qnil
-#endif
- );
+ = Fassoc_string (val, Vface_alternative_font_family_alist, Qt);
if (! NILP (alters))
{