[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: avoid using (type tty) in defface
|
From: |
Dan Nicolaescu |
|
Subject: |
Re: avoid using (type tty) in defface |
|
Date: |
Mon, 03 May 2004 10:00:48 -0700 |
Richard Stallman <address@hidden> 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 <address@hidden>
* 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