From: Glenn Morris <rgm@gnu.org>
Date: Sat, 22 Mar 2014 21:44:04 +0000 (-0700)
Subject: Merge from emacs-24; up to 2014-03-21T21:27:25Z!dancol@dancol.org
X-Git-Tag: emacs-25.0.90~2640^2~344^2~18
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=299ccd03f94008a1580a0dbbfd56c32484dd20f8;p=emacs.git

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

299ccd03f94008a1580a0dbbfd56c32484dd20f8
diff --cc doc/lispref/ChangeLog
index 3bbcee76884,1e57d4f0db2..a6adcdd9720
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@@ -1,3 -1,20 +1,20 @@@
+ 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-21  Stefan Monnier  <monnier@iro.umontreal.ca>
++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 3e1db68f70d,46073677881..eeb642a04c3
--- a/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 786710f3689,7cf7d50118c..fcd7cb3dd37
--- a/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'