Update x-face section.

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

diff --git a/wl/wl.el b/wl/wl.el
index 21e0669..48dc2cb 100644 (file)
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -691,7 +691,9 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
 
 (defun wl-check-environment (no-check-folder)
   (unless wl-from
-    (error "Please set `wl-from'"))
+    (setq wl-from
+         (concat (wl-address-quote-specials (user-full-name))
+                 " <" user-mail-address ">")))
   ;; Message-ID
   (unless (string-match "[^.]\\.[^.]" (or wl-message-id-domain
                                          (if wl-local-domain
@@ -754,22 +756,25 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
 If ARG (prefix argument) is specified, folder checkings are skipped."
   (interactive "P")
   (unless wl-init
-    (wl-load-profile))
-  (elmo-init)
-  (let (demo-buf)
+    (wl-load-profile)
+    (wl-folder-init)
+    (elmo-init))
+  (let (demo-buf check)
     (unless wl-init
       (if wl-demo (setq demo-buf (wl-demo)))
-      (condition-case nil
-         (progn
-           (message "Checking environment...")
-           (wl-check-environment arg)
-           (message "Checking environment...done"))
-       (error)
-       (quit)))
+      (setq check t))
     (wl-init)
     (condition-case obj
        (progn
          (wl-plugged-init (wl-folder arg))
+         (if check
+             (condition-case nil
+                 (progn
+                   (message "Checking environment...")
+                   (wl-check-environment arg)
+                   (message "Checking environment...done"))
+               (error)
+               (quit)))
          (unless arg
            (run-hooks 'wl-auto-check-folder-pre-hook)
            (wl-folder-auto-check)
@@ -813,6 +818,8 @@ If ARG (prefix argument) is specified, folder checkings are skipped."
       wl-fldmgr-save-folders wl-fldmgr-set-petname wl-fldmgr-sort
       wl-fldmgr-subscribe wl-fldmgr-subscribe-region
       wl-fldmgr-unsubscribe wl-fldmgr-unsubscribe-region wl-fldmgr-yank )
+     ("wl-acap" wl-acap-init)
+     ("wl-acap" :interactive t wl-acap-store)
      ("wl-fldmgr"
       (wl-fldmgr-mode-map keymap)
       wl-fldmgr-add-entity-hashtb)