From: yamaoka <yamaoka>
Date: Sun, 20 Mar 2005 09:12:32 +0000 (+0000)
Subject: Synch to No Gnus 200503200325.
X-Git-Tag: t-gnus-6_17_4-quimby-~525
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=d8d5720b208e4f7c6d108eb65a8b74fc54fc6c35;p=elisp%2Fgnus.git-

Synch to No Gnus 200503200325.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3bee3d0..a6029ea 100644
--- 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
--- 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.