* wl-version.el (toplevel): Added require `elmo-version' for

`product-version-as-string'.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 68a3600..f53c895 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-31  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+       * wl-version.el (toplevel): Added require `elmo-version' for
+       `product-version-as-string'.
+
 2000-10-31  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * wl-vars.el (wl-draft-send-hook): Changed default value to

diff --git a/wl/wl-version.el b/wl/wl-version.el
index 4217c59..35d5666 100644 (file)
--- a/wl/wl-version.el
+++ b/wl/wl-version.el
@@ -32,19 +32,18 @@
 ;;
 (require 'product)
 (provide 'wl-version)                  ; have to declare in the top.
+(require 'elmo-version)                        ; product-version-as-string
 
 (product-provide 'wl-version
   (product-define
    "Wanderlust" nil
    (eval-when-compile
-     (require 'elmo-version)
+;;;  (require 'elmo-version)
      (product-version (product-find 'elmo-version))) ; equals to ELMO version.
    "Roam"))
 
 ;; set version-string
-(if (fboundp 'product-version-as-string)
-    (product-version-as-string 'wl-version)
-  (product-string-1 'wl-version))      ; APEL 10.2 or earlier.
+(product-version-as-string 'wl-version)
 
 ;; require wl-util after product-provide.
 (eval-when-compile (require 'wl-util)) ; wl-match-string