(rmail-get-coding-system): Re-search

rmail-mime-charset-pattern directly instead of using
mail-fetch-field.  Use coding-system-from-name.
This commit is contained in:
Kenichi Handa 2009-01-27 04:48:56 +00:00
parent f4017dc56c
commit fe83a3004e
2 changed files with 13 additions and 7 deletions

View file

@ -1,3 +1,12 @@
2009-01-27 Kenichi Handa <handa@m17n.org>
* mail/rmail.el (rmail-get-coding-system): Re-search
rmail-mime-charset-pattern directly instead of using
mail-fetch-field. Use coding-system-from-name.
* international/mule-cmds.el (canonicalize-coding-system-name)
(coding-system-from-name): New functions.
2009-01-27 Glenn Morris <rgm@gnu.org>
* dired-x.el (dired-bind-vm): Doc fix.

View file

@ -940,13 +940,10 @@ This function also reinitializes local variables used by Rmail."
(defun rmail-get-coding-system ()
"Return a suitable coding system to use for the current mail message.
The buffer is expected to be narrowed to just the header of the message."
(let ((content-type-header (mail-fetch-field "content-type"))
separator)
(save-excursion
(setq separator (search-forward "\n\n")))
(if (and content-type-header
(string-match rmail-mime-charset-pattern content-type-header))
(substring content-type-header (match-beginning 1) (match-end 1))
(save-excursion
(goto-char (point-min))
(if (re-search-forward rmail-mime-charset-pattern)
(coding-system-from-name (match-string 1))
'undecided)))
;;; Set up Rmail mode keymaps