(mode-line, tool-bar): Merge entries for `x' and `w32'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3eeff7298cb16af42bccebeb8d684b1f47410128..3193204c32f5c8cc00147d897d0bf216909927cd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2000-09-20  Miles Bader  <miles@lsi.nec.co.jp>
 
+       * faces.el (mode-line, tool-bar): Merge entries for `x' and `w32'.
+
+       * info.el (info-header-node): Tweak for color ttys.
+
        * faces.el (face-valid-attribute-values): Make sure directories we
        search for stipples both exist and are readable before trying to
        search them.

diff --git a/lisp/faces.el b/lisp/faces.el
index f290a81566992242192bb9a0beaa4fd1501bee76..62c39dae4c4713670151e09ccb1c2d31b2d61a2a 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1516,10 +1516,7 @@ created."
 
 
 (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 @@ created."
 
 
 (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."