* wl-vars.el (wl-refile-policy-alist): Abolished.

* wl-action.el (wl-summary-set-action-refile): Follow the change
above.

diff --git a/NEWS b/NEWS
index 17f77c7..c594003 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ Wanderlust NEWS -- User-visible changes in Wanderlust.
 
 * Changes in 2.12.0 from 2.10.1
 
+** The variable wl-refile-policy-alist is abolished.
+
 ** SPAM filter module is added.
 
 ** Batch processing module is added.

diff --git a/NEWS.ja b/NEWS.ja
index f6076cd..b214d45 100644 (file)
--- a/NEWS.ja
+++ b/NEWS.ja
@@ -2,6 +2,8 @@ Wanderlust NEWS (\e$BF|K\8lHG\e(B) -- User-visible changes in Wanderlust.
 
 * 2.10.1 \e$B$+$i\e(B 2.12.0 \e$B$X$NJQ99E@\e(B
 
+** \e$BJQ?t\e(B wl-refile-policy-alist \e$B$OGQ;_$5$l$^$7$?!%\e(B
+
 ** \e$B%9%Q%`%U%#%k%?%b%8%e!<%k$,?7$?$KDI2C$5$l$^$7$?!%\e(B
 
 ** \e$B%P%C%A=hM}MQ$N%b%8%e!<%k$,?7$?$KDI2C$5$l$^$7$?!%\e(B

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index 4bccc06..38d52f6 100644 (file)
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -7973,22 +7973,6 @@ string             : \e$B;XDj$7$?%U%)%k%@$K0\F0$9$k!#\e(B
 @code{trash} or \e$B$=$NB>\e(B  : @code{wl-trash-folder} \e$B$K0\F0$9$k!#\e(B
 @end example
 
-@item wl-refile-policy-alist
-@vindex wl-refile-policy-alist
-\e$B=i4|@_Dj$O0J2<$N%j%9%H!#\e(B
-
-@lisp
-@group
-(("^[-=]" . copy)
- (".*" . move))
-@end group
-@end lisp
-
-@noindent
-\e$B%j%U%!%$%k%^!<%/\e(B @samp{o} \e$B$r$D$1$k:]!"%a%C%;!<%8$r0\F0$9$k$+%3%T!<$9$k$+\e(B
-\e$B$r;XDj$7$^$9!#%j%9%H$N3FMWAG$K$O%U%)%k%@$H\e(B @code{copy} \e$B$^$?$O\e(B 
-@code{move} \e$B$H$N\e(B cons cell \e$B$r;XDj$7$^$9!#\e(B
-
 @item wl-x-face-file
 @vindex wl-x-face-file
 \e$B=i4|@_Dj$O\e(B @file{~/.xface}\e$B!#\e(B

diff --git a/doc/wl.texi b/doc/wl.texi
index fca17f7..f292de8 100644 (file)
--- a/doc/wl.texi
+++ b/doc/wl.texi
@@ -8055,22 +8055,6 @@ string             : moves the messages to the specific folder.
 @code{trash} or others  : moves the messages to @code{wl-trash-folder}.
 @end example
 
-@item wl-refile-policy-alist
-@vindex wl-refile-policy-alist
-The initial setting is the list shown below:
-
-@lisp
-@group
-(("^[-=]" . copy)
- (".*" . move))
-@end group
-@end lisp
-
-@noindent
-This list determines whether messages with re-file marks are moved or
-copied.  Each item in the list is a cons cell of a folder and
-@code{copy} or @code{move}.
-
 @item wl-x-face-file
 @vindex wl-x-face-file
 The initial setting is @file{~/.xface}.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index d391256..09469be 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-21  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * wl-vars.el (wl-refile-policy-alist): Abolished.
+
+       * wl-action.el (wl-summary-set-action-refile): Follow the change
+       above.
+
 2004-02-19  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * wl-highlight.el (wl-highlight-signature-search): Don't use

diff --git a/wl/wl-action.el b/wl/wl-action.el
index 6274a5e..9c07368 100644 (file)
--- a/wl/wl-action.el
+++ b/wl/wl-action.el
@@ -436,19 +436,8 @@ Return number if put mark succeed"
 (defun wl-summary-set-action-refile (number mark data)
   (when (null data)
     (error "Destination folder is empty"))
-  (let ((policy (wl-get-assoc-list-value wl-refile-policy-alist
-                                        (wl-summary-buffer-folder-name)))
-       (elem wl-summary-mark-action-list))
-    (if (eq policy 'copy)
-       (while elem
-         (when (eq (wl-summary-action-symbol (car elem)) 'copy)
-           (wl-summary-register-temp-mark number
-                                          (wl-summary-action-mark (car elem))
-                                          data)
-           (setq elem nil))
-         (setq elem (cdr elem)))
-      (wl-summary-register-temp-mark number mark data)
-      (setq wl-summary-buffer-prev-refile-destination data))))
+  (wl-summary-register-temp-mark number mark data)
+  (setq wl-summary-buffer-prev-refile-destination data))
 
 (defun wl-summary-get-refile-destination (action number)
   "Decide refile destination."

diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 6e8ecc6..8377e02 100644 (file)
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -2378,16 +2378,6 @@ ex.
                               (string :tag "Folder"))))
   :group 'wl-folder)
 
-(defcustom wl-refile-policy-alist '(("^[-=']" . copy)
-                                   (".*" . move))
-  "*List of refile policy.  Each element is (FOLDER-REGEXP . POLICY).
-POLICY is copy or move."
-  :type '(repeat (cons (regexp :tag "Folder Regexp")
-                      (choice (const copy)
-                              (const move))))
-  :group 'wl-summary
-  :group 'wl-pref)
-
 (defcustom wl-folder-hierarchy-access-folders '("^-[^\\.]*\\(:\\|@\\|$\\)"
                                                "^@$" "^'$")
   "*Access group REGEXPs to make hierarchy structure."