1
0
Fork 0
mirror of https://git.sr.ht/~ryuslash/yoshi-theme synced 2025-02-07 13:35:50 +01:00

Add smerge faces

This commit is contained in:
Tom Willemse 2014-02-25 12:04:53 +01:00
parent af3371539b
commit c305c5e91b

View file

@ -274,6 +274,13 @@
`(slime-repl-inputed-output-face ((t (:foreground ,fgbright)))) `(slime-repl-inputed-output-face ((t (:foreground ,fgbright))))
`(slime-repl-output-face ((t (:foreground ,fgdefault)))) `(slime-repl-output-face ((t (:foreground ,fgdefault))))
`(slime-repl-prompt-face ((t (:foreground ,fgblue)))) `(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)))) `(success ((t (:foreground ,fggreen :weight bold))))
`(term-color-black ((t (:background ,bgdefault :foreground ,fgbright)))) `(term-color-black ((t (:background ,bgdefault :foreground ,fgbright))))
`(term-color-blue ((t (:background ,bgblue :foreground ,fgblue)))) `(term-color-blue ((t (:background ,bgblue :foreground ,fgblue))))