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

2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 481c3cbc04a..401dc6a1c7e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 7877287f5e6..cfde976ea0b 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -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))))