From: kaoru <kaoru>
Date: Wed, 11 Oct 2000 01:35:44 +0000 (+0000)
Subject: 	* wl-version.el (wl-generate-user-agent-string): Use
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=290cec0a191d8563e1368f429ebd32bb727edaba;p=elisp%2Fwanderlust.git

	* wl-version.el (wl-generate-user-agent-string): Use
	`product-string-1' instead of `wl-appname', `wl-version' and
	`wl-codename.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 36b2add..b237da9 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,11 +1,15 @@
 2000-10-11  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
-	* wl-version.el (toplevel): Use product-version-as-string for set
-	verstion-string, if defined.
+	* wl-version.el (toplevel): Use `product-version-as-string' for
+	set verstion-string, if defined.
 
 	* wl-version.el (wl-version-show): Insert string, when call with
 	argument.  And add docstring.
 
+	* wl-version.el (wl-generate-user-agent-string): Use
+	`product-string-1' instead of `wl-appname', `wl-version' and
+	`wl-codename.
+
 2000-10-10  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
 	* wl-address.el (toplevel): Use product-provide.
diff --git a/wl/wl-version.el b/wl/wl-version.el
index d580374..e6c10ef 100644
--- a/wl/wl-version.el
+++ b/wl/wl-version.el
@@ -78,14 +78,12 @@ Insert User-Agent field instead of X-Mailer field."
 			      mime-edit-user-agent-value)))
     (if mime-user-agent
 	(concat "User-Agent: "
-		wl-appname "/" wl-version
-		" (" wl-codename ") "
+		(product-string-1 'wl-version t) " "
 		mime-user-agent)
       (if (and (boundp 'mime-editor/version)
 	       mime-editor/version)
 	  (concat "User-Agent: "
-		  wl-appname "/" wl-version
-		  " (" wl-codename ") "
+		  (product-string-1 'wl-version t) " "
 		  "tm/" mime-editor/version
 		  (if (and (boundp 'mime-editor/codename)
 			   mime-editor/codename)
@@ -104,7 +102,7 @@ Insert User-Agent field instead of X-Mailer field."
 			(concat " " (apel-version)))
 		    (file-error nil))
 		  " " (wl-extended-emacs-version3 "/" t))
-	(concat "User-Agent: " wl-appname "/" wl-version " (" wl-codename ") "
+	(concat "User-Agent: " (product-string-1 'wl-version t) " "
 		(wl-extended-emacs-version3 "/" t))))))
 
 ;; from gnus