From 74f477fb612f7c7d4fb9c86be147d5875846a565 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Fri, 22 Aug 2003 04:33:48 +0000
Subject: [PATCH] Synch to Gnus 200308220149.

---
 lisp/ChangeLog  |    7 +++++++
 lisp/gnus.el    |    3 ++-
 lisp/message.el |   12 ++++++------
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bfb66fa..e6e8d3d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2003-08-22  Jesper Harder  <harder@ifa.au.dk>
+
+	* message.el (message-make-forward-subject-function): Fix
+	customize mismatch.
+
+	* gnus.el (gnus-message-archive-method): do.
+
 2003-08-20  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* gnus.el (gnus-read-group): Offer to continue only if the invalid
diff --git a/lisp/gnus.el b/lisp/gnus.el
index fe96558..d906bdd 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1186,7 +1186,8 @@ see the manual for details."
 This should be a mail method."
   :group 'gnus-server
   :group 'gnus-message
-  :type 'gnus-select-method)
+  :type '(choice (const :tag "Default archive method" "archive")
+		 gnus-select-method))
 
 (defcustom gnus-message-archive-group nil
   "*Name of the group in which to save the messages you've written.
diff --git a/lisp/message.el b/lisp/message.el
index f19f5fc..8c4ec03 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -567,18 +567,18 @@ If t, use `message-user-organization-file'."
   :type 'regexp)
 
 (defcustom message-make-forward-subject-function
-  'message-forward-subject-name-subject
+  #'message-forward-subject-name-subject
   "*List of functions called to generate subject headers for forwarded messages.
 The subject generated by the previous function is passed into each
 successive function.
 
 The provided functions are:
 
-* `message-forward-subject-author-subject' (Source of article (author or
-      newsgroup)), in brackets followed by the subject
-* `message-forward-subject-name-subject' (Source of article (name of author
-      or newsgroup)), in brackets followed by the subject
-* `message-forward-subject-fwd' (Subject of article with 'Fwd:' prepended
+* `message-forward-subject-author-subject' Source of article (author or
+      newsgroup), in brackets followed by the subject
+* `message-forward-subject-name-subject' Source of article (name of author
+      or newsgroup), in brackets followed by the subject
+* `message-forward-subject-fwd' Subject of article with 'Fwd:' prepended
       to it."
   :group 'message-forwarding
   :type '(radio (function-item message-forward-subject-author-subject)
-- 
1.7.10.4