From 021fe26a59fa30d2cf46aa4982bf4264c57c0e52 Mon Sep 17 00:00:00 2001
From: hmurata <hmurata>
Date: Sun, 30 Nov 2003 01:24:31 +0000
Subject: [PATCH] * wl/wl-spam.el (wl-spam-folder): Renamed from
 `wl-spam-folder-name'.

* doc/wl-ja.texi: Update `Spam Filter'.
---
 doc/wl-ja.texi |    5 +++--
 wl/ChangeLog   |    4 ++++
 wl/wl-spam.el  |    8 ++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index a3becb5..1c2e0dd 100644
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -6693,6 +6693,7 @@ LDAP を利用する場合は、@code{wl-ldap-server}、@code{wl-ldap-port},
 @code{elmo-split-rule} の @samp{CONDITION} として指定出来る関数に 
 @code{spam-p} が追加されます。この関数は、対象のメッセージが spam と判定
 された時に真となります。
+@xref{Split messages}
 
 以下に例を示します。
 
@@ -6764,8 +6765,8 @@ spam かどうかのテストを行います。spam と判定されたメッセージには、sp
 @subsection カスタマイズ変数
 
 @table @code
-@item wl-spam-folder-name
-@vindex wl-spam-folder-name
+@item wl-spam-folder
+@vindex wl-spam-folder
 spam と判定されたメッセージを移動するフォルダ名を設定します。
 初期設定は、@samp{+spam}。
 
diff --git a/wl/ChangeLog b/wl/ChangeLog
index 0d4d1f4..754dd60 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-30  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* wl-spam.el (wl-spam-folder): Renamed from `wl-spam-folder-name'.
+
 2003-11-29  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
 	* wl-message.el (wl-message-buffer-cur-summary-buffer): Remove
diff --git a/wl/wl-spam.el b/wl/wl-spam.el
index 1a7fee4..b33651a 100644
--- a/wl/wl-spam.el
+++ b/wl/wl-spam.el
@@ -41,7 +41,7 @@
   "Spam configuration for wanderlust."
   :group 'wl)
 
-(defcustom wl-spam-folder-name "+spam"
+(defcustom wl-spam-folder "+spam"
   "*Spam folder."
   :type 'string
   :group 'wl-spam)
@@ -103,7 +103,7 @@ See `wl-summary-mark-action-list' for the detail of element."
   :group 'wl-spam)
 
 (defun wl-spam-domain (folder-name)
-  (cond ((string= folder-name wl-spam-folder-name)
+  (cond ((string= folder-name wl-spam-folder)
 	 'spam)
 	((wl-string-match-member folder-name
 				 wl-spam-undecided-folder-regexp-list)
@@ -273,7 +273,7 @@ See `wl-summary-mark-action-list' for the detail of element."
 					  (eq domain 'good)))
       (message "Registering spam...done"))
     (wl-summary-move-mark-list-messages mark-list
-					wl-spam-folder-name
+					wl-spam-folder
 					"Refiling spam...")))
 
 (defun wl-summary-exec-action-refile-with-register (mark-list)
@@ -322,7 +322,7 @@ See `wl-summary-mark-action-list' for the detail of element."
   (when (elmo-spam-message-spam-p (elmo-spam-processor)
 				  wl-summary-buffer-elmo-folder
 				  (elmo-message-entity-number entity))
-    wl-spam-folder-name))
+    wl-spam-folder))
 
 (defun wl-spam-setup ()
   (add-hook 'wl-summary-prepared-hook #'wl-summary-auto-check-spam)
-- 
1.7.10.4