(mode-line-inactive): Add dark-background variant.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3c7a17ff6deaba8617da4f9076f78331b9740ca4..e5286147be738a0965fbd25a84ffc8e88a103100 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-12  Miles Bader  <miles@gnu.org>
+
+       * faces.el (mode-line-inactive): Add dark-background variant.
+
 2002-02-11  Per Abrahamsen  <abraham@dina.kvl.dk>
 
        * toolbar/tool-bar.el (tool-bar-mode): Removed standard value.
@@ -239,6 +243,7 @@
        * cus-start.el (x-use-underline-position-properties):
        Allow customization.
 
+>>>>>>> 1.3434
 2002-02-04  Simon Josefsson  <jas@extundo.com>
 
        * dired.el (dired-load-hook, dired-mode-hook)

diff --git a/lisp/faces.el b/lisp/faces.el
index 45b5d585282108da944cb84254d7d84835c75c65..be8f6e601e32a8066839ccd424e9c064565ab7ff 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1,6 +1,6 @@
 ;;; faces.el --- Lisp faces
 
-;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 ;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
@@ -1714,11 +1714,16 @@ created."
   :group 'basic-faces)
 
 (defface mode-line-inactive
-  '((((type x w32 mac) (class color))
+  '((((type x w32 mac) (background light) (class color))
      :inherit mode-line
      :weight light
      :box (:line-width -1 :color "grey75" :style nil)
      :foreground "grey20" :background "grey90")
+    (((type x w32 mac) (background dark) (class color))
+     :inherit mode-line
+     :weight light
+     :box (:line-width -1 :color "grey40" :style nil)
+     :foreground "grey80" :background "grey30")
     (t
      :inverse-video t))
   "Basic mode line face for non-selected windows."