X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=mcs-20.el;h=af9d2745260578339d2ecd36b5ec8d7ca73d8349;hb=8c0f07b254e917613e71ccbc56ff988bc59a8ee5;hp=45949be90af5cbcb4eede0fbdaa7932c7b3aa6b7;hpb=9abce339e57586f8a2f0388981af7ef97ff1d82e;p=elisp%2Fapel.git

diff --git a/mcs-20.el b/mcs-20.el
index 45949be..af9d274 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))
 
 
@@ -137,36 +137,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)