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

* wl-demo.el (toplevel): Ditto.
* wl-dnd.el (toplevel): Ditto.
* wl-highlight.el (toplevel): Ditto.
* wl-message.el (toplevel): Ditto.
* wl-refile.el (toplevel): Ditto.
* wl-util.el (toplevel): Ditto.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 52f8bdf..fe749c4 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,13 @@
+2000-12-29  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+       * wl.el (toplevel): Move `product-provide' declare.
+       * wl-demo.el (toplevel): Ditto.
+       * wl-dnd.el (toplevel): Ditto.
+       * wl-highlight.el (toplevel): Ditto.
+       * wl-message.el (toplevel): Ditto.
+       * wl-refile.el (toplevel): Ditto.
+       * wl-util.el (toplevel): Ditto.
+
 2000-12-26  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * wl-thread.el (wl-thread-open-all): Rewrite to open all threads and

diff --git a/wl/wl-demo.el b/wl/wl-demo.el
index 753dc0b..88639d8 100644 (file)
--- a/wl/wl-demo.el
+++ b/wl/wl-demo.el
@@ -37,8 +37,6 @@
 (require 'wl-vars)
 (require 'wl-version)
 (require 'wl-highlight)
-(require 'product)
-(product-provide (provide 'wl-demo) (require 'wl-version))
 
 (defconst wl-demo-icon-name (concat "wl-" (wl-version-status) "-logo"))
 
@@ -340,4 +338,7 @@ Optional IMAGE-TYPE overrides the variable `wl-demo-display-logo'."
       (sit-for (if (featurep 'lisp-float-type) (/ (float 5) (float 10)) 1))
       demo-buf)))
 
+(require 'product)
+(product-provide (provide 'wl-demo) (require 'wl-version))
+
 ;;; wl-demo.el ends here

diff --git a/wl/wl-dnd.el b/wl/wl-dnd.el
index 6874503..1812df4 100644 (file)
--- a/wl/wl-dnd.el
+++ b/wl/wl-dnd.el
@@ -29,9 +29,6 @@
 ;;; Code:
 ;; 
 
-(require 'product)
-(product-provide (provide 'wl-dnd) (require 'wl-version))
-
 (static-cond
  ((featurep 'offix)
   (defun start-drag (event what &optional typ)
@@ -99,5 +96,8 @@
     (setq kmap (make-keymap))
     (define-key kmap [button1] 'wl-dnd-start-drag)
     (set-extent-property ext 'keymap kmap)))
+
+(require 'product)
+(product-provide (provide 'wl-dnd) (require 'wl-version))
                                             
 ;;; wl-dnd.el ends here

diff --git a/wl/wl-highlight.el b/wl/wl-highlight.el
index 143e677..3864184 100644 (file)
--- a/wl/wl-highlight.el
+++ b/wl/wl-highlight.el
@@ -33,8 +33,7 @@
         (featurep 'dragdrop))
     (require 'wl-dnd))
 (require 'wl-vars)
-(require 'product)
-(product-provide (provide 'wl-highlight) (require 'wl-version))
+(provide 'wl-highlight)                        ; circular dependency
 
 (eval-when-compile
   (cond (wl-on-xemacs
@@ -1260,4 +1259,7 @@ interpreted as cited text.)"
         (inhibit-read-only t))
     (put-text-property beg end 'mouse-face 'highlight)))
 
+(require 'product)
+(product-provide (provide 'wl-highlight) (require 'wl-version))
+
 ;;; wl-highlight.el ends here

diff --git a/wl/wl-message.el b/wl/wl-message.el
index a45ca4c..c29e519 100644 (file)
--- a/wl/wl-message.el
+++ b/wl/wl-message.el
@@ -59,9 +59,6 @@
 (make-variable-buffer-local 'wl-message-buffer-cur-folder)
 (make-variable-buffer-local 'wl-message-buffer-cur-number)
 
-(require 'product)
-(product-provide (provide 'wl-message) (require 'wl-version))
-
 (defvar wl-fixed-window-configuration nil)
 
 (defun wl-message-buffer-window ()
@@ -636,6 +633,7 @@ If failed, attempt to execute button-dispatcher."
        (set-buffer buf)
        filename))))
 
-;;; wl-message.el ends here
-
+(require 'product)
+(product-provide (provide 'wl-message) (require 'wl-version))
 
+;;; wl-message.el ends here

diff --git a/wl/wl-refile.el b/wl/wl-refile.el
index 78b086d..467289f 100644 (file)
--- a/wl/wl-refile.el
+++ b/wl/wl-refile.el
@@ -31,8 +31,6 @@
 
 (require 'wl-vars)
 (require 'wl-util)
-(require 'product)
-(product-provide (provide 'wl-refile) (require 'wl-version))
 
 (defvar wl-refile-alist nil)
 (defvar wl-refile-alist-file-name "refile-alist")
@@ -296,4 +294,7 @@ If RULE does not match ENTITY, returns nil."
               (elmo-msgdb-overview-entity-get-subject entity))
              wl-refile-subject-alist)))
 
+(require 'product)
+(product-provide (provide 'wl-refile) (require 'wl-version))
+
 ;;; wl-refile.el ends here

diff --git a/wl/wl-util.el b/wl/wl-util.el
index 5f57d24..7e33be3 100644 (file)
--- a/wl/wl-util.el
+++ b/wl/wl-util.el
@@ -33,8 +33,6 @@
 ;;; Code:
 ;;
 
-(require 'product)
-(product-provide (provide 'wl-util) (require 'wl-version))
 (eval-when-compile
   (require 'elmo-util))
 
@@ -901,4 +899,7 @@ This function is imported from Emacs 20.7."
                        notify-minibuf)
        (setq wl-biff-check-folders-running nil)))))
 
+(require 'product)
+(product-provide (provide 'wl-util) (require 'wl-version))
+
 ;;; wl-util.el ends here

diff --git a/wl/wl.el b/wl/wl.el
index e5b3926..573e363 100644 (file)
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -32,6 +32,8 @@
 ;;
 
 (require 'elmo2)
+(require 'wl-version)                  ; reduce recursive-load-depth
+
 ;; from x-face.el
 (unless (and (fboundp 'defgroup)
              (fboundp 'defcustom))
@@ -43,7 +45,6 @@
 
 (require 'wl-vars)
 (require 'wl-util)
-(require 'wl-version)
 
 (cond (wl-on-xemacs
        (require 'wl-xmas))
@@ -54,7 +55,7 @@
       (t
        (require 'wl-mule)))
 
-(provide 'wl) ; circular dependency
+(provide 'wl)                          ; circular dependency
 (require 'wl-folder)
 (require 'wl-summary)
 (require 'wl-thread)