* Makefile.in (install-package-ja): Compile and install lisp files first.

[elisp/gnus.git-] / lisp / mm-util.el

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index 016d3a1..096d0f4 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -26,6 +26,7 @@
 
 (eval-when-compile (require 'static))
 
+(eval-when-compile (require 'cl))
 (require 'mail-prsvr)
 
 (defvar mm-mime-mule-charset-alist
@@ -323,7 +324,8 @@ If the charset is `composition', return the actual one."
 
 (defsubst mm-multibyte-p ()
   "Say whether multibyte is enabled."
-  (if (boundp 'enable-multibyte-characters)
+  (if (and (not (featurep 'xemacs))
+          (boundp 'enable-multibyte-characters))
       enable-multibyte-characters
     (featurep 'mule)))