From: yamaoka <yamaoka>
Date: Fri, 2 Jul 1999 05:08:05 +0000 (+0000)
Subject: Sync up with the latest semi-1_13.
X-Git-Tag: semi-pgpgpg_18~2
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=5160b1423905f7bf18a00f8e5fd817696494bfaa;p=elisp%2Fsemi.git

Sync up with the latest semi-1_13.
---

diff --git a/ChangeLog b/ChangeLog
index 217ef49..75d3006 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
-1999-06-04  Katsumi Yamaoka   <yamaoka@jpl.org>
+1999-06-17  MORIOKA Tomohiko  <tomo@m17n.org>
 
-	* mime-edit.el (mime-edit-user-agent-value): Ignore parenthesis in
-	`emacs-version' for XEmacs 21.2.15.
+	* mime-edit.el (mime-edit-user-agent-value): Modify for XEmacs
+	UTF-2000-MULE.
+
+1999-06-04  MORIOKA Tomohiko  <tomo@m17n.org>
+
+	* mime-edit.el (mime-edit-user-agent-value): Modify code to get
+	version number of XEmacs. [cf. <tm-ja:4561>]
 
 1999-05-31  Keiichi Suzuki  <keiichi@nanap.org>
 
diff --git a/mime-edit.el b/mime-edit.el
index ad3e3cb..94883c7 100644
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -634,12 +634,13 @@ If it is not specified for a major-mode,
 	  (mime-product-code-name mime-library-product)
 	  ") "
 	  (if (featurep 'xemacs)
-	      (concat (if (featurep 'mule) "MULE")
+	      (concat (cond ((featurep 'utf-2000)
+			     (concat "UTF-2000-MULE/" utf-2000-version))
+			    ((featurep 'mule) "MULE"))
 		      " XEmacs"
-		      (if (string-match "\\s +\\((\\|\\\"\\)" emacs-version)
+		      (if (string-match "^[0-9]+\\(\\.[0-9]+\\)" emacs-version)
 			  (concat "/"
-				  (substring emacs-version 0
-					     (match-beginning 0))
+				  (substring emacs-version 0 (match-end 0))
 				  (if (and (boundp 'xemacs-betaname)
 					   ;; It does not exist in XEmacs
 					   ;; versions prior to 20.3.