Mercurial > hg > xemacs-beta
comparison src/objects-xlike-inc.c @ 4353:4143b78d0df0
Merge an old patch of Ben's, involving font instantiation and charsets.
2007-12-23 Aidan Kehoe <kehoea@parhasard.net>
* objects-tty.c (tty_find_charset_font):
* objects-msw.c (mswindows_font_spec_matches_charset_stage_2):
* objects-msw.c (mswindows_font_spec_matches_charset_stage_1):
* objects-xlike-inc.c (x_font_spec_matches_charset):
* objects-xlike-inc.c (gtk_font_spec_matches_charset):
If the charset is not specified when calling the
font_spec_matches_charset device method, its value is Qnil, not
Qunbound. See
http://mid.gmane.org/E1EfbmW-00029r-5G@iwi191.iwi.uni-sb.de and
Ben Wing's patch of
http://mid.gmane.org/439FA06B.3090007@xemacs.org.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 23 Dec 2007 15:29:17 +0100 |
| parents | 9a633a00c3f2 |
| children | ea66743ff201 |
comparison
equal
deleted
inserted
replaced
| 4352:d2f4dd8611d9 | 4353:4143b78d0df0 |
|---|---|
| 123 } | 123 } |
| 124 } | 124 } |
| 125 #endif | 125 #endif |
| 126 | 126 |
| 127 /* Hmm, this smells bad. */ | 127 /* Hmm, this smells bad. */ |
| 128 if (UNBOUNDP (charset)) | 128 if (NILP (charset)) |
| 129 return 1; | 129 return 1; |
| 130 | 130 |
| 131 /* Hack! Short font names don't have the registry in them, | 131 /* Hack! Short font names don't have the registry in them, |
| 132 so we just assume the user knows what they're doing in the | 132 so we just assume the user knows what they're doing in the |
| 133 case of ASCII. For other charsets, you gotta give the | 133 case of ASCII. For other charsets, you gotta give the |