Merge from emacs-24; up to 2014-06-02T11:35:40Z!michael.albinus@gmx.de

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 80105470985e9a2a53a51058743927475ad6595b..2ce06f6ba54bd7dd574f7e572df22cecd1c9c4d5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2014-06-08  Glenn Morris  <rgm@gnu.org>
+
+       * startup.el (initial-buffer-choice): Doc fix.
+       Reset :version (adding an option does not merit a :version bump).
+
+       * bookmark.el (bookmark-load):
+       * uniquify.el (uniquify-buffer-name-style): Doc fixes.
+
 2014-06-08  Juri Linkov  <juri@jurta.org>
 
        * desktop.el: Activate auto-saving on window configuration changes.