From a62d05415841b7ba66ba9a660f68b452c4f1d1b6 Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Wed, 18 May 2016 10:29:03 +0100 Subject: [PATCH] el/dot-emacs.el: Better fontification for Ediff. Organization: Straylight/Edgeware From: Mark Wooding --- el/dot-emacs.el | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/el/dot-emacs.el b/el/dot-emacs.el index 3b4ec21..d83057a 100644 --- a/el/dot-emacs.el +++ b/el/dot-emacs.el @@ -1374,6 +1374,52 @@ (mdw-define-face diff-refine-added (((class color) (type x)) :background "#050") (t :underline t)) +(setq ediff-force-faces t) +(mdw-define-face ediff-current-diff-A + (((class color) (type x)) :background "darkred") + (((class color) (type tty)) :background "red") + (t :inverse-video t)) +(mdw-define-face ediff-fine-diff-A + (((class color) (type x)) :background "red3") + (((class color) (type tty)) :inverse-video t) + (t :inverse-video nil)) +(mdw-define-face ediff-even-diff-A + (((class color) (type x)) :background "#300")) +(mdw-define-face ediff-odd-diff-A + (((class color) (type x)) :background "#300")) +(mdw-define-face ediff-current-diff-B + (((class color) (type x)) :background "darkgreen") + (((class color) (type tty)) :background "magenta") + (t :inverse-video t)) +(mdw-define-face ediff-fine-diff-B + (((class color) (type x)) :background "green4") + (((class color) (type tty)) :inverse-video t) + (t :inverse-video nil)) +(mdw-define-face ediff-even-diff-B + (((class color) (type x)) :background "#020")) +(mdw-define-face ediff-odd-diff-B + (((class color) (type x)) :background "#020")) +(mdw-define-face ediff-current-diff-C + (((class color) (type x)) :background "darkblue") + (((class color) (type tty)) :background "blue") + (t :inverse-video t)) +(mdw-define-face ediff-fine-diff-C + (((class color) (type x)) :background "blue1") + (((class color) (type tty)) :inverse-video t) + (t :inverse-video nil)) +(mdw-define-face ediff-even-diff-C + (((class color) (type x)) :background "#004")) +(mdw-define-face ediff-odd-diff-C + (((class color) (type x)) :background "#004")) +(mdw-define-face ediff-current-diff-Ancestor + (((class color) (type x)) :background "#630") + (((class color) (type tty)) :background "blue") + (t :inverse-video t)) +(mdw-define-face ediff-even-diff-Ancestor + (((class color) (type x)) :background "#320")) +(mdw-define-face ediff-odd-diff-Ancestor + (((class color) (type x)) :background "#320")) + (mdw-define-face dylan-header-background (((class color) (type x)) :background "NavyBlue") (t :background "blue")) -- [mdw]