X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=wl%2Fwl.el;h=d52324314287af3347faa0dfaaf214d9a4c055cc;hb=62345218eb5ad2b29ace6731bbddf1d3fe787c3c;hp=0339e635422e386d010b521d583703a4486de0f6;hpb=5f29516aa214ae780fc3b7ee37f2436c7f442451;p=elisp%2Fwanderlust.git

diff --git a/wl/wl.el b/wl/wl.el
index 0339e63..d523243 100644
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -56,8 +56,10 @@
 (provide 'wl)				; circular dependency
 (require 'wl-folder)
 (require 'wl-summary)
+(require 'wl-action)
 (require 'wl-thread)
 (require 'wl-address)
+(require 'wl-news)
 
 (wl-draft-mode-setup)
 (require 'wl-draft)
@@ -71,7 +73,8 @@
   (require 'smtp)
   (require 'wl-score)
   (require 'wl-fldmgr)
-  (require 'wl-mime))
+  (require 'wl-mime)
+  (require 'wl-spam))
 
 (defun wl-plugged-init (&optional make-alist)
   (setq elmo-plugged wl-plugged)
@@ -646,6 +649,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
   (wl-refile-alist-save)
   (wl-folder-info-save)
   (and (featurep 'wl-fldmgr) (wl-fldmgr-exit))
+  (and (featurep 'wl-spam) (wl-spam-save-status))
   (elmo-crosspost-message-alist-save)
   (message "Saving summary and folder status...done"))
 
@@ -694,8 +698,15 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
 	  (symbol-value 'wl-summary-subject-function))
     (fset 'wl-summary-subject-filter-func-internal
 	  (symbol-value 'wl-summary-subject-filter-function))
+    (wl-summary-define-mark-action)
+    (dolist (spec wl-summary-flag-alist)
+      (set-face-foreground
+       (make-face (intern
+		   (format "wl-highlight-summary-%s-flag-face" (car spec))))
+       (nth 1 spec)))
     (setq elmo-no-from wl-summary-no-from-message)
     (setq elmo-no-subject wl-summary-no-subject-message)
+    (wl-news-check)
     (setq wl-init t)
     ;; This hook may contain the functions `wl-plugged-init-icons' and
     ;; `wl-biff-init-icons' for reasons of system internal to accord
@@ -703,7 +714,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
     (run-hooks 'wl-init-hook)))
 
 (defun wl-check-environment (no-check-folder)
-  (unless wl-from (error "Please set `wl-from' to your mail address."))
+  (unless wl-from (error "Please set `wl-from' to your mail address"))
   ;; Message-ID
   (when wl-insert-message-id
     (let ((message-id (funcall wl-message-id-function))
@@ -711,10 +722,10 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
       (unless (string-match "^<\\([^@]*\\)@\\([^@]*\\)>$" message-id)
 	(cond
 	 ((string-match "@" wl-message-id-domain)
-	  (error "Please remove `@' from `wl-message-id-domain'."))
+	  (error "Please remove `@' from `wl-message-id-domain'"))
 	 (t
 	  (error
-	   "Check around `wl-message-id-function' to get valid Message-ID string."))))
+	   "Check around `wl-message-id-function' to get valid Message-ID string"))))
       (setq domain (match-string 2 message-id))
       (if (or (not (string-match "[^.]\\.[^.]" domain))
 	      (string= domain "localhost.localdomain"))
@@ -726,8 +737,6 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
 	  (queue-folder (wl-folder-get-elmo-folder wl-queue-folder))
 	  (lost+found-folder (wl-folder-get-elmo-folder
 			      elmo-lost+found-folder)))
-      (if (not (elmo-folder-message-file-p draft-folder))
-	  (error "%s is not allowed for draft folder" wl-draft-folder))
       (unless (elmo-folder-exists-p draft-folder)
 	(if (y-or-n-p
 	     (format "Draft Folder %s does not exist, create it? "
@@ -776,7 +785,7 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
 
 (defun wl-check-variables-2 ()
   (if (< wl-message-buffer-cache-size 1)
-      (error "`wl-message-buffer-cache-size' must be larger than 0."))
+      (error "`wl-message-buffer-cache-size' must be larger than 0"))
   (when wl-message-buffer-prefetch-depth
     (if (not (< wl-message-buffer-prefetch-depth
 		wl-message-buffer-cache-size))
@@ -791,7 +800,6 @@ If ARG (prefix argument) is specified, folder checkings are skipped."
   (interactive "P")
   (unless wl-init
     (wl-load-profile)
-    (wl-folder-init)
     (elmo-init))
   (let (demo-buf check)
     (unless wl-init
@@ -810,7 +818,7 @@ If ARG (prefix argument) is specified, folder checkings are skipped."
 		(wl-check-variables-2)
 		(message "Checking type of variables...done")))
 	  (let ((inhibit-quit t))
-	    (wl-plugged-init (wl-folder arg)))
+	    (wl-plugged-init (wl-folder)))
 	  (unless arg
 	    (run-hooks 'wl-auto-check-folder-pre-hook)
 	    (wl-folder-auto-check)
@@ -819,7 +827,6 @@ If ARG (prefix argument) is specified, folder checkings are skipped."
       (error
        (if (buffer-live-p demo-buf)
 	   (kill-buffer demo-buf))
-       (setq wl-init nil)
        (signal (car obj)(cdr obj)))
       (quit))
     (if (buffer-live-p demo-buf)