update.

[elisp/apel.git] / mcharset.el

diff --git a/mcharset.el b/mcharset.el
index 8de8709..3be62d1 100644 (file)
--- a/mcharset.el
+++ b/mcharset.el
@@ -28,24 +28,15 @@
 (require 'pcustom)
 
 (cond ((featurep 'mule)
-       (cond ((featurep 'xemacs)
-             (require 'mcs-xm)
-             )
-            ((>= emacs-major-version 20)
-             (require 'mcs-e20)
-             )
-            (t
-             ;; for MULE 1.* and 2.*
-             (require 'mcs-om)
-             ))
-       )
+       (if (>= emacs-major-version 20)
+          (require 'mcs-20)
+        ;; for MULE 1.* and 2.*
+        (require 'mcs-om)))
       ((boundp 'NEMACS)
        ;; for Nemacs and Nepoch
-       (require 'mcs-nemacs)
-       )
+       (require 'mcs-nemacs))
       (t
-       (require 'mcs-ltn1)
-       ))
+       (require 'mcs-ltn1)))
 
 (defcustom default-mime-charset-for-write
   (if (and (fboundp 'find-coding-system)
@@ -91,10 +82,29 @@ Return nil if suitable mime-charset is not found."
            (setq rest (cdr rest)))
          ))))
 
+(defun find-mime-charset-by-charsets (charsets &optional mode &rest args)
+  "Like `charsets-to-mime-charset', but it does not return nil.
+
+When suitable mime-charset is not found and variable
+`default-mime-charset-detect-method-for-write' is not nil,
+`find-mime-charset-by-charsets' calls the variable as function and
+return the return value of the function.
+Interface of the function is (MODE CHARSETS &rest ARGS).
+
+When suitable mime-charset is not found and variable
+`default-mime-charset-detect-method-for-write' is nil,
+variable `default-mime-charset-for-write' is returned."
+  (or (charsets-to-mime-charset charsets)
+      (if default-mime-charset-detect-method-for-write
+         (apply default-mime-charset-detect-method-for-write
+                mode charsets args)
+       default-mime-charset-for-write)))
+
 
 ;;; @ end
 ;;;
 
-(provide 'mcharset)
+(require 'product)
+(product-provide (provide 'mcharset) (require 'apel-ver))
 
 ;;; mcharset.el ends here