* elmo-version.el (toplevel): Use product-version-as-string for set

	verstion-string, if defined.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index acbd182..2ce30bc 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-11  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+       * elmo-version.el (toplevel): Use product-version-as-string for set
+       verstion-string, if defined.
+
 2000-10-11  OKAZAKI Tetsurou  <okazaki@be.to>
 
        * elmo-util.el: Doc fixes.

diff --git a/elmo/elmo-version.el b/elmo/elmo-version.el
index a1d631f..d7f4c54 100644 (file)
--- a/elmo/elmo-version.el
+++ b/elmo/elmo-version.el
@@ -34,8 +34,13 @@
 (product-provide 'elmo-version
   (product-define "ELMO" nil '(2 3 0)))
 
+;; set version-string
+(if (fboundp 'product-version-as-string)
+    (product-version-as-string 'elmo-version)
+  (product-string-1 'elmo-version))
+
 (defun elmo-version ()
-  "Print ELMO version."
+  "Return ELMO version."
   (product-string-1 'elmo-version))
 
 
@@ -45,9 +50,7 @@
  'elmo-appname
  "use (product-name (product-find 'elmo-version)) insteaed.")
 
-(defconst elmo-version
-  (progn (product-string-1 'elmo-version) ; product-set-version-string
-        (product-version-string (product-find 'elmo-version))))
+(defconst elmo-version (product-version-string (product-find 'elmo-version)))
 (make-obsolete-variable
  'elmo-version
  "use (product-version-string (product-find 'elmo-version)) instead.")