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 (file)
--- 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 (file)
--- 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"