From: Glenn Morris <rgm@gnu.org>
Date: Mon, 13 Oct 2014 20:55:41 +0000 (-0400)
Subject: Merge from emacs-24; up to 2014-07-27T01:00:26Z!fgallina@gnu.org
X-Git-Tag: emacs-25.0.90~2635^2~679^2~65
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/2cae8632b75245e232030244159963287ffc6231

Merge from emacs-24; up to 2014-07-27T01:00:26Z!fgallina@gnu.org
---

2cae8632b75245e232030244159963287ffc6231
diff --cc admin/ChangeLog
index 258ce04783,48d7a211a7..f3d6d048e2
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@@ -1,31 -1,4 +1,39 @@@
 -2014-09-03  Eli Zaretskii  <eliz@gnu.org>
++2014-10-13  Glenn Morris  <rgm@gnu.org>
++
++	* authors.el (authors-aliases, authors-fixed-case)
++	(authors-obsolete-files-regexps): Additions.
++	(authors-no-scan-regexps): New constant.
++	(authors-no-scan-file-p): New function.
++	(authors): Respect authors-no-scan-file-p.
++
 +2014-10-12  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	Fix putenv race conditions with undefined behavior (Bug#8705).
 +	* merge-gnulib (GNULIB_MODULES): Add time_r, since Emacs now
 +	calls localtime_r and gmtime_r directly.
 +
 +2014-10-07  Glenn Morris  <rgm@gnu.org>
 +
 +	* unidata/Makefile.in: Check for deleted uni- files.  (Bug#18489)
 +	(all): Use unifiles rather than charprop.el.
 +	(FORCE): New variable and phony rule.
 +	(${unidir}/charprop.el): Respect FORCE.
 +	(unifiles): New rule.
 +
 +	* unidata/Makefile.in (unidir): Rename from DSTDIR.  Change all uses.
 +	(charprop.el, install): Remove rules.
 +	(clean): Simplify.
 +
 +2014-10-04  Glenn Morris  <rgm@gnu.org>
 +
 +	* authors.el (authors-renamed-files-alist): Add package-x-test.el
 +
 +2014-10-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +	* unidata/unidata-gen.el (unidata-gen-table-word-list): Use alist-get
 +	and cl-incf.
 +
 +2014-09-08  Eli Zaretskii  <eliz@gnu.org>
  
  	* unidata/unidata-gen.el (unidata-check): Bring this function up
  	to date with the currently supported methods of generating Unicode
diff --cc lisp/org/ChangeLog
index 38e2eb7a96,439bed3706..3910a71db3
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@@ -1,6 -1,22 +1,21 @@@
+ 2014-10-12  Marco Wahl  <marcowahlsoft@gmail.com>
+ 
+         * org-agenda.el (org-get-entries-from-diary): Use
+ 	`diary-fancy-display' instead of the obsolete
+ 	`diary-display-hook'.
+ 
+ 2014-10-12  Nicolas Goaziou  <mail@nicolasgoaziou.fr>
+ 
+         * ox.el (org-export-async-start): Limit first argument to lambda
+ 	expressions.
+ 
+         * ox-publish.el (org-publish, org-publish-all)
+ 	(org-publish-current-file): Replace `ignore', per limit stated
+ 	above.
+ 
  2014-10-12  Christopher Schmidt  <ch@ristopher.com>
  
 -	* org.el (orgstruct-make-binding): Do not use loop in interpreted
 -	code.
 +	* org.el (orgstruct-make-binding): Do not use loop in interpreted code.
  
  2014-10-12  Mike McLean  <mike.mclean@pobox.com>  (tiny change)