Mercurial > hg > xemacs-beta

diff src/objects-tty.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 77138fc618a9
children 3a87551bfeb5
line wrap: on
line diff
--- 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 ("/"),