(spam-ham-copy-or-move-routine): use spam-list-articles

(spam-list-articles): rewritten to only check a mark once per
invocation

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fc7e260..e8b9e85 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-02  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * spam.el (spam-ham-copy-or-move-routine): use spam-list-articles
+       (spam-list-articles): rewritten to only check a mark once per
+       invocation
+
 2004-01-01  Simon Josefsson  <jas@extundo.com>
 
        * mml-sec.el (mml-default-encrypt-method)

diff --git a/lisp/spam.el b/lisp/spam.el
index 1014d7c..4d30052 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -708,16 +708,12 @@ spam-use-* variable.")
  
 (defun spam-ham-copy-or-move-routine (copy groups)
   (gnus-summary-kill-process-mark)
-  (let ((articles gnus-newsgroup-articles)
+  (let ((todo (spam-list-articles gnus-newsgroup-articles 'ham))
        (backend-supports-deletions
         (gnus-check-backend-function
          'request-move-article gnus-newsgroup-name))
        (respool-method (gnus-find-method-for-group gnus-newsgroup-name))
        article mark todo deletep respool)
-    (dolist (article articles)
-      (when (spam-group-ham-mark-p gnus-newsgroup-name
-                                  (gnus-summary-article-mark article))
-       (push article todo)))
 
     (when (member 'respool groups)
       (setq respool t)                 ; boolean for later
@@ -1038,12 +1034,20 @@ functions")
   (let ((mark-check (if (eq classification 'spam) 
                        'spam-group-spam-mark-p 
                      'spam-group-ham-mark-p))
-       mark list)
+       list mark-cache-yes mark-cache-no)
     (dolist (article articles)
-      (when (funcall mark-check 
-                    gnus-newsgroup-name 
-                    (gnus-summary-article-mark article))
-       (push article list)))
+      (let ((mark (gnus-summary-article-mark article)))
+       (unless (memq mark mark-cache-no)
+         (if (memq mark mark-cache-yes)
+             (push article list)
+           ;; else, we have to actually check the mark
+           (if (funcall mark-check
+                        gnus-newsgroup-name 
+                        mark)
+               (progn
+                 (push article list)
+                 (push mark mark-cache-yes))
+             (push mark mark-cache-no))))))
     list))
 
 (defun spam-register-routine (classification