From: hmurata <hmurata>
Date: Sun, 2 Dec 2001 11:59:01 +0000 (+0000)
Subject: * wl-version.el (nemacs-version): Eliminated.
X-Git-Tag: wl-2_8-root~99
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=132f20482ff94022c63a40225d794b7a7c46b085;p=elisp%2Fwanderlust.git

* wl-version.el (nemacs-version): Eliminated.
(wl-extended-emacs-version2): Ignore nemacs.
(wl-extended-emacs-version3): Ditto.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 41b7e57..3ad2b8b 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-02  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* wl-version.el (nemacs-version): Eliminated.
+	(wl-extended-emacs-version2): Ignore nemacs.
+	(wl-extended-emacs-version3): Ditto.
+
 2001-11-30  Tatsuya Kinoshita  <tats@iris.ne.jp>
 
 	* wl-vars.el (wl-draft-add-references): Set default value as nil.
diff --git a/wl/wl-version.el b/wl/wl-version.el
index 28b30b1..2e99c0b 100644
--- a/wl/wl-version.el
+++ b/wl/wl-version.el
@@ -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)
@@ -144,15 +143,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 +173,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)