X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mcharset.el;h=5bb5a594a6d7a49f265e7480494044b976dfa85e;hb=6362a76695a230cf04f5da6109a24044949df6da;hp=156c34e7763e3b17a9466a4cc57ed25baed57e9b;hpb=8ea0cf57c248b6a4ba2f73288cc1b7cad582e171;p=elisp%2Fapel.git

diff --git a/mcharset.el b/mcharset.el
index 156c34e..5bb5a59 100644
--- a/mcharset.el
+++ b/mcharset.el
@@ -28,27 +28,18 @@
 (require 'pcustom)
 
 (cond ((featurep 'mule)
-       (cond ((featurep 'xemacs)
-	      (require 'mcs-xm)
-	      )
-	     ((>= emacs-major-version 20)
-	      (require 'mcs-e20)
-	      )
-	     (t
-	      ;; for MULE 1.* and 2.*
-	      (require 'mcs-om)
-	      ))
-       )
+       (if (>= emacs-major-version 20)
+	   (require 'mcs-20)
+	 ;; for MULE 1.* and 2.*
+	 (require 'mcs-om)))
       ((boundp 'NEMACS)
        ;; for Nemacs and Nepoch
-       (require 'mcs-nemacs)
-       )
+       (require 'mcs-nemacs))
       (t
-       (require 'mcs-ltn1)
-       ))
+       (require 'mcs-ltn1)))
 
 (defcustom default-mime-charset-for-write
-  (if (and (fboundp 'find-coding-system)
+  (if (and (require 'pces) ; for find-coding-system
 	   (find-coding-system 'utf-8))
       'utf-8
     default-mime-charset)