Mercurial > hg > xemacs-beta

comparison src/objects-msw.c @ 4353:4143b78d0df0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 b880e45ea63b
children 68f74b080e94
comparison
equal deleted inserted replaced
4352:d2f4dd8611d9 4353:4143b78d0df0
1974 const Ibyte *font_charset; 1974 const Ibyte *font_charset;
1975 const Ibyte *the_nonreloc = nonreloc; 1975 const Ibyte *the_nonreloc = nonreloc;
1976 const Ibyte *c; 1976 const Ibyte *c;
1977 Bytecount the_length = length; 1977 Bytecount the_length = length;
1978 1978
1979 if (UNBOUNDP (charset)) 1979 if (NILP (charset))
1980 return 1; 1980 return 1;
1981 1981
1982 if (!the_nonreloc) 1982 if (!the_nonreloc)
1983 the_nonreloc = XSTRING_DATA (reloc); 1983 the_nonreloc = XSTRING_DATA (reloc);
1984 fixup_internal_substring (nonreloc, reloc, offset, &the_length); 1984 fixup_internal_substring (nonreloc, reloc, offset, &the_length);
2036 struct gcpro gcpro1; 2036 struct gcpro gcpro1;
2037 Lisp_Object fontsig; 2037 Lisp_Object fontsig;
2038 Bytecount the_length = length; 2038 Bytecount the_length = length;
2039 int i; 2039 int i;
2040 2040
2041 if (UNBOUNDP (charset)) 2041 if (NILP (charset))
2042 return 1; 2042 return 1;
2043 2043
2044 if (!the_nonreloc) 2044 if (!the_nonreloc)
2045 the_nonreloc = XSTRING_DATA (reloc); 2045 the_nonreloc = XSTRING_DATA (reloc);
2046 fixup_internal_substring (nonreloc, reloc, offset, &the_length); 2046 fixup_internal_substring (nonreloc, reloc, offset, &the_length);