Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-17

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-83
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-84
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-2
   Merge from miles@gnu.org--gnu-2004

2005-01-05  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/spam.el (spam-face): New face. Don't use `gnus-splash-face'
   which is unreadable in some setups.

2005-01-06  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/message.texi (Reply): `message-reply-to-function' should return
   a list.  Suggested by ARISAWA Akihiro <ari@mbf.ocn.co.jp>.

2 files changed, 18 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 46a1449ce79..4eee8bcbbfc 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-05  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * spam.el (spam-face): New face.  Don't use `gnus-splash-face'
+        which is unreadable in some setups.
+
 2004-12-27  Simon Josefsson  <jas@extundo.com>
 
         * mm-bodies.el (mm-body-encoding): Don't permit 7-bit to be used
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index a0b28340717..9a55ba9f318 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -298,7 +298,19 @@ All unmarked article in such group receive the spam mark on group entry."
   :type '(radio (const nil) regexp)
   :group 'spam)
 
-(defcustom spam-face 'gnus-splash-face
+(defface spam-face
+  '((((class color) (type tty) (background dark))
+     (:foreground "gray80" :background "gray50"))
+    (((class color) (type tty) (background light))
+     (:foreground "gray50" :background "gray80"))
+    (((class color) (background dark))
+     (:foreground "ivory2"))
+    (((class color) (background light))
+     (:foreground "ivory4"))
+    (t :inverse-video t))
+  "Face for spam-marked articles.")
+
+(defcustom spam-face 'spam-face
   "Face for spam-marked articles."
   :type 'face
   :group 'spam)