(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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1a57158..ce0e547 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-24  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * 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
+
 2003-10-24  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * nndoc.el (nndoc-guess-type): Reverse the sort order.  Suggested

diff --git a/lisp/spam.el b/lisp/spam.el
index a7d84ee..efc04c6 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -574,7 +574,7 @@ spamoracle database."
 
   (gnus-summary-yank-process-mark))
  
-(defun spam-ham-copy-or-move-routine (copy &rest groups)
+(defun spam-ham-copy-or-move-routine (copy groups)
   (gnus-summary-kill-process-mark)
   (let ((articles gnus-newsgroup-articles)
        article mark todo)
@@ -592,11 +592,12 @@ spamoracle database."
          (gnus-summary-set-process-mark article))
        (gnus-summary-copy-article nil group)))
   
-    ;; now delete the articles
-    (dolist (article todo)
-      (gnus-summary-set-process-mark article))
-    (when todo
-      (gnus-summary-delete-article nil)))
+    ;; now delete the articles, unless copy is t
+    (unless copy
+      (dolist (article todo)
+       (gnus-summary-set-process-mark article))
+      (when todo
+       (gnus-summary-delete-article nil))))
   
   (gnus-summary-yank-process-mark))