update.

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

diff --git a/mcs-20.el b/mcs-20.el
index 49bc116..77911a4 100644 (file)
--- 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))
 
 
@@ -44,7 +44,8 @@
           (cn-gb         . cn-gb-2312)
           (iso-2022-jp-2 . iso-2022-7bit-ss2)
           (tis-620       . tis620)
-          (windows-874   . tis620)
+          (windows-874   . tis-620)
+          (cp874         . tis-620)
           (x-ctext       . ctext)
           (unknown       . undecided)
           (x-unknown     . undecided)
@@ -71,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')
@@ -137,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)
@@ -180,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