;;; Code:
(require 'poem)
-(require 'custom)
+(require 'pcustom)
(eval-when-compile (require 'wid-edit))
(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)
))
: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')
: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)