Commit 3923e7bd authored by Kenichi Handa's avatar Kenichi Handa

mail/rmail.el (rmail-get-coding-system): Check rmail-get-coding-function before "funcall"ing it.

parent 684d44ef
2014-01-10 K. Handa <handa@gnu.org>
* mail/rmail.el (rmail-get-coding-system): Check
rmail-get-coding-function before "funcall"ing it.
2014-01-09 Stefan Monnier <monnier@iro.umontreal.ca> 2014-01-09 Stefan Monnier <monnier@iro.umontreal.ca>
* simple.el (deactivate-mark, activate-mark): Force-mode-line-update * simple.el (deactivate-mark, activate-mark): Force-mode-line-update
......
...@@ -1040,7 +1040,8 @@ This function also reinitializes local variables used by Rmail." ...@@ -1040,7 +1040,8 @@ This function also reinitializes local variables used by Rmail."
The buffer is expected to be narrowed to just the header of the message." The buffer is expected to be narrowed to just the header of the message."
(save-excursion (save-excursion
(goto-char (point-min)) (goto-char (point-min))
(or (funcall rmail-get-coding-function) (or (if rmail-get-coding-function
(funcall rmail-get-coding-function))
(if (re-search-forward rmail-mime-charset-pattern nil t) (if (re-search-forward rmail-mime-charset-pattern nil t)
(coding-system-from-name (match-string 1)) (coding-system-from-name (match-string 1))
'undecided)))) 'undecided))))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment