diff options
| author | Joakim Verona | 2011-12-28 04:12:56 +0100 |
|---|---|---|
| committer | Joakim Verona | 2011-12-28 04:12:56 +0100 |
| commit | bb29f044aa967831cd664c54eba0de0c701436ce (patch) | |
| tree | 1398cc9780bbae0fdad071a3a3765a571c3f6d7b /src/font.c | |
| parent | 3c935a7e996701244d166f684119f0ff97e25496 (diff) | |
| parent | 5e605a2e528955721fc6f2bd7b9f174c15075fb1 (diff) | |
| download | emacs-bb29f044aa967831cd664c54eba0de0c701436ce.tar.gz emacs-bb29f044aa967831cd664c54eba0de0c701436ce.zip | |
upstream i think
Diffstat (limited to 'src/font.c')
| -rw-r--r-- | src/font.c | 9 |
1 files changed, 1 insertions, 8 deletions
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 | { |