(spam-mark-spam-as-expired-and-move-routine)

(spam-ham-copy-or-move-routine): delete articles only if 1 or
more groups were specified (and "copy" was specified for
spam-ham-copy-or-move-routine)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce0e547..c44ea34 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,10 @@
 
        * spam.el (spam-ham-copy-or-move-routine): do not delete if copy
        is t, also don't intepret the list of groups as a list of lists
+       (spam-mark-spam-as-expired-and-move-routine)
+       (spam-ham-copy-or-move-routine): delete articles only if 1 or
+       more groups were specified (and "copy" was specified for
+       spam-ham-copy-or-move-routine)
 
 2003-10-24  Katsumi Yamaoka  <yamaoka@jpl.org>
 

diff --git a/lisp/spam.el b/lisp/spam.el
index efc04c6..38480e3 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -567,10 +567,11 @@ spamoracle database."
          (gnus-summary-copy-article nil group))))
 
     ;; now delete the articles
-    (dolist (article tomove)
-      (gnus-summary-set-process-mark article))
-    (when tomove
-      (gnus-summary-delete-article nil)))
+    (when (and (listp groups) (< 0 (length groups)))
+      (dolist (article tomove)
+       (gnus-summary-set-process-mark article))
+      (when tomove
+       (gnus-summary-delete-article nil))))
 
   (gnus-summary-yank-process-mark))
  
@@ -592,12 +593,13 @@ spamoracle database."
          (gnus-summary-set-process-mark article))
        (gnus-summary-copy-article nil group)))
   
-    ;; now delete the articles, unless copy is t
+    ;; now delete the articles, unless copy is t, and when there was a group
     (unless copy
-      (dolist (article todo)
-       (gnus-summary-set-process-mark article))
-      (when todo
-       (gnus-summary-delete-article nil))))
+      (when (and (listp groups) (< 0 (length groups)))
+       (dolist (article todo)
+         (gnus-summary-set-process-mark article))
+       (when todo
+         (gnus-summary-delete-article nil)))))
   
   (gnus-summary-yank-process-mark))