diff options
Diffstat (limited to 'emacs.d')
-rw-r--r-- | emacs.d/init.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/emacs.d/init.el b/emacs.d/init.el index f8686a3..0d84d71 100644 --- a/emacs.d/init.el +++ b/emacs.d/init.el @@ -185,9 +185,10 @@ '(diff-added ((t (:foreground "#859900")))) '(diff-file-header ((((class color) (min-colors 88) (background dark)) (:weight bold)))) '(diff-header ((((class color) (min-colors 88) (background dark)) (:foreground "#6C71C4")))) - '(diff-refine-added ((t (:inherit diff-refine-changed :foreground "green")))) + '(diff-refine-added ((t (:inherit diff-refine-change :foreground "green")))) + '(diff-refine-change ((t (:background "grey15"))) t) '(diff-refine-changed ((t (:background "grey15")))) - '(diff-refine-removed ((t (:inherit diff-refine-changed :foreground "red")))) + '(diff-refine-removed ((t (:inherit diff-refine-change :foreground "red")))) '(diff-removed ((t (:foreground "#D30102")))) '(dired-directory ((t (:foreground "#268BD2")))) '(diredp-compressed-file-suffix ((t (:foreground "grey50")))) @@ -265,6 +266,7 @@ '(powerline-inactive1 ((t (:inherit mode-line-inactive :background "#121717")))) '(powerline-inactive2 ((t (:inherit mode-line-inactive :background "#1D2222")))) '(region ((t (:background "#455900")))) + '(smerge-refined-change ((t (:background "grey20"))) t) '(smerge-refined-changed ((t (:background "grey20")))) '(spaceline-highlight-face ((t (:background "#272A2A" :foreground "#FFFFFF" :inherit (quote mode-line))))) '(spaceline-modified ((t (:background "#A66" :foreground "#3E3D31" :inherit (quote mode-line))))) |