(header-line): Make more reasonable on mono/grayscale displays.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2531ef0de1b5105f5b56f64871175a49ccb5a726..5ced92fa8110e6cca5447f0535fbb964085d78c3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-23  Miles Bader  <miles@lsi.nec.co.jp>
+
+       * faces.el (header-line): Make more reasonable on mono/grayscale
+       displays.
+
 2000-10-23  Andrew Choi  <akochoi@i-cable.com>
 
        * cus-edit.el (custom-button-face): Use 3D look for mac.

diff --git a/lisp/faces.el b/lisp/faces.el
index 1a246af0a5a4da148e0791d7e6a3bbf83678d8e9..28ebba796c4626527c12a16cef2f3aad0be46c13 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1552,18 +1552,26 @@ created."
      ;; happens to look good with the only current use of header-lines,
      ;; the info browser. XXX
      (:underline t))
-    (((class color) (background light))
-     (:box (:line-width 1 :style released-button)
-          :background "grey90" :foreground "grey20"
-          :inherit mode-line))
-    (((class color) (background dark))
-     (:box (:line-width 1 :style released-button)
-          :background "grey20" :foreground "grey90"
-          :inherit mode-line))
-    (((class mono))
-     (:box (:line-width 1 :style released-button)
-          :background "grey"
-          :inherit mode-line))
+    (((class color grayscale) (background light))
+     (:inherit mode-line
+      :background "grey90" :foreground "grey20"
+      :box (:line-width 1 :style released-button)))
+    (((class color grayscale) (background dark))
+     (:inherit mode-line
+      :background "grey20" :foreground "grey90"
+      :box (:line-width 1 :style released-button)))
+    (((class mono) (background light))
+     (:inherit mode-line
+      :background "white" :foreground "black"
+      :inverse-video nil
+      :box nil
+      :underline t))
+    (((class mono) (background dark))
+     (:inherit mode-line
+      :background "black" :foreground "white"
+      :inverse-video nil
+      :box nil
+      :underline t))
     (t
      (:inverse-video t)))
   "Basic header-line face."