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

- Don't require `poem'.
- Require `custom' instead of `pcustom'.
- Require `mcs-xm' if XEmacs-Mule is running, otherwise require
  `mcs-e20'.
---

diff --git a/mime/mcs-20.el b/mime/mcs-20.el
index 87869c1..fae467b 100644
--- a/mime/mcs-20.el
+++ b/mime/mcs-20.el
@@ -1,8 +1,8 @@
 ;;; mcs-20.el --- MIME charset implementation for Emacs 20 and XEmacs/mule
 
-;; Copyright (C) 1997,1998,1999 Free Software Foundation, Inc.
+;; Copyright (C) 1997,1998,1999,2000 Free Software Foundation, Inc.
 
-;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;; Author: MORIOKA Tomohiko <tomo@m17n.org>
 ;; Keywords: emulation, compatibility, Mule
 
 ;; This file is part of APEL (A Portable Emacs Library).
@@ -29,10 +29,13 @@
 
 ;;; Code:
 
-(require 'poem)
-(require 'pcustom)
+(require 'custom)
 (eval-when-compile (require 'wid-edit))
 
+(if (featurep 'xemacs)
+    (require 'mcs-xm)
+  (require 'mcs-e20))
+
 
 ;;; @ MIME charset
 ;;;