--- navi2ch-spamfilter.el~	Sun Oct 12 19:19:33 2003
+++ navi2ch-spamfilter.el	Sun Oct 12 19:29:23 2003
@@ -51,10 +51,14 @@
 `navi2ch-article-register-to-corpus' も参照。")
 
 (defvar navi2ch-spamf-good-corpus
-  (make-spamf-corpus :table (make-hash-table :test #'eq) :message-count 0))
+  (make-spamf-corpus :name "navi2ch-spamf-good-corpus"
+		     :table (make-hash-table :test #'eq)
+		     :message-count 0))
 
 (defvar navi2ch-spamf-bad-corpus
-  (make-spamf-corpus :table (make-hash-table :test #'eq) :message-count 0))
+  (make-spamf-corpus :name "navi2ch-spamf-bad-corpus"
+		     :table (make-hash-table :test #'eq)
+		     :message-count 0))
 
 (dolist (map (list navi2ch-article-mode-map navi2ch-popup-article-mode-map))
   (define-key map "\C-c\C-g"
@@ -121,22 +125,24 @@
      (navi2ch-article-tokenize-current-message))))
 
 (defsubst navi2ch-article-spam-probability (token)
-  (let ((spamf-good-corpus navi2ch-spamf-good-corpus)
-	(spamf-bad-corpus navi2ch-spamf-bad-corpus))
-    (spamf-sum-spam-probability
-     (mapcar #'cdr (spamf-cutoff-words token spamf-cutoff-words-limit)))))
+  (spamf-sum-spam-probability
+   (mapcar #'cdr (spamf-cutoff-words token
+				     spamf-cutoff-words-limit
+				     navi2ch-spamf-good-corpus
+				     navi2ch-spamf-bad-corpus))))
 
 (defun navi2ch-article-show-spam-probability (&optional prefix)
   "レスの spam っぽさを表示する。"
   (interactive "P")
   (let* ((token (navi2ch-article-tokenize-current-message))
-	 (prob (navi2ch-article-spam-probability token))
-	 (spamf-good-corpus navi2ch-spamf-good-corpus)
-	 (spamf-bad-corpus navi2ch-spamf-bad-corpus))
+	 (prob (navi2ch-article-spam-probability token)))
     (if prefix
 	(with-output-to-temp-buffer "*spam probability*"
 	  (princ (format "Spam probability: %f\n\n" prob))
-	  (dolist (pair (spamf-cutoff-words token spamf-cutoff-words-limit))
+	  (dolist (pair (spamf-cutoff-words token
+					    spamf-cutoff-words-limit
+					    navi2ch-spamf-good-corpus
+					    navi2ch-spamf-bad-corpus))
 	    (prin1 (cons (symbol-name (car pair)) (cdr pair)))
 	    (princ "\n")))
       (message "Spam probability: %f" prob))))
@@ -149,18 +155,14 @@
 
 (defun navi2ch-article-save-corpus ()
   (message "Saving corpus file...")
-  (let ((spamf-good-corpus navi2ch-spamf-good-corpus)
-	(spamf-bad-corpus navi2ch-spamf-bad-corpus))
-    (spamf-save-corpus navi2ch-article-bayesian-save-file-name))
+  (spamf-save-corpus navi2ch-article-bayesian-save-file-name
+		     navi2ch-spamf-good-corpus
+		     navi2ch-spamf-bad-corpus)
   (message "Saving corpus file...done"))
 
 (defun navi2ch-article-load-corpus ()
   (message "Loading corpus file...")
-  (let ((spamf-good-corpus navi2ch-spamf-good-corpus)
-	(spamf-bad-corpus navi2ch-spamf-bad-corpus))
-    (spamf-load-corpus navi2ch-article-bayesian-save-file-name)
-    (setq navi2ch-spamf-good-corpus spamf-good-corpus
-	  navi2ch-spamf-bad-corpus spamf-bad-corpus))
+  (spamf-load-corpus navi2ch-article-bayesian-save-file-name)
   (message "Loading corpus file...done"))
 
 (defun navi2ch-article-register-to-corpus ()