* elmo2.el (toplevel): Move `product-provide' declare.

* mmelmo.el (toplevel): Ditto.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 9b5f1e9..8d419eb 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-29  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+       * elmo2.el (toplevel): Move `product-provide' declare.
+       * mmelmo.el (toplevel): Ditto.
+
 2000-12-26  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * elmo-util.el (elmo-folder-get-store-type): Rewrite.

diff --git a/elmo/elmo2.el b/elmo/elmo2.el
index 8208aaf..d49914c 100644 (file)
--- a/elmo/elmo2.el
+++ b/elmo/elmo2.el
@@ -29,13 +29,13 @@
 ;;; Code:
 ;; 
 
+(require 'elmo-version)                        ; reduce recursive-load-depth
 (require 'elmo-vars)
 (require 'elmo-msgdb)
 (require 'elmo-cache)
 (require 'elmo-util)
 (require 'elmo-dop)
-(require 'product)
-(product-provide (provide 'elmo2) (require 'elmo-version))
+;;;(provide 'elmo2)                    ; circular dependency
 
 (eval-when-compile
   (require 'elmo-localdir)
@@ -921,4 +921,7 @@ message list in msgdb. Otherwise, number-list is load from msgdb."
 (autoload 'elmo-localdir-msgdb-create-overview-entity-from-file "elmo-localdir")
 (autoload 'elmo-archive-copy-msgs-froms "elmo-archive")
 
+(require 'product)
+(product-provide (provide 'elmo2) (require 'elmo-version))
+
 ;;; elmo2.el ends here

diff --git a/elmo/mmelmo.el b/elmo/mmelmo.el
index 102bda3..0e54dd8 100644 (file)
--- a/elmo/mmelmo.el
+++ b/elmo/mmelmo.el
@@ -33,8 +33,7 @@
 (require 'mime-parse)
 (require 'mmbuffer)
 
-(require 'product)
-(product-provide (provide 'mmelmo) (require 'elmo-version))
+(provide 'mmelmo)                      ; circular dependency
 (require 'mmelmo-imap4)
 
 (eval-and-compile
@@ -260,4 +259,7 @@ size:   size of the entity."
 ;;                    (mime-buffer-entity-body-end-internal entity)))
 ;;   (mime-entity-encoding entity)))
 
+(require 'product)
+(product-provide (provide 'mmelmo) (require 'elmo-version))
+
 ;;; mmelmo.el ends here