aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog4
-rw-r--r--src/nsfont.m2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b453dc01e6f..91f39fdea57 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
12009-09-09 Stefan Monnier <monnier@iro.umontreal.ca> 12009-09-09 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * nsfont.m (ns_get_family): Don't force first letter to uppercase.
4
52009-09-09 Stefan Monnier <monnier@iro.umontreal.ca>
6
3 * keymap.c (where_is_internal): Filter out shadowed remappings. 7 * keymap.c (where_is_internal): Filter out shadowed remappings.
4 Assume that where_is_internal returns unshadowed bindings to simplify 8 Assume that where_is_internal returns unshadowed bindings to simplify
5 the code and get rid of the gotos. Use ASIZE. 9 the code and get rid of the gotos. Use ASIZE.
diff --git a/src/nsfont.m b/src/nsfont.m
index 46c50aa96d3..1319a376631 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -102,8 +102,6 @@ ns_get_family (Lisp_Object font_spec)
102 char *tmp = strdup (SDATA (SYMBOL_NAME (tem))); 102 char *tmp = strdup (SDATA (SYMBOL_NAME (tem)));
103 NSString *family; 103 NSString *family;
104 ns_unescape_name (tmp); 104 ns_unescape_name (tmp);
105 /* For names hard-coded into emacs, like 'helvetica' for splash. */
106 tmp[0] = toupper (tmp[0]);
107 family = [NSString stringWithUTF8String: tmp]; 105 family = [NSString stringWithUTF8String: tmp];
108 free (tmp); 106 free (tmp);
109 return family; 107 return family;