* wl-fldmgr.el (wl-fldmgr-save-folders): Use (wl-version t)

	instead of product.

	* wl-version.el (wl-version): Compile time evalution elmo-version.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index bb23821..f16950c 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-10  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+       * wl-fldmgr.el (wl-fldmgr-save-folders): Use (wl-version t)
+       instead of product.
+
+       * wl-version.el (wl-version): Compile time evalution elmo-version.
 
 2000-10-10  Kenichi OKADA  <okada@opaopa.org>
 

diff --git a/wl/wl-fldmgr.el b/wl/wl-fldmgr.el
index 328bdb9..75c35fb 100644 (file)
--- a/wl/wl-fldmgr.el
+++ b/wl/wl-fldmgr.el
@@ -1309,8 +1309,7 @@ return value is diffs '(-new -unread -all)."
     (message "Saving folders...")
     (set-buffer tmp-buf)
     (erase-buffer)
-    (insert (format wl-fldmgr-folders-header
-                   (product-string-1 'wl-version 'verbose)))
+    (insert (format wl-fldmgr-folders-header (wl-version t)))
     (wl-fldmgr-delete-disused-petname)
     (setq save-petname-entities
          (wl-fldmgr-insert-folders-buffer "" (nth 2 wl-folder-entity)))

diff --git a/wl/wl-version.el b/wl/wl-version.el
index 05a13b3..d2477d2 100644 (file)
--- a/wl/wl-version.el
+++ b/wl/wl-version.el
@@ -28,7 +28,6 @@
 
 ;;; Code:
 ;;
-(require 'elmo-version)
 (require 'product)
 (eval-when-compile (require 'wl-util)) ; wl-match-string
 (provide 'wl-version)
@@ -36,7 +35,9 @@
 (product-provide 'wl-version
   (product-define
    "Wanderlust" nil
-   (product-version (product-find 'elmo-version)) ; equals to ELMO version.
+   (eval-when-compile
+     (require 'elmo-version)
+     (product-version (product-find 'elmo-version))) ; equals to ELMO version.
    "Roam"))
 
 (defun wl-version (&optional with-codename)