From: hmurata <hmurata>
Date: Mon, 27 Oct 2003 05:02:13 +0000 (+0000)
Subject: * wl-spam.el (wl-spam-setup): Modify wl-summary-reserve-mark-list
X-Git-Tag: wl-2_11_21~37
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=a34d8cf7782b43376470c9cef36d73e7a315312a;p=elisp%2Fwanderlust.git

* wl-spam.el (wl-spam-setup): Modify wl-summary-reserve-mark-list
and wl-summary-skip-mark-list.

* en/dot.wl: Don't use setf.

* ja/dot.wl: Ditto.
---

diff --git a/samples/en/dot.wl b/samples/en/dot.wl
index 1699899..d108934 100644
--- a/samples/en/dot.wl
+++ b/samples/en/dot.wl
@@ -400,7 +400,7 @@
 ;    (setq action  (car actions)
 ;	  actions (cdr actions))
 ;    (when (eq (wl-summary-action-symbol action) 'refile)
-;      (setf (nth 4 action) 'wl-summary-exec-action-refile-with-register)
+;      (setcar (nthcdr 4 action) 'wl-summary-exec-action-refile-with-register)
 ;      (setq actions nil))))
 
 ;;; dot.wl ends here
diff --git a/samples/ja/dot.wl b/samples/ja/dot.wl
index 3a252c4..08e313e 100644
--- a/samples/ja/dot.wl
+++ b/samples/ja/dot.wl
@@ -378,17 +378,17 @@
 ;; うかを判定する様にする
 ;(unless (memq 'wl-refile-guess-by-spam wl-refile-guess-functions)
 ;  (setq wl-refile-guess-functions
-;	(cons #'wl-refile-guess-by-spam 
+;	(cons #'wl-refile-guess-by-spam
 ;	      wl-refile-guess-functions)))
 
-;; サマリバッファで `C-o' (wl-summary-auto-refile) した時, *最初*に 
+;; サマリバッファで `C-o' (wl-summary-auto-refile) した時, *最初*に
 ;; spam かどうかを判定する様にする
 ;(unless (memq 'wl-refile-guess-by-spam wl-auto-refile-guess-functions)
 ;  (setq wl-auto-refile-guess-functions
-;	(cons #'wl-refile-guess-by-spam 
+;	(cons #'wl-refile-guess-by-spam
 ;	      wl-auto-refile-guess-functions)))
 
-;; refile-rule を優先したい場合 (spamfilter-wl.el や bogofilter-wl.el 
+;; refile-rule を優先したい場合 (spamfilter-wl.el や bogofilter-wl.el
 ;; と同じ設定) は, こっちの設定を有効にする
 ;(unless (memq 'wl-refile-guess-by-spam wl-auto-refile-guess-functions)
 ;  (setq wl-auto-refile-guess-functions
@@ -401,7 +401,7 @@
 
 ;; refile の実行時に学習させる為の設定
 ;; 以下の設定をしたからと言って常に学習する訳ではありません. 詳しくは,
-;; wl-spam.el の wl-spam-undecided-folder-regexp-list と 
+;; wl-spam.el の wl-spam-undecided-folder-regexp-list と
 ;; wl-spam-ignored-folder-regexp-list の docstring を参照して下さい.
 ;(let ((actions wl-summary-mark-action-list)
 ;      action)
@@ -409,7 +409,7 @@
 ;    (setq action  (car actions)
 ;	  actions (cdr actions))
 ;    (when (eq (wl-summary-action-symbol action) 'refile)
-;      (setf (nth 4 action) 'wl-summary-exec-action-refile-with-register)
+;      (setcar (nthcdr 4 action) 'wl-summary-exec-action-refile-with-register)
 ;      (setq actions nil))))
 
 ;;; dot.wl ends here
diff --git a/wl/ChangeLog b/wl/ChangeLog
index bd14dc0..3c24a5e 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-27  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* wl-spam.el (wl-spam-setup): Modify wl-summary-reserve-mark-list
+	and wl-summary-skip-mark-list.
+
 2003-10-26  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
 	* wl-spam.el (wl-summary-exec-action-spam): Fixed.
diff --git a/wl/wl-spam.el b/wl/wl-spam.el
index 7e2224c..0b47a2d 100644
--- a/wl/wl-spam.el
+++ b/wl/wl-spam.el
@@ -319,7 +319,14 @@ See `wl-summary-mark-action-list' for the detail of element."
   (when wl-spam-mark-action-list
     (setq wl-summary-mark-action-list (append
 				       wl-summary-mark-action-list
-				       wl-spam-mark-action-list)))
+				       wl-spam-mark-action-list))
+    (dolist (action wl-spam-mark-action-list)
+      (setq wl-summary-reserve-mark-list
+	    (cons (wl-summary-action-mark action)
+		  wl-summary-reserve-mark-list))
+      (setq wl-summary-skip-mark-list
+	    (cons (wl-summary-action-mark action)
+		  wl-summary-skip-mark-list))))
   (define-key wl-summary-mode-map "k" wl-summary-spam-map)
   (define-key wl-summary-mode-map "ms" 'wl-summary-target-mark-register-as-spam)
   (define-key wl-summary-mode-map "mn" 'wl-summary-target-mark-register-as-good))