From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Dan Nicolaescu <dann@ics.uci.edu>
Newsgroups: gmane.emacs.devel
Subject: Re: face colors on 256 colors terminals
Date: Thu, 07 Apr 2005 11:27:36 -0700
Message-ID: <200504071827.j37IRdAH006473@scanner2.ics.uci.edu>
References: <200504060817.j368HDAH019106@scanner2.ics.uci.edu>
	<01c53acd$Blat.v2.4$7c0f2080@zahav.net.il>
	<200504062134.j36LY8AH022227@scanner2.ics.uci.edu>
	<01c53b25$Blat.v2.4$80e8db20@zahav.net.il>
NNTP-Posting-Host: main.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Trace: sea.gmane.org 1112899837 23801 80.91.229.2 (7 Apr 2005 18:50:37 GMT)
X-Complaints-To: usenet@sea.gmane.org
NNTP-Posting-Date: Thu, 7 Apr 2005 18:50:37 +0000 (UTC)
Cc: emacs-devel@gnu.org
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 07 20:50:31 2005
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
Original-Received: from lists.gnu.org ([199.232.76.165])
	by ciao.gmane.org with esmtp (Exim 4.43)
	id 1DJc3a-0006wX-Ca
	for ged-emacs-devel@m.gmane.org; Thu, 07 Apr 2005 20:49:09 +0200
Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1DJbcv-0007n4-0T
	for ged-emacs-devel@m.gmane.org; Thu, 07 Apr 2005 14:21:13 -0400
Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DJbcb-0007lD-BA
	for emacs-devel@gnu.org; Thu, 07 Apr 2005 14:20:53 -0400
Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DJbXA-0006mz-Lb
	for emacs-devel@gnu.org; Thu, 07 Apr 2005 14:15:28 -0400
Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DJbX9-0006eI-JE
	for emacs-devel@gnu.org; Thu, 07 Apr 2005 14:15:15 -0400
Original-Received: from [128.195.1.36] (helo=scanner2.ics.uci.edu)
	by monty-python.gnu.org with esmtp (Exim 4.34)
	id 1DJbmP-0003hn-SU; Thu, 07 Apr 2005 14:31:02 -0400
Original-Received: from vino.ics.uci.edu (vino.ics.uci.edu [128.195.11.198])
	by scanner2.ics.uci.edu (8.12.10/8.12.10) with ESMTP id j37IRdAH006473; 
	Thu, 7 Apr 2005 11:27:39 -0700 (PDT)
Original-To: Eli Zaretskii <eliz@gnu.org>
In-Reply-To: <01c53b25$Blat.v2.4$80e8db20@zahav.net.il> (Eli Zaretskii's
	message of "Thu, 07 Apr 2005 06:53:28 +0300")
Original-Lines: 1068
X-ICS-MailScanner: Found to be clean
X-ICS-MailScanner-SpamCheck: not spam (whitelisted), SpamAssassin (timed out)
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=subscribe>
Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Xref: news.gmane.org gmane.emacs.devel:35705
X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:35705

"Eli Zaretskii" <eliz@gnu.org> writes:

  > > Cc: emacs-devel@gnu.org
  > > From: Dan Nicolaescu <dann@ics.uci.edu>
  > 
  > Hmmm... "bother", as they say.  The changes to the face colors that
  > are under (min-colors 88) or when there's a separate color for less
  > color-capable displays are okay.  But there are few cases where
  > there's a single color definition, like the one above, which is
  > applicable to all color-capable displays.  In these cases, the changes
  > you suggest will have a significant effect on 16-color text terminals,
  > because cyan1, blue1, red1 etc. are translated to the bright shades of
  > the respective colors, so what was red will now be brightred.  The
  > bright shades are quite annoying in many situations.
  >
  > 
  > So I think we should change this patch so as not to change the color
  > definitions on displays that support less than 88 colors.  That is, in
  > those cases where there's a single color definition, split it into 2
  > and change only the one for >88 colors.

OK, I did this, except for a few faces that are supposed to stand out
by design, for those using the brighter colors seemed more appropriate
for 16-colore terminals too. These faces are:  custom-invalid-face
trailing-whitespace, c-invalid-face-name, whitespace-highlight-face.

Index: comint.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/comint.el,v
retrieving revision 1.310
diff -c -3 -p -r1.310 comint.el
*** comint.el	5 Apr 2005 01:21:23 -0000	1.310
--- comint.el	7 Apr 2005 18:16:38 -0000
*************** This variable is buffer-local."
*** 228,234 ****
    :group 'comint)
  
  (defface comint-highlight-prompt
!   '((((background dark)) (:foreground "cyan"))
      (t (:foreground "dark blue")))
    "Face to use to highlight prompts."
    :group 'comint)
--- 228,235 ----
    :group 'comint)
  
  (defface comint-highlight-prompt
!   '(((min-colors 88) ((background dark)) (:foreground "cyan1"))
!     (((background dark)) (:foreground "cyan"))
      (t (:foreground "dark blue")))
    "Face to use to highlight prompts."
    :group 'comint)
Index: cus-edit.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/cus-edit.el,v
retrieving revision 1.217
diff -c -3 -p -r1.217 cus-edit.el
*** cus-edit.el	5 Apr 2005 06:40:12 -0000	1.217
--- cus-edit.el	7 Apr 2005 18:16:38 -0000
*************** item in another window.\n\n"))
*** 1633,1639 ****
    :group 'custom-buffer)
  
  (defface custom-invalid-face '((((class color))
! 				(:foreground "yellow" :background "red"))
  			       (t
  				(:weight bold :slant italic :underline t)))
    "Face used when the customize item is invalid."
--- 1633,1639 ----
    :group 'custom-buffer)
  
  (defface custom-invalid-face '((((class color))
! 				(:foreground "yellow1" :background "red1"))
  			       (t
  				(:weight bold :slant italic :underline t)))
    "Face used when the customize item is invalid."
*************** item in another window.\n\n"))
*** 1646,1666 ****
    "Face used when the customize item is not defined for customization."
    :group 'custom-magic-faces)
  
! (defface custom-modified-face '((((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))
  			    (: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))
  				(:foreground "white" :background "blue"))
  			       (t
  				(:slant italic)))
--- 1646,1672 ----
    "Face used when the customize item is not defined for customization."
    :group 'custom-magic-faces)
  
! (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 '((((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 '((((min-colors 88) (class color))
! 				(:foreground "white" :background "blue1"))
! 			       (((class color))
  				(:foreground "white" :background "blue"))
  			       (t
  				(:slant italic)))
*************** If INITIAL-STRING is non-nil, use that r
*** 2148,2156 ****
    `((((class color)
        (background dark))
       (:foreground "light blue" :weight bold :height 1.2 :inherit variable-pitch))
      (((class color)
        (background light))
!      (:foreground "blue" :weight bold :height 1.2 :inherit variable-pitch))
      (t (:weight bold)))
    "Face used for unpushable variable tags."
    :group 'custom-faces)
--- 2154,2165 ----
    `((((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))    
      (t (:weight bold)))
    "Face used for unpushable variable tags."
    :group 'custom-faces)
*************** and so forth.  The remaining group tags 
*** 3392,3397 ****
--- 3401,3409 ----
    `((((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))
*************** and so forth.  The remaining group tags 
*** 3403,3408 ****
--- 3415,3423 ----
    `((((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))
Index: font-lock.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/font-lock.el,v
retrieving revision 1.236
diff -c -3 -p -r1.236 font-lock.el
*** font-lock.el	28 Mar 2005 16:45:43 -0000	1.236
--- font-lock.el	7 Apr 2005 18:16:38 -0000
*************** Sets various variables using `font-lock-
*** 1657,1663 ****
    '((((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 16) (background light)) (:foreground "Purple"))
      (((class color) (min-colors 16) (background dark)) (:foreground "Cyan"))
      (((class color) (min-colors 8)) (:foreground "cyan" :weight bold))
--- 1657,1663 ----
    '((((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 "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))
*************** Sets various variables using `font-lock-
*** 1678,1684 ****
    :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 dark)) (:foreground "LightSkyBlue"))
      (((class color) (min-colors 16) (background light)) (:foreground "Blue"))
      (((class color) (min-colors 16) (background dark)) (:foreground "LightSkyBlue"))
--- 1678,1684 ----
    :group 'font-lock-highlighting-faces)
  
  (defface font-lock-function-name-face
!   '((((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"))
*************** Sets various variables using `font-lock-
*** 1728,1734 ****
    :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 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))
--- 1728,1734 ----
    :group 'font-lock-highlighting-faces)
  
  (defface font-lock-warning-face
!   '((((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))
Index: generic-x.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/generic-x.el,v
retrieving revision 1.29
diff -c -3 -p -r1.29 generic-x.el
*** generic-x.el	5 Apr 2005 18:33:50 -0000	1.29
--- generic-x.el	7 Apr 2005 18:16:38 -0000
*************** generic-x to enable the specified modes.
*** 1612,1619 ****
  (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"))
      (t (:weight bold)))
    "Font Lock mode face used to highlight TABs."
    :group 'generic-x)
--- 1612,1619 ----
  (defface show-tabs-tab-face
    '((((class grayscale) (background light)) (:background "DimGray"   :weight bold))
      (((class grayscale) (background dark))  (:background "LightGray" :weight bold))
!     (((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)
*************** generic-x to enable the specified modes.
*** 1621,1628 ****
  (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"))
      (t (:weight bold)))
    "Font Lock mode face used to highlight spaces."
    :group 'generic-x)
--- 1621,1628 ----
  (defface show-tabs-space-face
    '((((class grayscale) (background light)) (:background "DimGray"   :weight bold))
      (((class grayscale) (background dark))  (:background "LightGray" :weight bold))
!     (((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)
Index: hi-lock.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/hi-lock.el,v
retrieving revision 1.21
diff -c -3 -p -r1.21 hi-lock.el
*** hi-lock.el	24 Mar 2005 22:12:00 -0000	1.21
--- hi-lock.el	7 Apr 2005 18:16:38 -0000
*************** calls."
*** 119,125 ****
    :group 'hi-lock-interactive-text-highlighting)
  
  (defface hi-yellow
!   '((((background dark)) (:background "yellow" :foreground "black"))
      (t (:background "yellow")))
    "Default face for hi-lock mode."
    :group 'hi-lock-faces)
--- 119,128 ----
    :group 'hi-lock-interactive-text-highlighting)
  
  (defface hi-yellow
!   '((((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)
*************** calls."
*** 131,137 ****
    :group 'hi-lock-faces)
  
  (defface hi-green
!   '((((background dark)) (:background "green" :foreground "black"))
      (t (:background "green")))
    "Face for hi-lock mode."
    :group 'hi-lock-faces)
--- 134,143 ----
    :group 'hi-lock-faces)
  
  (defface hi-green
!   '((((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)
*************** calls."
*** 148,164 ****
    :group 'hi-lock-faces)
  
  (defface hi-blue-b
!   '((t (:weight bold :foreground "blue")))
    "Face for hi-lock mode."
    :group 'hi-lock-faces)
  
  (defface hi-green-b
!   '((t (:weight bold :foreground "green")))
    "Face for hi-lock mode."
    :group 'hi-lock-faces)
  
  (defface hi-red-b
!   '((t (:weight bold :foreground "red")))
    "Face for hi-lock mode."
    :group 'hi-lock-faces)
  
--- 154,173 ----
    :group 'hi-lock-faces)
  
  (defface hi-blue-b
!   '((((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
!   '((((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
!   '((((min-colors 88)) (:weight bold :foreground "red1"))
!     (t (:weight bold :foreground "red")))
    "Face for hi-lock mode."
    :group 'hi-lock-faces)
  
Index: hilit-chg.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/hilit-chg.el,v
retrieving revision 1.27
diff -c -3 -p -r1.27 hilit-chg.el
*** hilit-chg.el	24 Mar 2005 22:13:39 -0000	1.27
--- hilit-chg.el	7 Apr 2005 18:16:38 -0000
***************
*** 213,226 ****
  ;; indentation on inserts gets underlined (which can look pretty ugly!).
  
  (defface highlight-changes-face
!   '((((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))
      (t (:inverse-video t)))
    "Face used for highlighting deletions."
    :group 'highlight-changes)
--- 213,228 ----
  ;; indentation on inserts gets underlined (which can look pretty ugly!).
  
  (defface highlight-changes-face
!   '((((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
!   '((((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)
Index: ido.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ido.el,v
retrieving revision 1.49
diff -c -3 -p -r1.49 ido.el
*** ido.el	31 Mar 2005 22:22:45 -0000	1.49
--- ido.el	7 Apr 2005 18:16:39 -0000
*************** subdirs in the alternatives."
*** 747,759 ****
    "*Font used by ido for highlighting only match."
    :group 'ido)
  
! (defface ido-subdir-face  '((((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))
  				(:foreground "yellow"
  				 :background "red"
  				 :width condensed))
--- 747,765 ----
    "*Font used by ido for highlighting only match."
    :group 'ido)
  
! (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  '((((min-colors 88) (class color))
! 				(:foreground "yellow1"
! 				 :background "red1"
! 				 :width condensed))
! 			       (((class color))
  				(:foreground "yellow"
  				 :background "red"
  				 :width condensed))
Index: info.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/info.el,v
retrieving revision 1.423
diff -c -3 -p -r1.423 info.el
*** info.el	7 Apr 2005 15:16:01 -0000	1.423
--- info.el	7 Apr 2005 18:16:39 -0000
*************** The Lisp code is executed when the node 
*** 83,89 ****
    :group 'info)
  
  (defface info-xref
!   '((((class color) (background light)) :foreground "blue" :underline t)
      (((class color) (background dark)) :foreground "cyan" :underline t)
      (t :underline t))
    "Face for Info cross-references."
--- 83,93 ----
    :group 'info)
  
  (defface info-xref
!   '((((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."
Index: pcvs-info.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/pcvs-info.el,v
retrieving revision 1.20
diff -c -3 -p -r1.20 pcvs-info.el
*** pcvs-info.el	7 Sep 2004 04:51:47 -0000	1.20
--- pcvs-info.el	7 Apr 2005 18:16:39 -0000
*************** to confuse some users sometimes."
*** 105,111 ****
    :group 'pcl-cvs)
  
  (defface cvs-marked-face
!   '((((class color) (background dark))
       (:foreground "green" :weight bold))
      (((class color) (background light))
       (:foreground "green3" :weight bold))
--- 105,113 ----
    :group 'pcl-cvs)
  
  (defface cvs-marked-face
!   '((((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))
Index: printing.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/printing.el,v
retrieving revision 1.26
diff -c -3 -p -r1.26 printing.el
*** printing.el	21 Nov 2004 23:05:20 -0000	1.26
--- printing.el	7 Apr 2005 18:16:39 -0000
*************** Please send all bug fixes and enhancemen
*** 994,1001 ****
  
  ;;; Code:
  
! 
! (require 'lpr)
  (require 'ps-print)
  
  
--- 994,1000 ----
  
  ;;; Code:
  
! ;;; this can be deleted if the test below is eliminated
  (require 'ps-print)
  
  
*************** COMMAND.exe, COMMAND.bat and COMMAND.com
*** 5754,5763 ****
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  ;; Printing Interface (inspired on ps-print-interface.el)
  
! 
! (require 'widget)
! (require 'wid-edit)
! (require 'cus-edit)
  
  
  (defvar pr-i-window-configuration nil)
--- 5753,5762 ----
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  ;; Printing Interface (inspired on ps-print-interface.el)
  
! ;; These are not needed, the functions used are autoloaded
! ;; (require 'widget)
! ;; (require 'wid-edit)
! ;; (require 'cus-edit)
  
  
  (defvar pr-i-window-configuration nil)
Index: smerge-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/smerge-mode.el,v
retrieving revision 1.33
diff -c -3 -p -r1.33 smerge-mode.el
*** smerge-mode.el	4 Apr 2005 09:09:01 -0000	1.33
--- smerge-mode.el	7 Apr 2005 18:16:39 -0000
*************** Used in `smerge-diff-base-mine' and rela
*** 76,83 ****
    :type 'boolean)
  
  (defface smerge-mine-face
!   '((((background light))
       (:foreground "blue"))
      (((background dark))
       (:foreground "cyan")))
    "Face for your code."
--- 76,87 ----
    :type 'boolean)
  
  (defface smerge-mine-face
!   '((((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."
*************** Used in `smerge-diff-base-mine' and rela
*** 94,100 ****
  (defvar smerge-other-face 'smerge-other-face)
  
  (defface smerge-base-face
!   '((((background light))
       (:foreground "red"))
      (((background dark))
       (:foreground "orange")))
--- 98,106 ----
  (defvar smerge-other-face 'smerge-other-face)
  
  (defface smerge-base-face
!   '((((min-colors 88) (background light))
!      (:foreground "red1"))
!     (((background light))
       (:foreground "red"))
      (((background dark))
       (:foreground "orange")))
Index: whitespace.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/whitespace.el,v
retrieving revision 1.30
diff -c -3 -p -r1.30 whitespace.el
*** whitespace.el	16 Oct 2004 15:26:23 -0000	1.30
--- whitespace.el	7 Apr 2005 18:16:39 -0000
*************** To disable timer scans, set this to zero
*** 319,325 ****
    :group 'faces)
  
  (defface whitespace-highlight-face '((((class color) (background light))
! 				      (:background "green"))
  				     (((class color) (background dark))
  				      (:background "sea green"))
  				     (((class grayscale mono)
--- 319,325 ----
    :group 'faces)
  
  (defface whitespace-highlight-face '((((class color) (background light))
! 				      (:background "green1"))
  				     (((class color) (background dark))
  				      (:background "sea green"))
  				     (((class grayscale mono)
Index: wid-edit.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/wid-edit.el,v
retrieving revision 1.137
diff -c -3 -p -r1.137 wid-edit.el
*** wid-edit.el	5 Apr 2005 06:41:09 -0000	1.137
--- wid-edit.el	7 Apr 2005 18:16:39 -0000
*************** Recommended as a parent keymap for modes
*** 883,889 ****
         (lookup-key widget-global-map (this-command-keys))))))
  
  (defface widget-button-pressed-face
!   '((((class color))
       (:foreground "red"))
      (t
       (:weight bold :underline t)))
--- 883,891 ----
         (lookup-key widget-global-map (this-command-keys))))))
  
  (defface widget-button-pressed-face
!   '((((min-colors 88) (class color))
!      (:foreground "red1"))
!     (((class color))
       (:foreground "red"))
      (t
       (:weight bold :underline t)))
Index: woman.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/woman.el,v
retrieving revision 1.26
diff -c -3 -p -r1.26 woman.el
*** woman.el	15 Jan 2005 12:45:28 -0000	1.26
--- woman.el	7 Apr 2005 18:16:40 -0000
*************** or different fonts."
*** 876,888 ****
  ;; 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"))
      (((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"))
      (((background dark)) (:weight bold :foreground "green2")))
    "Face for bold font in man pages."
    :group 'woman-faces)
--- 876,891 ----
  ;; 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
!   `((((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
!   '((((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)
*************** or different fonts."
*** 892,897 ****
--- 895,901 ----
  ;; 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)
Index: calendar/calendar.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/calendar/calendar.el,v
retrieving revision 1.167
diff -c -3 -p -r1.167 calendar.el
*** calendar/calendar.el	30 Mar 2005 16:55:58 -0000	1.167
--- calendar/calendar.el	7 Apr 2005 18:16:40 -0000
*************** If nil, make an icon of the frame.  If n
*** 209,216 ****
  (defvar diary-face 'diary-face
    "Face name to use for diary entries.")
  (defface diary-face
!   '((((class color) (background light))
       :foreground "red")
      (((class color) (background dark))
       :foreground "yellow")
      (t
--- 209,220 ----
  (defvar diary-face 'diary-face
    "Face name to use for diary entries.")
  (defface diary-face
!   '((((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
Index: emacs-lisp/re-builder.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emacs-lisp/re-builder.el,v
retrieving revision 1.20
diff -c -3 -p -r1.20 re-builder.el
*** emacs-lisp/re-builder.el	27 Feb 2005 10:35:51 -0000	1.20
--- emacs-lisp/re-builder.el	7 Apr 2005 18:16:40 -0000
*************** Set it to nil if you don't want limits h
*** 177,183 ****
    :group 're-builder)
  
  (defface reb-match-3
!   '((((class color) (background light))
       :background "yellow")
      (((class color) (background dark))
       :background "sienna4")
--- 177,185 ----
    :group 're-builder)
  
  (defface reb-match-3
!   '((((min-colors 88) (class color) (background light))
!      :background "yellow1")
!     (((class color) (background light))
       :background "yellow")
      (((class color) (background dark))
       :background "sienna4")
Index: mh-e/mh-customize.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mh-e/mh-customize.el,v
retrieving revision 1.10
diff -c -3 -p -r1.10 mh-customize.el
*** mh-e/mh-customize.el	25 Aug 2004 05:57:29 -0000	1.10
--- mh-e/mh-customize.el	7 Apr 2005 18:16:41 -0000
*************** The background and foreground is used in
*** 2345,2353 ****
  
  (defface mh-speedbar-selected-folder-face
    '((((class color) (background light))
!      (:foreground "red" :underline t))
      (((class color) (background dark))
!      (:foreground "red" :underline t))
      (t (:underline t)))
    "Face used for the current folder."
    :group 'mh-speed-faces)
--- 2345,2353 ----
  
  (defface mh-speedbar-selected-folder-face
    '((((class color) (background light))
!      (:foreground "red1" :underline t))
      (((class color) (background dark))
!      (:foreground "red1" :underline t))
      (t (:underline t)))
    "Face used for the current folder."
    :group 'mh-speed-faces)
Index: progmodes/cc-fonts.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/cc-fonts.el,v
retrieving revision 1.6
diff -c -3 -p -r1.6 cc-fonts.el
*** progmodes/cc-fonts.el	11 Aug 2004 16:22:21 -0000	1.6
--- progmodes/cc-fonts.el	7 Apr 2005 18:16:41 -0000
***************
*** 194,200 ****
  (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)) (:foreground "hotpink"))
        (t (:inverse-video t)))
      "Face used to highlight invalid syntax."
--- 194,200 ----
  (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 "red1"))
        (((class color)) (:foreground "hotpink"))
        (t (:inverse-video t)))
      "Face used to highlight invalid syntax."
Index: progmodes/compile.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/compile.el,v
retrieving revision 1.349
diff -c -3 -p -r1.349 compile.el
*** progmodes/compile.el	7 Apr 2005 15:15:38 -0000	1.349
--- progmodes/compile.el	7 Apr 2005 18:16:41 -0000
*************** starting the compilation process.")
*** 464,469 ****
--- 464,471 ----
  (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))
Index: progmodes/ebrowse.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/ebrowse.el,v
retrieving revision 1.26
diff -c -3 -p -r1.26 ebrowse.el
*** progmodes/ebrowse.el	15 Jan 2005 12:38:08 -0000	1.26
--- progmodes/ebrowse.el	7 Apr 2005 18:16:41 -0000
*************** This space is used to display markers."
*** 158,170 ****
  
  
  (defface ebrowse-tree-mark-face
!   '((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")))
    "*The face used for root classes in the tree."
    :group 'ebrowse-faces)
  
--- 158,172 ----
  
  
  (defface ebrowse-tree-mark-face
!   '((((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
!   '((((min-colors 88)) (:weight bold :foreground "blue1"))
!     (t (:weight bold :foreground "blue")))
    "*The face used for root classes in the tree."
    :group 'ebrowse-faces)
  
*************** This space is used to display markers."
*** 182,188 ****
  
  
  (defface ebrowse-member-attribute-face
!   '((t (:foreground "red")))
    "*Face used to display member attributes."
    :group 'ebrowse-faces)
  
--- 184,191 ----
  
  
  (defface ebrowse-member-attribute-face
!   '((((min-colors 88)) (:foreground "red1"))
!     (t (:foreground "red")))
    "*Face used to display member attributes."
    :group 'ebrowse-faces)
  
*************** This space is used to display markers."
*** 194,200 ****
  
  
  (defface ebrowse-progress-face
!   '((t (:background "blue")))
    "*Face for progress indicator."
    :group 'ebrowse-faces)
  
--- 197,204 ----
  
  
  (defface ebrowse-progress-face
!   '((((min-colors 88)) (:background "blue1"))
!     (t (:background "blue")))
    "*Face for progress indicator."
    :group 'ebrowse-faces)
  
Index: progmodes/idlw-help.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/idlw-help.el,v
retrieving revision 1.2
diff -c -3 -p -r1.2 idlw-help.el
*** progmodes/idlw-help.el	17 Nov 2004 11:45:29 -0000	1.2
--- progmodes/idlw-help.el	7 Apr 2005 18:16:41 -0000
*************** support."
*** 183,189 ****
    :type 'string)
  
  (defface idlwave-help-link-face
!   '((((class color)) (:foreground "Blue"))
      (t (:weight bold)))
    "Face for highlighting links into IDLWAVE online help."
    :group 'idlwave-online-help)
--- 183,190 ----
    :type 'string)
  
  (defface idlwave-help-link-face
!   '((((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)
Index: progmodes/sh-script.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/sh-script.el,v
retrieving revision 1.147
diff -c -3 -p -r1.147 sh-script.el
*** progmodes/sh-script.el	5 Apr 2005 13:07:42 -0000	1.147
--- progmodes/sh-script.el	7 Apr 2005 18:16:42 -0000
*************** See `sh-feature'.")
*** 779,785 ****
  ;; Font-Lock support
  
  (defface sh-heredoc-face
!   '((((class color)
        (background dark))
       (:foreground "yellow" :weight bold))
      (((class color)
--- 779,788 ----
  ;; Font-Lock support
  
  (defface sh-heredoc-face
!   '((((min-colors 88) (class color)
!       (background dark))
!      (:foreground "yellow1" :weight bold))
!     (((class color)
        (background dark))
       (:foreground "yellow" :weight bold))
      (((class color)
Index: progmodes/vhdl-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/vhdl-mode.el,v
retrieving revision 1.25
diff -c -3 -p -r1.25 vhdl-mode.el
*** progmodes/vhdl-mode.el	25 Mar 2005 10:06:23 -0000	1.25
--- progmodes/vhdl-mode.el	7 Apr 2005 18:16:42 -0000
*************** This does background highlighting of tra
*** 12593,12599 ****
   'vhdl-highlight-faces 'font-lock-variable-name-face 'custom-face)
  
  (defface vhdl-font-lock-prompt-face
!   '((((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."
--- 12593,12601 ----
   'vhdl-highlight-faces 'font-lock-variable-name-face 'custom-face)
  
  (defface vhdl-font-lock-prompt-face
!   '((((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."
*************** This does background highlighting of tra
*** 12634,12639 ****
--- 12636,12643 ----
  
  (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."
*************** expansion function)."
*** 14975,14981 ****
    :group 'speedbar-faces)
  
  (defface vhdl-speedbar-architecture-face
!   '((((class color) (background light)) (:foreground "Blue"))
      (((class color) (background dark)) (:foreground "LightSkyBlue")))
    "Face used for displaying architecture names."
    :group 'speedbar-faces)
--- 14979,14986 ----
    :group 'speedbar-faces)
  
  (defface vhdl-speedbar-architecture-face
!   '((((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)
*************** expansion function)."
*** 15000,15005 ****
--- 15005,15011 ----
  
  (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)
*************** expansion function)."
*** 15017,15023 ****
    :group 'speedbar-faces)
  
  (defface vhdl-speedbar-architecture-selected-face
!   '((((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)
--- 15023,15031 ----
    :group 'speedbar-faces)
  
  (defface vhdl-speedbar-architecture-selected-face
!   '((((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)
*************** expansion function)."
*** 15036,15041 ****
--- 15044,15050 ----
  
  (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)
Index: textmodes/table.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/textmodes/table.el,v
retrieving revision 1.12
diff -c -3 -p -r1.12 table.el
*** textmodes/table.el	18 Mar 2005 23:17:05 -0000	1.12
--- textmodes/table.el	7 Apr 2005 18:16:43 -0000
*************** height."
*** 683,689 ****
    :group 'table)
  
  (defface table-cell-face
!   '((((class color))
       (:foreground "gray90" :background "blue"))
      (t (:bold t)))
    "*Face used for table cell contents."
--- 683,691 ----
    :group 'table)
  
  (defface table-cell-face
!   '((((min-colors 88) (class color))
!      (:foreground "gray90" :background "blue1"))
!     (((class color))
       (:foreground "gray90" :background "blue"))
      (t (:bold t)))
    "*Face used for table cell contents."