From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Dan Nicolaescu Newsgroups: gmane.emacs.devel Subject: Re: avoid using (type tty) in ediff [was: Re: avoid using (type tty) in defface] Date: Thu, 16 Sep 2004 14:53:31 -0700 Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Message-ID: <200409162153.i8GLrVMJ021627@amrm2.ics.uci.edu> References: <200404291731.i3THVIGK013069@scanner2.ics.uci.edu> <200405031700.i43H0kGK013386@scanner2.ics.uci.edu> <7494-Sat15May2004152303+0300-eliz@gnu.org> <200405151809.i4FI9mGK015094@scanner2.ics.uci.edu> NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1095371841 9582 80.91.229.6 (16 Sep 2004 21:57:21 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 16 Sep 2004 21:57:21 +0000 (UTC) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Sep 16 23:57:12 2004 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1C84FY-0008Bm-00 for ; Thu, 16 Sep 2004 23:57:09 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1C84LD-0007Td-DD for ged-emacs-devel@m.gmane.org; Thu, 16 Sep 2004 18:02:59 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1C84L5-0007TF-Vm for emacs-devel@gnu.org; Thu, 16 Sep 2004 18:02:52 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1C84L4-0007Sm-VR for emacs-devel@gnu.org; Thu, 16 Sep 2004 18:02:51 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1C84L4-0007Sj-Rp for emacs-devel@gnu.org; Thu, 16 Sep 2004 18:02:50 -0400 Original-Received: from [128.195.11.175] (helo=amrm2.ics.uci.edu) by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168) (Exim 4.34) id 1C84Et-0004RK-8Y for emacs-devel@gnu.org; Thu, 16 Sep 2004 17:56:27 -0400 Original-Received: from amrm2.ics.uci.edu (amrm2 [127.0.0.1]) by amrm2.ics.uci.edu (8.12.11/8.12.11) with ESMTP id i8GLrV77021630 for ; Thu, 16 Sep 2004 14:53:31 -0700 Original-Received: (from dann@localhost) by amrm2.ics.uci.edu (8.12.11/8.12.11/Submit) id i8GLrVMJ021627; Thu, 16 Sep 2004 14:53:31 -0700 Original-To: emacs-devel@gnu.org In-Reply-To: <200405151809.i4FI9mGK015094@scanner2.ics.uci.edu> (Dan Nicolaescu's message of "Sat, 15 May 2004 11:09:51 -0700") Original-Lines: 520 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:27174 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:27174 Dan Nicolaescu 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 * 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,