From d4ba9ac1d0e1a570ece56a7564734a4c0c8d9b92 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Sat, 4 Jan 2003 14:44:02 +0000
Subject: [PATCH] Synch with Oort Gnus.

---
 lisp/ChangeLog   |   10 ++++++++++
 lisp/gnus-sum.el |    2 +-
 lisp/spam.el     |   16 ++++++----------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 93f886a..edd8f96 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus.el (gnus-variable-list): Write gnus-format-specs last. 
+
+	* gnus-sum.el (gnus-summary-goto-subjects): Fix typo.
+
 2003-01-04  Kevin Ryde  <user42@zip.com.au>
 
 	* gnus-art.el (gnus-mime-jka-compr-maybe-uncompress): New
@@ -25,6 +31,10 @@
 	from (gnus-data-list)
 	(spam-summary-prepare-exit): works completely now
 	(spam-use-blacklist): oops, should be nil by default
+	(spam-summary-prepare-exit): spam-use-PROCESSOR is only for
+	split processing now; before it was for summary exit as
+	well but that's done with the spam-contents and spam-process
+	parameters now
 
 2003-01-03  Jesper Harder  <harder@ifa.au.dk>
 
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 11d9f6c..9ea1efc 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -6764,7 +6764,7 @@ If optional argument UNREAD is non-nil, only unread article is selected."
   "Insert the subject header for ARTICLES in the current buffer."
   (save-excursion
     (dolist (article articles)
-      (gnus-summary-goto-subject articles t)))
+      (gnus-summary-goto-subject article t)))
   (gnus-summary-limit (append articles gnus-newsgroup-limit))
   (gnus-summary-position-point))
   
diff --git a/lisp/spam.el b/lisp/spam.el
index 2c82858..65387d0 100644
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -262,16 +262,14 @@ articles before they get registered by Bogofilter."
 
 (defun spam-summary-prepare-exit ()
   ;; The spam processors are invoked for any group, spam or ham or neither
-  (when (or (and spam-use-bogofilter spam-bogofilter-path)
-	    (spam-group-processor-bogofilter-p gnus-newsgroup-name))
+  (when (and spam-bogofilter-path
+	     (spam-group-processor-bogofilter-p gnus-newsgroup-name))
     (spam-bogofilter-register-routine))
   
-  (when (or spam-use-ifile
-	    (spam-group-processor-ifile-p gnus-newsgroup-name))
+  (when (spam-group-processor-ifile-p gnus-newsgroup-name)
     (spam-ifile-register-routine))
   
-  (when (or spam-use-blacklist
-	    (spam-group-processor-bogofilter-p gnus-newsgroup-name))
+  (when (spam-group-processor-bogofilter-p gnus-newsgroup-name)
     (spam-blacklist-register-routine))
 
   ;; Only for spam groups, we expire and maybe move articles
@@ -279,11 +277,9 @@ articles before they get registered by Bogofilter."
     (spam-mark-spam-as-expired-and-move-routine (gnus-parameter-spam-process-destination gnus-newsgroup-name)))
 
   (when (spam-group-ham-contents-p gnus-newsgroup-name)
-    (when (or spam-use-whitelist
-	      (spam-group-processor-whitelist-p gnus-newsgroup-name))
+    (when (spam-group-processor-whitelist-p gnus-newsgroup-name)
       (spam-whitelist-register-routine))
-    (when (or spam-use-BBDB
-	      (spam-group-processor-BBDB-p gnus-newsgroup-name))
+    (when (spam-group-processor-BBDB-p gnus-newsgroup-name)
       (spam-BBDB-register-routine))))
 
 (add-hook 'gnus-summary-prepare-hook 'spam-summary-prepare)
-- 
1.7.10.4