From: Stefan Bund Date: Fri, 19 Dec 2014 11:46:22 +0000 (+0100) Subject: fix ediff colors X-Git-Url: http://g0dil.de/git?p=emacs-init.git;a=commitdiff_plain;h=3d083fc4afbb0cca3dfac5b491589eefefd4022b fix ediff colors --- diff --git a/emacs-custom.el b/emacs-custom.el index e088a29..ea0eebe 100644 --- a/emacs-custom.el +++ b/emacs-custom.el @@ -89,6 +89,8 @@ ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(default ((t (:inherit nil :stipple nil :background "#ffffff" :foreground "black" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 97 :width semi-condensed :foundry "misc" :family "6x13")))) + '(ediff-even-diff-B ((t (:background "yellow")))) + '(ediff-odd-diff-A ((t (:background "yellow")))) '(font-lock-keyword-face ((((class color) (min-colors 8)) (:foreground "Purple")))) '(highlight-changes ((t (:background "alice blue")))) '(highlight-changes-delete ((t (:background "bisque1"))))