summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKévin Le Gouguec <kevin.legouguec@gmail.com>2019-03-05 17:49:01 +0100
committerKévin Le Gouguec <kevin.legouguec@gmail.com>2019-03-05 17:49:01 +0100
commita38f3d6611f8d3fb9e5f3d4a879ff0a5b23ff160 (patch)
treedb816c4c30544a5ac855e69a4e38aa8d7f499c39
parent4486d9dd149a516a7c8df956136cb6eccd7fba07 (diff)
downloadeighters-theme-a38f3d6611f8d3fb9e5f3d4a879ff0a5b23ff160.tar.xz
Specify more diff-related faces
- diff indicators - smerge
-rw-r--r--eighters-theme.el8
1 files changed, 8 insertions, 0 deletions
diff --git a/eighters-theme.el b/eighters-theme.el
index 1ee0bac..ef548ff 100644
--- a/eighters-theme.el
+++ b/eighters-theme.el
@@ -63,11 +63,19 @@
'(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-added ((t (:inherit ediff-fine-diff-A))))
+ '(smerge-refined-removed ((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"))))