Mirrors/solarized
2
0
Fork 0
mirror of https://github.com/altercation/solarized synced 2025-02-16 12:28:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add smerge support for color-theme

Browse source
This commit is contained in:
Chris Rose 2011-07-05 11:04:39 -07:00
parent c350650cb7
commit 57cf48ce3f
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
emacs-colors-solarized/color-theme-solarized.el
View file

@ -107,6 +107,11 @@ Ported to Emacs by Greg Pfeil, http://ethanschoonover.com/solarized."
(org-hide ((t (:foreground ,base03))))
(org-todo ((t (:foreground ,red :bold t))))
(org-done ((t (:foreground ,green :bold t))))
;; smerge
(smerge-refined-change ((t (:background ,base3 :foreground ,base03))))
(smerge-mine-face ((t (:foreground ,blue))))
(smerge-other-face ((t (:foreground ,green))))
(smerge-markers-face ((t (:foreground ,red))))
;; show-paren
(show-paren-match-face ((t (:background ,cyan :foreground ,base3))))
(show-paren-mismatch-face ((t (:background ,red :foreground ,base3))))))))