* slp.el: Add (eval-when-compile (require 'cl)).

* elmo-date.el: Ditto.
* elmo-pop3.el: Ditto.
* elmo-mime.el: Add (eval-when-compile (require 'elmo)).

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index aecde50..092058b 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-18  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+       * slp.el: Add (eval-when-compile (require 'cl)).
+       * elmo-date.el: Ditto.
+       * elmo-pop3.el: Ditto.
+       * elmo-mime.el: Add (eval-when-compile (require 'elmo)).
+
 2008-02-17  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
        * modb.el (elmo-msgdb-match-condition-primitive): Use

diff --git a/elmo/elmo-date.el b/elmo/elmo-date.el
index e2a05af..7a4fe4c 100644 (file)
--- a/elmo/elmo-date.el
+++ b/elmo/elmo-date.el
@@ -33,6 +33,7 @@
 (require 'path-util)
 (require 'timezone)
 (require 'elmo-vars)
+(eval-when-compile (require 'cl))
 
 (defmacro elmo-match-substring (pos string from)
   "Substring of POSth matched string of STRING."

diff --git a/elmo/elmo-mime.el b/elmo/elmo-mime.el
index f11e0cf..5ccc1d2 100644 (file)
--- a/elmo/elmo-mime.el
+++ b/elmo/elmo-mime.el
@@ -33,6 +33,11 @@
 (require 'mmimap)
 (require 'mime-view)
 
+(eval-when-compile
+  (require 'luna)
+  (require 'elmo)            ; elmo-folder-do-each-message-entity
+  (require 'cl))
+
 ;; MIME-Entity
 (eval-and-compile
   (luna-define-class elmo-mime-entity))

diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index b59f95b..85bb096 100644 (file)
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -36,6 +36,7 @@
 (require 'elmo-map)
 
 (eval-when-compile
+  (require 'cl)
   (require 'elmo-util))
 
 (eval-and-compile

diff --git a/elmo/slp.el b/elmo/slp.el
index 84f4cac..5805f31 100644 (file)
--- a/elmo/slp.el
+++ b/elmo/slp.el
@@ -32,6 +32,7 @@
 ;; 28 Aug 2001 Created.
 
 ;;; Code:
+(eval-when-compile (require 'cl))
 
 (defgroup slp nil
   "Interface for `Service Location Protocol'."