Merge from emacs-24; up to 2013-01-03T02:31:36Z!rgm@gnu.org

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5809c2a45136e0fb500c95b382bba54e89e47e47..f36ed3ceebbe1c5dc7e0acabdc861327a70df1b8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * subr.el (eval-after-load): Preserve evaluation order (bug#15389).
+
+       * abbrev.el (abbrev--check-chars): Fix thinko (bug#15329).
+
 2013-09-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * icomplete.el (icomplete-in-buffer): New var.