From: yoichi <yoichi>
Date: Sun, 14 Dec 2003 14:58:10 +0000 (+0000)
Subject: merge from semi-1_14 branch:
X-Git-Tag: emiko-1_14-epg-branchpoint~31
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88382056c40d87a5621838b1815cecc21878bc93;p=elisp%2Fsemi.git

merge from semi-1_14 branch:
* mime-edit.el (mime-edit-user-agent-value): Add a setting for XEmacs CHISE
---

diff --git a/ChangeLog b/ChangeLog
index c085143..e3a3869 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-12  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+	* mime-edit.el (mime-edit-user-agent-value): Add a setting for
+	XEmacs CHISE.
+
 2002-05-18  ARISAWA Akihiro  <ari@mbf.sphere.ne.jp>
 
 	* mime-play.el (mime-activate-mailcap-method): Don't use
diff --git a/mime-edit.el b/mime-edit.el
index 8538332..5f36513 100644
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -609,7 +609,10 @@ If it is not specified for a major-mode,
 	  (if (fboundp 'apel-version)
 	      (concat (apel-version) " "))
 	  (if (featurep 'xemacs)
-	      (concat (cond ((featurep 'utf-2000)
+	      (concat (cond ((and (featurep 'chise)
+				  (boundp 'xemacs-chise-version))
+			     (concat "CHISE-MULE/" xemacs-chise-version))
+			    ((featurep 'utf-2000)
 			     (concat "UTF-2000-MULE/" utf-2000-version))
 			    ((featurep 'mule) "MULE"))
 		      " XEmacs"