changeset: 4353:4143b78d0df09521124aed8cd0ed848b978130ba
tag: tip
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Sun Dec 23 15:29:17 2007 +0100
files: src/ChangeLog src/objects-msw.c src/objects-tty.c src/objects-xlike-inc.c
description:
Merge an old patch of Ben's, involving font instantiation and charsets.
2007-12-23 Aidan Kehoe <kehoea(a)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.
diff -r d2f4dd8611d9b88d0c16de371bc663a99bc6a305 -r
4143b78d0df09521124aed8cd0ed848b978130ba src/ChangeLog
--- 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-22 Aidan Kehoe <kehoea@parhasa
+2007-12-23 Aidan Kehoe <kehoea(a)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(a)parhasard.net>
* database.c (Fopen_database):
diff -r d2f4dd8611d9b88d0c16de371bc663a99bc6a305 -r
4143b78d0df09521124aed8cd0ed848b978130ba src/objects-msw.c
--- 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 @@ mswindows_font_spec_matches_charset_stag
const Ibyte *c;
Bytecount the_length = length;
- if (UNBOUNDP (charset))
+ if (NILP (charset))
return 1;
if (!the_nonreloc)
@@ -2038,7 +2038,7 @@ mswindows_font_spec_matches_charset_stag
Bytecount the_length = length;
int i;
- if (UNBOUNDP (charset))
+ if (NILP (charset))
return 1;
if (!the_nonreloc)
diff -r d2f4dd8611d9b88d0c16de371bc663a99bc6a305 -r
4143b78d0df09521124aed8cd0ed848b978130ba src/objects-tty.c
--- 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 @@ tty_font_spec_matches_charset (struct de
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 @@ tty_find_charset_font (Lisp_Object devic
return Qnil;
}
- if (UNBOUNDP (charset))
+ if (NILP (charset))
return font;
return concat3 (font, build_string ("/"),
diff -r d2f4dd8611d9b88d0c16de371bc663a99bc6a305 -r
4143b78d0df09521124aed8cd0ed848b978130ba src/objects-xlike-inc.c
--- a/src/objects-xlike-inc.c Sat Dec 22 15:57:21 2007 -0800
+++ b/src/objects-xlike-inc.c Sun Dec 23 15:29:17 2007 +0100
@@ -125,7 +125,7 @@ x_font_spec_matches_charset (struct devi
#endif
/* Hmm, this smells bad. */
- if (UNBOUNDP (charset))
+ if (NILP (charset))
return 1;
/* Hack! Short font names don't have the registry in them,
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches