Synch to No Gnus 200503200325.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3bee3d0..a6029ea 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-19  Aidan Kehoe  <kehoea@parhasard.net>
+
+       * lisp/mm-util.el (mm-xemacs-find-mime-charset): Only call
+       mm-xemacs-find-mime-charset-1 if we have the mule feature
+       available at runtime.
+
 2005-03-16  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * nnimap.el (nnimap-open-connection): Print which authinfo file is

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index fe7c77c..0a51090 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -668,7 +668,7 @@ But this is very much a corner case, so don't worry about it."
 
 (defmacro mm-xemacs-find-mime-charset (begin end)
   (when (featurep 'xemacs)
-    `(mm-xemacs-find-mime-charset-1 ,begin ,end)))
+    `(and (featurep 'mule) (mm-xemacs-find-mime-charset-1 ,begin ,end))))
 
 (defun mm-find-mime-charset-region (b e &optional hack-charsets)
   "Return the MIME charsets needed to encode the region between B and E.