Synch to No Gnus 200502120008.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index de5b04c..8332d24 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mm-util.el (mm-coding-system-to-mime-charset): Make it work with
+       non-Mule XEmacs as well.
+
 2005-02-11  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * gnus-registry.el (gnus-registry-delete-group): small bug leaves

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index f5d4be0..d21d0ed 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -942,8 +942,9 @@ If INHIBIT is non-nil, inhibit `mm-inhibit-file-name-handlers'."
   "Return the MIME charset corresponding to CODING-SYSTEM.
 To make this function work with XEmacs, the APEL package is required."
   (when coding-system
-    (or (coding-system-get coding-system :mime-charset)
-       (coding-system-get coding-system 'mime-charset)
+    (or (and (fboundp 'coding-system-get)
+            (or (coding-system-get coding-system :mime-charset)
+                (coding-system-get coding-system 'mime-charset)))
        (and (featurep 'xemacs)
             (or (and (fboundp 'coding-system-to-mime-charset)
                      (not (eq (symbol-function 'coding-system-to-mime-charset)