* mm-util.el (mm-mime-charset): Check for presence of

`coding-system-get' and `get-charset-property' (recent XEmacs has
the former, but not the latter).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2c1a57a..37fd3bd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-02-17  Florian Weimer  <fw@deneb.cygnus.argh.org>
+
+       * mm-util.el (mm-mime-charset): Check for presence of
+       `coding-system-get' and `get-charset-property' (recent XEmacs has
+       the former, but not the latter).
+
 2000-01-28  Dave Love  <fx@gnu.org>
 
        * message.el (message-check-news-header-syntax): Fix typo

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index bf94df4..d7dc793 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -241,7 +241,7 @@ If the charset is `composition', return the actual one."
 
 (defun mm-mime-charset (charset)
   "Return the MIME charset corresponding to the MULE CHARSET."
-  (if (fboundp 'coding-system-get)
+  (if (and (fboundp 'coding-system-get) (fboundp 'get-charset-property))
       ;; This exists in Emacs 20.
       (or
        (and (mm-preferred-coding-system charset)