Mercurial > hg > xemacs-beta

diff lisp/faces.el @ 290:c9fe270a4101 r21-0b43

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-0b43
author cvs
date Mon, 13 Aug 2007 10:36:47 +0200
parents e11d67e05968
children 70ad99077275
line wrap: on
line diff
--- a/lisp/faces.el	Mon Aug 13 10:35:55 2007 +0200
+++ b/lisp/faces.el	Mon Aug 13 10:36:47 2007 +0200
@@ -1671,19 +1671,18 @@
 		       (or
 			(and 
 			 (featurep 'x)
-			 (or 
-			  (x-get-resource "backgroundToolBarColor"
-					  "BackgroundToolBarColor" 'string)
-			  (x-get-resource "background" "Background" 'string)))
+			 (x-get-resource "backgroundToolBarColor"
+					 "BackgroundToolBarColor" 'string))
+
+			(face-background 'toolbar)
 			"Gray80")))
 	   (purecopy '("foregroundToolBarColor"
 		       (or
 			(and 
 			 (featurep 'x)
-			 (or
-			  (x-get-resource "foregroundToolBarColor"
-					  "ForegroundToolBarColor" 'string)
-			  (x-get-resource "foreground" "Foreground" 'string)))
+			 (x-get-resource "foregroundToolBarColor"
+					 "ForegroundToolBarColor" 'string))
+			(face-foreground 'toolbar)
 			"Black")))
 	   )))