CVS update by michaels xemacs/src ...

[xemacs-cvs at xemacs.org]

  User: michaels
  Date: 07/01/27 18:14:24

  Modified:    xemacs/src ChangeLog faces.c
Log:
2007-01-27  Mike Sperber  <mike at xemacs.org>

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

Revision  Changes    Path
1.1040    +5 -0      XEmacs/xemacs/src/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.1039
retrieving revision 1.1040
diff -u -p -r1.1039 -r1.1040
--- ChangeLog	2007/01/20 16:57:05	1.1039
+++ ChangeLog	2007/01/27 17:14:20	1.1040
@@ -1,3 +1,8 @@
+2007-01-27  Mike Sperber  <mike at 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 at parhasard.net>
 
 	* eval.c:



1.54      +3 -2      XEmacs/xemacs/src/faces.c

Index: faces.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/faces.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- faces.c	2006/12/17 11:26:09	1.53
+++ faces.c	2007/01/27 17:14:22	1.54
@@ -2258,7 +2258,7 @@ complex_vars_of_faces (void)
     Lisp_Object device_symbol = Qx;
 #endif
 
-#ifdef MULE
+    const Ascbyte **fontptr;
 
     const Ascbyte *fonts[] =
     {
@@ -2287,7 +2287,8 @@ complex_vars_of_faces (void)
       "-*-*-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