* poe.el (minor-mode-overriding-map-alist): Remove the filename

[elisp/apel.git] / mcharset.el

diff --git a/mcharset.el b/mcharset.el
index 156c34e..5bb5a59 100644 (file)
--- 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)