# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1105078580 0
# Node ID cf93431040c992f34d95ea24e8b33ce17e82c52c
# Parent  d90701bff29f81be1519c9bc752cdadf7ba2d88a
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>.

diff -r d90701bff29f -r cf93431040c9 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Fri Jan 07 02:52:29 2005 +0000
+++ b/lisp/gnus/ChangeLog	Fri Jan 07 06:16:20 2005 +0000
@@ -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 -r d90701bff29f -r cf93431040c9 lisp/gnus/spam.el
--- a/lisp/gnus/spam.el	Fri Jan 07 02:52:29 2005 +0000
+++ b/lisp/gnus/spam.el	Fri Jan 07 06:16:20 2005 +0000
@@ -298,7 +298,19 @@
   :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)
diff -r d90701bff29f -r cf93431040c9 man/ChangeLog
--- a/man/ChangeLog	Fri Jan 07 02:52:29 2005 +0000
+++ b/man/ChangeLog	Fri Jan 07 06:16:20 2005 +0000
@@ -1,3 +1,8 @@
+2005-01-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* message.texi (Reply): `message-reply-to-function' should return
+	a list.  Suggested by ARISAWA Akihiro <ari@mbf.ocn.co.jp>.
+
 2005-01-06  Hiroshi Fujishima  <pooh@nature.tsukuba.ac.jp>  (tiny change)
 
 	* faq.texi (Changing load-path): Fix typo.
diff -r d90701bff29f -r cf93431040c9 man/message.texi
--- a/man/message.texi	Fri Jan 07 02:52:29 2005 +0000
+++ b/man/message.texi	Fri Jan 07 06:16:20 2005 +0000
@@ -146,16 +146,15 @@
 This function will be called narrowed to the head of the article that is
 being replied to.
 
-As you can see, this function should return a string if it has an
-opinion as to what the To header should be.  If it does not, it should
-just return @code{nil}, and the normal methods for determining the To
-header will be used.
-
-This function can also return a list.  In that case, each list element
-should be a cons, where the @sc{car} should be the name of a header
-(e.g. @code{Cc}) and the @sc{cdr} should be the header value
-(e.g. @samp{larsi@@ifi.uio.no}).  All these headers will be inserted into
-the head of the outgoing mail.
+As you can see, this function should return a list.  In this case, it
+returns @code{((To . "Whom"))} if it has an opinion as to what the To
+header should be.  If it does not, it should just return @code{nil}, and
+the normal methods for determining the To header will be used.
+
+Each list element should be a cons, where the @sc{car} should be the
+name of a header (e.g. @code{Cc}) and the @sc{cdr} should be the header
+value (e.g. @samp{larsi@@ifi.uio.no}).  All these headers will be
+inserted into the head of the outgoing mail.
 
 
 @node Wide Reply