* wl.el (wl-init): Require mime-setup.

(wl-check-environment): Don't require mime-setup.

* wl-util.el (wl-biff-check-folder): Use elmo-folder-type-internal
instead of elmo-folder-type.

* wl-message.el (wl-message-buffer-prefetch-debug): Set default
value as nil.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 92150b0..8363242 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,14 @@
+2001-06-18  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * wl.el (wl-init): Require mime-setup.
+       (wl-check-environment): Don't require mime-setup.
+
+       * wl-util.el (wl-biff-check-folder): Use elmo-folder-type-internal
+       instead of elmo-folder-type.
+
+       * wl-message.el (wl-message-buffer-prefetch-debug): Set default
+       value as nil.
+
 2001-06-15  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * Version number is increased to 2.7.0.

diff --git a/wl/wl-message.el b/wl/wl-message.el
index b8f9851..5bdfa37 100644 (file)
--- a/wl/wl-message.el
+++ b/wl/wl-message.el
@@ -52,7 +52,7 @@
 
 (defvar wl-message-buffer-prefetch-folder-type-list t)
 
-(defvar wl-message-buffer-prefetch-debug t)
+(defvar wl-message-buffer-prefetch-debug nil)
 
 (defvar wl-message-buffer nil) ; message buffer.
 

diff --git a/wl/wl-util.el b/wl/wl-util.el
index f8c94a2..cce302f 100644 (file)
--- a/wl/wl-util.el
+++ b/wl/wl-util.el
@@ -826,7 +826,7 @@ This function is imported from Emacs 20.7."
          (wl-biff-notify new-mails (interactive-p)))))))
 
 (defun wl-biff-check-folder (folder)
-  (if (eq (elmo-folder-type folder) 'pop3)
+  (if (eq (elmo-folder-type-internal folder) 'pop3)
       ;; pop3 biff should share the session.
       (prog2
          (elmo-folder-check folder)

diff --git a/wl/wl.el b/wl/wl.el
index 349c5bc..f672bfa 100644 (file)
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -671,6 +671,8 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
 
 (defun wl-init ()
   (when (not wl-init)
+    (unless (featurep 'mime-setup)
+      (require 'mime-setup))
     (setq elmo-plugged wl-plugged)
     (unless wl-on-nemacs
       (add-hook 'kill-emacs-hook 'wl-save-status))
@@ -700,8 +702,6 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
     (run-hooks 'wl-init-hook)))
 
 (defun wl-check-environment (no-check-folder)
-  (unless (featurep 'mime-setup)
-    (require 'mime-setup))
   (unless wl-from
     (error "Please set `wl-from'"))
   ;; Message-ID