Revamp diff faces

1 files changed, 31 insertions, 49 deletions

diff --git a/eighters-theme.el b/eighters-theme.el
index 9bc04f3..4e59411 100644
--- a/eighters-theme.el
+++ b/eighters-theme.el
@@ -4,26 +4,6 @@
 ;; TODO: unset "inverse" on mode-line face; it messes up with
 ;;       foreground/background colors on custom lighters
 
-;; TODO: remove foreground of diff faces to make patches more readble;
-;;       model them on current ediff?  faces to juggle with:
-;;
-;;       - diff-xxx
-;;       - diff-refine-xxx
-;;       - diff-indicator-xxx
-;;
-;;       - ediff-current-diff-X
-;;       - ediff-fine-diff-A
-;;
-;;       - diff-hl-xxx
-;;
-;;       - magit-diff-xxx
-;;       - magit-diff-xxx-highlight
-;;       - magit-diffstat-xxx
-;;
-;;       - smerge-xxx
-;;       - smerge-refined-xxx
-
-
 ;; The default face's font and height are not defined, so that they
 ;; can be set individually for different computers in .Xresources; see
 ;; xrdb(1), Xsession(5) and (emacs) Fonts.
@@ -62,6 +42,32 @@
  '(mode-line ((t (:inverse-video t))))
  '(mode-line-inactive ((t (:foreground "gray70" :background "gray25" :inherit (mode-line)))))
  '(mode-line-buffer-id ((t (:weight bold))))
+ ;; Main diff faces, and derivatives.
+ '(diff-added ((t (:background "#07243F"))))
+ '(diff-removed ((t (:background "#3f2900"))))
+ '(diff-changed ((t (:background "#2a2a08"))))
+ '(diff-refine-added ((t (:background "#0f487f"))))
+ '(diff-refine-removed ((t (:background "#7f5200"))))
+ '(diff-refine-changed ((t (:background "yellow4"))))
+ '(diff-indicator-added ((t (:foreground "steelblue2"))))
+ '(diff-indicator-removed ((t (:foreground "orange2"))))
+ '(diff-indicator-changed ((t (:foreground "yellow2"))))
+ '(ediff-current-diff-A ((t (:inherit (diff-removed)))))
+ '(ediff-current-diff-B ((t (:inherit (diff-added)))))
+ '(ediff-current-diff-C ((t ((:inherit (diff-changed))))))
+ '(ediff-fine-diff-A ((t (:inherit (diff-refined-removed)))))
+ '(ediff-fine-diff-B ((t (:inherit (diff-refined-added)))))
+ '(ediff-fine-diff-C ((t (:inherit (diff-refined-changed)))))
+ '(smerge-base ((t (:inherit (diff-changed)))))
+ '(smerge-upper ((t (:inherit (diff-removed)))))
+ '(smerge-lower ((t (:inherit (diff-added)))))
+ '(smerge-refined-removed ((t (:inherit (diff-refined-removed)))))
+ '(smerge-refined-added ((t (:inherit (diff-refined-added)))))
+ ;; Supplementary diff faces.
+ '(diff-header ((t (:foreground "steelblue1" :weight bold))))
+ '(diff-file-header ((t (:foreground "cyan" :weight bold))))
+ '(ediff-current-diff-Ancestor ((t (:background "#340824"))))
+ '(ediff-fine-diff-Ancestor ((t (:background "#681048"))))
  '(ediff-even-diff-A ((t (:background "gray25"))))
  '(ediff-odd-diff-A ((t (:background "gray25"))))
  '(ediff-even-diff-B ((t (:background "gray25"))))
@@ -70,30 +76,6 @@
  '(ediff-odd-diff-C ((t (:background "gray25"))))
  '(ediff-even-diff-Ancestor ((t (:background "gray25"))))
  '(ediff-odd-diff-Ancestor ((t (:background "gray25"))))
- '(ediff-current-diff-A ((t (:background "#3f2900"))))
- '(ediff-current-diff-B ((t (:background "#07243F"))))
- '(ediff-current-diff-C ((t (:background "#2a2a08"))))
- '(ediff-current-diff-Ancestor ((t (:background "#340824"))))
- '(ediff-fine-diff-A ((t (:background "#7f5200"))))
- '(ediff-fine-diff-B ((t (:background "#0f487f"))))
- '(ediff-fine-diff-C ((t (:background "yellow4"))))
- '(ediff-fine-diff-Ancestor ((t (:background "#681048"))))
- '(diff-header ((t (:foreground "steelblue1" :weight bold))))
- '(diff-file-header ((t (:foreground "cyan" :weight bold))))
- '(diff-added ((t (:foreground "steel blue" :inherit (diff-changed)))))
- '(diff-indicator-added ((t (:inherit (diff-added)))))
- '(diff-refine-added ((t (:foreground "dodger blue" :inherit (diff-refine-changed)))))
- '(diff-removed ((t (:foreground "orange3" :inherit (diff-changed)))))
- '(diff-refine-removed ((t (:foreground "orange" :inherit (diff-refine-changed)))))
- '(diff-indicator-removed ((t (:inherit (diff-removed)))))
- '(diff-changed ((t (:background "gray25"))))
- '(diff-refine-changed ((t (:weight bold))))
- '(diff-indicator-changed ((t (:inherit (diff-changed)))))
- '(smerge-base ((t (:inherit (ediff-current-diff-C)))))
- '(smerge-upper ((t (:inherit (ediff-current-diff-A)))))
- '(smerge-lower ((t (:inherit (ediff-current-diff-B)))))
- '(smerge-refined-removed ((t (:inherit ediff-fine-diff-A))))
- '(smerge-refined-added ((t (:inherit ediff-fine-diff-B))))
  '(term-color-black ((t (:foreground "black" :background "black"))))
  '(term-color-blue ((t (:foreground "steelblue1" :background "steelblue1"))))
  '(term-color-cyan ((t (:foreground "cyan" :background "cyan"))))
@@ -118,22 +100,22 @@
  '(org-date ((t (:inherit (font-lock-string-face)))))
  '(org-special-keyword ((t (:weight bold :inherit (font-lock-comment-face)))))
  '(org-todo ((t (:inherit (error)))))
- '(diff-hl-insert ((t (:inherit (diff-added)))))
- '(diff-hl-change ((t (:foreground "yellow4" :inherit (diff-changed)))))
- '(diff-hl-delete ((t (:inherit (diff-removed)))))
  '(font-latex-bold-face ((t (:inherit (bold)))))
  '(font-latex-italic-face ((t (:inherit (italic)))))
  '(font-latex-math-face ((t (:inherit (tex-math)))))
  '(font-latex-script-char-face ((t (:inherit (shadow)))))
  '(font-latex-sectioning-5-face ((t (:inherit (variable-pitch font-lock-function-name-face)))))
  '(font-latex-verbatim-face ((t (:inherit (tex-verbatim)))))
+ '(diff-hl-insert ((t (:inherit (diff-indicator-added)))))
+ '(diff-hl-delete ((t (:inherit (diff-indicator-removed)))))
+ '(diff-hl-change ((t (:inherit (diff-indicator-changed)))))
  '(magit-blame-highlight ((t (:inherit (highlight shadow)))))
  '(magit-diff-added ((t (:inherit (diff-added)))))
  '(magit-diff-added-highlight ((t (:inherit (diff-added)))))
  '(magit-diff-removed ((t (:inherit (diff-removed)))))
  '(magit-diff-removed-highlight ((t (:inherit (diff-removed)))))
- '(magit-diffstat-added ((t (:foreground "steel blue"))))
- '(magit-diffstat-removed ((t (:foreground "orange3")))))
+ '(magit-diffstat-added ((t (:inherit (diff-indicator-added)))))
+ '(magit-diffstat-removed ((t (:inherit (diff-indicator-removed))))))
 
 (custom-theme-set-variables 'eighters
  '(ansi-color-names-vector