From: tomo <tomo>
Date: Wed, 20 Dec 2000 05:33:05 +0000 (+0000)
Subject: - Don't require `poem'.
X-Git-Tag: apel-10_3~28
X-Git-Url: http://git.chise.org/gitweb/?p=elisp%2Fapel.git;a=commitdiff_plain;h=4a7fa16b94efefc1caed581c77ed406adb9a5bc8

- Don't require `poem'.
- Require `custom' instead of `pcustom'.
- Require mcs-xm for XEmacs-Mule.
- Require mcs-e20 for GNU Emacs 20.1 or later.
(default-mime-charset): Change initial value to `x-unknown'.
---

diff --git a/mcs-20.el b/mcs-20.el
index aa4743f..fae467b 100644
--- a/mcs-20.el
+++ b/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
 ;;;
@@ -132,7 +135,7 @@ is specified, it is used as line break code type of coding-system."
     (widget-apply widget :notify widget event)
     (widget-setup)))
 
-(defcustom default-mime-charset 'x-ctext
+(defcustom default-mime-charset 'x-unknown
   "Default value of MIME-charset.
 It is used when MIME-charset is not specified.
 It must be symbol."