Mercurial > hg > xemacs-beta
changeset 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 | d2f4dd8611d9 |
| children | 232d873b9705 a2af1ff1761f ebb35ddea76a |
| files | src/ChangeLog src/objects-msw.c src/objects-tty.c src/objects-xlike-inc.c |
| diffstat | 4 files changed, 19 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Dec 22 15:57:21 2007 -0800 +++ b/src/ChangeLog Sun Dec 23 15:29:17 2007 +0100 @@ -1,3 +1,17 @@ +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. + 2007-12-22 Aidan Kehoe <kehoea@parhasard.net> * database.c (Fopen_database):
--- a/src/objects-msw.c Sat Dec 22 15:57:21 2007 -0800 +++ b/src/objects-msw.c Sun Dec 23 15:29:17 2007 +0100 @@ -1976,7 +1976,7 @@ const Ibyte *c; Bytecount the_length = length; - if (UNBOUNDP (charset)) + if (NILP (charset)) return 1; if (!the_nonreloc) @@ -2038,7 +2038,7 @@ Bytecount the_length = length; int i; - if (UNBOUNDP (charset)) + if (NILP (charset)) return 1; if (!the_nonreloc)
--- a/src/objects-tty.c Sat Dec 22 15:57:21 2007 -0800 +++ b/src/objects-tty.c Sun Dec 23 15:29:17 2007 +0100 @@ -347,7 +347,7 @@ fixup_internal_substring (nonreloc, reloc, offset, &length); the_nonreloc += offset; - if (UNBOUNDP (charset)) + if (NILP (charset)) return !memchr (the_nonreloc, '/', length); the_nonreloc = (const Ibyte *) memchr (the_nonreloc, '/', length); if (!the_nonreloc) @@ -379,7 +379,7 @@ return Qnil; } - if (UNBOUNDP (charset)) + if (NILP (charset)) return font; return concat3 (font, build_string ("/"),