Update copyright year to 2014 by running admin/update-copyright.

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3c9356fbd7cbf41a504dde6fe6a1118742ef928c..4e5ec33593607cea216eeff4b4068252c1103f84 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,26 @@
+2013-12-31  Eli Zaretskii  <eliz@gnu.org>
+
+       * international/mule-conf.el: Unify the charset indian-is13194.
+       (indian-is13194): Specify unify-map.
+
+2013-12-31  Leo Liu  <sdl.web@gmail.com>
+
+       * subr.el (set-temporary-overlay-map): Obsolete alias.  (Bug#16305)
+
+2013-12-30  Daniel Colascione  <dancol@dancol.org>
+
+       * term/x-win.el ([XF86WakeUp]): Ignore the XF86WakeUp key instead
+       of printing a useless when we resume from sleep.
+
+       * progmodes/sh-script.el
+       (sh-smie-sh-forward-token,sh-smie-rc-forward-token): Fix infloop
+       in indentation code.  (Bug#16233)
+
+2013-12-28  João Távora  <joaotavora@gmail.com>
+
+       * elec-pair.el (electric-pair-post-self-insert-function): Don't
+       open extra newlines at beginning of buffer.  (Bug#16272)
+
 2013-12-28  Eli Zaretskii  <eliz@gnu.org>
 
        * frame.el (window-system-for-display): Don't allow to create a
@@ -11794,7 +11817,7 @@ See ChangeLog.16 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2011-2013 Free Software Foundation, Inc.
+  Copyright (C) 2011-2014 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.