Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs.

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 82608b76b57fa103aac10921cda237cc22c4c4b4..64ead04f4b65105e2a54205290e0f8c387b0c2c6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-29  K. Handa  <handa@gnu.org>
+
+       * international/mule.el (make-translation-table-from-alist):
+       Accept nil or zero-length vector for FROM and TO.
+
 2014-12-29  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * net/eww.el (eww-mode): Truncate overlong lines for prettier