branch: elpa/alect-themes
commit 74cfab79a983d2c4f0ee256fa3da17866e2e6679
Author: Alex Kost <[email protected]>
Commit: Alex Kost <[email protected]>
Add 'smerge' faces
---
alect-themes.el | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/alect-themes.el b/alect-themes.el
index b155386a7f0..d558a4c9ce8 100644
--- a/alect-themes.el
+++ b/alect-themes.el
@@ -1634,6 +1634,13 @@ For INVERT, see `alect-get-color'."
(sldb-restartable-frame-line-face ((,c :foreground ,(gc 'green+1))))
(sldb-non-restartable-frame-line-face ((,c :foreground ,(gc 'red+1))))
+ ;; smerge
+ (smerge-base ((,c :background ,(gc 'yellow-bg))))
+ (smerge-upper ((,c :background ,(gc 'red-bg+1))))
+ (smerge-lower ((,c :background ,(gc 'green-bg+1))))
+ (smerge-refined-removed ((,c :background ,(gc 'red-bg))))
+ (smerge-refined-added ((,c :background ,(gc 'green-bg))))
+
;; speedbar
(speedbar-file-face ((,c)))
(speedbar-directory-face ((,c :inherit dired-directory)))
