[nongnu] elpa/gotham-theme 20f1e67b64 048/214: Add ediff

[ELPA Syncer]

branch: elpa/gotham-theme
commit 20f1e67b64c7d9dda2dd56322b36d0adb992cc7c
Author: Vasilij Schneidermann <v.schneidermann@gmail.com>
Commit: Vasilij Schneidermann <v.schneidermann@gmail.com>

    Add ediff
---
 gotham-theme.el | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/gotham-theme.el b/gotham-theme.el
index 06d235af41..341b7e6310 100644
--- a/gotham-theme.el
+++ b/gotham-theme.el
@@ -187,23 +187,17 @@ depending on DISPLAY for keys which are either 
:foreground or
    (diff-refine-removed :weight bold)
    (diff-removed :foreground red)
 
-   ;; FIXME ediff
-   ;; (ediff-current-diff-a)
-   ;; (ediff-current-diff-ancestor)
-   ;; (ediff-current-diff-b)
-   ;; (ediff-current-diff-c)
-   ;; (ediff-even-diff-a)
-   ;; (ediff-even-diff-ancestor)
-   ;; (ediff-even-diff-b)
-   ;; (ediff-even-diff-c)
-   ;; (ediff-fine-diff-a)
-   ;; (ediff-fine-diff-ancestor)
-   ;; (ediff-fine-diff-b)
-   ;; (ediff-fine-diff-c)
-   ;; (ediff-odd-diff-a)
-   ;; (ediff-odd-diff-ancestor)
-   ;; (ediff-odd-diff-b)
-   ;; (ediff-odd-diff-c)
+   ;; ediff
+   ;; FIXME add support for threeway diffs (*-diff-c)
+   ;; FIXME add support for threeway merges (*-diff-ancestor)
+   (ediff-current-diff-A :foreground red :background base2)
+   (ediff-current-diff-B :foreground green :background base2)
+   (ediff-even-diff-A :background base2)
+   (ediff-even-diff-B :background base2)
+   (ediff-fine-diff-A :foreground red :background base3)
+   (ediff-fine-diff-B :foreground green :background base3)
+   (ediff-odd-diff-A :background base2)
+   (ediff-odd-diff-B :background base2)
 
    ;; eshell
    (eshell-prompt :foreground yellow :weight bold)