# HG changeset patch
# User michaels
# Date 1169918062 0
# Node ID d6f975442bd377adffc5a89d40d7d0d3b870f91c
# Parent  b69bd495dfe221bb7d592c2f091c18c3095c3e27
[xemacs-hg @ 2007-01-27 17:14:20 by michaels]
2007-01-27  Mike Sperber  <mike@xemacs.org>

	* faces.c (complex_vars_of_faces): Move declarations of fontptr
	and fonts out of #ifdef MULE, unbreaking the non-MULE Xft build.

diff -r b69bd495dfe2 -r d6f975442bd3 src/ChangeLog
--- a/src/ChangeLog	Fri Jan 26 22:51:07 2007 +0000
+++ b/src/ChangeLog	Sat Jan 27 17:14:22 2007 +0000
@@ -1,3 +1,8 @@
+2007-01-27  Mike Sperber  <mike@xemacs.org>
+
+	* faces.c (complex_vars_of_faces): Move declarations of fontptr
+	and fonts out of #ifdef MULE, unbreaking the non-MULE Xft build.
+
 2007-01-20  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* eval.c:
diff -r b69bd495dfe2 -r d6f975442bd3 src/faces.c
--- a/src/faces.c	Fri Jan 26 22:51:07 2007 +0000
+++ b/src/faces.c	Sat Jan 27 17:14:22 2007 +0000
@@ -2258,7 +2258,7 @@
     Lisp_Object device_symbol = Qx;
 #endif
 
-#ifdef MULE
+    const Ascbyte **fontptr;
 
     const Ascbyte *fonts[] =
     {
@@ -2287,7 +2287,8 @@
       "-*-*-medium-r-*-*-*-170-*-*-c-*-*-*",
 #endif
     };
-    const Ascbyte **fontptr;
+
+#ifdef MULE
 
     /* Define some specifier tags for classes of character sets. Combining
        these allows for distinct fallback fonts for distinct dimensions of