diff src/objects-msw.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 b880e45ea63b
children 68f74b080e94
line wrap: on
line diff
--- 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)