X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mcs-20.el;h=77911a46d2dc79f3987f9864dd50199645764b40;hb=dea4ec18bf1cc6adbc1e23b0563ea662701df16f;hp=5fcd20436e127d7361dc9d04018ab21db13016aa;hpb=23759e7a7e62c10a3b924bb8d23906fe5d57f5c4;p=elisp%2Fapel.git

diff --git a/mcs-20.el b/mcs-20.el
index 5fcd204..77911a4 100644
--- a/mcs-20.el
+++ b/mcs-20.el
@@ -30,7 +30,7 @@
 ;;; Code:
 
 (require 'poem)
-(require 'custom)
+(require 'pcustom)
 (eval-when-compile (require 'wid-edit))
 
 
@@ -39,14 +39,14 @@
 
 (defcustom mime-charset-coding-system-alist
   (let ((rest
-	 `((us-ascii      . raw-text)
+	 '((us-ascii      . raw-text)
 	   (gb2312	  . cn-gb-2312)
 	   (cn-gb	  . cn-gb-2312)
 	   (iso-2022-jp-2 . iso-2022-7bit-ss2)
 	   (tis-620	  . tis620)
-	   (windows-874	  . tis620)
-	   ,@(unless (coding-system-p 'x-ctext)
-	       '((x-ctext . ctext)))
+	   (windows-874	  . tis-620)
+	   (cp874	  . tis-620)
+	   (x-ctext       . ctext)
 	   (unknown       . undecided)
 	   (x-unknown     . undecided)
 	   ))
@@ -72,7 +72,7 @@ If it is a function, interface must be (CHARSET LBT CODING-SYSTEM)."
   :group 'i18n
   :type '(choice function (const nil)))
 
-(defsubst mime-charset-to-coding-system (charset &optional lbt)
+(defun mime-charset-to-coding-system (charset &optional lbt)
   "Return coding-system corresponding with CHARSET.
 CHARSET is a symbol whose name is MIME charset.
 If optional argument LBT (`CRLF', `LF', `CR', `unix', `dos' or `mac')
@@ -138,36 +138,10 @@ It must be symbol."
   :group 'i18n
   :type 'mime-charset)
 
-(defcustom default-mime-charset-for-write
-  (if (find-coding-system 'utf-8)
-      'utf-8
-    default-mime-charset)
-  "Default value of MIME-charset for encoding.
-It may be used when suitable MIME-charset is not found.
-It must be symbol."
-  :group 'i18n
-  :type 'mime-charset)
-
-(defcustom default-mime-charset-detect-method-for-write
-  nil
-  "Function called when suitable MIME-charset is not found to encode.
-It must be nil or function.
-If it is nil, variable `default-mime-charset-for-write' is used.
-If it is a function, interface must be (TYPE CHARSETS &rest ARGS).
-CHARSETS is list of charset.
-If TYPE is 'region, ARGS has START and END."
-  :group 'i18n
-  :type '(choice function (const nil)))
-
 (defun detect-mime-charset-region (start end)
   "Return MIME charset for region between START and END."
-  (let ((charsets (find-charset-region start end)))
-    (or (charsets-to-mime-charset charsets)
-	(if default-mime-charset-detect-method-for-write
-	    (funcall default-mime-charset-detect-method-for-write
-		     'region charsets start end)
-	  default-mime-charset-for-write)
-	)))
+  (find-mime-charset-by-charsets (find-charset-region start end)
+				 'region start end))
 
 (defun write-region-as-mime-charset (charset start end filename
 					     &optional append visit lockname)
@@ -181,6 +155,7 @@ If TYPE is 'region, ARGS has START and END."
 ;;; @ end
 ;;;
 
-(provide 'mcs-20)
+(require 'product)
+(product-provide (provide 'mcs-20) (require 'apel-ver))
 
 ;;; mcs-20.el ends here