X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mcs-e20.el;h=00b621e791bd41a44029eec487941c1b8540b9ae;hb=856f094dabc99315a46caf8865beee174228f8af;hp=f5c5e36f98cea6165bfc9382b510933e74b4557d;hpb=621d7ee959dc60f22460de9e6c8d1ec261de85a4;p=elisp%2Fapel.git

diff --git a/mcs-e20.el b/mcs-e20.el
index f5c5e36..00b621e 100644
--- a/mcs-e20.el
+++ b/mcs-e20.el
@@ -1,8 +1,8 @@
 ;;; mcs-e20.el --- MIME charset implementation for Emacs 20.1 and 20.2
 
-;; Copyright (C) 1996,1997,1998 Free Software Foundation, Inc.
+;; Copyright (C) 1996,1997,1998,1999 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).
@@ -28,7 +28,10 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'static))
+(eval-when-compile
+  (require 'static)
+  (require 'poem)
+  )
 
 (defsubst encode-mime-charset-region (start end charset &optional lbt)
   "Encode the text between START and END as MIME CHARSET."
@@ -155,15 +158,20 @@ Return nil if corresponding MIME-charset is not found."
       dest)
     ))
 
-(static-when (string= (decode-coding-string "\e.A\eN!" 'ctext) "\eN!")
-  (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))))
+(static-when (and (string= (decode-coding-string "\e.A\eN!" 'ctext) "\eN!")
+		  (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
@@ -171,6 +179,7 @@ Return nil if corresponding MIME-charset is not found."
 
 (require 'mcs-20)
 
-(provide 'mcs-e20)
+(require 'product)
+(product-provide (provide 'mcs-e20) (require 'apel-ver))
 
 ;;; mcs-e20.el ends here