X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=wl%2Fwl-refile.el;h=6156774cec0d9d11c37c505c8c410a29343944ae;hb=3f902466589f92d94e1e4d6c8ff4b4f22449b620;hp=8155e93cae7e78220acf2b995f3ab676c3a65751;hpb=8b003dd16e3d4a1f0d29b5fcd0f57a2ee294f967;p=elisp%2Fwanderlust.git

diff --git a/wl/wl-refile.el b/wl/wl-refile.el
index 8155e93..6156774 100644
--- a/wl/wl-refile.el
+++ b/wl/wl-refile.el
@@ -1,4 +1,4 @@
-;;; wl-refile.el -- Refile modules for Wanderlust.
+;;; wl-refile.el --- Refile modules for Wanderlust.
 
 ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi <teranisi@gohome.org>
 
@@ -24,10 +24,10 @@
 ;;
 
 ;;; Commentary:
-;; 
+;;
 
 ;;; Code:
-;; 
+;;
 
 (require 'wl-vars)
 (require 'wl-util)
@@ -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)
@@ -117,7 +117,7 @@
 	  (wl-refile-subject-learn entity dst)))
     (when key
       (if (setq hit (assoc key wl-refile-alist))
-          (setq wl-refile-alist (delq hit wl-refile-alist)))
+	  (setq wl-refile-alist (delq hit wl-refile-alist)))
       (setq wl-refile-alist (cons (cons key dst)
 				  wl-refile-alist)))))
 
@@ -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 "")))
@@ -152,8 +152,9 @@
     wl-refile-guess-by-history)
   "*Functions in this list are used for guessing refile destination folder.")
 
-(defvar wl-refile-guess-func-list wl-refile-guess-functions)
-(make-obsolete-variable 'wl-refile-guess-func-list 'wl-refile-guess-functions)
+;; 2000-11-05: *-func-list -> *-functions
+(elmo-define-obsolete-variable 'wl-refile-guess-func-list
+			       'wl-refile-guess-functions)
 
 (defun wl-refile-guess (entity)
   (let ((flist wl-refile-guess-functions) guess)
@@ -242,7 +243,7 @@ If RULE does not match ENTITY, returns nil."
   (if (string-match "\\([^@]+\\)@[^@]+" address)
       (wl-match-string 1 address)
     address))
-		 
+
 (defun wl-refile-guess-by-from (entity)
   (let ((from
 	 (downcase (wl-address-header-extract-address
@@ -251,14 +252,14 @@ If RULE does not match ENTITY, returns nil."
     (or (cdr (assoc from wl-refile-alist))
 	(format "%s/%s" wl-refile-default-from-folder
 		(wl-refile-get-account-part-from-address from)))))
-  
+
 (defun wl-refile-guess-by-msgid (entity)
   (cdr (assoc (elmo-msgdb-overview-entity-get-references entity)
 	      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)