[Emacs-diffs] trunk r117361: * lisp/vc/diff-mode.el (diff-changed): Empty face definition

[Juri Linkov]

------------------------------------------------------------
revno: 117361
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/10181
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Wed 2014-06-18 11:48:49 +0300
message:
  * 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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/vc/diff-mode.el           
diffmode.el-20091113204419-o5vbwnq5f7feedwu-1659

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-06-18 08:33:57 +0000
+++ b/lisp/ChangeLog    2014-06-18 08:48:49 +0000
@@ -1,5 +1,12 @@
 2014-06-18  Juri Linkov  <address@hidden>
 
+       * 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  <address@hidden>
+
        * vc/diff-mode.el (diff-refine-changed): Rename from
        `diff-refine-change' for consistency with `diff-changed'.
        (diff-refine-change): Add obsolete face alias.  (Bug#10181)

=== modified file 'lisp/vc/diff-mode.el'
--- a/lisp/vc/diff-mode.el      2014-06-18 08:33:57 +0000
+++ b/lisp/vc/diff-mode.el      2014-06-18 08:48:49 +0000
@@ -302,14 +302,9 @@
 (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 @@
 (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)