avoid using (type tty) in defface

unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed

* avoid using (type tty) in defface
@ 2004-04-29 17:31 Dan Nicolaescu
  2004-05-01  9:44 ` Richard Stallman
  2004-05-15 13:16 ` avoid using (type tty) in defface Eli Zaretskii
  0 siblings, 2 replies; 11+ messages in thread
From: Dan Nicolaescu @ 2004-04-29 17:31 UTC (permalink / raw)



Since Emacs supports terminals with a high number of colors (>88
colors), using (type tty) in defface definitions is not always
desired.

In most cases (type tty) used to synonymous with "supports a small
number of colors", which is not true anymore.

It is better to define faces based on the number of colors the display
support. For example see how faces are defined in font-lock.el

Here is a list of files that make use of (type tty) that might need
to be changed:

compare-w.el
diff-mode.el
ediff-init.el
ruler-mode.el
wid-edit.el
mh-e/mh-customize.el


The patch below fixes the deffaces in compile.el
Iff it's OK, please apply it. 

2004-04-29  Dan Nicolaescu  <dann@ics.uci.edu>

	* progmodes/compile.el (compilation-warning-face)
	(compilation-info-face): Use min-colors.

*** compile.el	29 Apr 2004 07:28:48 -0700	1.309
--- compile.el	29 Apr 2004 07:52:33 -0700	
***************
*** 445,461 ****
  (defvar compile-history nil)
  
  (defface compilation-warning-face
!   '((((type tty) (class color)) (:foreground "cyan" :weight bold))
!     (((class color)) (:foreground "Orange" :weight bold))
      (t (:weight bold)))
    "Face used to highlight compiler warnings."
    :group 'font-lock-highlighting-faces
    :version "21.4")
  
  (defface compilation-info-face
!   '((((type tty) (class color)) (:foreground "green" :weight bold))
!     (((class color) (background light)) (:foreground "Green3" :weight bold))
!     (((class color) (background dark)) (:foreground "Green" :weight bold))
      (t (:weight bold)))
    "Face used to highlight compiler warnings."
    :group 'font-lock-highlighting-faces
--- 445,463 ----
  (defvar compile-history nil)
  
  (defface compilation-warning-face
!   '((((class color) (min-colors 16)) (:foreground "Orange" :weight bold))
!     (((class color)) (:foreground "cyan" :weight bold))
      (t (:weight bold)))
    "Face used to highlight compiler warnings."
    :group 'font-lock-highlighting-faces
    :version "21.4")
  
  (defface compilation-info-face
!   '((((class color) (min-colors 16) (background light)) 
!      (:foreground "Green3" :weight bold))
!     (((class color) (min-colors 16) (background dark)) 
!      (:foreground "Green" :weight bold))
!     (((class color)) (:foreground "green" :weight bold))
      (t (:weight bold)))
    "Face used to highlight compiler warnings."
    :group 'font-lock-highlighting-faces

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: avoid using (type tty) in defface
  2004-04-29 17:31 avoid using (type tty) in defface Dan Nicolaescu
@ 2004-05-01  9:44 ` Richard Stallman
  2004-05-03 17:00   ` Dan Nicolaescu
  2004-05-15 13:16 ` avoid using (type tty) in defface Eli Zaretskii
  1 sibling, 1 reply; 11+ messages in thread
From: Richard Stallman @ 2004-05-01  9:44 UTC (permalink / raw)
  Cc: Dan Nicolaescu

I don't have an opinion about this; if those who know this issue
better think this is the right approach, please install the change.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: avoid using (type tty) in defface
  2004-05-01  9:44 ` Richard Stallman
@ 2004-05-03 17:00   ` Dan Nicolaescu
  2004-05-03 19:10     ` Eli Zaretskii
  2004-05-15 13:23     ` Eli Zaretskii
  0 siblings, 2 replies; 11+ messages in thread
From: Dan Nicolaescu @ 2004-05-03 17:00 UTC (permalink / raw)


Richard Stallman <rms@gnu.org> writes:

  > I don't have an opinion about this; if those who know this issue
  > better think this is the right approach, please install the change.

Well, can someone please install the changes? 
If more clarifications are needed, just ask. 

ediff-init.el and compare-w.el have also been converted to use
min-colors (also diff-mode.el, that change has already been installed). 

Eli, in case you are watching this, for ediff-init.el the places where
(class pc) were treated differently than (class tty) have been kept, I
can guess it was done that way because ":weight bold" was not
desirable for (class pc). 

Thanks.


2004-05-03  Dan Nicolaescu  <dann@ics.uci.edu>

	* ediff-init.el (ediff-current-diff-face-A)
	(ediff-current-diff-face-B, ediff-current-diff-face-C)
	(ediff-current-diff-face-Ancestor) 
	(ediff-fine-diff-face-A)
	(ediff-fine-diff-face-B, ediff-fine-diff-face-C)
	(ediff-fine-diff-face-Ancestor) 
	(ediff-even-diff-face-A)
	(ediff-even-diff-face-B, ediff-even-diff-face-C)
	(ediff-even-diff-face-Ancestor) 
	(ediff-odd-diff-face-A)
	(ediff-odd-diff-face-B, ediff-odd-diff-face-C)
	(ediff-odd-diff-face-Ancestor):  Use min-colors.

	* compare-w.el (compare-windows-face): Use min-colors.

	* progmodes/compile.el (compilation-warning-face)
	(compilation-info-face): Use min-colors.



*** ediff-init.el	27 Mar 2004 23:08:38 -0800	1.64
--- ediff-init.el	02 May 2004 12:55:29 -0700	
***************
*** 902,910 ****
  
  
  (defface ediff-current-diff-face-A
!   '((((type tty))    (:foreground "blue3" :background "yellow3"))
!     (((class color)) (:foreground "firebrick" :background "pale green"))
!     (t	     	     (:inverse-video t)))
    "Face for highlighting the selected difference in buffer A."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
--- 902,912 ----
  
  
  (defface ediff-current-diff-face-A
!   '((((class color) (min-colors 16))
!      (:foreground "firebrick" :background "pale green"))
!     (((class color))
!      (:foreground "blue3" :background "yellow3"))
!     (t		     (:inverse-video t)))
    "Face for highlighting the selected difference in buffer A."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
***************
*** 925,934 ****
  
  
  (defface ediff-current-diff-face-B
!   '((((type tty))    (:foreground "magenta3" :background "yellow3"
! 				  :weight bold))
!     (((class color)) (:foreground "DarkOrchid" :background "Yellow"))
!     (t	     	     (:inverse-video t)))
    "Face for highlighting the selected difference in buffer B."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
--- 927,938 ----
  
  
  (defface ediff-current-diff-face-B
!   '((((class color) (min-colors 16))
!      (:foreground "DarkOrchid" :background "Yellow"))
!     ((((class color)))
!      (:foreground "magenta3" :background "yellow3"
! 		  :weight bold))
!     (t		     (:inverse-video t)))
    "Face for highlighting the selected difference in buffer B."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
***************
*** 948,956 ****
  
  
  (defface ediff-current-diff-face-C
!   '((((type tty))    (:foreground "cyan3" :background "yellow3" :weight bold))
!     (((class color)) (:foreground "Navy" :background "Pink"))
!     (t	     	     (:inverse-video t)))
    "Face for highlighting the selected difference in buffer C."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
--- 952,962 ----
  
  
  (defface ediff-current-diff-face-C
!   '((((class color) (min-colors 16))
!      (:foreground "Navy" :background "Pink"))
!     (((class color))
!      (:foreground "cyan3" :background "yellow3" :weight bold))
!     (t		     (:inverse-video t)))
    "Face for highlighting the selected difference in buffer C."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
***************
*** 970,977 ****
  
  
  (defface ediff-current-diff-face-Ancestor
!   '((((type tty))    (:foreground "black" :background "magenta3"))
!     (((class color)) (:foreground "Black" :background "VioletRed"))
      (t (:inverse-video t)))
    "Face for highlighting the selected difference in buffer Ancestor."
    :group 'ediff-highlighting)
--- 976,985 ----
  
  
  (defface ediff-current-diff-face-Ancestor
!   '((((class color) (min-colors 16))
!      (:foreground "Black" :background "VioletRed"))
!     (((class color))
!      (:foreground "black" :background "magenta3"))
      (t (:inverse-video t)))
    "Face for highlighting the selected difference in buffer Ancestor."
    :group 'ediff-highlighting)
***************
*** 992,999 ****
  
  
  (defface ediff-fine-diff-face-A
!   '((((type tty))    (:foreground "white" :background "sky blue" :weight bold))
!     (((class color)) (:foreground "Navy" :background "sky blue"))
      (t (:underline t :stipple "gray3")))
    "Face for highlighting the refinement of the selected diff in buffer A."
    :group 'ediff-highlighting)
--- 1000,1009 ----
  
  
  (defface ediff-fine-diff-face-A
!   '((((class color) (min-colors 16))
!      (:foreground "Navy" :background "sky blue"))
!     (((class color))
!      (:foreground "white" :background "sky blue" :weight bold))
      (t (:underline t :stipple "gray3")))
    "Face for highlighting the refinement of the selected diff in buffer A."
    :group 'ediff-highlighting)
***************
*** 1007,1015 ****
  (ediff-hide-face 'ediff-fine-diff-face-A)
  
  (defface ediff-fine-diff-face-B
!   '((((type tty))    (:foreground "magenta3" :background "cyan3"))
!     (((class color)) (:foreground "Black" :background "cyan"))
!     (t	     	     (:underline t :stipple "gray3")))
    "Face for highlighting the refinement of the selected diff in buffer B."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
--- 1017,1027 ----
  (ediff-hide-face 'ediff-fine-diff-face-A)
  
  (defface ediff-fine-diff-face-B
!   '((((class color) (min-colors 16))
!      (:foreground "Black" :background "cyan"))
!     (((class color))
!      (:foreground "magenta3" :background "cyan3"))
!     (t		     (:underline t :stipple "gray3")))
    "Face for highlighting the refinement of the selected diff in buffer B."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
***************
*** 1022,1031 ****
  (ediff-hide-face 'ediff-fine-diff-face-B)
  
  (defface ediff-fine-diff-face-C
!   '((((type tty))    (:foreground "yellow3" :background "Turquoise"
! 				  :weight bold))
!     (((type pc))     (:foreground "white" :background "Turquoise"))
!     (((class color)) (:foreground "Black" :background "Turquoise"))
      (t (:underline t :stipple "gray3")))
    "Face for highlighting the refinement of the selected diff in buffer C."
    :group 'ediff-highlighting)
--- 1034,1046 ----
  (ediff-hide-face 'ediff-fine-diff-face-B)
  
  (defface ediff-fine-diff-face-C
!   '((((type pc))
!      (:foreground "white" :background "Turquoise"))
!     (((class color) (min-colors 16))
!      (:foreground "Black" :background "Turquoise"))
!     (((class color))
!      (:foreground "yellow3" :background "Turquoise"
! 		  :weight bold))
      (t (:underline t :stipple "gray3")))
    "Face for highlighting the refinement of the selected diff in buffer C."
    :group 'ediff-highlighting)
***************
*** 1039,1047 ****
  (ediff-hide-face 'ediff-fine-diff-face-C)
  
  (defface ediff-fine-diff-face-Ancestor
!   '((((type tty))    (:foreground "red3" :background "green"))
!     (((class color)) (:foreground "Black" :background "Green"))
!     (t	     	     (:underline t :stipple "gray3")))
    "Face for highlighting the refinement of the selected diff in the ancestor buffer.
  At present, this face is not used and no fine differences are computed for the
  ancestor buffer."
--- 1054,1064 ----
  (ediff-hide-face 'ediff-fine-diff-face-C)
  
  (defface ediff-fine-diff-face-Ancestor
!   '((((class color) (min-colors 16))
!      (:foreground "Black" :background "Green"))
!     (((class color))
!      (:foreground "red3" :background "green"))
!     (t		     (:underline t :stipple "gray3")))
    "Face for highlighting the refinement of the selected diff in the ancestor buffer.
  At present, this face is not used and no fine differences are computed for the
  ancestor buffer."
***************
*** 1065,1075 ****
  	(t "Stipple")))
  
  (defface ediff-even-diff-face-A
!   `((((type tty))    (:foreground "red3" :background "light grey"
! 				  :weight bold))
!     (((type pc))     (:foreground "green3" :background "light grey"))
!     (((class color)) (:foreground "Black" :background "light grey"))
!     (t	     	     (:italic t :stipple ,stipple-pixmap)))
    "Face for highlighting even-numbered non-current differences in buffer A."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
--- 1082,1095 ----
  	(t "Stipple")))
  
  (defface ediff-even-diff-face-A
!   `((((type pc))
!      (:foreground "green3" :background "light grey"))
!     (((class color) (min-colors 16))
!      (:foreground "Black" :background "light grey"))
!     (((class color))
!      (:foreground "red3" :background "light grey"
! 		  :weight bold))
!     (t		     (:italic t :stipple ,stipple-pixmap)))
    "Face for highlighting even-numbered non-current differences in buffer A."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
***************
*** 1082,1090 ****
  (ediff-hide-face 'ediff-even-diff-face-A)
  
  (defface ediff-even-diff-face-B
!   `((((type tty))    (:foreground "blue3" :background "Grey" :weight bold))
!     (((class color)) (:foreground "White" :background "Grey"))
!     (t	     	     (:italic t :stipple ,stipple-pixmap)))
    "Face for highlighting even-numbered non-current differences in buffer B."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
--- 1102,1110 ----
  (ediff-hide-face 'ediff-even-diff-face-A)
  
  (defface ediff-even-diff-face-B
!   `((((class color) (min-colors 16)) (:foreground "White" :background "Grey"))
!     (((class color))    (:foreground "blue3" :background "Grey" :weight bold))
!     (t		     (:italic t :stipple ,stipple-pixmap)))
    "Face for highlighting even-numbered non-current differences in buffer B."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
***************
*** 1097,1107 ****
  (ediff-hide-face 'ediff-even-diff-face-B)
  
  (defface ediff-even-diff-face-C
!   `((((type tty))    (:foreground "yellow3" :background "light grey"
! 				  :weight bold))
!     (((type pc))     (:foreground "yellow3" :background "light grey"))
!     (((class color)) (:foreground "Black" :background "light grey"))
!     (t	     	     (:italic t :stipple ,stipple-pixmap)))
    "Face for highlighting even-numbered non-current differences in buffer C."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
--- 1117,1130 ----
  (ediff-hide-face 'ediff-even-diff-face-B)
  
  (defface ediff-even-diff-face-C
!   `((((type pc))
!      (:foreground "yellow3" :background "light grey"))
!     (((class color) (min-colors 16))
!      (:foreground "Black" :background "light grey"))
!     (((class color))
!      (:foreground "yellow3" :background "light grey"
! 		  :weight bold))
!     (t		     (:italic t :stipple ,stipple-pixmap)))
    "Face for highlighting even-numbered non-current differences in buffer C."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
***************
*** 1114,1123 ****
  (ediff-hide-face 'ediff-even-diff-face-C)
  
  (defface ediff-even-diff-face-Ancestor
!   `((((type tty))    (:foreground "cyan3" :background "light grey"
! 				  :weight bold))
!     (((type pc))     (:foreground "cyan3" :background "light grey"))
!     (((class color)) (:foreground "White" :background "Grey"))
      (t (:italic t :stipple ,stipple-pixmap)))
    "Face for highlighting even-numbered non-current differences in the ancestor buffer."
    :group 'ediff-highlighting)
--- 1137,1149 ----
  (ediff-hide-face 'ediff-even-diff-face-C)
  
  (defface ediff-even-diff-face-Ancestor
!   `((((type pc))
!      (:foreground "cyan3" :background "light grey"))
!     (((class color) (min-colors 16))
!      (:foreground "White" :background "Grey"))
!     (((class color))
!      (:foreground "cyan3" :background "light grey"
! 		  :weight bold))
      (t (:italic t :stipple ,stipple-pixmap)))
    "Face for highlighting even-numbered non-current differences in the ancestor buffer."
    :group 'ediff-highlighting)
***************
*** 1138,1147 ****
      (Ancestor . ediff-even-diff-face-Ancestor)))
  
  (defface ediff-odd-diff-face-A
!   '((((type tty))    (:foreground "red3" :background "black" :weight bold))
!     (((type pc))     (:foreground "green3" :background "gray40"))
!     (((class color)) (:foreground "White" :background "Grey"))
!     (t	     	     (:italic t :stipple "gray1")))
    "Face for highlighting odd-numbered non-current differences in buffer A."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
--- 1164,1176 ----
      (Ancestor . ediff-even-diff-face-Ancestor)))
  
  (defface ediff-odd-diff-face-A
!   '((((type pc))
!      (:foreground "green3" :background "gray40"))
!     (((class color) (min-colors 16))
!      (:foreground "White" :background "Grey"))
!     (((class color))
!      (:foreground "red3" :background "black" :weight bold))
!     (t		     (:italic t :stipple "gray1")))
    "Face for highlighting odd-numbered non-current differences in buffer A."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
***************
*** 1155,1164 ****
  
  
  (defface ediff-odd-diff-face-B
!   '((((type tty))    (:foreground "cyan3" :background "black" :weight bold))
!     (((type pc))     (:foreground "White" :background "gray40"))
!     (((class color)) (:foreground "Black" :background "light grey"))
!     (t	     	     (:italic t :stipple "gray1")))
    "Face for highlighting odd-numbered non-current differences in buffer B."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
--- 1184,1196 ----
  
  
  (defface ediff-odd-diff-face-B
!   '((((type pc))
!      (:foreground "White" :background "gray40"))
!     (((class color) (min-colors 16))
!      (:foreground "Black" :background "light grey"))
!     (((class color))
!      (:foreground "cyan3" :background "black" :weight bold))
!     (t		     (:italic t :stipple "gray1")))
    "Face for highlighting odd-numbered non-current differences in buffer B."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
***************
*** 1171,1180 ****
  (ediff-hide-face 'ediff-odd-diff-face-B)
  
  (defface ediff-odd-diff-face-C
!   '((((type tty))    (:foreground "yellow3" :background "black" :weight bold))
!     (((type pc))     (:foreground "yellow3" :background "gray40"))
!     (((class color)) (:foreground "White" :background "Grey"))
!     (t	     	     (:italic t :stipple "gray1")))
    "Face for highlighting odd-numbered non-current differences in buffer C."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
--- 1203,1215 ----
  (ediff-hide-face 'ediff-odd-diff-face-B)
  
  (defface ediff-odd-diff-face-C
!   '((((type pc))
!      (:foreground "yellow3" :background "gray40"))
!     (((class color) (min-colors 16))
!      (:foreground "White" :background "Grey"))
!     (((class color))
!      (:foreground "yellow3" :background "black" :weight bold))
!     (t		     (:italic t :stipple "gray1")))
    "Face for highlighting odd-numbered non-current differences in buffer C."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
***************
*** 1187,1195 ****
  (ediff-hide-face 'ediff-odd-diff-face-C)
  
  (defface ediff-odd-diff-face-Ancestor
!   '((((type tty))    (:foreground "green3" :background "black" :weight bold))
!     (((class color)) (:foreground "cyan3" :background "gray40"))
!     (t	     	     (:italic t :stipple "gray1")))
    "Face for highlighting odd-numbered non-current differences in the ancestor buffer."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
--- 1222,1232 ----
  (ediff-hide-face 'ediff-odd-diff-face-C)
  
  (defface ediff-odd-diff-face-Ancestor
!   '((((class color) (min-colors 16))
!      (:foreground "cyan3" :background "gray40"))
!     (((class color))
!      (:foreground "green3" :background "black" :weight bold))
!     (t		     (:italic t :stipple "gray1")))
    "Face for highlighting odd-numbered non-current differences in the ancestor buffer."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,

*** compare-w.el	13 Nov 2003 18:33:59 -0800	1.24
--- compare-w.el	02 May 2004 12:49:27 -0700	
***************
*** 1,6 ****
  ;;; compare-w.el --- compare text between windows for Emacs
  
! ;; Copyright (C) 1986, 1989, 1993, 1997, 2003 Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
  ;; Keywords: convenience files
--- 1,6 ----
  ;;; compare-w.el --- compare text between windows for Emacs
  
! ;; Copyright (C) 1986, 1989, 1993, 1997, 2003, 2004 Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
  ;; Keywords: convenience files
***************
*** 117,128 ****
    :group 'compare-w)
  
  (defface compare-windows-face
!   '((((type tty pc) (class color))
!      (:background "turquoise3"))
!     (((class color) (background light))
       (:background "paleturquoise"))
!     (((class color) (background dark))
       (:background "paleturquoise4"))
      (t (:underline t)))
    "Face for highlighting of compare-windows difference regions."
    :group 'compare-w)
--- 117,128 ----
    :group 'compare-w)
  
  (defface compare-windows-face
!   '((((class color) (min-colors 88) (background light))
       (:background "paleturquoise"))
!     (((class color) (min-colors 88) (background dark))
       (:background "paleturquoise4"))
+     (((class color))
+      (:background "turquoise3"))
      (t (:underline t)))
    "Face for highlighting of compare-windows difference regions."
    :group 'compare-w)


*** compile.el	29 Apr 2004 07:28:48 -0700	1.309
--- compile.el	29 Apr 2004 07:52:33 -0700	
***************
*** 445,461 ****
  (defvar compile-history nil)
  
  (defface compilation-warning-face
!   '((((type tty) (class color)) (:foreground "cyan" :weight bold))
!     (((class color)) (:foreground "Orange" :weight bold))
      (t (:weight bold)))
    "Face used to highlight compiler warnings."
    :group 'font-lock-highlighting-faces
    :version "21.4")
  
  (defface compilation-info-face
!   '((((type tty) (class color)) (:foreground "green" :weight bold))
!     (((class color) (background light)) (:foreground "Green3" :weight bold))
!     (((class color) (background dark)) (:foreground "Green" :weight bold))
      (t (:weight bold)))
    "Face used to highlight compiler warnings."
    :group 'font-lock-highlighting-faces
--- 445,463 ----
  (defvar compile-history nil)
  
  (defface compilation-warning-face
!   '((((class color) (min-colors 16)) (:foreground "Orange" :weight bold))
!     (((class color)) (:foreground "cyan" :weight bold))
      (t (:weight bold)))
    "Face used to highlight compiler warnings."
    :group 'font-lock-highlighting-faces
    :version "21.4")
  
  (defface compilation-info-face
!   '((((class color) (min-colors 16) (background light)) 
!      (:foreground "Green3" :weight bold))
!     (((class color) (min-colors 16) (background dark)) 
!      (:foreground "Green" :weight bold))
!     (((class color)) (:foreground "green" :weight bold))
      (t (:weight bold)))
    "Face used to highlight compiler warnings."
    :group 'font-lock-highlighting-faces

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: avoid using (type tty) in defface
  2004-05-03 17:00   ` Dan Nicolaescu
@ 2004-05-03 19:10     ` Eli Zaretskii
  2004-05-15 13:23     ` Eli Zaretskii
  1 sibling, 0 replies; 11+ messages in thread
From: Eli Zaretskii @ 2004-05-03 19:10 UTC (permalink / raw)
  Cc: emacs-devel

> From: Dan Nicolaescu <dann@godzilla.ics.uci.edu>
> Date: Mon, 03 May 2004 10:00:48 -0700
> 
> Well, can someone please install the changes? 

Will do, but that could take a few days (I'm swamped these days).

> Eli, in case you are watching this, for ediff-init.el the places where
> (class pc) were treated differently than (class tty) have been kept, I
> can guess it was done that way because ":weight bold" was not
> desirable for (class pc). 

Thanks for the heads-up.  I rather think that the special treatment of
(type pc) is because the combination of black foreground on the
(translated) Turquoise background was deemed unpleasant.  I will look
into eliminating `pc' there.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: avoid using (type tty) in defface
  2004-05-03 17:00   ` Dan Nicolaescu
  2004-05-03 19:10     ` Eli Zaretskii
@ 2004-05-15 13:23     ` Eli Zaretskii
  2004-05-15 18:09       ` avoid using (type tty) in ediff [was: Re: avoid using (type tty) in defface] Dan Nicolaescu
  1 sibling, 1 reply; 11+ messages in thread
From: Eli Zaretskii @ 2004-05-15 13:23 UTC (permalink / raw)
  Cc: emacs-devel

> From: Dan Nicolaescu <dann@godzilla.ics.uci.edu>
> Date: Mon, 03 May 2004 10:00:48 -0700
> 
> Eli, in case you are watching this, for ediff-init.el the places where
> (class pc) were treated differently than (class tty) have been kept, I
> can guess it was done that way because ":weight bold" was not
> desirable for (class pc). 

No, it's because black on light-gray does not stand out enough on the
DOS terminal.  (I don't like it on other types of display as well, but
if others do, I don't mind customizing them for me.)

I think we should show these changes to the Ediff maintainer and get
his okay.  Could you please do that?

^ permalink raw reply	[flat|nested] 11+ messages in thread

* avoid using (type tty) in ediff [was: Re: avoid using (type tty) in defface]
  2004-05-15 13:23     ` Eli Zaretskii
@ 2004-05-15 18:09       ` Dan Nicolaescu
  2004-09-16 21:53         ` Dan Nicolaescu
  0 siblings, 1 reply; 11+ messages in thread
From: Dan Nicolaescu @ 2004-05-15 18:09 UTC (permalink / raw)
  Cc: Eli Zaretskii, emacs-devel

Hi, 

Could you please take a look at the ediff patch at: 

http://mail.gnu.org/archive/html/emacs-devel/2004-05/msg00158.html

and say it it's OK? 

Please let me know if you want any changes or clarifications.

Thanks. 

        --dan

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: avoid using (type tty) in ediff [was: Re: avoid using (type tty) in defface]
  2004-05-15 18:09       ` avoid using (type tty) in ediff [was: Re: avoid using (type tty) in defface] Dan Nicolaescu
@ 2004-09-16 21:53         ` Dan Nicolaescu
  2004-09-17 21:28           ` avoid using (type tty) in ediff Kim F. Storm
  0 siblings, 1 reply; 11+ messages in thread
From: Dan Nicolaescu @ 2004-09-16 21:53 UTC (permalink / raw)


Dan Nicolaescu <dann@ics.uci.edu> writes:

  > Hi, 
  >
  > Could you please take a look at the ediff patch at: 
  >
  > http://mail.gnu.org/archive/html/emacs-devel/2004-05/msg00158.html
  >
  > and say it it's OK? 
  >
  > Please let me know if you want any changes or clarifications.
  >

Following up to my old message... 
After the above message Michael Kifer, Eli and I had an offlist
discussion about this patch. After some changes Michael agreed with
the changes.  The final version of the patch is below. It would be good
if someone could check it in. Thanks.

2004-05-03  Dan Nicolaescu  <dann@ics.uci.edu>

	* ediff-init.el (ediff-current-diff-face-A)
	(ediff-current-diff-face-B, ediff-current-diff-face-C)
	(ediff-current-diff-face-Ancestor) 
	(ediff-fine-diff-face-A)
	(ediff-fine-diff-face-B, ediff-fine-diff-face-C)
	(ediff-fine-diff-face-Ancestor) 
	(ediff-even-diff-face-A)
	(ediff-even-diff-face-B, ediff-even-diff-face-C)
	(ediff-even-diff-face-Ancestor) 
	(ediff-odd-diff-face-A)
	(ediff-odd-diff-face-B, ediff-odd-diff-face-C)
	(ediff-odd-diff-face-Ancestor):  Use min-colors.


Index: ediff-init.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-init.el,v
retrieving revision 1.64
diff -c -3 -p -c -r1.64 ediff-init.el
*** ediff-init.el	26 Mar 2004 15:16:42 -0000	1.64
--- ediff-init.el	16 Sep 2004 21:50:47 -0000
*************** to temp files when Ediff needs to find f
*** 902,910 ****
  
  
  (defface ediff-current-diff-face-A
!   '((((type tty))    (:foreground "blue3" :background "yellow3"))
!     (((class color)) (:foreground "firebrick" :background "pale green"))
!     (t	     	     (:inverse-video t)))
    "Face for highlighting the selected difference in buffer A."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
--- 902,916 ----
  
  
  (defface ediff-current-diff-face-A
!   (if ediff-emacs-p
!       '((((class color) (min-colors 16))
! 	 (:foreground "firebrick" :background "pale green"))
! 	(((class color))
! 	 (:foreground "blue3" :background "yellow3"))
! 	(t		     (:inverse-video t)))
!     '((((type tty))    (:foreground "blue3" :background "yellow3"))
!       (((class color)) (:foreground "firebrick" :background "pale green"))
!       (t	     	     (:inverse-video t))))
    "Face for highlighting the selected difference in buffer A."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
*************** this variable represents.")
*** 925,934 ****
  
  
  (defface ediff-current-diff-face-B
!   '((((type tty))    (:foreground "magenta3" :background "yellow3"
! 				  :weight bold))
!     (((class color)) (:foreground "DarkOrchid" :background "Yellow"))
!     (t	     	     (:inverse-video t)))
    "Face for highlighting the selected difference in buffer B."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
--- 931,947 ----
  
  
  (defface ediff-current-diff-face-B
!   (if ediff-emacs-p
!       '((((class color) (min-colors 16))
! 	 (:foreground "DarkOrchid" :background "Yellow"))
! 	(((class color))
! 	 (:foreground "magenta3" :background "yellow3"
! 		      :weight bold))
! 	(t		     (:inverse-video t)))
!     '((((type tty))    (:foreground "magenta3" :background "yellow3"
! 				    :weight bold))
!       (((class color)) (:foreground "DarkOrchid" :background "Yellow"))
!       (t	     	     (:inverse-video t))))
    "Face for highlighting the selected difference in buffer B."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
*************** this variable represents.")
*** 948,956 ****
  
  
  (defface ediff-current-diff-face-C
!   '((((type tty))    (:foreground "cyan3" :background "yellow3" :weight bold))
!     (((class color)) (:foreground "Navy" :background "Pink"))
!     (t	     	     (:inverse-video t)))
    "Face for highlighting the selected difference in buffer C."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
--- 961,975 ----
  
  
  (defface ediff-current-diff-face-C
!   (if ediff-emacs-p
!       '((((class color) (min-colors 16))
! 	 (:foreground "Navy" :background "Pink"))
! 	(((class color))
! 	 (:foreground "cyan3" :background "yellow3" :weight bold))
! 	(t		     (:inverse-video t)))
!     '((((type tty))    (:foreground "cyan3" :background "yellow3" :weight bold))
!       (((class color)) (:foreground "Navy" :background "Pink"))
!       (t	     	     (:inverse-video t))))
    "Face for highlighting the selected difference in buffer C."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
*************** this variable represents.")
*** 970,978 ****
  
  
  (defface ediff-current-diff-face-Ancestor
!   '((((type tty))    (:foreground "black" :background "magenta3"))
!     (((class color)) (:foreground "Black" :background "VioletRed"))
!     (t (:inverse-video t)))
    "Face for highlighting the selected difference in buffer Ancestor."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
--- 989,1003 ----
  
  
  (defface ediff-current-diff-face-Ancestor
!   (if ediff-emacs-p
!       '((((class color) (min-colors 16))
! 	 (:foreground "Black" :background "VioletRed"))
! 	(((class color))
! 	 (:foreground "black" :background "magenta3"))
! 	(t (:inverse-video t)))
!     '((((type tty))    (:foreground "black" :background "magenta3"))
!       (((class color)) (:foreground "Black" :background "VioletRed"))
!       (t (:inverse-video t))))
    "Face for highlighting the selected difference in buffer Ancestor."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
*************** this variable represents.")
*** 992,1000 ****
  
  
  (defface ediff-fine-diff-face-A
!   '((((type tty))    (:foreground "white" :background "sky blue" :weight bold))
!     (((class color)) (:foreground "Navy" :background "sky blue"))
!     (t (:underline t :stipple "gray3")))
    "Face for highlighting the refinement of the selected diff in buffer A."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
--- 1017,1031 ----
  
  
  (defface ediff-fine-diff-face-A
!   (if ediff-emacs-p
!       '((((class color) (min-colors 16))
! 	 (:foreground "Navy" :background "sky blue"))
! 	(((class color))
! 	 (:foreground "white" :background "sky blue" :weight bold))
! 	(t (:underline t :stipple "gray3")))
!     '((((type tty))    (:foreground "white" :background "sky blue" :weight bold))
!       (((class color)) (:foreground "Navy" :background "sky blue"))
!       (t (:underline t :stipple "gray3"))))
    "Face for highlighting the refinement of the selected diff in buffer A."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
*************** this variable represents.")
*** 1007,1015 ****
  (ediff-hide-face 'ediff-fine-diff-face-A)
  
  (defface ediff-fine-diff-face-B
!   '((((type tty))    (:foreground "magenta3" :background "cyan3"))
!     (((class color)) (:foreground "Black" :background "cyan"))
!     (t	     	     (:underline t :stipple "gray3")))
    "Face for highlighting the refinement of the selected diff in buffer B."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
--- 1038,1052 ----
  (ediff-hide-face 'ediff-fine-diff-face-A)
  
  (defface ediff-fine-diff-face-B
!   (if ediff-emacs-p
!       '((((class color) (min-colors 16))
! 	 (:foreground "Black" :background "cyan"))
! 	(((class color))
! 	 (:foreground "magenta3" :background "cyan3"))
! 	(t		     (:underline t :stipple "gray3")))
!     '((((type tty))    (:foreground "magenta3" :background "cyan3"))
!       (((class color)) (:foreground "Black" :background "cyan"))
!       (t	     	     (:underline t :stipple "gray3"))))
    "Face for highlighting the refinement of the selected diff in buffer B."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
*************** this variable represents.")
*** 1022,1032 ****
  (ediff-hide-face 'ediff-fine-diff-face-B)
  
  (defface ediff-fine-diff-face-C
!   '((((type tty))    (:foreground "yellow3" :background "Turquoise"
! 				  :weight bold))
!     (((type pc))     (:foreground "white" :background "Turquoise"))
!     (((class color)) (:foreground "Black" :background "Turquoise"))
!     (t (:underline t :stipple "gray3")))
    "Face for highlighting the refinement of the selected diff in buffer C."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
--- 1059,1078 ----
  (ediff-hide-face 'ediff-fine-diff-face-B)
  
  (defface ediff-fine-diff-face-C
!   (if ediff-emacs-p
!       '((((type pc))
! 	 (:foreground "white" :background "Turquoise"))
! 	(((class color) (min-colors 16))
! 	 (:foreground "Black" :background "Turquoise"))
! 	(((class color))
! 	 (:foreground "yellow3" :background "Turquoise"
! 		      :weight bold))
! 	(t (:underline t :stipple "gray3")))
!     '((((type tty))    (:foreground "yellow3" :background "Turquoise"
! 				    :weight bold))
!       (((type pc))     (:foreground "white" :background "Turquoise"))
!       (((class color)) (:foreground "Black" :background "Turquoise"))
!       (t (:underline t :stipple "gray3"))))
    "Face for highlighting the refinement of the selected diff in buffer C."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
*************** this variable represents.")
*** 1039,1047 ****
  (ediff-hide-face 'ediff-fine-diff-face-C)
  
  (defface ediff-fine-diff-face-Ancestor
!   '((((type tty))    (:foreground "red3" :background "green"))
!     (((class color)) (:foreground "Black" :background "Green"))
!     (t	     	     (:underline t :stipple "gray3")))
    "Face for highlighting the refinement of the selected diff in the ancestor buffer.
  At present, this face is not used and no fine differences are computed for the
  ancestor buffer."
--- 1085,1099 ----
  (ediff-hide-face 'ediff-fine-diff-face-C)
  
  (defface ediff-fine-diff-face-Ancestor
!   (if ediff-emacs-p
!       '((((class color) (min-colors 16))
! 	 (:foreground "Black" :background "Green"))
! 	(((class color))
! 	 (:foreground "red3" :background "green"))
! 	(t		     (:underline t :stipple "gray3")))
!     '((((type tty))    (:foreground "red3" :background "green"))
!       (((class color)) (:foreground "Black" :background "Green"))
!       (t	     	     (:underline t :stipple "gray3"))))
    "Face for highlighting the refinement of the selected diff in the ancestor buffer.
  At present, this face is not used and no fine differences are computed for the
  ancestor buffer."
*************** this variable represents.")
*** 1065,1075 ****
  	(t "Stipple")))
  
  (defface ediff-even-diff-face-A
!   `((((type tty))    (:foreground "red3" :background "light grey"
! 				  :weight bold))
!     (((type pc))     (:foreground "green3" :background "light grey"))
!     (((class color)) (:foreground "Black" :background "light grey"))
!     (t	     	     (:italic t :stipple ,stipple-pixmap)))
    "Face for highlighting even-numbered non-current differences in buffer A."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
--- 1117,1136 ----
  	(t "Stipple")))
  
  (defface ediff-even-diff-face-A
!   (if ediff-emacs-p
!       `((((type pc))
! 	 (:foreground "green3" :background "light grey"))
! 	(((class color) (min-colors 16))
! 	 (:foreground "Black" :background "light grey"))
! 	(((class color))
! 	 (:foreground "red3" :background "light grey"
! 		      :weight bold))
! 	(t		     (:italic t :stipple ,stipple-pixmap)))
!     `((((type tty))    (:foreground "red3" :background "light grey"
! 				    :weight bold))
!       (((type pc))     (:foreground "green3" :background "light grey"))
!       (((class color)) (:foreground "Black" :background "light grey"))
!       (t	     	     (:italic t :stipple ,stipple-pixmap))))
    "Face for highlighting even-numbered non-current differences in buffer A."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
*************** this variable represents.")
*** 1082,1090 ****
  (ediff-hide-face 'ediff-even-diff-face-A)
  
  (defface ediff-even-diff-face-B
!   `((((type tty))    (:foreground "blue3" :background "Grey" :weight bold))
!     (((class color)) (:foreground "White" :background "Grey"))
!     (t	     	     (:italic t :stipple ,stipple-pixmap)))
    "Face for highlighting even-numbered non-current differences in buffer B."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
--- 1143,1157 ----
  (ediff-hide-face 'ediff-even-diff-face-A)
  
  (defface ediff-even-diff-face-B
!   (if ediff-emacs-p
!       `((((class color) (min-colors 16)) 
! 	 (:foreground "White" :background "Grey"))
! 	(((class color))    
! 	 (:foreground "blue3" :background "Grey" :weight bold))
! 	(t		     (:italic t :stipple ,stipple-pixmap)))
!     `((((type tty))    (:foreground "blue3" :background "Grey" :weight bold))
!       (((class color)) (:foreground "White" :background "Grey"))
!       (t	     	     (:italic t :stipple ,stipple-pixmap))))
    "Face for highlighting even-numbered non-current differences in buffer B."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
*************** this variable represents.")
*** 1097,1107 ****
  (ediff-hide-face 'ediff-even-diff-face-B)
  
  (defface ediff-even-diff-face-C
!   `((((type tty))    (:foreground "yellow3" :background "light grey"
! 				  :weight bold))
!     (((type pc))     (:foreground "yellow3" :background "light grey"))
!     (((class color)) (:foreground "Black" :background "light grey"))
!     (t	     	     (:italic t :stipple ,stipple-pixmap)))
    "Face for highlighting even-numbered non-current differences in buffer C."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
--- 1164,1183 ----
  (ediff-hide-face 'ediff-even-diff-face-B)
  
  (defface ediff-even-diff-face-C
!   (if ediff-emacs-p
!       `((((type pc))
! 	 (:foreground "yellow3" :background "light grey"))
! 	(((class color) (min-colors 16))
! 	 (:foreground "Black" :background "light grey"))
! 	(((class color))
! 	 (:foreground "yellow3" :background "light grey"
! 		      :weight bold))
! 	(t		     (:italic t :stipple ,stipple-pixmap)))
!     `((((type tty))    (:foreground "yellow3" :background "light grey"
! 				    :weight bold))
!       (((type pc))     (:foreground "yellow3" :background "light grey"))
!       (((class color)) (:foreground "Black" :background "light grey"))
!       (t	     	     (:italic t :stipple ,stipple-pixmap))))
    "Face for highlighting even-numbered non-current differences in buffer C."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
*************** this variable represents.")
*** 1114,1124 ****
  (ediff-hide-face 'ediff-even-diff-face-C)
  
  (defface ediff-even-diff-face-Ancestor
!   `((((type tty))    (:foreground "cyan3" :background "light grey"
! 				  :weight bold))
!     (((type pc))     (:foreground "cyan3" :background "light grey"))
!     (((class color)) (:foreground "White" :background "Grey"))
!     (t (:italic t :stipple ,stipple-pixmap)))
    "Face for highlighting even-numbered non-current differences in the ancestor buffer."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
--- 1190,1209 ----
  (ediff-hide-face 'ediff-even-diff-face-C)
  
  (defface ediff-even-diff-face-Ancestor
!   (if ediff-emacs-p
!       `((((type pc))
! 	 (:foreground "cyan3" :background "light grey"))
! 	(((class color) (min-colors 16))
! 	 (:foreground "White" :background "Grey"))
! 	(((class color))
! 	 (:foreground "cyan3" :background "light grey"
! 		      :weight bold))
! 	(t (:italic t :stipple ,stipple-pixmap)))
!     `((((type tty))    (:foreground "cyan3" :background "light grey"
! 				    :weight bold))
!       (((type pc))     (:foreground "cyan3" :background "light grey"))
!       (((class color)) (:foreground "White" :background "Grey"))
!       (t (:italic t :stipple ,stipple-pixmap))))
    "Face for highlighting even-numbered non-current differences in the ancestor buffer."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
*************** this variable represents.")
*** 1138,1147 ****
      (Ancestor . ediff-even-diff-face-Ancestor)))
  
  (defface ediff-odd-diff-face-A
!   '((((type tty))    (:foreground "red3" :background "black" :weight bold))
!     (((type pc))     (:foreground "green3" :background "gray40"))
!     (((class color)) (:foreground "White" :background "Grey"))
!     (t	     	     (:italic t :stipple "gray1")))
    "Face for highlighting odd-numbered non-current differences in buffer A."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
--- 1223,1240 ----
      (Ancestor . ediff-even-diff-face-Ancestor)))
  
  (defface ediff-odd-diff-face-A
!   (if ediff-emacs-p
!       '((((type pc))
! 	 (:foreground "green3" :background "gray40"))
! 	(((class color) (min-colors 16))
! 	 (:foreground "White" :background "Grey"))
! 	(((class color))
! 	 (:foreground "red3" :background "black" :weight bold))
! 	(t		     (:italic t :stipple "gray1")))
!     '((((type tty))    (:foreground "red3" :background "black" :weight bold))
!       (((type pc))     (:foreground "green3" :background "gray40"))
!       (((class color)) (:foreground "White" :background "Grey"))
!       (t	     	     (:italic t :stipple "gray1"))))
    "Face for highlighting odd-numbered non-current differences in buffer A."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
*************** this variable represents.")
*** 1155,1164 ****
  
  
  (defface ediff-odd-diff-face-B
!   '((((type tty))    (:foreground "cyan3" :background "black" :weight bold))
!     (((type pc))     (:foreground "White" :background "gray40"))
!     (((class color)) (:foreground "Black" :background "light grey"))
!     (t	     	     (:italic t :stipple "gray1")))
    "Face for highlighting odd-numbered non-current differences in buffer B."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
--- 1248,1265 ----
  
  
  (defface ediff-odd-diff-face-B
!   (if ediff-emacs-p
!       '((((type pc))
! 	 (:foreground "White" :background "gray40"))
! 	(((class color) (min-colors 16))
! 	 (:foreground "Black" :background "light grey"))
! 	(((class color))
! 	 (:foreground "cyan3" :background "black" :weight bold))
! 	(t		     (:italic t :stipple "gray1")))
!     '((((type tty))    (:foreground "cyan3" :background "black" :weight bold))
!       (((type pc))     (:foreground "White" :background "gray40"))
!       (((class color)) (:foreground "Black" :background "light grey"))
!       (t	     	     (:italic t :stipple "gray1"))))
    "Face for highlighting odd-numbered non-current differences in buffer B."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
*************** this variable represents.")
*** 1171,1180 ****
  (ediff-hide-face 'ediff-odd-diff-face-B)
  
  (defface ediff-odd-diff-face-C
!   '((((type tty))    (:foreground "yellow3" :background "black" :weight bold))
!     (((type pc))     (:foreground "yellow3" :background "gray40"))
!     (((class color)) (:foreground "White" :background "Grey"))
!     (t	     	     (:italic t :stipple "gray1")))
    "Face for highlighting odd-numbered non-current differences in buffer C."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
--- 1272,1289 ----
  (ediff-hide-face 'ediff-odd-diff-face-B)
  
  (defface ediff-odd-diff-face-C
!   (if ediff-emacs-p
!       '((((type pc))
! 	 (:foreground "yellow3" :background "gray40"))
! 	(((class color) (min-colors 16))
! 	 (:foreground "White" :background "Grey"))
! 	(((class color))
! 	 (:foreground "yellow3" :background "black" :weight bold))
! 	(t		     (:italic t :stipple "gray1")))
!     '((((type tty))    (:foreground "yellow3" :background "black" :weight bold))
!       (((type pc))     (:foreground "yellow3" :background "gray40"))
!       (((class color)) (:foreground "White" :background "Grey"))
!       (t	     	     (:italic t :stipple "gray1"))))
    "Face for highlighting odd-numbered non-current differences in buffer C."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
*************** this variable represents.")
*** 1187,1195 ****
  (ediff-hide-face 'ediff-odd-diff-face-C)
  
  (defface ediff-odd-diff-face-Ancestor
!   '((((type tty))    (:foreground "green3" :background "black" :weight bold))
!     (((class color)) (:foreground "cyan3" :background "gray40"))
!     (t	     	     (:italic t :stipple "gray1")))
    "Face for highlighting odd-numbered non-current differences in the ancestor buffer."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,
--- 1296,1310 ----
  (ediff-hide-face 'ediff-odd-diff-face-C)
  
  (defface ediff-odd-diff-face-Ancestor
!   (if ediff-emacs-p
!       '((((class color) (min-colors 16))
! 	 (:foreground "cyan3" :background "gray40"))
! 	(((class color))
! 	 (:foreground "green3" :background "black" :weight bold))
! 	(t		     (:italic t :stipple "gray1")))
!     '((((type tty))    (:foreground "green3" :background "black" :weight bold))
!       (((class color)) (:foreground "cyan3" :background "gray40"))
!       (t	     	     (:italic t :stipple "gray1"))))
    "Face for highlighting odd-numbered non-current differences in the ancestor buffer."
    :group 'ediff-highlighting)
  ;; An internal variable.  Ediff takes the face from here.  When unhighlighting,

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: avoid using (type tty) in ediff
  2004-09-16 21:53         ` Dan Nicolaescu
@ 2004-09-17 21:28           ` Kim F. Storm
  2004-09-17 21:40             ` Andreas Schwab
  0 siblings, 1 reply; 11+ messages in thread
From: Kim F. Storm @ 2004-09-17 21:28 UTC (permalink / raw)
  Cc: emacs-devel

Dan Nicolaescu <dann@godzilla.ics.uci.edu> writes:

>
> Following up to my old message... 
> After the above message Michael Kifer, Eli and I had an offlist
> discussion about this patch. After some changes Michael agreed with
> the changes.  The final version of the patch is below. It would be good
> if someone could check it in. Thanks.

Installed.

But your diff program seems hoaxed ...

>
> *************** to temp files when Ediff needs to find f
> *** 902,910 ****

> *************** this variable represents.")
> *** 925,934 ****

> *************** this variable represents.")
> *** 948,956 ****

etc.


-- 
Kim F. Storm <storm@cua.dk> http://www.cua.dk

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: avoid using (type tty) in ediff
  2004-09-17 21:28           ` avoid using (type tty) in ediff Kim F. Storm
@ 2004-09-17 21:40             ` Andreas Schwab
  2004-09-17 21:55               ` Kim F. Storm
  0 siblings, 1 reply; 11+ messages in thread
From: Andreas Schwab @ 2004-09-17 21:40 UTC (permalink / raw)
  Cc: Dan Nicolaescu, emacs-devel

storm@cua.dk (Kim F. Storm) writes:

> But your diff program seems hoaxed ...
>
>>
>> *************** to temp files when Ediff needs to find f
>> *** 902,910 ****
>
>> *************** this variable represents.")
>> *** 925,934 ****
>
>> *************** this variable represents.")
>> *** 948,956 ****

That's diff -p.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: avoid using (type tty) in ediff
  2004-09-17 21:40             ` Andreas Schwab
@ 2004-09-17 21:55               ` Kim F. Storm
  0 siblings, 0 replies; 11+ messages in thread
From: Kim F. Storm @ 2004-09-17 21:55 UTC (permalink / raw)
  Cc: Dan Nicolaescu, emacs-devel

Andreas Schwab <schwab@suse.de> writes:

> storm@cua.dk (Kim F. Storm) writes:
>
>> But your diff program seems hoaxed ...
>>
>>>
>>> *************** to temp files when Ediff needs to find f
>>> *** 902,910 ****
>>
>>> *************** this variable represents.")
>>> *** 925,934 ****
>>
>>> *************** this variable represents.")
>>> *** 948,956 ****
>
> That's diff -p.

Ah, I didn't see the connection --
diff -p obviously behaves stupid in non-C files.

-- 
Kim F. Storm <storm@cua.dk> http://www.cua.dk

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: avoid using (type tty) in defface
  2004-04-29 17:31 avoid using (type tty) in defface Dan Nicolaescu
  2004-05-01  9:44 ` Richard Stallman
@ 2004-05-15 13:16 ` Eli Zaretskii
  1 sibling, 0 replies; 11+ messages in thread
From: Eli Zaretskii @ 2004-05-15 13:16 UTC (permalink / raw)
  Cc: emacs-devel

> From: Dan Nicolaescu <dann@ics.uci.edu>
> Date: Thu, 29 Apr 2004 10:31:20 -0700
> 
> The patch below fixes the deffaces in compile.el
> Iff it's OK, please apply it. 

Done.

Thanks!

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2004-09-17 21:55 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-04-29 17:31 avoid using (type tty) in defface Dan Nicolaescu
2004-05-01  9:44 ` Richard Stallman
2004-05-03 17:00   ` Dan Nicolaescu
2004-05-03 19:10     ` Eli Zaretskii
2004-05-15 13:23     ` Eli Zaretskii
2004-05-15 18:09       ` avoid using (type tty) in ediff [was: Re: avoid using (type tty) in defface] Dan Nicolaescu
2004-09-16 21:53         ` Dan Nicolaescu
2004-09-17 21:28           ` avoid using (type tty) in ediff Kim F. Storm
2004-09-17 21:40             ` Andreas Schwab
2004-09-17 21:55               ` Kim F. Storm
2004-05-15 13:16 ` avoid using (type tty) in defface Eli Zaretskii

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).