* wl-folder.el (wl-folder): Abolish unused argument.

Call wl-folder-init when wl-folder-entity is nil.
* wl.el (wl): Change accordingly.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 23b0b00..fd5f545 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-17  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+       * wl-folder.el (wl-folder): Abolish unused argument.
+       Call wl-folder-init when wl-folder-entity is nil.
+       * wl.el (wl): Change accordingly.
+
 2004-05-16  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * wl-draft.el (wl-draft-yank-from-mail-reply-buffer): Convert to

diff --git a/wl/wl-folder.el b/wl/wl-folder.el
index 7d6e4cb..7767da2 100644 (file)
--- a/wl/wl-folder.el
+++ b/wl/wl-folder.el
@@ -1500,8 +1500,7 @@ Entering Folder mode calls the value of `wl-folder-mode-hook'."
     (wl-append wl-folder-petname-alist
               (list (cons realname petname)))))
 
-(defun wl-folder (&optional arg)
-  (interactive "P")
+(defun wl-folder ()
   (let (initialize folder-buf)
     (if (setq folder-buf (get-buffer wl-folder-buffer-name))
        (if wl-folder-use-frame
@@ -1530,6 +1529,8 @@ Entering Folder mode calls the value of `wl-folder-mode-hook'."
       (set-buffer wl-folder-buffer-name)
       (wl-folder-mode)
       ;; Initialization.
+      (unless wl-folder-entity
+       (wl-folder-init))
       (setq wl-folder-entity-id 0)
       (wl-folder-entity-assign-id wl-folder-entity)
       (setq wl-folder-entity-hashtb

diff --git a/wl/wl.el b/wl/wl.el
index 9b8189a..d523243 100644 (file)
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -800,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
@@ -819,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)