* wl.el (wl): Initialize plug-related settings before `wl-init'.

* wl-draft.el (wl-draft): funcall `wl-fcc' if it is a function.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 7e21d28..8f403fd 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-13  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * wl.el (wl): Initialize plug-related settings before `wl-init'.
+
+       * wl-draft.el (wl-draft): funcall `wl-fcc' if it is a function.
+
 2000-09-13  Katsumi Yamaoka    <yamaoka@jpl.org>
 
        * wl-folder.el (wl-folder-entity-assign-id): Undo the last change.

diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index b8d674e..3afdd64 100644 (file)
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -1344,7 +1344,7 @@ If optional argument is non-nil, current draft buffer is killed"
     (if (or wl-bcc mail-self-blind)
        (insert "Bcc: " (or wl-bcc (user-login-name)) "\n"))
     (if wl-fcc
-       (insert "FCC: " wl-fcc "\n"))
+       (insert "FCC: " (if (functionp wl-fcc) (funcall wl-fcc) wl-fcc) "\n"))
     (if wl-organization
        (insert "Organization: " wl-organization "\n"))
     (and wl-auto-insert-x-face

diff --git a/wl/wl.el b/wl/wl.el
index ff47ecb..b23fe16 100644 (file)
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -757,10 +757,10 @@ If prefix argument is specified, folder checkings are skipped."
   (interactive "P")
   (unless wl-init
     (wl-load-profile))
+  (wl-plugged-init (null (get-buffer wl-folder-buffer-name)))
   (unwind-protect
       (wl-init arg)
-    (let ((make (wl-folder arg)))
-      (wl-plugged-init make)))
+    (wl-folder arg))
   (run-hooks 'wl-hook))
 
 ;; Define some autoload functions WL might use.