# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 969439534 0
# Node ID 095cc7f7e024ee110817d1c74aae487d7aa6cfb6
# Parent  e3d01cb9b0181082963d8f055e3454417b6eaebc
(mode-line, tool-bar): Merge entries for `x' and `w32'.

diff -r e3d01cb9b018 -r 095cc7f7e024 lisp/faces.el
--- a/lisp/faces.el	Wed Sep 20 08:44:46 2000 +0000
+++ b/lisp/faces.el	Wed Sep 20 08:45:34 2000 +0000
@@ -1516,10 +1516,7 @@
 
 
 (defface mode-line
-  '((((type x) (class color))
-     (:box (:line-width 2 :style released-button)
-	   :background "grey75" :foreground "black"))
-    (((type w32) (class color))
+  '((((type x w32) (class color))
      (:box (:line-width 2 :style released-button)
 	   :background "grey75" :foreground "black"))
     (t
@@ -1555,15 +1552,12 @@
 
 
 (defface tool-bar
-  '((((type x) (class color))
+  '((((type x w32) (class color))
      (:box (:line-width 1 :style released-button)
 	   :background "grey75" :foreground "black"))
     (((type x) (class mono))
      (:box (:line-width 1 :style released-button)
 	   :background "grey" :foreground "black"))
-    (((type w32) (class color))
-     (:box (:line-width 1 :style released-button)
-	   :background "grey75" :foreground "black"))
     (t
      ()))
   "Basic tool-bar face."