From f8fb7ba92cea3ae236abdf0e24720fd57b2aae41 Mon Sep 17 00:00:00 2001 From: kaoru Date: Wed, 18 Oct 2000 08:58:16 +0000 Subject: [PATCH] * wl-version.el (wl-generate-user-agent-string-1): Use `cond' instead of `if'. --- wl/ChangeLog | 3 +++ wl/wl-version.el | 63 ++++++++++++++++++++++++++++-------------------------- 2 files changed, 36 insertions(+), 30 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index 6b58387..4122a65 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -30,6 +30,9 @@ (wl-generate-user-agent-string): Check `mime-edit-insert-user-agent-field' and `mime-editor/version'. + * wl-version.el (wl-generate-user-agent-string-1): Use `cond' + instead of `if'. + 2000-10-18 Kenichi OKADA * wl-expire.el (wl-summary-expire): Fix. diff --git a/wl/wl-version.el b/wl/wl-version.el index 98b6c9d..763caea 100644 --- a/wl/wl-version.el +++ b/wl/wl-version.el @@ -100,36 +100,39 @@ 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" - (let ((mime-user-agent (and (boundp 'mime-edit-user-agent-value) - mime-edit-user-agent-value))) - (if (and verbose mime-user-agent) - (concat (product-string-verbose 'wl-version) " " - mime-user-agent) - (if (and verbose - (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)) - ;; Don't use product-string-verbose for short User-Agent field. - (concat (product-string-1 'wl-version t) " " - (wl-extended-emacs-version3 "/" t)))))) + (cond + ;; Don't use product-string-verbose for short User-Agent field value. + ((not verbose) + (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)))) ;; from gnus (defun wl-extended-emacs-version (&optional with-codename) -- 1.7.10.4