From 7b842e99388b614f58e7c40df76e693a0368fa1d Mon Sep 17 00:00:00 2001
From: teranisi <teranisi>
Date: Wed, 29 Aug 2001 08:40:11 +0000
Subject: [PATCH] * wl.el (wl): Call `elmo-init' and `wl-folder-init' unless
 wl-init is non-nil.

* wl-draft.el (wl-draft): Ditto.

* wl-folder.el (wl-folder): Don't call `wl-folder-init' here.
---
 wl/ChangeLog    |    7 +++++++
 wl/wl-draft.el  |    4 +++-
 wl/wl-folder.el |    2 --
 wl/wl.el        |    5 +++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 5a98aef..228273c 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,12 @@
 2001-08-29  Yuuichi Teranishi  <teranisi@gohome.org>
 
+	* wl.el (wl): Call `elmo-init' and `wl-folder-init' unless
+	wl-init is non-nil.
+
+	* wl-draft.el (wl-draft): Ditto.
+
+	* wl-folder.el (wl-folder): Don't call `wl-folder-init' here.
+
 	* wl-acap.el (toplevel): Require 'wl.
 	(wl-acap-store): Call `elmo-init'.
 
diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index 39c19f6..f4d817d 100644
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -1313,7 +1313,9 @@ If optional argument is non-nil, current draft buffer is killed"
   (unless (featurep 'wl)
     (require 'wl))
   (unless wl-init
-    (wl-load-profile))
+    (wl-load-profile)
+    (elmo-init)
+    (wl-folder-init))
   (wl-init) ;; returns immediately if already initialized.
   (if (interactive-p)
       (setq summary-buf (wl-summary-get-buffer (wl-summary-buffer-folder-name))))
diff --git a/wl/wl-folder.el b/wl/wl-folder.el
index 3669437..611e4b0 100644
--- a/wl/wl-folder.el
+++ b/wl/wl-folder.el
@@ -1446,8 +1446,6 @@ Entering Folder mode calls the value of `wl-folder-mode-hook'."
 (defun wl-folder (&optional arg)
   (interactive "P")
   (let (initialize folder-buf)
-    (unless (get-buffer wl-folder-buffer-name)
-      (wl-folder-init))
     (if (setq folder-buf (get-buffer wl-folder-buffer-name))
 	(if wl-folder-use-frame
 	    (let (select-frame)
diff --git a/wl/wl.el b/wl/wl.el
index b4526b8..9b7bdeb 100644
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -754,8 +754,9 @@ 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)
+    (wl-load-profile)
+    (elmo-init)
+    (wl-folder-init))
   (let (demo-buf check)
     (unless wl-init
       (if wl-demo (setq demo-buf (wl-demo)))
-- 
1.7.10.4