Merge from emacs-24; up to 2014-03-21T23:16:26Z!rms@gnu.org

[bpt/emacs.git] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7822950..64f138a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,18 @@
        (Bug#3647) --- unfortunately, only for freshly-compiled code.
        Please make bootstrap.
 
+2014-03-23  Richard Stallman  <rms@gnu.org>
+
+       * battery.el (battery-linux-sysfs): Search for each field
+       from the beginning of the buffer.
+
+2014-03-23  Daniel Colascione  <dancol@dancol.org>
+
+       * emacs-lisp/cl-macs.el (cl--do-arglist): Use a little `cl-loop'
+       list to look for keyword arguments instead of `memq', fixing
+       (Bug#3647) --- unfortunately, only for freshly-compiled code.
+       Please make bootstrap.
+
 2014-03-22  Glenn Morris  <rgm@gnu.org>
 
        * dired.el (dired-read-regexp): Make obsolete.