Index: lisp/faces.el
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs-20/lisp/faces.el,v
retrieving revision 1.14
diff -u -r1.14 faces.el
--- lisp/faces.el 1998/05/24 05:40:25 1.14
+++ lisp/faces.el 1998/05/28 00:23:48
@@ -1661,6 +1661,32 @@
 		       ((mswindows default color) . "green"))
 		     'global)
 
+;; Define some logical color names to be used when reading the pixmap files.
+(if (featurep 'xpm)
+    (setq xpm-color-symbols
+	  (list
+	   (purecopy '("foreground" (face-foreground 'default)))
+	   (purecopy '("background" (face-background 'default)))
+	   (purecopy '("backgroundToolBarColor"
+		       (or
+			(and 
+			 (featurep 'x)
+			 (or 
+			  (x-get-resource "backgroundToolBarColor"
+					  "BackgroundToolBarColor" 'string)
+			  (x-get-resource "background" "Background" 'string)))
+			"Gray80")))
+	   (purecopy '("foregroundToolBarColor"
+		       (or
+			(and 
+			 (featurep 'x)
+			 (or
+			  (x-get-resource "foregroundToolBarColor"
+					  "ForegroundToolBarColor" 'string)
+			  (x-get-resource "foreground" "Foreground" 'string)))
+			"Black")))
+	   )))
+
 (when (featurep 'tty)
   (set-face-highlight-p 'bold                    t 'global '(default tty))
   (set-face-underline-p 'italic                  t 'global '(default tty))
Index: lisp/x-faces.el
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs-20/lisp/x-faces.el,v
retrieving revision 1.10
diff -u -r1.10 x-faces.el
--- lisp/x-faces.el 1998/05/24 05:40:32 1.10
+++ lisp/x-faces.el 1998/05/28 00:23:49
@@ -362,26 +362,6 @@
 (make-obsolete 'x-make-face-unitalic 'make-face-unitalic)
 
 
-;; Define some logical color names to be used when reading the pixmap files.
-(if (featurep 'xpm)
-    (setq xpm-color-symbols
-	  (list
-	   (purecopy '("foreground" (face-foreground 'default)))
-	   (purecopy '("background" (face-background 'default)))
-	   (purecopy '("backgroundToolBarColor"
-		       (or
-			(x-get-resource "backgroundToolBarColor"
-					"BackgroundToolBarColor" 'string)
-			(x-get-resource "background" "Background" 'string)
-			"Gray80")))
-	   (purecopy '("foregroundToolBarColor"
-		       (or
-			(x-get-resource "foregroundToolBarColor"
-					"ForegroundToolBarColor" 'string)
-			(x-get-resource "foreground" "Foreground" 'string)
-			"Black")))
-	   )))
-
 ;;; internal routines
 
 ;;; x-init-face-from-resources is responsible for initializing a