Fix typo in message

[elisp/wanderlust.git] / elmo / elsp-sa.el

diff --git a/elmo/elsp-sa.el b/elmo/elsp-sa.el
index fcb5a9c..47a1c82 100644 (file)
--- a/elmo/elsp-sa.el
+++ b/elmo/elsp-sa.el
@@ -76,7 +76,7 @@
                (cons
                 elmo-spam-spamassassin-learn-program
                 elmo-spam-spamassassin-learn-program-arguments))
-              (t (error "Internal error.")))))
+              (t (error "Internal error")))))
     (apply #'call-process-region
           (point-min) (point-max)
           (car pair)
@@ -111,32 +111,17 @@
                                                    spam
                                                    restore)
   (if (not (< 0 elmo-spam-spamassassin-max-messages-per-process))
-      (error
- "non-positive value for `elmo-spam-spamassassin-max-messages-per-process'"))
-  (with-temp-buffer
-    (buffer-disable-undo (current-buffer))
-    (while numbers
-      (let ((count 0))
-       (while (and numbers
-                   (< count elmo-spam-spamassassin-max-messages-per-process))
-         (insert "From MAILER-DAEMON@example.com\n"
-                 (with-temp-buffer
-                   (elmo-spam-message-fetch folder (car numbers))
-                   (goto-char (point-min))
-                   (while (re-search-forward "^>*From " nil t)
-                     (goto-char (match-beginning 0))
-                     (insert ?>)
-                     (forward-line))
-                   (buffer-substring (point-min) (point-max)))
-                 "\n\n")
-         (setq count (1+ count)
-               numbers (cdr numbers)))
-       (apply 'elmo-spamassassin-call 'learn
-              (delq nil
-                    (list "--mbox"
-                          (if spam "--spam" "--ham"))))
-       (elmo-progress-notify 'elmo-spam-register count)
-       (erase-buffer)))))
+      (error "\
+non-positive value for `elmo-spam-spamassassin-max-messages-per-process'"))
+  (elmo-spam-process-messages-as-mbox
+   folder numbers elmo-spam-spamassassin-max-messages-per-process
+   (lambda (count spam restore)
+     (apply 'elmo-spamassassin-call 'learn
+           (delq nil
+                 (list "--mbox"
+                       (if spam "--spam" "--ham"))))
+     (elmo-progress-notify 'elmo-spam-register count))
+   spam restore))
 
 (luna-define-method elmo-spam-register-spam-messages :around
   ((processor elsp-sa) folder &optional numbers restore)