Fix diff-changed face definition.

* lisp/vc/diff-mode.el (diff-changed): Don't use terminal specs for
defface (Bug#8144).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5b0fa090eaa14e4c1f568ae70c835abe8e82728b..ea1c659a89ed4156aed0b2b1f0432af058a777ac 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-22  Chong Yidong  <cyd@stupidchicken.com>
+
+       * vc/diff-mode.el (diff-changed): Don't use terminal specs for
+       defface (Bug#8144).
+
 2011-05-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/macroexp.el (macroexpand-all-1): Convert ' to #' for

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 56ebe868a2d7424b34d52262f49f8dae57a26f6c..392973e08feeb476501d6c661314f4221d573326 100644 (file)
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -295,9 +295,14 @@ try to refine the current hunk, as well."
 (defvar diff-added-face 'diff-added)
 
 (defface diff-changed
-  '((((type tty pc) (class color) (background light))
+  ;; 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) (background light))
      :foreground "magenta" :weight bold :slant italic)
-    (((type tty pc) (class color) (background dark))
+    (((class color) (background dark))
      :foreground "yellow" :weight bold :slant italic))
   "`diff-mode' face used to highlight changed lines."
   :group 'diff-mode)