* 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 1f0bf124c7f1c24537c00adbb0facf865c2fe97f..c8229b6eb233d67d9124d32bd025719b7d2a1ebb 100644 (file)
--- 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 3d985d9ca4df7b8a64d3f9168441062522703c9a..4908c5f496148aa55b60821c975a6277b4cd2a3f 100644 (file)
--- 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)