* wl-version.el (wl-generate-user-agent-string-1): Remove tm

support.
(wl-generate-user-agent-string): Ditto.

* wl-version.el (wl-version): Update docsting.
(wl-version-status): Ditto.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 43546d8..23e33d6 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,12 @@
+2001-09-04  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+       * wl-version.el (wl-generate-user-agent-string-1): Remove tm
+       support.
+       (wl-generate-user-agent-string): Ditto.
+
+       * wl-version.el (wl-version): Update docsting.
+       (wl-version-status): Ditto.
+
 2001-09-03  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
        * wl-e21.el (make-mode-line-mouse-map): Import from Emacs

diff --git a/wl/wl-version.el b/wl/wl-version.el
index bc7f5e0..4b1913a 100644 (file)
--- a/wl/wl-version.el
+++ b/wl/wl-version.el
@@ -56,11 +56,11 @@ If nil, use default rule.")
 ;; set version-string
 (product-version-as-string 'wl-version)
 
-;; Don't support insert string at-point (C-u M-x wl-version).
-;; For bug report, use `wl-generate-user-agent-string-1' instead.
-;; When non-interactive, use `product-string-1' instead.
 (defun wl-version ()
-  "Print Wanderlust version."
+  "Print Wanderlust version.
+Don't support insert string at-point (C-u M-x wl-version).
+For bug report, use `wl-generate-user-agent-string-1' instead.
+When non-interactive, use `product-string-1' instead."
   (interactive)
   (let ((product-info (product-string-1 'wl-version t)))
     (if (interactive-p)
@@ -68,7 +68,8 @@ If nil, use default rule.")
       product-info)))
 
 (defun wl-version-status ()
-  "Return version status string."
+  "Return version status string.
+If variable `wl-version-status' is non-nil, override default rule."
   (or wl-version-status
       (if (zerop (% (nth 1 (product-version (product-find 'wl-version))) 2))
          "stable"
@@ -90,10 +91,8 @@ Insert User-Agent field instead of X-Mailer field."
   (concat "User-Agent: "
          (wl-generate-user-agent-string-1
           ;; for backward compatibility
-          (or (and (boundp 'mime-edit-insert-user-agent-field)
-                   mime-edit-insert-user-agent-field) ; SEMI
-              (and (boundp 'mime-editor/version)
-                   mime-editor/version))))) ; verbose User-Agent when tm
+          (and (boundp 'mime-edit-insert-user-agent-field)
+               mime-edit-insert-user-agent-field))))
 
 (defun wl-generate-user-agent-string-1 (&optional verbose)
   "Return User-Agent field value.
@@ -107,24 +106,6 @@ If VERBOSE return with SEMI, FLIM and APEL version."
    ((and (boundp 'mime-edit-user-agent-value) mime-edit-user-agent-value)
     (concat (product-string-verbose 'wl-version) " "
            mime-edit-user-agent-value))
-   ;; tm (verbose)
-   ((and (boundp 'mime-editor/version) mime-editor/version)
-    (concat (product-string-verbose 'wl-version) " "
-           "tm/" mime-editor/version
-           (when (and (boundp 'mime-editor/codename) mime-editor/codename)
-             (concat " (" mime-editor/codename ")"))
-           (when (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))))