From a46683c44016e41373df5089080bbb2cb0b9ea8e Mon Sep 17 00:00:00 2001
From: kaoru <kaoru>
Date: Tue, 10 Oct 2000 05:29:33 +0000
Subject: [PATCH] 	* wl.el: add (require 'wl-version). 	*
 wl-fldmgr.el (wl-fldmgr-save-folders): Use
 `product-string-1' 	for ~/.folders header. 
 (wl-fldmgr-folders-header): Changed.

	* wl-vars.el (wl-appname, wl-version, wl-codename): Move to
	wl-version.el.
	* wl-util.el (wl-version, wl-version-show): Ditto.
---
 wl/ChangeLog    |   17 +++++++++++++----
 wl/wl-fldmgr.el |    5 +++--
 wl/wl-util.el   |    9 ---------
 wl/wl-vars.el   |    4 ----
 wl/wl.el        |    1 +
 5 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 1b1a6ca..750b6c5 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,15 +1,24 @@
+
 2000-10-10  Kenichi OKADA  <okada@opaopa.org>
 
 	* wl-summary.el (wl-summary-sync-force-update): Append queue
 	`mark-as-read'if unplugged.
 
-2000-10-09  Kenichi OKADA  <okada@opaopa.org>
-
-	* wl-summary.el (wl-summary-refile-subr): Fix.
-
 2000-10-10  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
 	* wl-version.el: New file.  Use product.el.
+	* wl.el: add (require 'wl-version).
+	* wl-fldmgr.el (wl-fldmgr-save-folders): Use `product-string-1'
+	for ~/.folders header.
+	(wl-fldmgr-folders-header): Changed.
+
+	* wl-vars.el (wl-appname, wl-version, wl-codename): Move to
+	wl-version.el.
+	* wl-util.el (wl-version, wl-version-show): Ditto.
+
+2000-10-09  Kenichi OKADA  <okada@opaopa.org>
+
+	* wl-summary.el (wl-summary-refile-subr): Fix.
 
 2000-10-09  Yuuichi Teranishi  <teranisi@gohome.org>
 
diff --git a/wl/wl-fldmgr.el b/wl/wl-fldmgr.el
index b97a092..328bdb9 100644
--- a/wl/wl-fldmgr.el
+++ b/wl/wl-fldmgr.el
@@ -33,6 +33,7 @@
 (require 'wl-folder)
 (require 'wl-summary)
 (require 'wl-highlight)
+(require 'wl-version)
 (eval-when-compile
   (require 'wl-util))
 
@@ -47,7 +48,7 @@
 (defconst wl-fldmgr-folders-header
   "#
 # Folder definition file
-# This file is generated automatically by %s %s (%s).
+# This file is generated automatically by %s.
 #
 
 ")
@@ -1309,7 +1310,7 @@ return value is diffs '(-new -unread -all)."
     (set-buffer tmp-buf)
     (erase-buffer)
     (insert (format wl-fldmgr-folders-header
-		    wl-appname wl-version wl-codename))
+		    (product-string-1 'wl-version 'verbose)))
     (wl-fldmgr-delete-disused-petname)
     (setq save-petname-entities
 	  (wl-fldmgr-insert-folders-buffer "" (nth 2 wl-folder-entity)))
diff --git a/wl/wl-util.el b/wl/wl-util.el
index d9a90b8..e554d92 100644
--- a/wl/wl-util.el
+++ b/wl/wl-util.el
@@ -150,15 +150,6 @@ If HACK-ADDRESSES is t, then the strings are considered to be mail addresses,
        (nreverse list)) ; jwz: fixed order
      )))
 
-(defun wl-version (&optional with-codename)
-  (format "%s %s%s" wl-appname wl-version
-	  (if with-codename
-	      (format " - \"%s\"" wl-codename) "")))
-
-(defun wl-version-show ()
-  (interactive)
-  (message "%s" (wl-version t)))
-
 ;; from gnus
 (defun wl-extended-emacs-version (&optional with-codename)
   "Stringified Emacs version"
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 8e3433c..a1238d2 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -34,10 +34,6 @@
 (if (module-installed-p 'custom)
     (require 'custom))
 
-(defconst wl-appname  "Wanderlust")
-(defconst wl-version  elmo-version) ; equals to ELMO version.
-(defconst wl-codename "Roam")
-
 ;;; Customizable Variables
 
 (defgroup wl nil
diff --git a/wl/wl.el b/wl/wl.el
index 3ea1a6d..7f412bc 100644
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -41,6 +41,7 @@
 
 (require 'wl-vars)
 (require 'wl-util)
+(require 'wl-version)
 
 (cond (wl-on-xemacs
        (require 'wl-xmas))
-- 
1.7.10.4