From 55a3d2a170ba11523c420853f19846771100b28a Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Wed, 20 Sep 2000 08:46:32 +0000 Subject: [PATCH] (mode-line, tool-bar): Merge entries for `x' and `w32'. --- lisp/ChangeLog | 4 ++++ lisp/faces.el | 10 ++-------- 2 files changed, 6 insertions(+), 8 deletions(-) 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 + * 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." -- 2.39.2