aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2004-05-20 16:45:28 +0000
committerEli Zaretskii2004-05-20 16:45:28 +0000
commit88537a99d684a40aeaf960a277447caf575d689a (patch)
treebd985f97671cfaae20bc152ba29bbe3effbb9ee9
parent013d402e904390717e1e10d0c9815999d5ea51d7 (diff)
downloademacs-88537a99d684a40aeaf960a277447caf575d689a.tar.gz
emacs-88537a99d684a40aeaf960a277447caf575d689a.zip
(compare-windows-face): Use min-colors instead of
checking for tty or pc types.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/compare-w.el10
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 81da604aea5..c0b9b0100dd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12004-05-20 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * compare-w.el (compare-windows-face): Use min-colors instead of
4 checking for tty or pc types.
5
12004-05-19 Stefan Monnier <monnier@iro.umontreal.ca> 62004-05-19 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * simple.el (do-auto-fill): Remove unused vars `bol' and `opoint'. 8 * simple.el (do-auto-fill): Remove unused vars `bol' and `opoint'.
diff --git a/lisp/compare-w.el b/lisp/compare-w.el
index d283016750f..7e23c9efedf 100644
--- a/lisp/compare-w.el
+++ b/lisp/compare-w.el
@@ -1,6 +1,6 @@
1;;; compare-w.el --- compare text between windows for Emacs 1;;; compare-w.el --- compare text between windows for Emacs
2 2
3;; Copyright (C) 1986, 1989, 1993, 1997, 2003 Free Software Foundation, Inc. 3;; Copyright (C) 1986,1989,1993,1997,2003,2004 Free Software Foundation, Inc.
4 4
5;; Maintainer: FSF 5;; Maintainer: FSF
6;; Keywords: convenience files 6;; Keywords: convenience files
@@ -117,12 +117,12 @@ and the value `((4) (4))' for horizontally split windows."
117 :group 'compare-w) 117 :group 'compare-w)
118 118
119(defface compare-windows-face 119(defface compare-windows-face
120 '((((type tty pc) (class color)) 120 '((((class color) (min-colors 88) (background light))
121 (:background "turquoise3"))
122 (((class color) (background light))
123 (:background "paleturquoise")) 121 (:background "paleturquoise"))
124 (((class color) (background dark)) 122 (((class color) (min-colors 88) (background dark))
125 (:background "paleturquoise4")) 123 (:background "paleturquoise4"))
124 (((class color))
125 (:background "turquoise3"))
126 (t (:underline t))) 126 (t (:underline t)))
127 "Face for highlighting of compare-windows difference regions." 127 "Face for highlighting of compare-windows difference regions."
128 :group 'compare-w) 128 :group 'compare-w)