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

diff --cc etc/PROBLEMS
index ba95586c43f867ec0f6200a37cb062e35af7974e,ae836cf73ec5e744d086e34b4399409b27f82629..6978d79c636bfa6c3c4217c0eb6d9c4859e75538
--- 1/etc/PROBLEMS
--- 2/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@@ -2504,10 -2505,26 +2505,10 @@@ o
  
  (The -R option disables address space randomization.)
  
 -*** test-distrib says that the distribution has been clobbered.
 -*** or, temacs prints "Command key out of range 0-127".
 -*** or, temacs runs and dumps emacs, but emacs totally fails to work.
 -*** or, temacs gets errors dumping emacs.
 -
 -This can be because the .elc files have been garbled.  Do not be
 -fooled by the fact that most of a .elc file is text: these are
 -binary files and can contain all 256 byte values.
 -
 -If you have a copy of Emacs whose .elc files have been damaged in this
 -way, you should be able to fix it by using:
 -
 - make bootstrap
 -
 -to regenerate all the .elc files.
 -
  *** temacs prints "Pure Lisp storage exhausted".
  
- This means that the Lisp code loaded from the .elc and .el files
- during temacs -l loadup inc dump took up more space than was allocated.
+ This means that the Lisp code loaded from the .elc and .el files during
+ `temacs --batch --load loadup dump' took up more space than was allocated.
  
  This could be caused by
   1) adding code to the preloaded Lisp files

diff --cc lisp/ChangeLog
index 78229507684c447e49bba9e7a2a492d19b4feaae,2a0840031b2aac94d28eeab1f18b50c4159d2b24..64f138a2dc89861d38e6b6d83095ab08015dedad
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -5,42 -5,11 +5,54 @@@
        (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.
 +      (dired-mark-files-regexp, dired-mark-files-containing-regexp)
 +      (dired-flag-files-regexp):
 +      * dired-aux.el (dired-mark-read-regexp):
 +      * dired-x.el (dired-mark-unmarked-files): Use read-regexp directly.
 +
 +      * startup.el (fancy-startup-text):
 +      * help.el (describe-gnu-project): Visit online info about GNU project.
 +
 +      * help-fns.el (help-fns--interactive-only): New function.
 +      (help-fns-describe-function-functions): Add the above function.
 +      * simple.el (beginning-of-buffer, end-of-buffer, insert-buffer)
 +      (next-line, previous-line): Remove hand-written interactive-only
 +      information from doc strings, it is auto-generated now.
 +      * bookmark.el (bookmark-write):
 +      * epa-mail.el (epa-mail-decrypt, epa-mail-verify, epa-mail-sign)
 +      (epa-mail-import-keys): Mark interactive-only,
 +      and remove hand-written interactive-only information from doc strings.
 +      * epa.el (epa-decrypt-armor-in-region, epa-verify-region)
 +      (epa-verify-cleartext-in-region, epa-sign-region, epa-encrypt-region):
 +      * files.el (not-modified):
 +      * simple.el (mark-whole-buffer): Mark interactive-only.
 +
 +      * emacs-lisp/byte-run.el (defun-declarations-alist):
 +      Add interactive-only.  Doc tweak.
 +      (macro-declarations-alist): Doc tweak.
 +      * subr.el (declare): Doc tweak (add xref to manual).
 +      * comint.el (comint-run):
 +      * files.el (insert-file-literally, insert-file):
 +      * replace.el (replace-string, replace-regexp):
 +      * simple.el (beginning-of-buffer, end-of-buffer, delete-backward-char)
 +      (delete-forward-char, goto-line, insert-buffer, next-line)
 +      (previous-line): Set interactive-only via declare.
 +
  2014-03-22  Dmitry Gutov  <dgutov@yandex.ru>
  
        * emacs-lisp/package.el (package-desc): Use the contents of the

diff --cc test/ChangeLog
index 183fb409f1fcb93d3492a730ca68a3d3a5790aab,15677e764681b2ca6cc8afb3b2b315dcf41cb84b..1fe024a12860dbde86a63ac69ce2a05449b24921
--- 1/test/ChangeLog
--- 2/test/ChangeLog
+++ b/test/ChangeLog
@@@ -3,6 -3,29 +3,34 @@@
        * automated/cl-lib.el (cl-lib-keyword-names-versus-values): New
        test: correct parsing of keyword arguments.
  
+ 2014-03-23  Dmitry Gutov  <dgutov@yandex.ru>
+ 
+       * automated/package-test.el (package-test-describe-package):
+       Fix test failure in non-graphical mode.
+ 
+ 2014-03-22  Dmitry Gutov  <dgutov@yandex.ru>
+ 
+       * automated/package-test.el (package-test-describe-package):
+       Check for the "Keywords: " line.
+ 
+       * automated/data/package/archive-contents: Include the :keywords
+       field in `simple-single' data form.
+ 
+ 2014-03-21  Dmitry Gutov  <dgutov@yandex.ru>
+ 
+       * automated/package-test.el
+       (package-test-install-two-dependencies): New test (bug#16826).
+ 
+       * automated/data/package/simple-two-depend-1.1.el: New file.
+ 
+       * automated/data/package/archive-contents:
+       Add info about the new package.
+ 
++2014-03-23  Daniel Colascione  <dancol@dancol.org>
++
++      * automated/cl-lib.el (cl-lib-keyword-names-versus-values): New
++      test: correct parsing of keyword arguments.
++
  2014-03-07  Michael Albinus  <michael.albinus@gmx.de>
  
        * automated/tramp-tests.el (tramp-copy-size-limit): Declare.