From: Fabián Ezequiel Gallina <fgallina@gnu.org>
Date: Wed, 28 Jan 2015 03:59:33 +0000 (-0300)
Subject: Merge from origin/emacs-24
X-Git-Tag: emacs-25.0.90~2572^2~54
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/0b2014f9cb13efdd6ebc30627d88b9a7f3a42149

Merge from origin/emacs-24

e13e3bd * admin/update_autogen (commit): Prepend "# " to commit message.
---

0b2014f9cb13efdd6ebc30627d88b9a7f3a42149
diff --cc admin/ChangeLog
index e692ca0dbf,b1d8ed858d..6cc59c47d0
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@@ -1,95 -1,8 +1,99 @@@
+ 2015-01-03  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* update_autogen (commit): Prepend "# " to commit message.
+ 
 -2014-11-19  Paul Eggert  <eggert@cs.ucla.edu>
 +2015-01-24  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	Fix a couple of AM_V_GEN bugs
 +	* unidata/Makefile.in (unifiles): Use AM_V_at instead of AM_V_GEN,
 +	since this doesn't generate a file.
 +
 +2015-01-15  Eli Zaretskii  <eliz@gnu.org>
 +
 +	* unidata/uvs.el (uvs-print-table-ivd): Call set-binary-mode on
 +	stdout.
 +
 +2015-01-12  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	Say "ELC foo.elc" instead of "GEN foo.elc"
 +	* unidata/Makefile.in (AM_V_ELC, am__v_ELC_, am__v_ELC_0)
 +	(am__v_ELC_1): New macros.
 +	(%.elc): Use them.
 +
 +2015-01-08  Glenn Morris  <rgm@gnu.org>
 +
 +	* authors.el (authors-aliases): Add an entry to ignore.
 +
 +2015-01-04  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	Less 'make' chatter for admin/grammars
 +	* grammars/Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN)
 +	(am__v_GEN_, am__v_GEN_0, am__v_GEN_1, AM_V_at, am__v_at_)
 +	(am__v_at_0, am__v_at_1): New macros, from src/Makefile.in.
 +	(${bovinedir}/%-by.el, ${bovinedir}/scm-by.el)
 +	(${cedetdir}/semantic/%-wy.el, ${wisentdir}/%-wy.el)
 +	(${wisentdir}/javat-wy.el, ${cedetdir}/srecode/srt-wy.el): Use them.
 +
 +	Less chatter in batch mode
 +	* unidata/unidata-gen.el (unidata-gen-files):
 +	Don't output messages like "Generating ..." in batch mode.
 +
 +2015-01-02  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	Less 'make' chatter for unidata
 +	* unidata/Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_)
 +	(am__v_GEN_0, am__v_GEN_1, AM_V_at, am__v_at_, am__v_at_0, am__v_at_1):
 +	New macros, from ../src/Makefile.in.
 +	(${top_srcdir}/src/macuvs.h, %.elc, unidata.txt)
 +	(${unidir}/charprop.el, unifiles): Use them.
 +	(PHONY_EXTRAS): New macro.
 +	(.PHONY, ${unidir}/charprop.el): Use it.
 +	(FORCE): Remove; all uses replaced by PHONY_EXTRAS manipulation.
 +	(${unidir}/charprop.el, extraclean):
 +	Use 'make' conditionals rather than shell.
 +
 +2015-01-01  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	* update-copyright (emacsver): Change to emacsver.tex.in.
 +
 +2014-12-25  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	* merge-gnulib (GNULIB_MODULES): Add stpcpy.
 +
 +2014-12-24  Glenn Morris  <rgm@gnu.org>
 +
 +	* authors.el (authors-obsolete-files-regexps)
 +	(authors-ignored-files, authors-valid-file-names)
 +	(authors-renamed-files-alist, authors-renamed-files-regexps):
 +	Additions.
 +
 +2014-12-14  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	* notes/unicode: Track leim/quail file renames.
 +	Correct coding system of lisp/international/titdic-cnv.el.
 +
 +2014-12-14  Glenn Morris  <rgm@gnu.org>
 +
 +	* quick-install-emacs (PUBLIC_LIBSRC_SCRIPTS): Remove, and all uses.
 +	* authors.el (authors-valid-file-names): Add grep-changelog.
 +
 +2014-12-13  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	* notes/unicode: Don't mention Czech and Slovakian refcards.
 +
 +	* merge-gnulib (GNULIB_MODULES): Add stddef, for max_align_t.
 +
 +2014-12-06  Stephen Leake  <stephen_leake@stephe-leake.org>
 +
 +	* notes/commits: Delete; merge into ./CONTRIBUTE.
 +
 +	* notes/repo: Move commit, branch info into ./CONTRIBUTE.
 +
 +2014-12-01  Glenn Morris  <rgm@gnu.org>
 +
 +	* update_autogen: Fix bogosity introduced in 2014-11-16 merge.
 +
 +2014-11-29  Paul Eggert  <eggert@cs.ucla.edu>
  
  	Lessen focus on ChangeLog files, as opposed to change log entries.
  	This is in preparation for generating the former automatically