checkdoc.

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

diff --git a/mcs-20.el b/mcs-20.el
index c115e4c..b4472d5 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)
@@ -139,13 +140,8 @@ It must be symbol."
 
 (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)