From 7cae7346a44561395cbc2149fd4871b5061322d3 Mon Sep 17 00:00:00 2001
From: kaoru <kaoru>
Date: Tue, 10 Oct 2000 07:40:54 +0000
Subject: [PATCH] 	* elmo-archive.el (toplevel): Use product-provide. 
 * elmo-cache.el (toplevel): Ditto. 	* elmo-database.el
 (toplevel): Ditto. 	* elmo-date.el (toplevel): Ditto. 
 * elmo-dop.el (toplevel): Ditto. 	* elmo-filter.el
 (toplevel): Ditto. 	* elmo-imap4.el (toplevel): Ditto. 
 * elmo-internal.el (toplevel): Ditto. 	* elmo-localdir.el
 (toplevel): Ditto. 	* elmo-localnews.el (toplevel):
 Ditto. 	* elmo-maildir.el (toplevel): Ditto. 	*
 elmo-msgdb.el (toplevel): Ditto. 	* elmo-multi.el
 (toplevel): Ditto. 	* elmo-net.el (toplevel): Ditto. 
 * elmo-nntp.el (toplevel): Ditto. 	* elmo-pipe.el
 (toplevel): Ditto. 	* elmo-pop3.el (toplevel): Ditto. 
 * elmo-util.el (toplevel): Ditto. 	* elmo-vars.el
 (toplevel): Ditto. 	* elmo2.el (toplevel): Ditto. 	*
 mmelmo-1.el (toplevel): Ditto. 	* mmelmo-2.el
 (toplevel): Ditto. 	* mmelmo-imap4-1.el (toplevel):
 Ditto. 	* mmelmo-imap4-2.el (toplevel): Ditto. 	*
 mmelmo-imap4.el (toplevel): Ditto. 	* mmelmo.el
 (toplevel): Ditto.

---
 elmo/ChangeLog         |   28 ++++++++++++++++++++++++++++
 elmo/elmo-archive.el   |    4 +++-
 elmo/elmo-cache.el     |    3 ++-
 elmo/elmo-database.el  |    3 ++-
 elmo/elmo-date.el      |    3 ++-
 elmo/elmo-dop.el       |    3 ++-
 elmo/elmo-filter.el    |    3 ++-
 elmo/elmo-imap4.el     |    3 ++-
 elmo/elmo-internal.el  |    3 ++-
 elmo/elmo-localdir.el  |    3 ++-
 elmo/elmo-localnews.el |    3 ++-
 elmo/elmo-maildir.el   |    3 ++-
 elmo/elmo-msgdb.el     |    3 ++-
 elmo/elmo-multi.el     |    3 ++-
 elmo/elmo-net.el       |    3 ++-
 elmo/elmo-nntp.el      |    3 ++-
 elmo/elmo-pipe.el      |    3 ++-
 elmo/elmo-pop3.el      |    3 ++-
 elmo/elmo-util.el      |    3 ++-
 elmo/elmo-vars.el      |    3 ++-
 elmo/elmo2.el          |    4 ++--
 elmo/mmelmo-1.el       |    3 ++-
 elmo/mmelmo-2.el       |    3 ++-
 elmo/mmelmo-imap4-1.el |    3 ++-
 elmo/mmelmo-imap4-2.el |    3 ++-
 elmo/mmelmo-imap4.el   |    3 ++-
 elmo/mmelmo.el         |    6 ++++--
 27 files changed, 83 insertions(+), 28 deletions(-)

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 51f4286..b2e55e7 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,31 @@
+2000-10-10  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+	* elmo-archive.el (toplevel): Use product-provide.
+	* elmo-cache.el (toplevel): Ditto.
+	* elmo-database.el (toplevel): Ditto.
+	* elmo-date.el (toplevel): Ditto.
+	* elmo-dop.el (toplevel): Ditto.
+	* elmo-filter.el (toplevel): Ditto.
+	* elmo-imap4.el (toplevel): Ditto.
+	* elmo-internal.el (toplevel): Ditto.
+	* elmo-localdir.el (toplevel): Ditto.
+	* elmo-localnews.el (toplevel): Ditto.
+	* elmo-maildir.el (toplevel): Ditto.
+	* elmo-msgdb.el (toplevel): Ditto.
+	* elmo-multi.el (toplevel): Ditto.
+	* elmo-net.el (toplevel): Ditto.
+	* elmo-nntp.el (toplevel): Ditto.
+	* elmo-pipe.el (toplevel): Ditto.
+	* elmo-pop3.el (toplevel): Ditto.
+	* elmo-util.el (toplevel): Ditto.
+	* elmo-vars.el (toplevel): Ditto.
+	* elmo2.el (toplevel): Ditto.
+	* mmelmo-1.el (toplevel): Ditto.
+	* mmelmo-2.el (toplevel): Ditto.
+	* mmelmo-imap4-1.el (toplevel): Ditto.
+	* mmelmo-imap4-2.el (toplevel): Ditto.
+	* mmelmo-imap4.el (toplevel): Ditto.
+	* mmelmo.el (toplevel): Ditto.
 
 2000-10-10  Kenichi OKADA  <okada@opaopa.org>
 
diff --git a/elmo/elmo-archive.el b/elmo/elmo-archive.el
index 510fc78..6bb7c80 100644
--- a/elmo/elmo-archive.el
+++ b/elmo/elmo-archive.el
@@ -1066,6 +1066,8 @@ TYPE specifies the archiver's symbol."
 
 ;;; End
 (run-hooks 'elmo-archive-load-hook)
-(provide 'elmo-archive)
+
+(require 'product)
+(product-provide (provide 'elmo-archive) (require 'elmo-version))
 
 ;;; elmo-archive.el ends here
diff --git a/elmo/elmo-cache.el b/elmo/elmo-cache.el
index 93c96e5..604bcb6 100644
--- a/elmo/elmo-cache.el
+++ b/elmo/elmo-cache.el
@@ -752,6 +752,7 @@ Returning its cache buffer."
 (defalias 'elmo-cache-commit 'elmo-generic-commit)
 (defalias 'elmo-cache-folder-diff 'elmo-generic-folder-diff)
 
-(provide 'elmo-cache)
+(require 'product)
+(product-provide (provide 'elmo-cache) (require 'elmo-version))
 
 ;;; elmo-cache.el ends here
diff --git a/elmo/elmo-database.el b/elmo/elmo-database.el
index dc8b185..86d91b5 100644
--- a/elmo/elmo-database.el
+++ b/elmo/elmo-database.el
@@ -68,6 +68,7 @@
 				    elmo-database-msgid-filename))))
     (and match (read match))))
 
-(provide 'elmo-database)
+(require 'product)
+(product-provide (provide 'elmo-database) (require 'elmo-version))
 
 ;;; elmo-database.el ends here
diff --git a/elmo/elmo-date.el b/elmo/elmo-date.el
index 02d4c5f..1a7a5cb 100644
--- a/elmo/elmo-date.el
+++ b/elmo/elmo-date.el
@@ -146,6 +146,7 @@
       (aref (, datevec) 2)
       (aref (, datevec) 3))))
 
-(provide 'elmo-date)
+(require 'product)
+(product-provide (provide 'elmo-date) (require 'elmo-version))
 
 ;;; elmo-date.el ends here
diff --git a/elmo/elmo-dop.el b/elmo/elmo-dop.el
index 5ef77dc..0aeb228 100644
--- a/elmo/elmo-dop.el
+++ b/elmo/elmo-dop.el
@@ -557,6 +557,7 @@ even an operation concerns the unplugged folder."
     (elmo-call-func folder "msgdb-create" numlist new-mark already-mark
 		    seen-mark important-mark seen-list)))
 
-(provide 'elmo-dop)
+(require 'product)
+(product-provide (provide 'elmo-dop) (require 'elmo-version))
 
 ;;; elmo-dop.el ends here
diff --git a/elmo/elmo-filter.el b/elmo/elmo-filter.el
index 413096f..31b5300 100644
--- a/elmo/elmo-filter.el
+++ b/elmo/elmo-filter.el
@@ -133,6 +133,7 @@
 (defun elmo-filter-server-diff (spec)
   (elmo-call-func (nth 2 spec) "server-diff"))
 
-(provide 'elmo-filter)
+(require 'product)
+(product-provide (provide 'elmo-filter) (require 'elmo-version))
 
 ;;; elmo-filter.el ends here
diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index d1957a2..2ac7348 100644
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -2094,6 +2094,7 @@ Return nil if no complete line has arrived."
 	(elmo-imap4-forward)
 	(nreverse body)))))
 
-(provide 'elmo-imap4)
+(require 'product)
+(product-provide (provide 'elmo-imap4) (require 'elmo-version))
 
 ;;; elmo-imap4.el ends here
diff --git a/elmo/elmo-internal.el b/elmo/elmo-internal.el
index 6c33211..d504393 100644
--- a/elmo/elmo-internal.el
+++ b/elmo/elmo-internal.el
@@ -269,6 +269,7 @@
 (defalias 'elmo-internal-commit 'elmo-generic-commit)
 (defalias 'elmo-internal-folder-diff 'elmo-generic-folder-diff)
 
-(provide 'elmo-internal)
+(require 'product)
+(product-provide (provide 'elmo-internal) (require 'elmo-version))
 
 ;;; elmo-internal.el ends here
diff --git a/elmo/elmo-localdir.el b/elmo/elmo-localdir.el
index 6ef6eff..f6bc0e6 100644
--- a/elmo/elmo-localdir.el
+++ b/elmo/elmo-localdir.el
@@ -475,6 +475,7 @@
 (defalias 'elmo-localdir-commit 'elmo-generic-commit)
 (defalias 'elmo-localdir-folder-diff 'elmo-generic-folder-diff)
 
-(provide 'elmo-localdir)
+(require 'product)
+(product-provide (provide 'elmo-localdir) (require 'elmo-version))
 
 ;;; elmo-localdir.el ends here
diff --git a/elmo/elmo-localnews.el b/elmo/elmo-localnews.el
index 2cf3337..bbb1a42 100644
--- a/elmo/elmo-localnews.el
+++ b/elmo/elmo-localnews.el
@@ -128,6 +128,7 @@
 (defalias 'elmo-localnews-commit 'elmo-generic-commit)
 (defalias 'elmo-localnews-folder-diff 'elmo-generic-folder-diff)
 
-(provide 'elmo-localnews)
+(require 'product)
+(product-provide (provide 'elmo-localnews) (require 'elmo-version))
 
 ;;; elmo-localnews.el ends here
diff --git a/elmo/elmo-maildir.el b/elmo/elmo-maildir.el
index 12da26c..9d0d3b5 100644
--- a/elmo/elmo-maildir.el
+++ b/elmo/elmo-maildir.el
@@ -517,6 +517,7 @@ file name for maildir directories."
 (defalias 'elmo-maildir-commit 'elmo-generic-commit)
 (defalias 'elmo-maildir-folder-diff 'elmo-generic-folder-diff)
 
-(provide 'elmo-maildir)
+(require 'product)
+(product-provide (provide 'elmo-maildir) (require 'elmo-version))
 
 ;;; elmo-maildir.el ends here
diff --git a/elmo/elmo-msgdb.el b/elmo/elmo-msgdb.el
index 8e5f119..5a91a72 100644
--- a/elmo/elmo-msgdb.el
+++ b/elmo/elmo-msgdb.el
@@ -811,6 +811,7 @@ Header region is supposed to be narrowed."
 	    (elmo-make-directory new-dir))
 	(rename-file old new)))))
 
-(provide 'elmo-msgdb)
+(require 'product)
+(product-provide (provide 'elmo-msgdb) (require 'elmo-version))
 
 ;;; elmo-msgdb.el ends here
diff --git a/elmo/elmo-multi.el b/elmo/elmo-multi.el
index a54659b..851b327 100644
--- a/elmo/elmo-multi.el
+++ b/elmo/elmo-multi.el
@@ -419,6 +419,7 @@
       (setq folder-list (cdr folder-list)))
     result-alist))
 
-(provide 'elmo-multi)
+(require 'product)
+(product-provide (provide 'elmo-multi) (require 'elmo-version))
 
 ;;; elmo-multi.el ends here
diff --git a/elmo/elmo-net.el b/elmo/elmo-net.el
index 653d707..5b946fa 100644
--- a/elmo/elmo-net.el
+++ b/elmo/elmo-net.el
@@ -231,6 +231,7 @@ Returns a process object. if making session failed, returns nil."
 	(elmo-set-plugged t host service))
       process)))
 
-(provide 'elmo-net)
+(require 'product)
+(product-provide (provide 'elmo-net) (require 'elmo-version))
 
 ;;; elmo-net.el ends here
diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el
index d8cd5c6..f509f0d 100644
--- a/elmo/elmo-nntp.el
+++ b/elmo/elmo-nntp.el
@@ -1536,6 +1536,7 @@ Returns a list of cons cells like (NUMBER . VALUE)"
 (defalias 'elmo-nntp-commit 'elmo-generic-commit)
 (defalias 'elmo-nntp-folder-diff 'elmo-generic-folder-diff)
 
-(provide 'elmo-nntp)
+(require 'product)
+(product-provide (provide 'elmo-nntp) (require 'elmo-version))
 
 ;;; elmo-nntp.el ends here
diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el
index cbfa534..8989966 100644
--- a/elmo/elmo-pipe.el
+++ b/elmo/elmo-pipe.el
@@ -147,6 +147,7 @@
 
 (defalias 'elmo-pipe-folder-diff 'elmo-generic-folder-diff)
 
-(provide 'elmo-pipe)
+(require 'product)
+(product-provide (provide 'elmo-pipe) (require 'elmo-version))
 
 ;;; elmo-pipe.el ends here
diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index 78a8c5f..65338c5 100644
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -808,6 +808,7 @@
 	     (elmo-network-close-session session)))))
        
 
-(provide 'elmo-pop3)
+(require 'product)
+(product-provide (provide 'elmo-pop3) (require 'elmo-version))
 
 ;;; elmo-pop3.el ends here
diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index 1e1cb52..675f2b6 100644
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -1667,6 +1667,7 @@ NUMBER-SET is altered."
 	(setq number-set-1 (nconc number-set-1 (list number))))
     number-set-1))
 
-(provide 'elmo-util)
+(require 'product)
+(product-provide (provide 'elmo-util) (require 'elmo-version))
 
 ;;; elmo-util.el ends here
diff --git a/elmo/elmo-vars.el b/elmo/elmo-vars.el
index 91fd2de..bc40fec 100644
--- a/elmo/elmo-vars.el
+++ b/elmo/elmo-vars.el
@@ -360,6 +360,7 @@ set as non-nil.")
 (defvar elmo-display-progress-threshold 20
   "*Displaying progress gauge if number of messages are more than this value.")
 
-(provide 'elmo-vars)
+(require 'product)
+(product-provide (provide 'elmo-vars) (require 'elmo-version))
 
 ;;; elmo-vars.el ends here
diff --git a/elmo/elmo2.el b/elmo/elmo2.el
index ae907e7..9a02f84 100644
--- a/elmo/elmo2.el
+++ b/elmo/elmo2.el
@@ -33,9 +33,9 @@
 (require 'elmo-msgdb)
 (require 'elmo-cache)
 (require 'elmo-util)
-(require 'elmo-version)
 (require 'elmo-dop)
-(provide 'elmo2)
+(require 'product)
+(product-provide (provide 'elmo2) (require 'elmo-version))
 
 (eval-when-compile
   (require 'elmo-localdir)
diff --git a/elmo/mmelmo-1.el b/elmo/mmelmo-1.el
index 27b8fe0..8400e0c 100644
--- a/elmo/mmelmo-1.el
+++ b/elmo/mmelmo-1.el
@@ -104,6 +104,7 @@
                                'CRLF))
   (run-hooks 'mmelmo-entity-content-inserted-hook))
 
-(provide 'mmelmo-1)
+(require 'product)
+(product-provide (provide 'mmelmo-1) (require 'elmo-version))
 
 ;;; mmelmo-1.el ends here
diff --git a/elmo/mmelmo-2.el b/elmo/mmelmo-2.el
index 4c6b7c0..8a3d2af 100644
--- a/elmo/mmelmo-2.el
+++ b/elmo/mmelmo-2.el
@@ -136,6 +136,7 @@ size:   size of the entity."
 ;		       (mime-buffer-entity-body-end-internal entity)))
 ;   (mime-entity-encoding entity)))
 
-(provide 'mmelmo-2)
+(require 'product)
+(product-provide (provide 'mmelmo-2) (require 'elmo-version))
 
 ;;; mmelmo-2.el ends here
diff --git a/elmo/mmelmo-imap4-1.el b/elmo/mmelmo-imap4-1.el
index 769fce4..0c90987 100644
--- a/elmo/mmelmo-imap4-1.el
+++ b/elmo/mmelmo-imap4-1.el
@@ -344,6 +344,7 @@
 		(std11-fetch-field field-name))
 	    nil))))))
 
-(provide 'mmelmo-imap4-1)
+(require 'product)
+(product-provide (provide 'mmelmo-imap4-1) (require 'elmo-version))
 
 ;;; mmelmo-imap4-1.el ends here
diff --git a/elmo/mmelmo-imap4-2.el b/elmo/mmelmo-imap4-2.el
index ff926d7..6b31535 100644
--- a/elmo/mmelmo-imap4-2.el
+++ b/elmo/mmelmo-imap4-2.el
@@ -350,6 +350,7 @@ These value must be specified as argument for `luna-make-entity'."
 	 filename
 	 (or (mime-entity-encoding entity) "7bit"))))))
 
-(provide 'mmelmo-imap4-2)
+(require 'product)
+(product-provide (provide 'mmelmo-imap4-2) (require 'elmo-version))
 
 ;;; mmelmo-imap4-2.el ends here
diff --git a/elmo/mmelmo-imap4.el b/elmo/mmelmo-imap4.el
index 4bd5c45..f3142f4 100644
--- a/elmo/mmelmo-imap4.el
+++ b/elmo/mmelmo-imap4.el
@@ -35,6 +35,7 @@
   ;; FLIM 1.12
   (require 'mmelmo-imap4-1))
 
-(provide 'mmelmo-imap4)
+(require 'product)
+(product-provide (provide 'mmelmo-imap4) (require 'elmo-version))
 
 ;;; mmelmo-imap4.el ends here
diff --git a/elmo/mmelmo.el b/elmo/mmelmo.el
index ebd64e4..c64b16e 100644
--- a/elmo/mmelmo.el
+++ b/elmo/mmelmo.el
@@ -145,12 +145,14 @@ If function is specified, its return value is used.")
 	  (setq attrlist (cdr (cdr attrlist))))
 	ret-val)))
 
-(provide 'mmelmo) ; for circular dependency.
+;;;(provide 'mmelmo) ; for circular dependency.
+(require 'product)
+(product-provide (provide 'mmelmo) (require 'elmo-version))
+
 (static-if (fboundp 'luna-define-method)
     ;; FLIM 1.13 or later
     (require 'mmelmo-2)
   ;; FLIM 1.12
   (require 'mmelmo-1))
 
-
 ;;; mmelmo.el ends here
-- 
1.7.10.4