From: tomo <tomo>
Date: Fri, 15 Dec 2000 09:58:09 +0000 (+0000)
Subject: - Don't require `poe'.
X-Git-Tag: semi21-1_14_0-1~38
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdfe8c9ebcd53a5fe1841d0de817c0eea0cd99f9;p=elisp%2Flemi.git

- Don't require `poe'.
- Require mcs-20 if XEmacs-Mule, Emacs 20.1 or later are running.
---

diff --git a/mime/mcharset.el b/mime/mcharset.el
index d1550ab..05babb4 100644
--- a/mime/mcharset.el
+++ b/mime/mcharset.el
@@ -24,28 +24,18 @@
 
 ;;; Code:
 
-(require 'poe)
-(require 'pcustom)
+(require 'custom)
 
 (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)