"Say whether the current (narrowed) buffer contains characters that need encoding."
(let ((charsets (mapcar
'mm-mule-charset-to-mime-charset
- (find-charset-region (point-min) (point-max))))
+ (mm-find-charset-region (point-min) (point-max))))
(cs (list 'us-ascii rfc2047-default-charset))
found)
(while charsets
found))
(defun rfc2047-dissect-region (b e)
- "Dissect the region between B and E."
+ "Dissect the region between B and E into words."
(let (words)
(save-restriction
(narrow-to-region b e)
(concat "[^" ietf-drums-tspecials " \t\n]+") nil t)
(push
(list (match-beginning 0) (match-end 0)
- (car
- (delq 'ascii
- (find-charset-region (match-beginning 0)
- (match-end 0)))))
+ (car (delq 'ascii (mm-find-charset-region
+ (match-beginning 0) (match-end 0)))))
words))
words)))
(prog1
(match-string 0)
(delete-region (match-beginning 0) (match-end 0)))))
- (when (mm-multibyte-p)
+ (when (and (mm-multibyte-p) rfc2047-default-charset)
(mm-decode-coding-region b e rfc2047-default-charset))
(setq b (point)))
- (when (mm-multibyte-p)
+ (when (and (mm-multibyte-p)
+ rfc2047-default-charset
+ (not (eq rfc2047-default-charset 'us-ascii)))
(mm-decode-coding-region b (point-max) rfc2047-default-charset))))))
(defun rfc2047-decode-string (string)
"Decode STRING that uses CHARSET with ENCODING.
Valid ENCODINGs are \"B\" and \"Q\".
If your Emacs implementation can't decode CHARSET, it returns nil."
- (let ((cs (mm-charset-to-coding-system charset)))
+ (let ((cs (let ((mm-default-charset rfc2047-default-charset))
+ (mm-charset-to-coding-system charset))))
(when cs
(when (eq cs 'ascii)
(setq cs rfc2047-default-charset))