merge trunk

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f59908ef353b232127467b604fd57e8abeb8280a..795dec24bf196c25d2c81573ddbccbeb3469d783 100644 (file)
--- 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-10  Glenn Morris  <rgm@gnu.org>
 
        * emacs-lisp/authors.el (authors-fixed-entries):

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 7877287f5e6e886caeb54db81a0c9f6e6798a7a4..cfde976ea0b164f29594efab4c31a0e5090cecd3 100644 (file)
--- 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))))