diff options
| author |  Tom Willemse | 2014-02-25 12:04:53 +0100 |
|---|---|---|
| committer | Tom Willemse | 2014-02-25 12:04:53 +0100 |
| commit | c305c5e91ba3f1ac4b6a1941d2d2c9678d895951 (patch) | |
| tree | 353bde799df48078a1641fd730af01cf152200dc | |
| parent | af3371539bdda093b79a71ab7286bb0c579009e4 (diff) | |
| download | yoshi-theme-c305c5e91ba3f1ac4b6a1941d2d2c9678d895951.tar.gz yoshi-theme-c305c5e91ba3f1ac4b6a1941d2d2c9678d895951.zip | |
Add smerge faces
| -rw-r--r-- | yoshi-theme.el | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/yoshi-theme.el b/yoshi-theme.el index 7a5c10f..4ae9637 100644 --- a/yoshi-theme.el +++ b/yoshi-theme.el @@ -274,6 +274,13 @@ `(slime-repl-inputed-output-face ((t (:foreground ,fgbright)))) `(slime-repl-output-face ((t (:foreground ,fgdefault)))) `(slime-repl-prompt-face ((t (:foreground ,fgblue)))) + `(smerge-base ((t (:background ,bggreen)))) + `(smerge-markers ((t (:background ,bgbright)))) + `(smerge-mine ((t (:background ,bgblue)))) + `(smerge-other ((t (:background ,bgred)))) + `(smerge-refined-added ((t (:inherit diff-refine-added)))) + `(smerge-refined-change ((t (:inherit diff-refine-change)))) + `(smerge-refined-removed ((t (:inherit diff-refine-removed)))) `(success ((t (:foreground ,fggreen :weight bold)))) `(term-color-black ((t (:background ,bgdefault :foreground ,fgbright)))) `(term-color-blue ((t (:background ,bgblue :foreground ,fgblue)))) |