From: Miles Bader <miles@gnu.org>
Date: Wed, 20 Sep 2000 08:46:32 +0000 (+0000)
Subject: (mode-line, tool-bar): Merge entries for `x' and `w32'.
X-Git-Tag: emacs-pretest-21.0.90~1497
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=55a3d2a170ba11523c420853f19846771100b28a;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3eeff7298cb..3193204c32f 100644
--- 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 f290a815669..62c39dae4c4 100644
--- 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."