[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104317: Fix diff-changed face defini
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104317: Fix diff-changed face definition. |
Date: |
Sun, 22 May 2011 15:22:37 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104317
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2011-05-22 15:22:37 -0400
message:
Fix diff-changed face definition.
* lisp/vc/diff-mode.el (diff-changed): Don't use terminal specs for
defface (Bug#8144).
modified:
lisp/ChangeLog
lisp/vc/diff-mode.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-05-22 18:22:30 +0000
+++ b/lisp/ChangeLog 2011-05-22 19:22:37 +0000
@@ -1,3 +1,8 @@
+2011-05-22 Chong Yidong <address@hidden>
+
+ * vc/diff-mode.el (diff-changed): Don't use terminal specs for
+ defface (Bug#8144).
+
2011-05-22 Stefan Monnier <address@hidden>
* emacs-lisp/macroexp.el (macroexpand-all-1): Convert ' to #' for
=== modified file 'lisp/vc/diff-mode.el'
--- a/lisp/vc/diff-mode.el 2011-05-18 00:39:40 +0000
+++ b/lisp/vc/diff-mode.el 2011-05-22 19:22:37 +0000
@@ -295,9 +295,14 @@
(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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104317: Fix diff-changed face definition.,
Chong Yidong <=