merge trunk

[bpt/emacs.git] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f59908e..795dec2 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):