Sync up with the latest semi-1_13.

diff --git a/ChangeLog b/ChangeLog
index ed6fd24..51d44b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
-1999-06-27  Katsumi Yamaoka   <yamaoka@jpl.org>
+1999-06-17  MORIOKA Tomohiko  <tomo@m17n.org>
 
-       * mime-edit.el (mime-edit-user-agent-value): Include UTF-2000-MULE
-       version if it exists.
+       * mime-edit.el (mime-edit-user-agent-value): Modify for XEmacs
+       UTF-2000-MULE.
 
 1999-06-25  Kenichi OKADA     <kokada@vlsi.kuee.kyoto-u.ac.jp>
 
@@ -17,11 +17,6 @@
        * mime-edit.el (mime-edit-user-agent-value): Modify code to get
        version number of XEmacs. [cf. <tm-ja:4561>]
 
-1999-06-04  Katsumi Yamaoka   <yamaoka@jpl.org>
-
-       * mime-edit.el (mime-edit-user-agent-value): Ignore parenthesis in
-       `emacs-version' for XEmacs 21.2.15.
-
 1999-05-31  Keiichi Suzuki  <keiichi@nanap.org>
 
        * mime-play.el (mime-show-echo-buffer): Bind `buffer-read-only' to

diff --git a/mime-edit.el b/mime-edit.el
index 8e3da1f..c6229b8 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -632,10 +632,9 @@ If it is not specified for a major-mode,
          (mime-product-code-name mime-library-product)
          ") "
          (if (featurep 'xemacs)
-             (concat (cond ((boundp 'utf-2000-version)
+             (concat (cond ((featurep 'utf-2000)
                             (concat "UTF-2000-MULE/" utf-2000-version))
-                           ((featurep 'mule) "MULE")
-                           (t ""))
+                           ((featurep 'mule) "MULE"))
                      " XEmacs"
                      (if (string-match "^[0-9]+\\(\\.[0-9]+\\)" emacs-version)
                          (concat "/"