* 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 (file)
--- 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 (file)
--- a/samples/ja/dot.wl
+++ b/samples/ja/dot.wl
@@ -378,17 +378,17 @@
 ;; \e$B$&$+$rH=Dj$9$kMM$K$9$k\e(B
 ;(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)))
 
-;; \e$B%5%^%j%P%C%U%!$G\e(B `C-o' (wl-summary-auto-refile) \e$B$7$?;~\e(B, *\e$B:G=i\e(B*\e$B$K\e(B 
+;; \e$B%5%^%j%P%C%U%!$G\e(B `C-o' (wl-summary-auto-refile) \e$B$7$?;~\e(B, *\e$B:G=i\e(B*\e$B$K\e(B
 ;; spam \e$B$+$I$&$+$rH=Dj$9$kMM$K$9$k\e(B
 ;(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 \e$B$rM%@h$7$?$$>l9g\e(B (spamfilter-wl.el \e$B$d\e(B bogofilter-wl.el 
+;; refile-rule \e$B$rM%@h$7$?$$>l9g\e(B (spamfilter-wl.el \e$B$d\e(B bogofilter-wl.el
 ;; \e$B$HF1$8@_Dj\e(B) \e$B$O\e(B, \e$B$3$C$A$N@_Dj$rM-8z$K$9$k\e(B
 ;(unless (memq 'wl-refile-guess-by-spam wl-auto-refile-guess-functions)
 ;  (setq wl-auto-refile-guess-functions
@@ -401,7 +401,7 @@
 
 ;; refile \e$B$N<B9T;~$K3X=,$5$;$k0Y$N@_Dj\e(B
 ;; \e$B0J2<$N@_Dj$r$7$?$+$i$H8@$C$F>o$K3X=,$9$kLu$G$O$"$j$^$;$s\e(B. \e$B>\$7$/$O\e(B,
-;; wl-spam.el \e$B$N\e(B wl-spam-undecided-folder-regexp-list \e$B$H\e(B 
+;; wl-spam.el \e$B$N\e(B wl-spam-undecided-folder-regexp-list \e$B$H\e(B
 ;; wl-spam-ignored-folder-regexp-list \e$B$N\e(B docstring \e$B$r;2>H$7$F2<$5$$\e(B.
 ;(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 (file)
--- 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 (file)
--- 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))