Release 2.10.1.

[elisp/wanderlust.git] / wl / wl-version.el

diff --git a/wl/wl-version.el b/wl/wl-version.el
index 4b1913a..59ebbc4 100644 (file)
--- a/wl/wl-version.el
+++ b/wl/wl-version.el
@@ -1,4 +1,4 @@
-;;; wl-version.el -- Version information for Wanderlust.
+;;; wl-version.el --- Version information for Wanderlust.
 
 ;; Copyright (C) 2000-2001 Yuuichi Teranishi <teranisi@gohome.org>
 ;; Copyright (C) 2000-2001 TAKAHASHI Kaoru <kaoru@kaisei.org>
@@ -46,7 +46,7 @@
    "Wanderlust" nil
    (eval-when-compile
      (product-version (product-find 'elmo-version))) ; equals to ELMO version.
-   "Too Funky"))
+   "Watching The Wheels"))
 
 (defconst wl-version-status nil
   "Wanderlust verstion status.  For override default rule.
@@ -77,7 +77,6 @@ If variable `wl-version-status' is non-nil, override default rule."
 
 ;; avoid compile warnings
 (defvar mule-version)
-(defvar nemacs-version)
 (defvar emacs-beta-version)
 (defvar xemacs-codename)
 (defvar mime-edit-insert-user-agent-field)
@@ -88,11 +87,10 @@ If variable `wl-version-status' is non-nil, override default rule."
 (defun wl-generate-user-agent-string ()
   "A candidate of `wl-generate-mailer-string-function'.
 Insert User-Agent field instead of X-Mailer field."
-  (concat "User-Agent: "
-         (wl-generate-user-agent-string-1
-          ;; for backward compatibility
-          (and (boundp 'mime-edit-insert-user-agent-field)
-               mime-edit-insert-user-agent-field))))
+  (wl-generate-user-agent-string-1
+   ;; for backward compatibility
+   (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.
@@ -144,15 +142,8 @@ Separate DELIMITER (default is \" \").  If WITH-CODENAME add XEmacs codename."
                (elmo-match-string 2 mule-version)
              "")))
    ((string-match "^\\([0-9]+\\.[0-9]+\\)\\.[.0-9]+$" emacs-version)
-    (if (boundp 'nemacs-version)
-       (concat "Nemacs" (or delimiter " ")
-               nemacs-version
-               "@"
-               (substring emacs-version
-                          (match-beginning 1)
-                          (match-end 1)))
-      (concat "Emacs" (or delimiter " ")
-             (elmo-match-string 1 emacs-version))))
+    (concat "Emacs" (or delimiter " ")
+           (elmo-match-string 1 emacs-version)))
    ((string-match "\\([A-Z]*[Mm][Aa][Cc][Ss]\\)[^(]*\\(\\((beta.*)\\|'\\)\\)?"
                  emacs-version)
     (concat (elmo-match-string 1 emacs-version)
@@ -181,21 +172,8 @@ Separate DELIMITER (default is \" \").  If WITH-CODENAME add XEmacs codename."
                (elmo-match-string 2 mule-version)
              "")))
    ((string-match "^\\([0-9]+\\.[0-9]+\\)\\.[.0-9]+$" emacs-version)
-    (if (boundp 'nemacs-version)
-       (let ((nemacs-codename-assoc '(("3.3.2" . " (FUJIMUSUME)")
-                                      ("3.3.1" . " (HINAMATSURI)")
-                                      ("3.2.3" . " (YUMENO-AWAYUKI)"))))
-         (format "Emacs%s%s Nemacs%s%s%s"
-                 (or delimiter " ")
-                 (elmo-match-string 1 emacs-version)
-                 (or delimiter " ")
-                 nemacs-version
-                 (or (and with-codename
-                          (cdr (assoc nemacs-version
-                                      nemacs-codename-assoc)))
-                     "")))
-      (concat "Emacs" (or delimiter " ")
-             (elmo-match-string 1 emacs-version))))
+    (concat "Emacs" (or delimiter " ")
+           (elmo-match-string 1 emacs-version)))
    ((string-match "\\([A-Z]*[Mm][Aa][Cc][Ss]\\)[^(]*\\(\\((beta.*)\\|'\\)\\)?"
                  emacs-version)
     (concat (elmo-match-string 1 emacs-version)