* Makefile : Apply patch from TAKAHASHI Kaoru <kaoru@se.uec.ac.jp>

[elisp/apel.git] / mcs-e20.el

diff --git a/mcs-e20.el b/mcs-e20.el
index 7eae509..84a4694 100644 (file)
--- a/mcs-e20.el
+++ b/mcs-e20.el
@@ -1,6 +1,6 @@
 ;;; mcs-e20.el --- MIME charset implementation for Emacs 20.1 and 20.2
 
-;; Copyright (C) 1996,1997,1998,1999 Free Software Foundation, Inc.
+;; Copyright (C) 1996,1997,1998,1999,2000 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <tomo@m17n.org>
 ;; Keywords: emulation, compatibility, Mule
@@ -28,10 +28,8 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'static)
-  (require 'poem)
-  )
+(require 'pces)
+(eval-when-compile (require 'static))
 
 (defsubst encode-mime-charset-region (start end charset &optional lbt)
   "Encode the text between START and END as MIME CHARSET."
@@ -159,25 +157,25 @@ Return nil if corresponding MIME-charset is not found."
     ))
 
 (static-when (and (string= (decode-coding-string "\e.A\eN!" 'ctext) "\eN!")
-                 (not (find-coding-system 'x-ctext)))
-  (require 'poem)
-  (or (find-coding-system 'x-ctext)
-      (make-coding-system
-       'x-ctext 2 ?x
-       "Compound text based generic encoding for decoding unknown messages."
-       '((ascii t) (latin-iso8859-1 t) t t
-        nil ascii-eol ascii-cntl nil locking-shift single-shift nil nil nil
-        init-bol nil nil)
-       '((safe-charsets . t)
-        (mime-charset . x-ctext)))
-      ))
+                 (or (not (find-coding-system 'x-ctext))
+                     (coding-system-get 'x-ctext 'apel)))
+  (unless (find-coding-system 'x-ctext)
+    (make-coding-system
+     'x-ctext 2 ?x
+     "Compound text based generic encoding for decoding unknown messages."
+     '((ascii t) (latin-iso8859-1 t) t t
+       nil ascii-eol ascii-cntl nil locking-shift single-shift nil nil nil
+       init-bol nil nil)
+     '((safe-charsets . t)
+       (mime-charset . x-ctext)))
+    (coding-system-put 'x-ctext 'apel t)
+    ))
 
 
 ;;; @ end
 ;;;
 
-(require 'mcs-20)
-
-(provide 'mcs-e20)
+(require 'product)
+(product-provide (provide 'mcs-e20) (require 'apel-ver))
 
 ;;; mcs-e20.el ends here