[Emacs-diffs] trunk r115975: mail/rmail.el (rmail-get-coding-system): Check rmail-get-coding-function before "funcall"ing it.

[Kenichi Handa]

------------------------------------------------------------
revno: 115975 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: K. Handa <address@hidden>
branch nick: trunk
timestamp: Sat 2014-01-11 22:01:59 +0900
message:
  mail/rmail.el (rmail-get-coding-system): Check rmail-get-coding-function 
before "funcall"ing it.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/mail/rmail.el             rmail.el-20091113204419-o5vbwnq5f7feedwu-8812

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-01-11 03:55:50 +0000
+++ b/lisp/ChangeLog    2014-01-11 13:00:54 +0000
@@ -1,3 +1,8 @@
+2014-01-10  K. Handa  <address@hidden>
+
+       * mail/rmail.el (rmail-get-coding-system): Check
+       rmail-get-coding-function before "funcall"ing it.
+
 2014-01-10  Glenn Morris  <address@hidden>
 
        * emacs-lisp/authors.el (authors-fixed-entries):

=== modified file 'lisp/mail/rmail.el'
--- a/lisp/mail/rmail.el        2014-01-03 11:21:25 +0000
+++ b/lisp/mail/rmail.el        2014-01-10 23:29:10 +0000
@@ -1040,7 +1040,8 @@
 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))))