From a8715f6cc5811d4933621a22dcf60cbcb1bb4876 Mon Sep 17 00:00:00 2001 From: hmurata Date: Sat, 21 Feb 2004 06:29:50 +0000 Subject: [PATCH] * wl-vars.el (wl-refile-policy-alist): Abolished. * wl-action.el (wl-summary-set-action-refile): Follow the change above. --- NEWS | 2 ++ NEWS.ja | 2 ++ doc/wl-ja.texi | 16 ---------------- doc/wl.texi | 16 ---------------- wl/ChangeLog | 7 +++++++ wl/wl-action.el | 15 ++------------- wl/wl-vars.el | 10 ---------- 7 files changed, 13 insertions(+), 55 deletions(-) diff --git a/NEWS b/NEWS index 17f77c7..c594003 100644 --- 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 --- a/NEWS.ja +++ b/NEWS.ja @@ -2,6 +2,8 @@ Wanderlust NEWS (日本語版) -- User-visible changes in Wanderlust. * 2.10.1 から 2.12.0 への変更点 +** 変数 wl-refile-policy-alist は廃止されました． + ** スパムフィルタモジュールが新たに追加されました． ** バッチ処理用のモジュールが新たに追加されました． diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi index 4bccc06..38d52f6 100644 --- a/doc/wl-ja.texi +++ b/doc/wl-ja.texi @@ -7973,22 +7973,6 @@ string : 指定したフォルダに移動する。 @code{trash} or その他 : @code{wl-trash-folder} に移動する。 @end example -@item wl-refile-policy-alist -@vindex wl-refile-policy-alist -初期設定は以下のリスト。 - -@lisp -@group -(("^[-=]" . copy) - (".*" . move)) -@end group -@end lisp - -@noindent -リファイルマーク @samp{o} をつける際、メッセージを移動するかコピーするか -を指定します。リストの各要素にはフォルダと @code{copy} または -@code{move} との cons cell を指定します。 - @item wl-x-face-file @vindex wl-x-face-file 初期設定は @file{~/.xface}。 diff --git a/doc/wl.texi b/doc/wl.texi index fca17f7..f292de8 100644 --- 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 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,10 @@ +2004-02-21 Hiroya Murata + + * 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 * 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 --- 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 --- 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." -- 1.7.10.4