From: Juri Linkov <juri@jurta.org>
Date: Wed, 18 Jun 2014 08:48:49 +0000 (+0300)
Subject: * lisp/vc/diff-mode.el (diff-changed): Empty face definition
X-Git-Tag: emacs-25.0.90~2612^2~709^2~697^2~67
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1a63945352257ede0289d37dd8a71e2cfa84f2ea;p=emacs.git

* lisp/vc/diff-mode.el (diff-changed): Empty face definition
to use `diff-removed' and `diff-added' on tty as well.
(diff-context): Use darker color on light background and
lighter color on dark background.

Fixes: debbugs:10181
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1f0bf124c7f..c8229b6eb23 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2014-06-18  Juri Linkov  <juri@jurta.org>
+
+	* vc/diff-mode.el (diff-changed): Empty face definition to use
+	`diff-removed' and `diff-added' on tty as well.  (Bug#10181)
+	(diff-context): Use darker color on light background and
+	lighter color on dark background.
+
 2014-06-18  Juri Linkov  <juri@jurta.org>
 
 	* vc/diff-mode.el (diff-refine-changed): Rename from
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 3d985d9ca4d..4908c5f4961 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -302,14 +302,9 @@ well."
 (defvar diff-added-face 'diff-added)
 
 (defface diff-changed
-  ;; We normally apply a `shadow'-based face on the `diff-context'
-  ;; face, and keep `diff-changed' the default.
-  '((((class color grayscale) (min-colors 88)))
-    ;; If the terminal lacks sufficient colors for shadowing,
-    ;; highlight changed lines explicitly.
-    (((class color))
-     :foreground "yellow"))
+  '((t nil))
   "`diff-mode' face used to highlight changed lines."
+  :version "24.5"
   :group 'diff-mode)
 (define-obsolete-face-alias 'diff-changed-face 'diff-changed "22.1")
 (defvar diff-changed-face 'diff-changed)
@@ -343,8 +338,12 @@ well."
 (defvar diff-function-face 'diff-function)
 
 (defface diff-context
-  '((((class color grayscale) (min-colors 88)) :inherit shadow))
+  '((((class color grayscale) (min-colors 88) (background light))
+     :foreground "#333333")
+    (((class color grayscale) (min-colors 88) (background dark))
+     :foreground "#dddddd"))
   "`diff-mode' face used to highlight context and other side-information."
+  :version "24.5"
   :group 'diff-mode)
 (define-obsolete-face-alias 'diff-context-face 'diff-context "22.1")
 (defvar diff-context-face 'diff-context)