Synch to No Gnus 200404211555.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d913a49..abd9713 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-21  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * spam.el (spam-summary-prepare-exit): logic and message fix.
+       Reported by bojohan+news@dd.chalmers.se (Johan Bockg\e,Ae\e(Brd).
+
 2004-04-17  Jesper Harder  <harder@ifa.au.dk>
 
        * gnus-sum.el (gnus-set-global-variables)

diff --git a/lisp/spam.el b/lisp/spam.el
index 82f30d7..e6a1d8f 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -733,7 +733,8 @@ Respects the process/prefix convention."
            ;; call spam-register-routine with specific articles to unregister,
            ;; when there are articles to unregister and the check is enabled
            (when (and unregister-list (symbol-value check))
-             (spam-register-routine classification check t unregister-list))))))
+             (spam-register-routine 
+              classification check t unregister-list))))))
 
     ;; find all the spam processors applicable to this group
     (dolist (processor-param spam-list-of-processors)
@@ -745,9 +746,10 @@ Respects the process/prefix convention."
          (spam-register-routine classification check))))
 
     (unless (and spam-move-spam-nonspam-groups-only
-                (not (spam-group-spam-contents-p gnus-newsgroup-name)))
+                (spam-group-spam-contents-p gnus-newsgroup-name))
       (gnus-message 5 "Marking spam as expired and moving it to %s"
-                   gnus-newsgroup-name)
+                   (gnus-parameter-spam-process-destination 
+                    gnus-newsgroup-name))
       (spam-mark-spam-as-expired-and-move-routine
        (gnus-parameter-spam-process-destination gnus-newsgroup-name)))