* elsp-sa.el (elmo-spam-register-spam-buffer): Don't specify '--forget'.

(elmo-spam-register-good-buffer): Ditto.
(elmo-spam-spamassassin-register-messages): Ditto.

* elmo-util.el (elmo-string-member-ignore-case): Define with
static-cond.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 3a26887..453db8f 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,12 @@
+2004-02-12  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * elsp-sa.el (elmo-spam-register-spam-buffer): Don't specify '--forget'.
+       (elmo-spam-register-good-buffer): Ditto.
+       (elmo-spam-spamassassin-register-messages): Ditto.
+
+       * elmo-util.el (elmo-string-member-ignore-case): Define with
+       static-cond.
+
 2004-02-09  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * elmo.el (elmo-folder-type): Undo last change.

diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index cf169cb..7021069 100644 (file)
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -1302,7 +1302,7 @@ But if optional argument AUTO is non-nil, DEFAULT is returned."
          (throw 'found t))
       (setq slist (cdr slist)))))
 
-(cond ((fboundp 'member-ignore-case)
+(static-cond ((fboundp 'member-ignore-case)
        (defalias 'elmo-string-member-ignore-case 'member-ignore-case))
       ((fboundp 'compare-strings)
        (defun elmo-string-member-ignore-case (elt list)

diff --git a/elmo/elsp-sa.el b/elmo/elsp-sa.el
index 4c9ea7e..fcb5a9c 100644 (file)
--- a/elmo/elsp-sa.el
+++ b/elmo/elsp-sa.el
@@ -98,13 +98,13 @@
                                                    buffer &optional restore)
   (with-current-buffer buffer
     (eq 0 (apply 'elmo-spamassassin-call 'learn
-                (list (when restore "--forget") "--spam")))))
+                (list "--spam")))))
 
 (luna-define-method elmo-spam-register-good-buffer ((processor elsp-sa)
                                                    buffer &optional restore)
   (with-current-buffer buffer
     (eq 0 (apply 'elmo-spamassassin-call 'learn
-                (list (when restore "--forget") "--ham")))))
+                (list "--ham")))))
 
 (defsubst elmo-spam-spamassassin-register-messages (folder
                                                    numbers
@@ -134,7 +134,6 @@
        (apply 'elmo-spamassassin-call 'learn
               (delq nil
                     (list "--mbox"
-                          (when restore "--forget")
                           (if spam "--spam" "--ham"))))
        (elmo-progress-notify 'elmo-spam-register count)
        (erase-buffer)))))