Prepare for 2.10.1.

[elisp/wanderlust.git] / wl / wl-refile.el

diff --git a/wl/wl-refile.el b/wl/wl-refile.el
index c8b5f53..6156774 100644 (file)
--- a/wl/wl-refile.el
+++ b/wl/wl-refile.el
@@ -50,17 +50,17 @@
        (setq wl-refile-alist
              (elmo-object-load
               (expand-file-name wl-refile-alist-file-name
-                                elmo-msgdb-dir) elmo-mime-charset)))
+                                elmo-msgdb-directory) elmo-mime-charset)))
        ((eq (car flist) 'wl-refile-guess-by-msgid)
        (setq wl-refile-msgid-alist
              (elmo-object-load
               (expand-file-name wl-refile-msgid-alist-file-name
-                                elmo-msgdb-dir) elmo-mime-charset)))
+                                elmo-msgdb-directory) elmo-mime-charset)))
        ((eq (car flist) 'wl-refile-guess-by-subject)
        (setq wl-refile-subject-alist
              (elmo-object-load
               (expand-file-name wl-refile-subject-alist-file-name
-                                elmo-msgdb-dir) elmo-mime-charset))))
+                                elmo-msgdb-directory) elmo-mime-charset))))
       (setq flist (cdr flist)))))
 
 (defun wl-refile-alist-save ()
@@ -77,7 +77,7 @@
 (defun wl-refile-alist-save-file (file-name alist)
   (if (> (length alist) wl-refile-alist-max-length)
       (setcdr (nthcdr (1- wl-refile-alist-max-length) alist) nil))
-  (elmo-object-save (expand-file-name file-name elmo-msgdb-dir)
+  (elmo-object-save (expand-file-name file-name elmo-msgdb-directory)
                    alist elmo-mime-charset))
 
 (defun wl-refile-learn (entity dst)
@@ -132,8 +132,8 @@
                                            wl-refile-msgid-alist))))))
 
 (defun wl-refile-subject-learn (entity dst)
-  (let ((subject (wl-summary-subject-filter-func-internal
-                 (elmo-msgdb-overview-entity-get-subject entity)))
+  (let ((subject (funcall wl-summary-subject-filter-function
+                         (elmo-msgdb-overview-entity-get-subject entity)))
        hit)
     (setq dst (elmo-string dst))
     (if (and subject (not (string= subject "")))
@@ -258,8 +258,8 @@ If RULE does not match ENTITY, returns nil."
              wl-refile-msgid-alist)))
 
 (defun wl-refile-guess-by-subject (entity)
-  (cdr (assoc (wl-summary-subject-filter-func-internal
-              (elmo-msgdb-overview-entity-get-subject entity))
+  (cdr (assoc (funcall wl-summary-subject-filter-function
+                      (elmo-msgdb-overview-entity-get-subject entity))
              wl-refile-subject-alist)))
 
 (require 'product)