(isearch, isearch-lazy-highlight-face): Use `min-colors'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6b91102a1e707256e03a55f7d384697bfe8534db..080167bad25dc836537299c37e7b9fc8dffb8134 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2004-02-27  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * faces.el (face-spec-set-match-display): Add a new  attribute,
+       `min-colors'. 
+       (region, highlight, secondary-selection): Use `min-colors`.
+
+       * custom.el (defface): Add documentation for `min-colors'.
+
+       * font-lock.el (font-lock-comment-face, font-lock-string-face)
+       (font-lock-keyword-face, font-lock-function-name-face)
+       (font-lock-variable-name-face, font-lock-constant-face): Use
+       `min-colors`.
+
+       * isearch.el (isearch, isearch-lazy-highlight-face): Use
+       `min-colors'. 
+
 2004-02-25  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
        * ebnf2ps.el: Doc fix.  For compatibility with Emacs 20, define

diff --git a/lisp/isearch.el b/lisp/isearch.el
index d84510eb7a23a1c1e5d72a62b7473a35a000f721..c0d694e84b17f1f217ad0b5970df32c4c27a860d 100644 (file)
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2128,26 +2128,30 @@ A value of nil means highlight all matches."
   :group 'isearch)
 
 (defface isearch
-  '((((type tty pc) (class color))
-     (:background "magenta4" :foreground "cyan1"))
-    (((class color) (background light))
+  '((((class color) (min-colors 88) (background light))
      ;; The background must not be too dark, for that means
      ;; the character is hard to see when the cursor is there.
      (:background "magenta2" :foreground "lightskyblue1"))
-    (((class color) (background dark))
+    (((class color) (min-colors 88) (background dark))
      (:background "palevioletred2" :foreground "brown4"))
+    (((class color) (min-colors 16))
+     (:background "magenta4" :foreground "cyan1"))
+    (((class color) (min-colors 8))
+     (:background "magenta4" :foreground "cyan1"))
     (t (:inverse-video t)))
   "Face for highlighting Isearch matches."
   :group 'isearch-faces)
 (defvar isearch 'isearch)
 
 (defface isearch-lazy-highlight-face
-  '((((type tty pc) (class color))
-     (:background "turquoise3"))
-    (((class color) (background light))
+  '((((class color) (min-colors 88) (background light))
      (:background "paleturquoise"))
-    (((class color) (background dark))
+    (((class color) (min-colors 88) (background dark))
      (:background "paleturquoise4"))
+    (((class color) (min-colors 16))
+     (:background "turquoise3"))
+    (((class color) (min-colors 8))
+     (:background "turquoise3"))
     (t (:underline t)))
   "Face for lazy highlighting of Isearch matches other than the current one."
   :group 'isearch-faces)