[Emacs-diffs] trunk r117362: * lisp/vc/ediff-init.el (ediff-current-diff-Ancestor)

[Juri Linkov]

------------------------------------------------------------
revno: 117362
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/10181
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Wed 2014-06-18 11:54:11 +0300
message:
  * lisp/vc/ediff-init.el (ediff-current-diff-Ancestor)
  (ediff-fine-diff-Ancestor, ediff-even-diff-A, ediff-even-diff-B)
  (ediff-even-diff-C, ediff-even-diff-Ancestor, ediff-odd-diff-A)
  (ediff-odd-diff-B, ediff-odd-diff-C, ediff-odd-diff-Ancestor):
  Add `min-colors 88' version with removed black/white foregrounds.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/vc/ediff-init.el          
ediffinit.el-20091113204419-o5vbwnq5f7feedwu-846

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-06-18 08:48:49 +0000
+++ b/lisp/ChangeLog    2014-06-18 08:54:11 +0000
@@ -1,5 +1,14 @@
 2014-06-18  Juri Linkov  <address@hidden>
 
+       * vc/ediff-init.el (ediff-current-diff-Ancestor)
+       (ediff-fine-diff-Ancestor, ediff-even-diff-A, ediff-even-diff-B)
+       (ediff-even-diff-C, ediff-even-diff-Ancestor, ediff-odd-diff-A)
+       (ediff-odd-diff-B, ediff-odd-diff-C, ediff-odd-diff-Ancestor):
+       Add `min-colors 88' version with removed black/white foregrounds.
+       (Bug#10181)
+
+2014-06-18  Juri Linkov  <address@hidden>
+
        * vc/diff-mode.el (diff-changed): Empty face definition to use
        `diff-removed' and `diff-added' on tty as well.  (Bug#10181)
        (diff-context): Use darker color on light background and

=== modified file 'lisp/vc/ediff-init.el'
--- a/lisp/vc/ediff-init.el     2014-05-03 02:27:46 +0000
+++ b/lisp/vc/ediff-init.el     2014-06-18 08:54:11 +0000
@@ -949,7 +949,9 @@
 
 (defface ediff-current-diff-Ancestor
   (if (featurep 'emacs)
-      '((((class color) (min-colors 16))
+      '((((class color) (min-colors 88))
+        (:background "VioletRed"))
+       (((class color) (min-colors 16))
         (:foreground "Black" :background "VioletRed"))
        (((class color))
         (:foreground "black" :background "magenta3"))
@@ -1057,7 +1059,9 @@
 
 (defface ediff-fine-diff-Ancestor
   (if (featurep 'emacs)
-      '((((class color) (min-colors 16))
+      '((((class color) (min-colors 88))
+        (:background "Green"))
+       (((class color) (min-colors 16))
         (:foreground "Black" :background "Green"))
        (((class color))
         (:foreground "red3" :background "green"))
@@ -1091,6 +1095,8 @@
   (if (featurep 'emacs)
       `((((type pc))
         (:foreground "green3" :background "light grey"))
+       (((class color) (min-colors 88))
+        (:background "light grey"))
        (((class color) (min-colors 16))
         (:foreground "Black" :background "light grey"))
        (((class color))
@@ -1115,7 +1121,9 @@
 
 (defface ediff-even-diff-B
   (if (featurep 'emacs)
-      `((((class color) (min-colors 16))
+      `((((class color) (min-colors 88))
+        (:background "Grey"))
+       (((class color) (min-colors 16))
         (:foreground "White" :background "Grey"))
        (((class color))
         (:foreground "blue3" :background "Grey" :weight bold))
@@ -1138,6 +1146,8 @@
   (if (featurep 'emacs)
       `((((type pc))
         (:foreground "yellow3" :background "light grey"))
+       (((class color) (min-colors 88))
+        (:background "light grey"))
        (((class color) (min-colors 16))
         (:foreground "Black" :background "light grey"))
        (((class color))
@@ -1164,6 +1174,8 @@
   (if (featurep 'emacs)
       `((((type pc))
         (:foreground "cyan3" :background "light grey"))
+       (((class color) (min-colors 88))
+        (:background "Grey"))
        (((class color) (min-colors 16))
         (:foreground "White" :background "Grey"))
        (((class color))
@@ -1197,6 +1209,8 @@
   (if (featurep 'emacs)
       '((((type pc))
         (:foreground "green3" :background "gray40"))
+       (((class color) (min-colors 88))
+        (:background "Grey"))
        (((class color) (min-colors 16))
         (:foreground "White" :background "Grey"))
        (((class color))
@@ -1222,6 +1236,8 @@
   (if (featurep 'emacs)
       '((((type pc))
         (:foreground "White" :background "gray40"))
+       (((class color) (min-colors 88))
+        (:background "light grey"))
        (((class color) (min-colors 16))
         (:foreground "Black" :background "light grey"))
        (((class color))
@@ -1246,6 +1262,8 @@
   (if (featurep 'emacs)
       '((((type pc))
         (:foreground "yellow3" :background "gray40"))
+       (((class color) (min-colors 88))
+        (:background "Grey"))
        (((class color) (min-colors 16))
         (:foreground "White" :background "Grey"))
        (((class color))
@@ -1268,7 +1286,9 @@
 
 (defface ediff-odd-diff-Ancestor
   (if (featurep 'emacs)
-      '((((class color) (min-colors 16))
+      '((((class color) (min-colors 88))
+        (:background "gray40"))
+       (((class color) (min-colors 16))
         (:foreground "cyan3" :background "gray40"))
        (((class color))
         (:foreground "green3" :background "black" :weight bold))