From: kaoru <kaoru>
Date: Fri, 23 Nov 2001 08:21:45 +0000 (+0000)
Subject: * wl.el (wl-init): (require 'mime-setup) move to toplevel.
X-Git-Tag: wl-2_8-root~121
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=446bc3ed731b230a1ec244bed838bbf00b9f439a;p=elisp%2Fwanderlust.git

* wl.el (wl-init): (require 'mime-setup) move to toplevel.
* wl-draft.el (wl-draft): Remove verbose `featurep'.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 9e57fe5..6cc494b 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,8 @@
 2001-11-23  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
+	* wl.el (wl-init): (require 'mime-setup) move to toplevel.
+	* wl-draft.el (wl-draft): Remove verbose `featurep'.
+
 	* wl-e21.el: Removed kludge for Emacs 21 prerelease versions.
 
 2001-11-23  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index 0306f5a..dbf51ba 100644
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -1329,8 +1329,7 @@ If KILL-WHEN-DONE is non-nil, current draft buffer is killed"
 			   body edit-again summary-buf from parent-folder)
   "Write and send mail/news message with Wanderlust."
   (interactive)
-  (unless (featurep 'wl)
-    (require 'wl))
+  (require 'wl)
   (unless wl-init
     (wl-load-profile)
     (wl-folder-init)
diff --git a/wl/wl.el b/wl/wl.el
index af68ce4..46dc6f2 100644
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -31,6 +31,7 @@
 ;;; Code:
 ;;
 
+(require 'mime-setup)
 (require 'elmo)
 (require 'wl-version)			; reduce recursive-load-depth
 
@@ -665,8 +666,6 @@ 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)
     (add-hook 'kill-emacs-hook 'wl-save-status)
     (wl-address-init)