diff options
| author | Miles Bader | 2005-06-09 07:13:03 +0000 |
|---|---|---|
| committer | Miles Bader | 2005-06-09 07:13:03 +0000 |
| commit | d113efea8e0a56aedd60615f5dc6669c72aca77f (patch) | |
| tree | c51aa1cd5076acfc2391217b0d7dea96552011de /lisp/diff-mode.el | |
| parent | 2435213ba6b74f7425e15b1f799c9ae18467e43d (diff) | |
| parent | 47600d8e97925ed8816b099267e24f4ab3311e75 (diff) | |
| download | emacs-d113efea8e0a56aedd60615f5dc6669c72aca77f.tar.gz emacs-d113efea8e0a56aedd60615f5dc6669c72aca77f.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-61
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 353-357)
- Update from CVS
Diffstat (limited to 'lisp/diff-mode.el')
| -rw-r--r-- | lisp/diff-mode.el | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index aabd09e98ee..5deb7880bdf 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el | |||
| @@ -243,10 +243,7 @@ when editing big diffs)." | |||
| 243 | (defvar diff-function-face 'diff-function-face) | 243 | (defvar diff-function-face 'diff-function-face) |
| 244 | 244 | ||
| 245 | (defface diff-context-face | 245 | (defface diff-context-face |
| 246 | '((((class color) (background light)) | 246 | '((t :inherit shadow)) |
| 247 | :foreground "grey50") | ||
| 248 | (((class color) (background dark)) | ||
| 249 | :foreground "grey70")) | ||
| 250 | "`diff-mode' face used to highlight context and other side-information." | 247 | "`diff-mode' face used to highlight context and other side-information." |
| 251 | :group 'diff-mode) | 248 | :group 'diff-mode) |
| 252 | (defvar diff-context-face 'diff-context-face) | 249 | (defvar diff-context-face 'diff-context-face) |