(header-line): Don't use a `common' clause for inheriting from the mode-line

face, since we can't override it, and we don't want it for ttys.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 48bd1d60ce97c54ef23232161991e234c1dda502..c333a967f690be4964bb07dcd35e072eb059a28b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-03  Miles Bader  <miles@gnu.org>
+
+       * faces.el (header-line): Don't use a `common' clause for
+       inheriting from the mode-line face, since we can't override it,
+       and we don't want it for ttys.
+
 2002-07-02  Richard M. Stallman  <rms@gnu.org>
 
        * net/ange-ftp.el (ange-ftp-hook-function): Add file-remote-p prop.

diff --git a/lisp/faces.el b/lisp/faces.el
index 2ee70a336d7d50e991068416b1489f145a9dcc48..3dfc24931ad2cf2b29cc4371e2987bc74b116a23 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1808,9 +1808,7 @@ created."
 (put 'modeline-inactive 'face-alias 'mode-line-inactive)
 
 (defface header-line
-  '((t
-     :inherit mode-line)
-    (((type tty))
+  '((((type tty))
      ;; This used to be `:inverse-video t', but that doesn't look very
      ;; good when combined with inverse-video mode-lines and multiple
      ;; windows.  Underlining looks better, and is more consistent with
@@ -1820,24 +1818,27 @@ created."
      ;; highlighting; this may be too confusing in general, although it
      ;; happens to look good with the only current use of header-lines,
      ;; the info browser. XXX
-     :underline t
-     :inverse-video nil)
+     :underline t)
     (((class color grayscale) (background light))
      :background "grey90" :foreground "grey20"
-     :box nil)
+     :box nil
+     :inherit mode-line)
     (((class color grayscale) (background dark))
      :background "grey20" :foreground "grey90"
-     :box nil)
+     :box nil
+     :inherit mode-line)
     (((class mono) (background light))
      :background "white" :foreground "black"
      :inverse-video nil
      :box nil
-     :underline t)
+     :underline t
+     :inherit mode-line)
     (((class mono) (background dark))
      :background "black" :foreground "white"
      :inverse-video nil
      :box nil
-     :underline t))
+     :underline t
+     :inherit mode-line))
   "Basic header-line face."
   :version "21.1"
   :group 'basic-faces)