[Emacs-diffs] master e39d593 1/2: diff-mode: Improve default faces for buffer ancestor

[Tino Calancha]

branch: master
commit e39d593475300ff388cdb69c8134ad513e9310e7
Author: Tino Calancha <address@hidden>
Commit: Tino Calancha <address@hidden>

    diff-mode: Improve default faces for buffer ancestor
    
    * lisp/vc/ediff-init.el (ediff-current-diff-Ancestor)
    (ediff-fine-diff-Ancestor): Use defaults consistent with
    faces for 'ediff-buffer-A' and 'ediff-buffer-B'.
---
 lisp/vc/ediff-init.el | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el
index 0235926..535fdbf 100644
--- a/lisp/vc/ediff-init.el
+++ b/lisp/vc/ediff-init.el
@@ -942,13 +942,17 @@ this variable represents.")
 
 (defface ediff-current-diff-Ancestor
   (if (featurep 'emacs)
-      '((((class color) (min-colors 88))
-        (:background "VioletRed"))
-       (((class color) (min-colors 16))
-        (:foreground "Black" :background "VioletRed"))
-       (((class color))
-        (:foreground "black" :background "magenta3"))
-       (t (:inverse-video t)))
+      '((((class color) (min-colors 88) (background light))
+         :background "#cfdeee")
+        (((class color) (min-colors 88) (background dark))
+         :background "#004151")
+        (((class color) (min-colors 16) (background light))
+         :background "#cfdeee")
+        (((class color) (min-colors 16) (background dark))
+         :background "#004151")
+        (((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))))
@@ -1052,13 +1056,17 @@ this variable represents.")
 
 (defface ediff-fine-diff-Ancestor
   (if (featurep 'emacs)
-      '((((class color) (min-colors 88))
-        (:background "Green"))
-       (((class color) (min-colors 16))
-        (:foreground "Black" :background "Green"))
-       (((class color))
-        (:foreground "red3" :background "green"))
-       (t                   (:underline t :stipple "gray3")))
+      '((((class color) (min-colors 88) (background light))
+         :background "#00c5c0")
+        (((class color) (min-colors 88) (background dark))
+         :background "#009591")
+        (((class color) (min-colors 16) (background light))
+         :background "#00c5c0")
+        (((class color) (min-colors 16) (background dark))
+         :background "#009591")
+        (((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"))))