Update ediff faces

Author: jamescherti

tomorrow-night-deepblue-theme.el

@@ -372,34 +372,34 @@ names to which it refers are bound."
      (vdiff-subtraction-face ((,class (:foreground ,background :background ,red))))
      (vdiff-closed-fold-face ((,class (:foreground ,blue :background ,darkblue))))
      (vdiff-refine-changed ((,class (:foreground ,background :background ,blue))))
+     (diff-context ((,class ())))
      (diff-added ((,class (:background ,bg-added :foreground ,fg-added))))
      (diff-changed ((,class (:background ,bg-changed :foreground ,fg-changed :extend t))))
      (diff-removed ((,class (:background ,bg-removed :foreground ,fg-removed))))
-     ;; `(diff-indicator-added ((,c :inherit diff-added :foreground ,fg-added)))
+     ;; (diff-indicator-added ((,c :inherit diff-added :foreground ,fg-added)))
      (diff-indicator-added ((,class (:inherit diff-added :foreground ,fg-added))))
-     ;; `(diff-indicator-changed ((,c :inherit diff-changed :foreground ,fg-changed)))
+     ;; (diff-indicator-changed ((,c :inherit diff-changed :foreground ,fg-changed)))
      (diff-indicator-changed ((,class (:inherit diff-changed :foreground ,fg-changed))))
-     ;; `(diff-indicator-removed ((,c :inherit diff-removed :foreground ,fg-removed)))
+     ;; (diff-indicator-removed ((,c :inherit diff-removed :foreground ,fg-removed)))
      (diff-indicator-removed ((,class (:inherit diff-removed :foreground ,fg-removed))))
-     ;; `(diff-file-header ((,c :inherit bold)))
+     ;; (diff-file-header ((,c :inherit bold)))
      (diff-file-header ((,class (:background ,selection))))
      (diff-header ((,class (:background ,current-line))))
      (diff-hl-change ((,class (:background ,bg-changed-refine))))
-     ;; `(diff-hl-delete ((,c :background ,bg-removed-refine)))
+     ;; (diff-hl-delete ((,c :background ,bg-removed-refine)))
      (diff-hl-delete ((,class (:foreground ,background :background ,red))))
      (diff-hl-insert ((,class (:background ,bg-added-refine))))
-     ;; `(diff-hunk-header ((,c :inherit bold :background ,bg-alt)))
+     ;; (diff-hunk-header ((,c :inherit bold :background ,bg-alt)))
      (diff-hunk-header ((,class (:background ,current-line :foreground ,purple))))
      (diff-refine-added ((,class (:background ,bg-added-refine :foreground ,fg-added))))
      (diff-refine-removed ((,class (:background ,bg-removed-refine :foreground ,fg-removed))))
-     ;; `(diff-hl-reverted-hunk-highlight ((,c :background ,fg-main :foreground ,bg-main)))
-     ;; `(diff-changed-unspecified ((,c :inherit diff-changed)))
-     ;; `(diff-refine-changed ((,c :background ,bg-changed-refine :foreground ,fg-changed)))
-     ;; `(diff-context (( )))
-     ;; `(diff-error ((,c :inherit error)))
-     ;; `(diff-function ((,c :background ,bg-alt)))
-     ;; `(diff-index ((,c :inherit italic)))
-     ;; `(diff-nonexistent ((,c :inherit bold)))
+     ;; (diff-hl-reverted-hunk-highlight ((,c :background ,fg-main :foreground ,bg-main)))
+     ;; (diff-changed-unspecified ((,c :inherit diff-changed)))
+     ;; (diff-refine-changed ((,c :background ,bg-changed-refine :foreground ,fg-changed)))
+     ;; (diff-error ((,c :inherit error)))
+     ;; (diff-function ((,c :background ,bg-alt)))
+     ;; (diff-index ((,c :inherit italic)))
+     ;; (diff-nonexistent ((,c :inherit bold)))
      (dired-async-failures ((,class (:inherit error))))
      (dired-async-message ((,class (:inherit success))))
      (dired-async-mode-message ((,class (:inherit warning))))
@@ -459,22 +459,29 @@ names to which it refers are bound."
      (e2wm:face-history-list-normal ((,class (:foreground ,foreground :background ,background))))
      (e2wm:face-history-list-select1 ((,class (:foreground ,aqua :background ,background))))
      (e2wm:face-history-list-select2 ((,class (:foreground ,yellow :background ,background))))
-     (ediff-current-diff-A ((,class (:foreground ,comment :inverse-video t))))
-     (ediff-current-diff-Ancestor ((,class (:foreground ,aqua :background ,highlight))))
-     (ediff-current-diff-B ((,class (:foreground ,comment :inverse-video t))))
-     (ediff-current-diff-C ((,class (:foreground ,comment :inverse-video t))))
+     (ediff-current-diff-A ((,class (:background ,bg-removed :foreground ,fg-removed))))
+     ;; TODO `(ediff-current-diff-Ancestor ((,c :background ,bg-region)))
+     (ediff-current-diff-Ancestor ((,class (:foreground ,aqua :background ,highlight)))) ;; TODO
+     (ediff-current-diff-B ((,class (:background ,bg-added :foreground ,fg-added))))
+     (ediff-current-diff-C ((,class (:background ,bg-changed :foreground ,fg-changed))))
+     ;; `(ediff-even-diff-A ((,c :background ,bg-dim)))
      (ediff-even-diff-A ((,class (:foreground ,blue :background ,contrast-bg :extend t))))
+     ;; `(ediff-even-diff-Ancestor ((,c :background ,bg-dim)))
      (ediff-even-diff-Ancestor ((,class (:foreground ,purple :background ,highlight))))
-     (ediff-even-diff-B ((,class (:foreground ,blue :background ,contrast-bg :extend t))))
-     (ediff-even-diff-C ((,class (:foreground ,blue :background ,contrast-bg :extend t))))
-     (ediff-fine-diff-A ((,class (:foreground ,background :background ,blue))))
+     ;; `(ediff-even-diff-B ((,c :background ,bg-dim)))
+     ;; `(ediff-even-diff-C ((,c :background ,bg-dim)))
+     ;; TODO `(ediff-fine-diff-A ((,c )))
+     (ediff-even-diff-B ((,class (:foreground ,blue :background ,darkblue :extend t))))
+     (ediff-even-diff-C ((,class (:foreground ,blue :background ,darkblue :extend t))))
+     (ediff-fine-diff-A ((,class (:background ,bg-removed-refine :foreground ,fg-removed))))
+     ;; `(ediff-fine-diff-Ancestor ((,c :background ,bg-active :foreground ,fg-intense)))
      (ediff-fine-diff-Ancestor ((,class (:foreground ,yellow :background ,highlight))))
-     (ediff-fine-diff-B ((,class (:foreground ,background :background ,blue))))
-     (ediff-fine-diff-C ((,class (:foreground ,background :background ,blue))))
-     (ediff-odd-diff-A  ((,class (:foreground ,comment :background ,highlight :extend t))))
-     (ediff-odd-diff-Ancestor ((,class (:foreground ,red :background ,highlight))))
-     (ediff-odd-diff-B  ((,class (:foreground ,comment :background ,highlight :extend t))))
-     (ediff-odd-diff-C ((,class (:foreground ,comment :background ,highlight :extend t))))
+     (ediff-fine-diff-B ((,class (:background ,bg-added-refine :foreground ,fg-added))))
+     (ediff-fine-diff-C ((,class (:background ,bg-changed-refine :foreground ,fg-changed))))
+     (ediff-odd-diff-A  ((,class (:inherit ediff-even-diff-A))))
+     (ediff-odd-diff-Ancestor ((,class (:inherit ediff-even-diff-Ancestor))))
+     (ediff-odd-diff-B  ((,class (:inherit ediff-even-diff-B))))
+     (ediff-odd-diff-C ((,class (:inherit ediff-even-diff-C))))
      (edts-face-error-line ((,class (:background unspecified :inherit flymake-errline))))
      (edts-face-error-mode-line ((,class (:background unspecified :foreground ,red :weight bold))))
      (edts-face-warning-line ((,class (:background unspecified :inherit flymake-warnline))))
@@ -994,7 +1001,7 @@ names to which it refers are bound."
      (org-habit-ready-future-face ((,class (:foreground ,background :background ,green))))
      (org-headline-done ((,class (:foreground ,green))))
      (org-headline-todo ((,class (:foreground ,red))))
-     (org-hide ((,class (:foreground ,background :background ,background))))
+     (org-hide ((,class (:foreground ,background))))
      (org-link ((,class (:foreground ,blue :underline t))))
      (org-mode-line-clock-overrun ((,class (:inherit mode-line :background ,red))))
      (org-scheduled ((,class (:foreground ,green))))