Synch up with main trunk, and prepare the release 2.12.0.

[elisp/wanderlust.git] / wl / wl-spam.el

diff --git a/wl/wl-spam.el b/wl/wl-spam.el
index ad1febc..690242b 100644 (file)
--- a/wl/wl-spam.el
+++ b/wl/wl-spam.el
@@ -94,12 +94,14 @@
 Append this value to `wl-summary-mark-action-list' by `wl-spam-setup'.
 
 See `wl-summary-mark-action-list' for the detail of element."
-  :type '(repeat (string :tag "Temporary mark")
-                (symbol :tag "Set mark function")
-                (symbol :tag "Unset mark function")
-                (symbol :tag "Exec function")
-                (symbol :tag "Face symbol")
-                (string :tag "Document string"))
+  :type '(repeat (list
+                 (string :tag "Temporary mark")
+                 (symbol :tag "Action name")
+                 (symbol :tag "Argument function")
+                 (symbol :tag "Set mark function")
+                 (symbol :tag "Exec function")
+                 (symbol :tag "Face symbol")
+                 (string :tag "Document string")))
   :group 'wl-spam)
 
 (defun wl-spam-domain (folder-name)
@@ -330,7 +332,7 @@ See `wl-summary-mark-action-list' for the detail of element."
     wl-spam-folder))
 
 (defun wl-spam-setup ()
-  (add-hook 'wl-summary-prepared-hook #'wl-summary-auto-check-spam)
+  (add-hook 'wl-summary-sync-updated-hook #'wl-summary-auto-check-spam)
   (let ((actions wl-summary-mark-action-list)
        action)
     (while actions