From: kaoru <kaoru>
Date: Wed, 18 Oct 2000 12:55:46 +0000 (+0000)
Subject: * wl-version.el (wl-generate-user-agent-string-1): Use `cond'
X-Git-Tag: wl-2_4-root~121
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=7aebdb06cd8af09230363c4098caa2e999ae8e3d;p=elisp%2Fwanderlust.git

* wl-version.el (wl-generate-user-agent-string-1): Use `cond'
instead of `if', when verbose case.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 4122a65..c7c8bf4 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -31,7 +31,7 @@
 	`mime-edit-insert-user-agent-field' and `mime-editor/version'.
 
 	* wl-version.el (wl-generate-user-agent-string-1): Use `cond'
-	instead of `if'.
+	instead of `if', when verbose case.
 
 2000-10-18  Kenichi OKADA  <okada@opaopa.org>
 
diff --git a/wl/wl-version.el b/wl/wl-version.el
index 4f52cc9..f0e2fc3 100644
--- a/wl/wl-version.el
+++ b/wl/wl-version.el
@@ -100,40 +100,40 @@ Insert User-Agent field instead of X-Mailer field."
 (defun wl-generate-user-agent-string-1 (&optional verbose)
   "Return User-Agent field value.
 If VERBOSE return with SEMI, FLIM and APEL version."
-  (cond
-   ;; non-verbose
-   ((not verbose)
-    ;; Don't use product-string-verbose for short User-Agent field value.
-    (concat (product-string-1 'wl-version t) " "
-	    (wl-extended-emacs-version3 "/" t)))
-   ;; SEMI
-   ((and (boundp 'mime-edit-user-agent-value) mime-edit-user-agent-value)
-    (concat (product-string-verbose 'wl-version) " "
-	    mime-edit-user-agent-value))
-   ;; tm
-   ((and (boundp 'mime-editor/version) mime-editor/version)
-    (concat (product-string-verbose 'wl-version) " "
-	    "tm/" mime-editor/version
-	    (if (and (boundp 'mime-editor/codename)
-		     mime-editor/codename)
-		(concat " (" mime-editor/codename ")"))
-	    (if (and (boundp 'mime-library-product)
-		     mime-library-product)
-		(concat " " (aref mime-library-product 0)
-			"/"
-			(mapconcat 'int-to-string
-				   (aref mime-library-product 1)
-				   ".")
-			" (" (aref mime-library-product 2) ")"))
-	    (condition-case nil
-		(progn
-		  (require 'apel-ver)
-		  (concat " " (apel-version)))
-	      (file-error nil))
-	    " " (wl-extended-emacs-version3 "/" t)))
-   ;; error case
-   (t
-    (product-string-1 'wl-version nil))))
+  (if (not verbose)
+      ;; Don't use product-string-verbose for short User-Agent field value.
+      (concat (product-string-1 'wl-version t) " "
+	      (wl-extended-emacs-version3 "/" t))
+    ;; verbose
+    (cond
+     ;; SEMI
+     ((and (boundp 'mime-edit-user-agent-value) mime-edit-user-agent-value)
+      (concat (product-string-verbose 'wl-version) " "
+	      mime-edit-user-agent-value))
+     ;; tm
+     ((and (boundp 'mime-editor/version) mime-editor/version)
+      (concat (product-string-verbose 'wl-version) " "
+	      "tm/" mime-editor/version
+	      (if (and (boundp 'mime-editor/codename)
+		       mime-editor/codename)
+		  (concat " (" mime-editor/codename ")"))
+	      (if (and (boundp 'mime-library-product)
+		       mime-library-product)
+		  (concat " " (aref mime-library-product 0)
+			  "/"
+			  (mapconcat 'int-to-string
+				     (aref mime-library-product 1)
+				     ".")
+			  " (" (aref mime-library-product 2) ")"))
+	      (condition-case nil
+		  (progn
+		    (require 'apel-ver)
+		    (concat " " (apel-version)))
+		(file-error nil))
+	      " " (wl-extended-emacs-version3 "/" t)))
+     ;; error case
+     (t
+      (product-string-1 'wl-version nil)))))
 
 ;; from gnus
 (defun wl-extended-emacs-version (&optional with-codename)