summaryrefslogtreecommitdiffstats
path: root/emacs.d
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2015-10-18 14:33:19 -0400
committerDavid Robillard <d@drobilla.net>2015-10-18 14:33:19 -0400
commitf27da971d73aa48bdd9f0f8c4f5d0fbddfd698b8 (patch)
treeca6f0dc4827dc4513176ec324d54529e9d1dd14d /emacs.d
parentf4c45f5b2808ff853fdbc79dc5af8002d6fa2aab (diff)
downloaddotfiles-f27da971d73aa48bdd9f0f8c4f5d0fbddfd698b8.tar.gz
dotfiles-f27da971d73aa48bdd9f0f8c4f5d0fbddfd698b8.tar.bz2
dotfiles-f27da971d73aa48bdd9f0f8c4f5d0fbddfd698b8.zip
Pretty diffs
Diffstat (limited to 'emacs.d')
-rw-r--r--emacs.d/init.el18
1 files changed, 14 insertions, 4 deletions
diff --git a/emacs.d/init.el b/emacs.d/init.el
index 36bf5ea..c6bb77f 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -84,9 +84,9 @@
'(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-change :background "#336633" :foreground "#EEFFEE"))))
- '(diff-refine-change ((((class color) (min-colors 88) (background dark)) (:background "grey20"))))
- '(diff-refine-removed ((t (:inherit diff-refine-change :background "#663333"))))
+ '(diff-refine-added ((t (:inherit diff-refine-change :foreground "green"))))
+ '(diff-refine-change ((t (:background "gray15"))))
+ '(diff-refine-removed ((t (:inherit diff-refine-change :foreground "red"))))
'(diff-removed ((t (:foreground "#D30102"))))
'(dired-directory ((t (:foreground "#268BD2"))))
'(escape-glyph ((((background dark)) (:foreground "cyan"))))
@@ -103,7 +103,17 @@
'(fringe ((((class color) (background dark)) (:background "grey25"))))
'(link ((((class color) (min-colors 88) (background dark)) (:foreground "#268BD2" :inverse-video nil :underline t))))
'(link-visited ((default (:inherit link)) (((class color) (background dark)) (:foreground "#6C71C4"))))
- '(magit-item-highlight ((t (:background "gray12"))))
+ '(magit-diff-added ((t (:foreground "#657900"))))
+ '(magit-diff-added-highlight ((t (:foreground "#859900"))))
+ '(magit-diff-context ((t (:foreground "grey70"))))
+ '(magit-diff-context-highlight ((t (:foreground "grey80"))))
+ '(magit-diff-hunk-heading ((t (:foreground "#6C71C4"))))
+ '(magit-diff-hunk-heading-highlight ((t (:foreground "#6C71C4" :weight bold))))
+ '(magit-diff-removed ((t (:foreground "#955353"))))
+ '(magit-diff-removed-highlight ((t (:foreground "#cc221f"))))
+ '(magit-item-highlight ((t (:background "grey15"))))
+ '(magit-section-heading ((t (:foreground "#859900" :weight bold))))
+ '(magit-section-highlight ((t (:background "grey15"))))
'(minibuffer-prompt ((((background dark)) (:foreground "white"))))
'(mode-line ((t (:background "#2D3232" :foreground "#AFB3B2" :box (:line-width 2 :color "#1A1A1A")))))
'(mode-line-inactive ((t (:inherit mode-line :background "gray20" :foreground "#4F5352" :box (:line-width 2 :color "#1A1A1A")))))