summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lisp/ChangeLog39
-rw-r--r--lisp/calendar/calendar.el6
-rw-r--r--lisp/comint.el3
-rw-r--r--lisp/cus-edit.el25
-rw-r--r--lisp/emacs-lisp/re-builder.el6
-rw-r--r--lisp/font-lock.el6
-rw-r--r--lisp/generic-x.el8
-rw-r--r--lisp/hi-lock.el19
-rw-r--r--lisp/hilit-chg.el6
-rw-r--r--lisp/ido.el12
-rw-r--r--lisp/info.el8
-rw-r--r--lisp/mh-e/ChangeLog5
-rw-r--r--lisp/mh-e/mh-customize.el6
-rw-r--r--lisp/pcvs-info.el6
-rw-r--r--lisp/progmodes/cc-fonts.el4
-rw-r--r--lisp/progmodes/compile.el4
-rw-r--r--lisp/progmodes/ebrowse.el14
-rw-r--r--lisp/progmodes/idlw-help.el5
-rw-r--r--lisp/progmodes/sh-script.el5
-rw-r--r--lisp/progmodes/vhdl-mode.el15
-rw-r--r--lisp/smerge-mode.el10
-rw-r--r--lisp/textmodes/table.el4
-rw-r--r--lisp/whitespace.el4
-rw-r--r--lisp/wid-edit.el6
-rw-r--r--lisp/woman.el10
25 files changed, 179 insertions, 57 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4bdc5caa94e..656c03c7d32 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,42 @@
+2005-04-08 Dan Nicolaescu <dann@ics.uci.edu>
+
+ * textmodes/table.el (table-cell-face): Add special case for
+ displays supporting a high number of colors.
+ * progmodes/vhdl-mode.el (vhdl-font-lock-prompt-face)
+ (vhdl-font-lock-reserved-words-face)
+ (vhdl-speedbar-architecture-face)
+ (vhdl-speedbar-instantiation-face)
+ (vhdl-speedbar-architecture-selected-face)
+ (vhdl-speedbar-instantiation-selected-face): Likewise.
+ * progmodes/sh-script.el (sh-heredoc-face): Likewise.
+ * progmodes/idlw-help.el (idlwave-help-link-face): Likewise.
+ * progmodes/ebrowse.el (ebrowse-tree-mark-face)
+ (ebrowse-root-class-face, ebrowse-member-attribute-face)
+ (ebrowse-progress-face): Likewise.
+ * progmodes/compile.el (compilation-info-face): Likewise.
+ * progmodes/cc-fonts.el (c-invalid-face): Likewise.
+ * emacs-lisp/re-builder.el (reb-match-3): Likewise.
+ * calendar/calendar.el (diary-face): Likewise.
+ * woman.el (woman-italic-face, woman-bold-face)
+ (woman-unknown-face): Likewise.
+ * wid-edit.el (widget-button-pressed-face): Likewise.
+ * whitespace.el (whitespace-highlight-face): Likewise.
+ * smerge-mode.el (smerge-mine-face, smerge-base-face): Likewise.
+ * pcvs-info.el (cvs-marked-face): Likewise.
+ * info.el (info-xref): Likewise.
+ * ido.el (ido-subdir-face, ido-indicator-face): Likewise.
+ * hilit-chg.el (highlight-changes-face)
+ (highlight-changes-delete-face): Likewise.
+ * hi-lock.el (hi-yellow, hi-green, hi-blue-b, hi-green-b)
+ (hi-red-b): Likewise.
+ * generic-x.el (show-tabs-tab-face, show-tabs-space-face): Likewise.
+ * font-lock.el (font-lock-keyword-face)
+ (font-lock-function-name-face, font-lock-warning-face): Likewise.
+ * cus-edit.el (custom-invalid-face, custom-modified-face)
+ (custom-set-face, custom-changed-face, custom-variable-tag-face)
+ (custom-group-tag-face-1, custom-group-tag-face): Likewise.
+ * comint.el (comint-highlight-prompt): Likewise.
+
2005-04-08 Lute Kamstra <lute@gnu.org>
* font-lock.el (font-lock-keywords): Docstring fixes.
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 5fc23a15cc9..305ecc1e9bc 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -209,8 +209,12 @@ If nil, make an icon of the frame. If non-nil, delete the frame."
(defvar diary-face 'diary-face
"Face name to use for diary entries.")
(defface diary-face
- '((((class color) (background light))
+ '((((min-colors 88) (class color) (background light))
+ :foreground "red1")
+ (((class color) (background light))
:foreground "red")
+ (((min-colors 88) (class color) (background dark))
+ :foreground "yellow1")
(((class color) (background dark))
:foreground "yellow")
(t
diff --git a/lisp/comint.el b/lisp/comint.el
index 73425710455..520641aca8d 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -228,7 +228,8 @@ This variable is buffer-local."
:group 'comint)
(defface comint-highlight-prompt
- '((((background dark)) (:foreground "cyan"))
+ '(((min-colors 88) ((background dark)) (:foreground "cyan1"))
+ (((background dark)) (:foreground "cyan"))
(t (:foreground "dark blue")))
"Face to use to highlight prompts."
:group 'comint)
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 0b06b3f6980..5be34dd4adb 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1633,7 +1633,7 @@ item in another window.\n\n"))
:group 'custom-buffer)
(defface custom-invalid-face '((((class color))
- (:foreground "yellow" :background "red"))
+ (:foreground "yellow1" :background "red1"))
(t
(:weight bold :slant italic :underline t)))
"Face used when the customize item is invalid."
@@ -1646,21 +1646,27 @@ item in another window.\n\n"))
"Face used when the customize item is not defined for customization."
:group 'custom-magic-faces)
-(defface custom-modified-face '((((class color))
+(defface custom-modified-face '(((min-colors 88) ((class color))
+ (:foreground "white" :background "blue1"))
+ (((class color))
(:foreground "white" :background "blue"))
(t
(:slant italic :bold)))
"Face used when the customize item has been modified."
:group 'custom-magic-faces)
-(defface custom-set-face '((((class color))
+(defface custom-set-face '((((min-colors 88) (class color))
+ (:foreground "blue1" :background "white"))
+ (((class color))
(:foreground "blue" :background "white"))
(t
(:slant italic)))
"Face used when the customize item has been set."
:group 'custom-magic-faces)
-(defface custom-changed-face '((((class color))
+(defface custom-changed-face '((((min-colors 88) (class color))
+ (:foreground "white" :background "blue1"))
+ (((class color))
(:foreground "white" :background "blue"))
(t
(:slant italic)))
@@ -2148,9 +2154,12 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"."
`((((class color)
(background dark))
(:foreground "light blue" :weight bold :height 1.2 :inherit variable-pitch))
+ (((min-colors 88) (class color)
+ (background light))
+ (:foreground "blue1" :weight bold :height 1.2 :inherit variable-pitch))
(((class color)
(background light))
- (:foreground "blue" :weight bold :height 1.2 :inherit variable-pitch))
+ (:foreground "blue" :weight bold :height 1.2 :inherit variable-pitch))
(t (:weight bold)))
"Face used for unpushable variable tags."
:group 'custom-faces)
@@ -3392,6 +3401,9 @@ and so forth. The remaining group tags are shown with
`((((class color)
(background dark))
(:foreground "pink" :weight bold :height 1.2 :inherit variable-pitch))
+ (((min-colors 88) (class color)
+ (background light))
+ (:foreground "red1" :weight bold :height 1.2 :inherit variable-pitch))
(((class color)
(background light))
(:foreground "red" :weight bold :height 1.2 :inherit variable-pitch))
@@ -3403,6 +3415,9 @@ and so forth. The remaining group tags are shown with
`((((class color)
(background dark))
(:foreground "light blue" :weight bold :height 1.2))
+ (((min-colors 88) (class color)
+ (background light))
+ (:foreground "blue1" :weight bold :height 1.2))
(((class color)
(background light))
(:foreground "blue" :weight bold :height 1.2))
diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el
index d26a0ae5f38..1c8d12fef0e 100644
--- a/lisp/emacs-lisp/re-builder.el
+++ b/lisp/emacs-lisp/re-builder.el
@@ -1,6 +1,6 @@
;;; re-builder.el --- building Regexps with visual feedback
-;; Copyright (C) 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
;; Author: Detlev Zundel <dzu@gnu.org>
;; Keywords: matching, lisp, tools
@@ -177,7 +177,9 @@ Set it to nil if you don't want limits here."
:group 're-builder)
(defface reb-match-3
- '((((class color) (background light))
+ '((((min-colors 88) (class color) (background light))
+ :background "yellow1")
+ (((class color) (background light))
:background "yellow")
(((class color) (background dark))
:background "sienna4")
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index c047bed0677..cced6a13ca2 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1657,7 +1657,7 @@ Sets various variables using `font-lock-defaults' (or, if nil, using
'((((class grayscale) (background light)) (:foreground "LightGray" :weight bold))
(((class grayscale) (background dark)) (:foreground "DimGray" :weight bold))
(((class color) (min-colors 88) (background light)) (:foreground "Purple"))
- (((class color) (min-colors 88) (background dark)) (:foreground "Cyan"))
+ (((class color) (min-colors 88) (background dark)) (:foreground "Cyan1"))
(((class color) (min-colors 16) (background light)) (:foreground "Purple"))
(((class color) (min-colors 16) (background dark)) (:foreground "Cyan"))
(((class color) (min-colors 8)) (:foreground "cyan" :weight bold))
@@ -1678,7 +1678,7 @@ Sets various variables using `font-lock-defaults' (or, if nil, using
:group 'font-lock-highlighting-faces)
(defface font-lock-function-name-face
- '((((class color) (min-colors 88) (background light)) (:foreground "Blue"))
+ '((((class color) (min-colors 88) (background light)) (:foreground "Blue1"))
(((class color) (min-colors 88) (background dark)) (:foreground "LightSkyBlue"))
(((class color) (min-colors 16) (background light)) (:foreground "Blue"))
(((class color) (min-colors 16) (background dark)) (:foreground "LightSkyBlue"))
@@ -1728,7 +1728,7 @@ Sets various variables using `font-lock-defaults' (or, if nil, using
:group 'font-lock-highlighting-faces)
(defface font-lock-warning-face
- '((((class color) (min-colors 88) (background light)) (:foreground "Red" :weight bold))
+ '((((class color) (min-colors 88) (background light)) (:foreground "Red1" :weight bold))
(((class color) (min-colors 88) (background dark)) (:foreground "Pink" :weight bold))
(((class color) (min-colors 16) (background light)) (:foreground "Red" :weight bold))
(((class color) (min-colors 16) (background dark)) (:foreground "Pink" :weight bold))
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index d24ed378543..9191c39e553 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -1612,8 +1612,8 @@ generic-x to enable the specified modes."
(defface show-tabs-tab-face
'((((class grayscale) (background light)) (:background "DimGray" :weight bold))
(((class grayscale) (background dark)) (:background "LightGray" :weight bold))
- (((class color) (background light)) (:background "red"))
- (((class color) (background dark)) (:background "red"))
+ (((class color) (min-colors 88)) (:background "red1"))
+ (((class color)) (:background "red"))
(t (:weight bold)))
"Font Lock mode face used to highlight TABs."
:group 'generic-x)
@@ -1621,8 +1621,8 @@ generic-x to enable the specified modes."
(defface show-tabs-space-face
'((((class grayscale) (background light)) (:background "DimGray" :weight bold))
(((class grayscale) (background dark)) (:background "LightGray" :weight bold))
- (((class color) (background light)) (:background "yellow"))
- (((class color) (background dark)) (:background "yellow"))
+ (((class color) (min-colors 88)) (:background "yellow1"))
+ (((class color)) (:background "yellow"))
(t (:weight bold)))
"Font Lock mode face used to highlight spaces."
:group 'generic-x)
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index 431087087f1..137d3cf20da 100644
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -119,7 +119,10 @@ calls."
:group 'hi-lock-interactive-text-highlighting)
(defface hi-yellow
- '((((background dark)) (:background "yellow" :foreground "black"))
+ '((((min-colors 88) (background dark))
+ (:background "yellow1" :foreground "black"))
+ (((background dark)) (:background "yellow" :foreground "black"))
+ (((min-colors 88)) (:background "yellow1"))
(t (:background "yellow")))
"Default face for hi-lock mode."
:group 'hi-lock-faces)
@@ -131,7 +134,10 @@ calls."
:group 'hi-lock-faces)
(defface hi-green
- '((((background dark)) (:background "green" :foreground "black"))
+ '((((min-colors 88) (background dark))
+ (:background "green1" :foreground "black"))
+ (((background dark)) (:background "green" :foreground "black"))
+ ((min-colors 88) (:background "green1"))
(t (:background "green")))
"Face for hi-lock mode."
:group 'hi-lock-faces)
@@ -148,17 +154,20 @@ calls."
:group 'hi-lock-faces)
(defface hi-blue-b
- '((t (:weight bold :foreground "blue")))
+ '((((min-colors 88)) (:weight bold :foreground "blue1"))
+ (t (:weight bold :foreground "blue")))
"Face for hi-lock mode."
:group 'hi-lock-faces)
(defface hi-green-b
- '((t (:weight bold :foreground "green")))
+ '((((min-colors 88)) (:weight bold :foreground "green1"))
+ (t (:weight bold :foreground "green")))
"Face for hi-lock mode."
:group 'hi-lock-faces)
(defface hi-red-b
- '((t (:weight bold :foreground "red")))
+ '((((min-colors 88)) (:weight bold :foreground "red1"))
+ (t (:weight bold :foreground "red")))
"Face for hi-lock mode."
:group 'hi-lock-faces)
diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el
index 8e84bbf68e2..a6db060ce0f 100644
--- a/lisp/hilit-chg.el
+++ b/lisp/hilit-chg.el
@@ -213,14 +213,16 @@
;; indentation on inserts gets underlined (which can look pretty ugly!).
(defface highlight-changes-face
- '((((class color)) (:foreground "red" ))
+ '((((min-colors 88) (class color)) (:foreground "red1" ))
+ (((class color)) (:foreground "red" ))
(t (:inverse-video t)))
"Face used for highlighting changes."
:group 'highlight-changes)
;; This looks pretty ugly, actually. Maybe the underline should be removed.
(defface highlight-changes-delete-face
- '((((class color)) (:foreground "red" :underline t))
+ '((((min-colors 88) (class color)) (:foreground "red1" :underline t))
+ (((class color)) (:foreground "red" :underline t))
(t (:inverse-video t)))
"Face used for highlighting deletions."
:group 'highlight-changes)
diff --git a/lisp/ido.el b/lisp/ido.el
index ddeecbb9b69..2e2aca3126e 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1,6 +1,6 @@
;;; ido.el --- interactively do things with buffers and files.
-;; Copyright (C) 1996-2004 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2004, 2005 Free Software Foundation, Inc.
;; Author: Kim F. Storm <storm@cua.dk>
;; Based on: iswitchb by Stephen Eglen <stephen@cns.ed.ac.uk>
@@ -747,13 +747,19 @@ subdirs in the alternatives."
"*Font used by ido for highlighting only match."
:group 'ido)
-(defface ido-subdir-face '((((class color))
+(defface ido-subdir-face '((((min-colors 88) (class color))
+ (:foreground "red1"))
+ (((class color))
(:foreground "red"))
(t (:underline t)))
"*Font used by ido for highlighting subdirs in the alternatives."
:group 'ido)
-(defface ido-indicator-face '((((class color))
+(defface ido-indicator-face '((((min-colors 88) (class color))
+ (:foreground "yellow1"
+ :background "red1"
+ :width condensed))
+ (((class color))
(:foreground "yellow"
:background "red"
:width condensed))
diff --git a/lisp/info.el b/lisp/info.el
index e44de75072e..81494a167bb 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1,6 +1,6 @@
;;; info.el --- info package for Emacs
-;; Copyright (C) 1985,86,92,93,94,95,96,97,98,99,2000,01,02,03,2004
+;; Copyright (C) 1985,86,92,93,94,95,96,97,98,99,2000,01,02,03,04,2005
;; Free Software Foundation, Inc.
;; Maintainer: FSF
@@ -83,7 +83,11 @@ The Lisp code is executed when the node is selected.")
:group 'info)
(defface info-xref
- '((((class color) (background light)) :foreground "blue" :underline t)
+ '((((min-colors 88)
+ (class color) (background light)) :foreground "blue1" :underline t)
+ (((class color) (background light)) :foreground "blue" :underline t)
+ (((min-colors 88)
+ (class color) (background dark)) :foreground "cyan1" :underline t)
(((class color) (background dark)) :foreground "cyan" :underline t)
(t :underline t))
"Face for Info cross-references."
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 965cb103006..92f997d7b4a 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-08 Dan Nicolaescu <dann@ics.uci.edu>
+
+ * mh-customize.el (mh-speedbar-selected-folder-face): Special case
+ high number of colors displays.
+
2005-03-25 Werner Lemberg <wl@gnu.org>
* mh-e.el, mh-identity.el, mh-mime.el: Replace `legal' with `valid'.
diff --git a/lisp/mh-e/mh-customize.el b/lisp/mh-e/mh-customize.el
index 622c457897f..c9a4b11702d 100644
--- a/lisp/mh-e/mh-customize.el
+++ b/lisp/mh-e/mh-customize.el
@@ -1,6 +1,6 @@
;;; mh-customize.el --- MH-E customization
-;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
;; Author: Bill Wohler <wohler@newt.com>
;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -2345,9 +2345,9 @@ The background and foreground is used in the image."
(defface mh-speedbar-selected-folder-face
'((((class color) (background light))
- (:foreground "red" :underline t))
+ (:foreground "red1" :underline t))
(((class color) (background dark))
- (:foreground "red" :underline t))
+ (:foreground "red1" :underline t))
(t (:underline t)))
"Face used for the current folder."
:group 'mh-speed-faces)
diff --git a/lisp/pcvs-info.el b/lisp/pcvs-info.el
index 77e165b2462..0f66099c46f 100644
--- a/lisp/pcvs-info.el
+++ b/lisp/pcvs-info.el
@@ -1,7 +1,7 @@
;;; pcvs-info.el --- internal representation of a fileinfo entry
;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;; 2000, 2004 Free Software Foundation, Inc.
+;; 2000, 2004, 2005 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@cs.yale.edu>
;; Keywords: pcl-cvs
@@ -105,7 +105,9 @@ to confuse some users sometimes."
:group 'pcl-cvs)
(defface cvs-marked-face
- '((((class color) (background dark))
+ '((((min-colors 88) (class color) (background dark))
+ (:foreground "green1" :weight bold))
+ (((class color) (background dark))
(:foreground "green" :weight bold))
(((class color) (background light))
(:foreground "green3" :weight bold))
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index c5bbfaf86dd..8ca47af91f4 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -1,6 +1,6 @@
;;; cc-fonts.el --- font lock support for CC Mode
-;; Copyright (C) 2002, 03 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
;; Authors: 2003- Alan Mackenzie
;; 2002- Martin Stjernholm
@@ -194,7 +194,7 @@
(unless (c-face-name-p c-invalid-face-name)
(defconst c-invalid-face 'c-invalid-face) ; Necessary in Emacs 19.
(defface c-invalid-face
- '((((class color) (background light)) (:foreground "red"))
+ '((((class color) (background light)) (:foreground "red1"))
(((class color)) (:foreground "hotpink"))
(t (:inverse-video t)))
"Face used to highlight invalid syntax."
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index bcff4d2f70d..6df76e21472 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1,7 +1,7 @@
;;; compile.el --- run compiler as inferior of Emacs, parse error messages
;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;; 2001, 2003, 2004 Free Software Foundation, Inc.
+;; 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
;; Authors: Roland McGrath <roland@gnu.org>,
;; Daniel Pfeiffer <occitan@esperanto.org>
@@ -464,6 +464,8 @@ starting the compilation process.")
(defface compilation-info-face
'((((class color) (min-colors 16) (background light))
(:foreground "Green3" :weight bold))
+ (((class color) (min-colors 88) (background dark))
+ (:foreground "Green1" :weight bold))
(((class color) (min-colors 16) (background dark))
(:foreground "Green" :weight bold))
(((class color)) (:foreground "green" :weight bold))
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index bf11ea28514..ac8ab28d92a 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -1,6 +1,6 @@
;;; ebrowse.el --- Emacs C++ class browser & tags facility
-;; Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000, 2001, 2002
+;; Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000, 2001, 2002, 2005
;; Free Software Foundation Inc.
;; Author: Gerd Moellmann <gerd@gnu.org>
@@ -158,13 +158,15 @@ This space is used to display markers."
(defface ebrowse-tree-mark-face
- '((t (:foreground "red")))
+ '((((min-colors 88)) (:foreground "red1"))
+ (t (:foreground "red")))
"*The face used for the mark character in the tree."
:group 'ebrowse-faces)
(defface ebrowse-root-class-face
- '((t (:weight bold :foreground "blue")))
+ '((((min-colors 88)) (:weight bold :foreground "blue1"))
+ (t (:weight bold :foreground "blue")))
"*The face used for root classes in the tree."
:group 'ebrowse-faces)
@@ -182,7 +184,8 @@ This space is used to display markers."
(defface ebrowse-member-attribute-face
- '((t (:foreground "red")))
+ '((((min-colors 88)) (:foreground "red1"))
+ (t (:foreground "red")))
"*Face used to display member attributes."
:group 'ebrowse-faces)
@@ -194,7 +197,8 @@ This space is used to display markers."
(defface ebrowse-progress-face
- '((t (:background "blue")))
+ '((((min-colors 88)) (:background "blue1"))
+ (t (:background "blue")))
"*Face for progress indicator."
:group 'ebrowse-faces)
diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el
index 28f61b6cbcc..e3da5508342 100644
--- a/lisp/progmodes/idlw-help.el
+++ b/lisp/progmodes/idlw-help.el
@@ -1,7 +1,7 @@
;;; idlw-help.el --- HTML Help code for IDLWAVE
;; Copyright (c) 2000 Carsten Dominik
;; Copyright (c) 2001, 2002 J.D. Smith
-;; Copyright (c) 2003,2004 Free Software Foundation
+;; Copyright (c) 2003,2004,2005 Free Software Foundation
;;
;; Authors: J.D. Smith <jdsmith@as.arizona.edu>
;; Carsten Dominik <dominik@astro.uva.nl>
@@ -183,7 +183,8 @@ support."
:type 'string)
(defface idlwave-help-link-face
- '((((class color)) (:foreground "Blue"))
+ '((((min-colors 88) (class color)) (:foreground "Blue1"))
+ (((class color)) (:foreground "Blue"))
(t (:weight bold)))
"Face for highlighting links into IDLWAVE online help."
:group 'idlwave-online-help)
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 8579cccb0c2..7015c0d943d 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -779,7 +779,10 @@ See `sh-feature'.")
;; Font-Lock support
(defface sh-heredoc-face
- '((((class color)
+ '((((min-colors 88) (class color)
+ (background dark))
+ (:foreground "yellow1" :weight bold))
+ (((class color)
(background dark))
(:foreground "yellow" :weight bold))
(((class color)
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index 7e30a816e15..914c6725cc7 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -12593,7 +12593,9 @@ This does background highlighting of translate-off regions.")
'vhdl-highlight-faces 'font-lock-variable-name-face 'custom-face)
(defface vhdl-font-lock-prompt-face
- '((((class color) (background light)) (:foreground "Red" :bold t))
+ '((((min-colors 88) (class color) (background light))
+ (:foreground "Red1" :bold t))
+ (((class color) (background light)) (:foreground "Red" :bold t))
(((class color) (background dark)) (:foreground "Pink" :bold t))
(t (:inverse-video t)))
"Font lock mode face used to highlight prompts."
@@ -12634,6 +12636,8 @@ This does background highlighting of translate-off regions.")
(defface vhdl-font-lock-reserved-words-face
'((((class color) (background light)) (:foreground "Orange" :bold t))
+ (((min-colors 88) (class color) (background dark))
+ (:foreground "Yellow1" :bold t))
(((class color) (background dark)) (:foreground "Yellow" :bold t))
(t ()))
"Font lock mode face used to highlight additional reserved words."
@@ -14975,7 +14979,8 @@ expansion function)."
:group 'speedbar-faces)
(defface vhdl-speedbar-architecture-face
- '((((class color) (background light)) (:foreground "Blue"))
+ '((((min-colors 88) (class color) (background light)) (:foreground "Blue1"))
+ (((class color) (background light)) (:foreground "Blue"))
(((class color) (background dark)) (:foreground "LightSkyBlue")))
"Face used for displaying architecture names."
:group 'speedbar-faces)
@@ -15000,6 +15005,7 @@ expansion function)."
(defface vhdl-speedbar-instantiation-face
'((((class color) (background light)) (:foreground "Brown"))
+ (((min-colors 88) (class color) (background dark)) (:foreground "Yellow1"))
(((class color) (background dark)) (:foreground "Yellow")))
"Face used for displaying instantiation names."
:group 'speedbar-faces)
@@ -15017,7 +15023,9 @@ expansion function)."
:group 'speedbar-faces)
(defface vhdl-speedbar-architecture-selected-face
- '((((class color) (background light)) (:foreground "Blue" :underline t))
+ '((((min-colors 88) (class color) (background light)) (:foreground "Blue1" :underline t))
+ (((min-colors 88) (class color) (background light)) (:foreground "Blue1" :underline t))
+ (((class color) (background light)) (:foreground "Blue" :underline t))
(((class color) (background dark)) (:foreground "LightSkyBlue" :underline t)))
"Face used for displaying architecture names."
:group 'speedbar-faces)
@@ -15036,6 +15044,7 @@ expansion function)."
(defface vhdl-speedbar-instantiation-selected-face
'((((class color) (background light)) (:foreground "Brown" :underline t))
+ (((min-colors 88) (class color) (background dark)) (:foreground "Yellow1" :underline t))
(((class color) (background dark)) (:foreground "Yellow" :underline t)))
"Face used for displaying instantiation names."
:group 'speedbar-faces)
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index d6a93a935d6..0cab4b31404 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -76,8 +76,12 @@ Used in `smerge-diff-base-mine' and related functions."
:type 'boolean)
(defface smerge-mine-face
- '((((background light))
+ '((((min-colors 88) (background light))
+ (:foreground "blue1"))
+ (((background light))
(:foreground "blue"))
+ (((min-colors 88) (background dark))
+ (:foreground "cyan1"))
(((background dark))
(:foreground "cyan")))
"Face for your code."
@@ -94,7 +98,9 @@ Used in `smerge-diff-base-mine' and related functions."
(defvar smerge-other-face 'smerge-other-face)
(defface smerge-base-face
- '((((background light))
+ '((((min-colors 88) (background light))
+ (:foreground "red1"))
+ (((background light))
(:foreground "red"))
(((background dark))
(:foreground "orange")))
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 52a0c8a1deb..a85e968d3ee 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -683,7 +683,9 @@ height."
:group 'table)
(defface table-cell-face
- '((((class color))
+ '((((min-colors 88) (class color))
+ (:foreground "gray90" :background "blue1"))
+ (((class color))
(:foreground "gray90" :background "blue"))
(t (:bold t)))
"*Face used for table cell contents."
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 323c75ed6de..81a0aec9100 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -1,6 +1,6 @@
;;; whitespace.el --- warn about and clean bogus whitespaces in the file
-;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2005 Free Software Foundation, Inc.
;; Author: Rajesh Vaidheeswarran <rv@gnu.org>
;; Keywords: convenience
@@ -319,7 +319,7 @@ To disable timer scans, set this to zero."
:group 'faces)
(defface whitespace-highlight-face '((((class color) (background light))
- (:background "green"))
+ (:background "green1"))
(((class color) (background dark))
(:background "sea green"))
(((class grayscale mono)
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 74bda990aed..d1ea8197fec 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -1,6 +1,6 @@
;;; wid-edit.el --- Functions for creating and using widgets -*-byte-compile-dynamic: t;-*-
;;
-;; Copyright (C) 1996,97,1999,2000,01,02,2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1996,97,1999,2000,01,02,2003, 2004, 2005 Free Software Foundation, Inc.
;;
;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
;; Maintainer: FSF
@@ -883,7 +883,9 @@ Recommended as a parent keymap for modes using widgets.")
(lookup-key widget-global-map (this-command-keys))))))
(defface widget-button-pressed-face
- '((((class color))
+ '((((min-colors 88) (class color))
+ (:foreground "red1"))
+ (((class color))
(:foreground "red"))
(t
(:weight bold :underline t)))
diff --git a/lisp/woman.el b/lisp/woman.el
index e4b29374a05..4d92c9ee0c7 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -1,6 +1,6 @@
;;; woman.el --- browse UN*X manual pages `wo (without) man'
-;; Copyright (C) 2000, 2002, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2002, 2004, 2005 Free Software Foundation, Inc.
;; Author: Francis J. Wright <F.J.Wright@qmul.ac.uk>
;; Maintainer: Francis J. Wright <F.J.Wright@qmul.ac.uk>
@@ -876,13 +876,16 @@ or different fonts."
;; You should probably select either italic or underline as you prefer, but
;; not both, although italic and underline work together perfectly well!
(defface woman-italic-face
- `((((background light)) (:slant italic :underline t :foreground "red"))
+ `((((min-colors 88) (background light))
+ (:slant italic :underline t :foreground "red1"))
+ (((background light)) (:slant italic :underline t :foreground "red"))
(((background dark)) (:slant italic :underline t)))
"Face for italic font in man pages."
:group 'woman-faces)
(defface woman-bold-face
- '((((background light)) (:weight bold :foreground "blue"))
+ '((((min-colors 88) (background light)) (:weight bold :foreground "blue1"))
+ (((background light)) (:weight bold :foreground "blue"))
(((background dark)) (:weight bold :foreground "green2")))
"Face for bold font in man pages."
:group 'woman-faces)
@@ -892,6 +895,7 @@ or different fonts."
;; non-standard fonts seem to do so badly or in idiosyncratic ways!)
(defface woman-unknown-face
'((((background light)) (:foreground "brown"))
+ (((min-colors 88) (background dark)) (:foreground "cyan1"))
(((background dark)) (:foreground "cyan")))
"Face for all unknown fonts in man pages."
:group 'woman-faces)
View Lorry Controller Status