dotfiles

commit b53603f3e86084bea810b9015e97c3a0b9acd364
parent 9842de2c4d9d3b13fa568217bb8115c244a4169f
Author: Kévin Le Gouguec <kevin.legouguec@gmail.com>
Date:   Sun,  8 Jan 2023 18:00:40 +0100

Add smerge faces

Diffstat:
M
.emacs.d/eighters-theme.el
 | 
9
++++++++-

1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/.emacs.d/eighters-theme.el b/.emacs.d/eighters-theme.el
@@ -188,7 +188,7 @@
   `(vertical-border ((t (:foreground ,bg-hl))))
   `(warning ((t (:foreground ,fg-yellow :weight bold))))
   `(widget-field ((t (:background ,bg-hl-dim))))
-;;;; diff faces.
+;;;; Diff faces.
   `(diff-header ((t (:background ,bg-hl-dimmer :foreground ,fg-dim))))
   `(diff-file-header ((t (:background ,bg-hl-dimmer :foreground ,fg :weight bold))))
   `(diff-hunk-header ((t (:background ,bg-hl-dim :foreground ,fg-dim))))
@@ -219,6 +219,13 @@
   `(ediff-fine-diff-B ((t (:inherit diff-refine-added))))
   `(ediff-fine-diff-C ((t (:inherit diff-refine-changed))))
   `(ediff-fine-diff-Ancestor ((t (:background ,bg-magenta))))
+  `(smerge-markers ((t (:background ,bg-hl-dim :foreground ,fg-dim))))
+  `(smerge-base ((t (:background ,bg-yellow-dim))))
+  `(smerge-refined-changed ((t (:inherit diff-refine-changed))))
+  `(smerge-upper ((t (:background ,bg-red-dim))))
+  `(smerge-refined-removed ((t (:inherit diff-refine-removed))))
+  `(smerge-lower ((t (:background ,bg-blue-dim))))
+  `(smerge-refined-added ((t (:inherit diff-refine-added))))
 ;;; Third-party faces.
   `(diff-hl-delete ((t (:foreground ,fg-red :background ,bg-red))))
   `(diff-hl-insert ((t (:foreground ,fg-blue :background ,bg-blue))))