# HG changeset patch
# User Stephen J. Turnbull <stephen@xemacs.org>
# Date 1259942553 -32400
# Node ID 32b358a240b0c9a1be6ff7208ab599114bcb1826
# Parent  1257b938f03ac2f2e6f6d8aeb6c0b967bcc77679
Avoid calling Xft if not built in.

diff -r 1257b938f03a -r 32b358a240b0 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Dec 04 10:59:45 2009 +0900
+++ b/lisp/ChangeLog	Sat Dec 05 01:02:33 2009 +0900
@@ -1,3 +1,7 @@
+2009-12-05  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* font.el (x-font-create-object): Check for Xft before using it.
+
 2009-11-10  Jerry James  <james@xemacs.org>
 
 	* device.el (device-type): Remove (mostly imaginary) support for
diff -r 1257b938f03a -r 32b358a240b0 lisp/font.el
--- a/lisp/font.el	Fri Dec 04 10:59:45 2009 +0900
+++ b/lisp/font.el	Sat Dec 05 01:02:33 2009 +0900
@@ -569,6 +569,7 @@
     (if (or (not (stringp fontname))
 	    (not (string-match font-x-font-regexp fontname)))
 	(if (and (stringp fontname)
+		 (featurep 'xft-fonts)
 		 (string-match font-xft-font-regexp fontname))
 	    ;; Return an XFT font. 
 	    (xft-font-create-object fontname)
diff -r 1257b938f03a -r 32b358a240b0 src/ChangeLog
--- a/src/ChangeLog	Fri Dec 04 10:59:45 2009 +0900
+++ b/src/ChangeLog	Sat Dec 05 01:02:33 2009 +0900
@@ -1,3 +1,8 @@
+2009-12-05  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* faces.c (complex_vars_of_faces): Explain why "*" isn't rewritten
+	as a full XLFD.
+
 2009-11-19  Vin Shelton  <acs@xemacs.org>
 
 	* sysdep.c (sys_subshell): Restore sys_subshell(); it's necessary
diff -r 1257b938f03a -r 32b358a240b0 src/faces.c
--- a/src/faces.c	Fri Dec 04 10:59:45 2009 +0900
+++ b/src/faces.c	Sat Dec 05 01:02:33 2009 +0900
@@ -2342,6 +2342,8 @@
       Fcons
       (Fcons
        (list1 (device_symbol),
+	/* grrr.  This really does need to be "*", not an XLFD.
+	   An unspecified XLFD won't pick up stuff like 10x20. */
 	build_string ("*")),
        inst_list);
 #ifdef MULE