Merge from emacs-24; up to 2014-03-21T21:27:25Z!dancol@dancol.org

diff --cc doc/lispref/ChangeLog
index 3bbcee768843e8a2205c577c35a9006bebade68c,1e57d4f0db2bd9bd1a78309dad0df70e7ed56b79..a6adcdd972092e21921310e5105bd253c3049ed1
--- 1/doc/lispref/ChangeLog
--- 2/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@@ -1,3 -1,20 +1,20 @@@
 -2014-03-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 2014-03-22  Glenn Morris  <rgm@gnu.org>
+ 
+       * commands.texi (Defining Commands): List interactive-only values.
+ 
+ 2014-03-22  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * functions.texi (Core Advising Primitives): Fix cross-reference
+       in last change.
+ 
++2014-03-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * functions.texi (Advising Functions): Explain a bit more how
+       arguments work.
+       (Advice combinators): New node.
+       (Core Advising Primitives): Use it.  Expand description of "depth".
+       (Advising Named Functions): Document limitation of advices on macros.
+ 
  2014-03-21  Martin Rudalics  <rudalics@gmx.at>
  
        * frames.texi (Size and Position): In `frame-resize-pixelwise'

diff --cc doc/lispref/functions.texi
index 3e1db68f70d9bb315730f5b8eff290d1e148c019,460736778817a137d26f4ca682c7c344d47397eb..eeb642a04c31ee15a67e26edaf4fa9fef3e24a08
--- 1/doc/lispref/functions.texi
--- 2/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@@ -1205,6 -1209,7 +1209,7 @@@ ways to do it.  The added function is a
  @menu
  * Core Advising Primitives::    Primitives to Manipulate Advices
  * Advising Named Functions::    Advising Named Functions
 -* Advice combinators::                Ways to compose advices
++* Advice combinators::          Ways to compose advices
  * Porting old advices::         Adapting code using the old defadvice
  @end menu
  

diff --cc lisp/ChangeLog
index 786710f36891fcecf3f5b672b736bc73d5eb25a6,7cf7d50118cb613de3a4526f3f2ff04bce764658..fcd7cb3dd3742fa901b54e474cb888d38864e556
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,33 -1,13 +1,43 @@@
+ 2014-03-22  Dmitry Gutov  <dgutov@yandex.ru>
+ 
+       * emacs-lisp/package.el (package-desc): Use the contents of the
+       quoted form, not its cdr.  (Bug#16873)
+ 
+ 2014-03-22  Juanma Barranquero  <lekktu@gmail.com>
+ 
+       * w32-common-fns.el (x-selection-owner-p): Add empty docstring for the
+       benefit of doc.c; change parameter profile to match the X function.
+ 
 +2014-03-22  Leo Liu  <sdl.web@gmail.com>
 +
 +      * help.el (temp-buffer-setup-hook): Remove help-mode-setup.
 +      (temp-buffer-show-hook): Remove help-mode-finish.  (Bug#16038)
 +
 +2014-03-21  Richard Stallman  <rms@gnu.org>
 +
 +      * battery.el (battery-linux-sysfs): Search for each field
 +      from the beginning of the buffer.
 +
 +      * subr.el (set-transient-map): Clear out function and value
 +      of the temporary symbol when we're done with it.
 +
 +      * mail/rmailsum.el (rmail-summary-delete-forward):
 +      Optimize case of reaching end and handling count.
 +      (rmail-summary-mark-deleted): Optimize when N is current msg.
 +      Don't create new summary line.
 +      (rmail-summary-undelete): Pass arg to rmail-undelete-previous-message.
 +      (rmail-summary-undelete-many): Rewrite for speed.
 +      (rmail-summary-msg-number): New function.
 +
 +      * mail/rmail.el (rmail-delete-message): Update summary.
 +      (rmail-undelete-previous-message): Handle repeat count arg.
 +      (rmail-delete-backward, rmail-delete-forward): Likewise.
 +
 +2014-03-21  Daniel Colascione  <dancol@dancol.org>
 +
 +      * mail/emacsbug.el (report-emacs-bug): Include memory usage
 +      information in bug reports.
 +
  2014-03-21  Michael Albinus  <michael.albinus@gmx.de>
  
        * net/tramp.el (tramp-methods): Add docstring for `tramp-login-env'