procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Kenichi Handa 2014-01-11 08:29:10 +09:00
parent 684d44ef81
commit 3923e7bde9
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
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>
* simple.el (deactivate-mark, activate-mark): Force-mode-line-update

3
lisp/mail/rmail.el
View file

@ -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."
(save-excursion
(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)
(coding-system-from-name (match-string 1))
'undecided))))