From 7d60d89728749049ca0bbfc88ba4baf3c34d6ef1 Mon Sep 17 00:00:00 2001 From: kaoru Date: Wed, 18 Oct 2000 08:12:48 +0000 Subject: [PATCH] * wl-version.el (wl-generate-user-agent-string-1): Ignore `mime-edit-insert-user-agent-field'. (wl-generate-user-agent-string): Check `mime-edit-insert-user-agent-field' and `mime-editor/version'. --- wl/ChangeLog | 5 +++++ wl/wl-version.el | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index fe0169a..6b58387 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -25,6 +25,11 @@ * wl-version.el (wl-generate-user-agent-string-1): New function. (wl-generate-user-agent-string): Use it. + * wl-version.el (wl-generate-user-agent-string-1): Ignore + `mime-edit-insert-user-agent-field'. + (wl-generate-user-agent-string): Check + `mime-edit-insert-user-agent-field' and `mime-editor/version'. + 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 1a6d6c5..ef637b3 100644 --- a/wl/wl-version.el +++ b/wl/wl-version.el @@ -90,13 +90,17 @@ If ARG insert string at point." (defun wl-generate-user-agent-string () "A candidate of `wl-generate-mailer-string-func'. Insert User-Agent field instead of X-Mailer field." - (concat "User-Agent: " (wl-generate-user-agent-string-1 t))) + (concat "User-Agent: " + (wl-generate-user-agent-string-1 + (or (and (boundp 'mime-edit-insert-user-agent-field) + mime-edit-insert-user-agent-field) + (and (boundp 'mime-editor/version) + mime-editor/version))))) (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-insert-user-agent-field) - mime-edit-insert-user-agent-field + (let ((mime-user-agent (and (boundp 'mime-edit-insert-user-agent-value) mime-edit-user-agent-value))) (if (and verbose mime-user-agent) (concat (product-string-verbose 'wl-version) " " -- 1.7.10.4