diff options
| author | Adrian Robert | 2009-09-09 15:05:47 +0000 |
|---|---|---|
| committer | Adrian Robert | 2009-09-09 15:05:47 +0000 |
| commit | c1905ca3e6b687db0f951aa07789dc90d5310109 (patch) | |
| tree | d7949f1a7c8c57e6fd7f8570baafbd608b5af57a | |
| parent | cd8752523c8e4e2fe3655c2e81edd133fb8c1947 (diff) | |
| download | emacs-c1905ca3e6b687db0f951aa07789dc90d5310109.tar.gz emacs-c1905ca3e6b687db0f951aa07789dc90d5310109.zip | |
* nsfont.m (ns_get_family): Don't force first letter to uppercase.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/nsfont.m | 2 |
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 @@ | |||
| 1 | 2009-09-09 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2009-09-09 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * nsfont.m (ns_get_family): Don't force first letter to uppercase. | ||
| 4 | |||
| 5 | 2009-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; |