Mercurial > emacs

changeset 44608:74f2f6095fa9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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): Add special color definitions for tty and MS-DOS displays.
author Eli Zaretskii <eliz@gnu.org>
date Mon, 15 Apr 2002 18:30:38 +0000
parents 8f3420af28a8
children afe4cbc0a63a
files lisp/ediff-init.el
diffstat 1 files changed, 56 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ediff-init.el	Mon Apr 15 16:04:52 2002 +0000
+++ b/lisp/ediff-init.el	Mon Apr 15 18:30:38 2002 +0000
@@ -902,8 +902,9 @@
 
 
 (defface ediff-current-diff-face-A
-  '((((class color)) (:foreground "firebrick" :background "pale green"))
-    (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,
@@ -924,8 +925,10 @@
 
 
 (defface ediff-current-diff-face-B
-  '((((class color)) (:foreground "DarkOrchid" :background "Yellow"))
-    (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,
@@ -945,8 +948,9 @@
 
 
 (defface ediff-current-diff-face-C
-  '((((class color)) (:foreground "Navy" :background "Pink"))
-    (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,
@@ -966,7 +970,8 @@
 
 
 (defface ediff-current-diff-face-Ancestor
-  '((((class color)) (:foreground "Black" :background "VioletRed"))
+  '((((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)
@@ -987,7 +992,8 @@
 
 
 (defface ediff-fine-diff-face-A
-  '((((class color)) (:foreground "Navy" :background "sky blue"))
+  '((((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)
@@ -1001,8 +1007,9 @@
 (ediff-hide-face 'ediff-fine-diff-face-A)
 
 (defface ediff-fine-diff-face-B
-  '((((class color)) (:foreground "Black" :background "cyan"))
-    (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,
@@ -1015,7 +1022,10 @@
 (ediff-hide-face 'ediff-fine-diff-face-B)
 
 (defface ediff-fine-diff-face-C
-  '((((class color)) (:foreground "Black" :background "Turquoise"))
+  '((((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)
@@ -1029,8 +1039,9 @@
 (ediff-hide-face 'ediff-fine-diff-face-C)
 
 (defface ediff-fine-diff-face-Ancestor
-  '((((class color)) (:foreground "Black" :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."
@@ -1054,8 +1065,11 @@
 	(t "Stipple")))
 
 (defface ediff-even-diff-face-A
-  `((((class color)) (:foreground "Black" :background "light grey"))
-    (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,
@@ -1068,8 +1082,9 @@
 (ediff-hide-face 'ediff-even-diff-face-A)
 
 (defface ediff-even-diff-face-B
-  `((((class color)) (:foreground "White" :background "Grey"))
-    (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,
@@ -1082,8 +1097,11 @@
 (ediff-hide-face 'ediff-even-diff-face-B)
 
 (defface ediff-even-diff-face-C
-  `((((class color)) (:foreground "Black" :background "light grey"))
-    (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,
@@ -1096,7 +1114,10 @@
 (ediff-hide-face 'ediff-even-diff-face-C)
 
 (defface ediff-even-diff-face-Ancestor
-  `((((class color)) (:foreground "White" :background "Grey"))
+  `((((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)
@@ -1117,8 +1138,10 @@
     (Ancestor . ediff-even-diff-face-Ancestor)))
 
 (defface ediff-odd-diff-face-A
-  '((((class color)) (:foreground "White" :background "Grey"))
-    (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,
@@ -1132,8 +1155,10 @@
 
 
 (defface ediff-odd-diff-face-B
-  '((((class color)) (:foreground "Black" :background "light grey"))
-    (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,
@@ -1146,8 +1171,10 @@
 (ediff-hide-face 'ediff-odd-diff-face-B)
 
 (defface ediff-odd-diff-face-C
-  '((((class color)) (:foreground "White" :background "Grey"))
-    (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,
@@ -1160,8 +1187,9 @@
 (ediff-hide-face 'ediff-odd-diff-face-C)
 
 (defface ediff-odd-diff-face-Ancestor
-  '((((class color)) (:foreground "Black" :background "light grey"))
-    (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,