Re: master cbef1e9 2/3: ; make change-history-commit

[Paul Eggert <eggert@cs.ucla.edu>]

[-- Attachment #1: Type: text/plain, Size: 1931 bytes --]

Glenn Morris wrote:

> The file ChangeLog.1 in the repo contains a mixture of new, generated
> entries applying to the entire Emacs tree, and (before a certain magic
> date) older, hand-written entries that only apply to the top-level
> (essentially) directory. I think it's pretty confusing to have both
> things in the same file.

If you prefer a sharper division between pre-April-7 and post-April-7 entries, 
we can move the latter entries into a new file ChangeLog.2.  That is, 
ChangeLog.1 and ChangeLog.2 would both be hand-maintained, ChangeLog.1 would 
contain top-level entries predating April 7, and ChangeLog.2 would contain all 
entries between April 7 and the most recent 'make change-history'.  Please see 
the first attached patch.  (I haven't tested it.)

> Suppose we improve/change the ChangeLog generation script, and want to
> regenerate the generated ChangeLog. It will be difficult to extract the
> various corrections that have been applied by hand to the generated
> entries.

That shouldn't be a problem, as the newly-generated ChangeLog shouldn't include 
any hand-corrected entries.  All hand-corrected entries should be in ChangeLog.1 
(or ChangeLog.2, etc.).

> I had assumed that "ChangeLog" would be a top-level generated file that
> would grow and grow with time, and would always be generated from
> scratch whenever needed

That's basically right, except that the generated "ChangeLog" file also shrinks 
after 'make change-history' is run.

> with entries always starting from Apr 7 2015.

No, the automatically-generated 'ChangeLog' entries start from the last time 
'make change-history' was run.

> erc uses a non-standard scheme where .YY contains the entries for 20YY.

Ah, sorry, I didn't know that.  We could proceed as you suggest, though we'd 
need to add a line to Makefile.in.  Please see the second attached patch (it's 
so large that I gzipped it).  (I haven't tested this either.)

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Split-top-level-entries-into-pre-and-post-April-7.patch --]
[-- Type: text/x-patch; name="0001-Split-top-level-entries-into-pre-and-post-April-7.patch", Size: 22415 bytes --]

From 7e70e8f97740fc0f144ddecb999cb17a7dd714a4 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 12 Apr 2015 23:31:49 -0700
Subject: [PATCH 1/2] Split top-level entries into pre- and post-April 7

This more clearly distingiushes pre-April-7 ChangeLog entries (which
are for top-level files only) from post-April-7 entries (which are
about files at all levels.  Problem reported by Glenn Morris in:
http://lists.gnu.org/archive/html/emacs-devel/2015-04/msg00678.html
* ChangeLog.1: Move post-April-7 entries from here ...
* ChangeLog.2: ... to this new file.
* Makefile.in (CHANGELOG_HISTORY_INDEX_MAX): Bump to 2.
---
 ChangeLog.1 | 241 -------------------------------------------------------
 ChangeLog.2 | 261 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Makefile.in |   2 +-
 3 files changed, 262 insertions(+), 242 deletions(-)
 create mode 100644 ChangeLog.2

diff --git a/ChangeLog.1 b/ChangeLog.1
index 6160f4b..6e2b4fc 100644
--- a/ChangeLog.1
+++ b/ChangeLog.1
@@ -1,244 +1,3 @@
-2015-04-09  Paul Eggert  <eggert@cs.ucla.edu>
-
-	Adapt 'make change-history' to coding cookie
-	* Makefile.in (change-history): Adjust to change of format of
-	ChangeLog file, which now has a coding cookie before an indented
-	copyright notice.
-
-	gitlog-to-changelog coding cookie and mv -i
-	* build-aux/gitlog-to-emacslog: Use ChangeLog.1, not Makefile.in,
-	for copyright notice prototype, so that we get a proper "coding:"
-	cookie.  Use 'mv -i' to avoid unconditionally overwriting an
-	existing ChangeLog.  Problems reported by Eli Zaretskii in:
-	http://lists.gnu.org/archive/html/emacs-devel/2015-04/msg00504.html
-
-	Merge from gnulib
-	* build-aux/gitlog-to-changelog: Update from gnulib, incorporating:
-	2015-04-09 gitlog-to-changelog: port to MS-Windows
-
-2015-04-09  Boruch Baum  <boruch_baum@gmx.com>
-
-	* lisp/bookmark.el (bookmark-bmenu-goto-bookmark): Don't inf-loop.
-	Fixes: debbugs:20212
-
-2015-04-09  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-	Stop messing with the EMACS env var
-	Fixes: debbugs:20202
-	* lisp/net/tramp-sh.el (tramp-remote-process-environment):
-	* lisp/comint.el (comint-exec-1):
-	* lisp/term.el (term-exec-1): Don't set EMACS envvar.
-	* lisp/progmodes/compile.el (compilation-start): Same and bring
-	INSIDE_EMACS's format in line with other users.
-
-	css-mode.el (css-smie-rules): Fix indentation after complex selectors
-	Fixes: debbugs:20282
-	* lisp/textmodes/css-mode.el (css-smie-rules): Don't get confused by
-	inner structure of selectors.
-
-2015-04-08  Fabián Ezequiel Gallina  <fgallina@gnu.org>
-
-	python.el: Indent docstring lines to base-indent
-	Fixes: debbugs:19595
-	Thanks to immerrr <immerrr@gmail.com> for reporting and providing
-	an initial patch.
-	* lisp/progmodes/python.el
-	(python-indent-context): Add :inside-docstring context.
-	(python-indent--calculate-indentation): Handle :inside-docstring.
-	(python-indent-region): Re-indent docstrings.
-	* test/automated/python-tests.el (python-indent-region-5)
-	(python-indent-inside-string-2): Fix tests.
-
-	python.el: Increase native completion robustness
-	Fixes: debbugs:19755
-	Thanks to Carlos Pita <carlosjosepita@gmail.com> for reporting
-	this and providing useful ideas.
-	* lisp/progmodes/python.el
-	(python-shell-completion-native-output-timeout): Increase value.
-	(python-shell-completion-native-try-output-timeout): New var.
-	(python-shell-completion-native-try): Use it.
-	(python-shell-completion-native-setup): New readline setup avoids
-	polluting current context, ensures output when no-completions are
-	available and includes output end marker.
-	(python-shell-completion-native-get-completions): Trigger with one
-	tab only.  Call accept-process-output until output end is found or
-	python-shell-completion-native-output-timeout is exceeded.
-
-2015-04-08  Samer Masterson  <samer@samertm.com>
-
-	* lisp/eshell: Make backslash a no-op in front of normal chars
-	Fixes: debbugs:8531
-	* lisp/eshell/esh-arg.el (eshell-parse-argument-hook): Update comment.
-	(eshell-parse-backslash): Return escaped character after backslash
-	if it is special.  Otherwise, if the backslash is not in a quoted
-	string, ignore the backslash and return the character after; if
-	the backslash is in a quoted string, return the backslash and the
-	character after.
-	* test/automated/eshell.el (eshell-test/escape-nonspecial)
-	(eshell-test/escape-nonspecial-unicode)
-	(eshell-test/escape-nonspecial-quoted)
-	(eshell-test/escape-special-quoted): Add tests for new
-	`eshell-parse-backslash' behavior.
-
-2015-04-08  Gustav Hållberg  <gustav@gmail.com>  (tiny change)
-
-	* lisp/vc/diff-mode.el (diff-hunk-file-names): Don't require a TAB
-	after the file name.
-	Fixes: debbugs:20276
-
-2015-04-08  Paul Eggert  <eggert@cs.ucla.edu>
-
-	Minor quoting etc. fixes to Emacs manual
-	* doc/emacs/Makefile.in, doc/emacs/ack.texi, doc/emacs/building.texi:
-	* doc/emacs/calendar.texi, doc/emacs/cmdargs.texi:
-	* doc/emacs/custom.texi, doc/emacs/dired.texi, doc/emacs/emacs.texi:
-	* doc/emacs/files.texi, doc/emacs/glossary.texi, doc/emacs/gnu.texi:
-	* doc/emacs/indent.texi, doc/emacs/macos.texi:
-	* doc/emacs/maintaining.texi, doc/emacs/makefile.w32-in:
-	* doc/emacs/programs.texi, doc/emacs/rmail.texi:
-	* doc/emacs/search.texi, doc/emacs/trouble.texi:
-	* doc/emacs/vc1-xtra.texi:
-	Use American-style double quoting in ordinary text,
-	and quote 'like this' when single-quoting in ASCII text.
-	Also, fix some minor spacing issues.
-
-	Minor quoting etc. fixes to elisp intro
-	* doc/lispintro/emacs-lisp-intro.texi: Consistently use
-	American-style double quoting in ordinary text.  In ASCII text,
-	consistently quote 'like this' instead of `like this', unless
-	Emacs requires the latter.
-
-2015-04-08  Dmitry Gutov  <dgutov@yandex.ru>
-
-	* CONTRIBUTE: Mention log-edit-insert-changelog.
-
-	* CONTRIBUTE: Emphasize creating the top-level ChangeLog file manually.
-
-2015-04-08  Paul Eggert  <eggert@cs.ucla.edu>
-
-	* doc/misc/calc.texi (Summary): Avoid '@:' when usurped.
-
-2015-04-08  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-	(eieio-copy-parents-into-subclass): Fix inheritance of initargs
-	Fixes: debbugs:20270
-	* lisp/emacs-lisp/eieio-core.el (eieio-copy-parents-into-subclass):
-	Fix inheritance of initargs.
-
-2015-04-08  Artur Malabarba  <bruce.connor.am@gmail.com>
-
-	* lisp/emacs-lisp/package.el (package-menu-mode): Mode-line notification
-	while dowloading information.
-
-	* lisp/emacs-lisp/package.el: More conservative `ensure-init-file'
-	(package--ensure-init-file): Check file contents before visiting.
-	(package-initialize): Call it.
-	(package-install-from-buffer, package-install): Don't call it.
-
-2015-04-08  Eli Zaretskii  <eliz@gnu.org>
-
-	* src/eval.c (init_eval_once): Bump max_lisp_eval_depth to 800
-	Fixes: bug#17517
-
-2015-04-08  Michael Albinus  <michael.albinus@gmx.de>
-
-	Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
-
-	Fix nasty scoping bug in tramp-cache.el
-	* lisp/net/tramp-cache.el (tramp-flush-file-property): Fix nasty scoping bug.
-
-2015-04-08  Tassilo Horn  <tsdh@gnu.org>
-
-	Add notice to visual commands section
-	* doc/misc/eshell.texi (Input/Output): Add notice that some tools
-	such as git call less with its -F option which omits pagination if
-	the contents is less than one page long.  This interferes with
-	eshell's visual (sub-)commands.
-
-2015-04-07  Dmitry Gutov  <dgutov@yandex.ru>
-
-	ffap: Support environment variable expansion in file names
-	Fixes: debbugs:19839
-	* lisp/ffap.el (ffap-string-at-point-mode-alist): Support
-	environment variable expansion in file names.
-
-2015-04-07  Paul Eggert  <eggert@cs.ucla.edu>
-
-	Prefer double-quote to accent-grave in man pages
-
-2015-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-	Fixes: debbugs:20257
-	* lisp/files.el (set-visited-file-name): Clear auto-save if nil.
-
-2015-04-07  Ivan Shmakov  <ivan@siamics.net>
-
-	Update etc/PROBLEMS.
-	* etc/PROBLEMS: Mention visible-cursor; a few more mentions of
-	~/.Xresources and xrdb(1); refer to 'GNU Coreutils' and
-	'X Window System' or 'X' (were: 'GNU Fileutils' and 'X Windows',
-	respectively); other minor updates and tweaks.  (Bug#20011)
-
-2015-04-07  Paul Eggert  <eggert@cs.ucla.edu>
-
-	Add doc strings for some Isearch state vars
-	* lisp/misearch.el (multi-isearch-buffer-list)
-	(multi-isearch-file-list): Add doc strings.
-	Fixes: bug#20232
-
-2015-04-07  Alan Mackenzie  <acm@muc.de>
-
-	Always mark "<" and ">" in #include directives with text properties.
-	* lisp/progmodes/c-fonts.el (c-cpp-matchers): Replace a font-lock "anchored
-	matcher" with an invocation of c-make-font-lock-search-function to allow
-	fontification when there's no trailing space on an "#include <..>" line.
-
-2015-04-07  Paul Eggert  <eggert@cs.ucla.edu>
-
-	Generate a ChangeLog file from commit logs
-	* .gitignore: Add 'ChangeLog'.
-	* build-aux/gitlog-to-changelog: New file, from Gnulib.
-	* build-aux/gitlog-to-emacslog: New file.
-	* CONTRIBUTE: Document the revised workflow.
-	* Makefile.in (clean): Remove *.tmp and etc/*.tmp*
-	instead of just special cases.
-	(CHANGELOG_HISTORY_INDEX_MAX, CHANGELOG_N, gen_origin): New vars.
-	(ChangeLog, unchanged-history-files, change-history)
-	(change-history-commit): New rules.
-	* admin/admin.el (make-manuals-dist--1):
-	Don't worry about doc/ChangeLog.
-	* admin/authors.el: Add a FIXME.
-	* admin/make-tarball.txt:
-	* lisp/calendar/icalendar.el:
-	* lisp/gnus/deuglify.el:
-	* lisp/obsolete/gulp.el:
-	* lwlib/README:
-	Adjust to renamed ChangeLog history files.
-	* admin/merge-gnulib (GNULIB_MODULES): Add gitlog-to-changelog.
-	* admin/notes/repo: Call it 'master' a la Git, not 'trunk' a la Bzr.
-	Remove obsolete discussion of merging ChangeLog files.
-	New section "Maintaining ChangeLog history".
-	* build-aux/git-hooks/pre-commit:
-	Reject attempts to commit files named 'ChangeLog'.
-	* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
-	* make-dist: Make and distribute top-level ChangeLog if there's a
-	.git directory.  Distribute the new ChangeLog history files
-	instead of scattered ChangeLog files.  Distribute the new files
-	gitlog-to-changelog and gitlog-to-emacslog.
-	Fixes: bug#19113
-
-	Rename ChangeLogs for gitlog-to-changelog
-	This patch was implemented via the following shell commands:
-	find * -name ChangeLog |
-	sed 's,.*,git mv & &.1,
-	s, lisp/ChangeLog\.1$, lisp/ChangeLog.17,
-	s, lisp/erc/ChangeLog\.1$, lisp/erc/ChangeLog.09,
-	s, lisp/gnus/ChangeLog\.1$, lisp/gnus/ChangeLog.3,
-	s, lisp/mh-e/ChangeLog\.1$, lisp/mh-e/ChangeLog.2,
-	s, src/ChangeLog\.1$, src/ChangeLog.13,' |
-	sh
-	git commit -am"[this commit message]"
-
 2015-04-07  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Merge from gnulib
diff --git a/ChangeLog.2 b/ChangeLog.2
new file mode 100644
index 0000000..b4ee75a
--- /dev/null
+++ b/ChangeLog.2
@@ -0,0 +1,261 @@
+2015-04-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Adapt 'make change-history' to coding cookie
+	* Makefile.in (change-history): Adjust to change of format of
+	ChangeLog file, which now has a coding cookie before an indented
+	copyright notice.
+
+	gitlog-to-changelog coding cookie and mv -i
+	* build-aux/gitlog-to-emacslog: Use ChangeLog.1, not Makefile.in,
+	for copyright notice prototype, so that we get a proper "coding:"
+	cookie.  Use 'mv -i' to avoid unconditionally overwriting an
+	existing ChangeLog.  Problems reported by Eli Zaretskii in:
+	http://lists.gnu.org/archive/html/emacs-devel/2015-04/msg00504.html
+
+	Merge from gnulib
+	* build-aux/gitlog-to-changelog: Update from gnulib, incorporating:
+	2015-04-09 gitlog-to-changelog: port to MS-Windows
+
+2015-04-09  Boruch Baum  <boruch_baum@gmx.com>
+
+	* lisp/bookmark.el (bookmark-bmenu-goto-bookmark): Don't inf-loop.
+	Fixes: debbugs:20212
+
+2015-04-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Stop messing with the EMACS env var
+	Fixes: debbugs:20202
+	* lisp/net/tramp-sh.el (tramp-remote-process-environment):
+	* lisp/comint.el (comint-exec-1):
+	* lisp/term.el (term-exec-1): Don't set EMACS envvar.
+	* lisp/progmodes/compile.el (compilation-start): Same and bring
+	INSIDE_EMACS's format in line with other users.
+
+	css-mode.el (css-smie-rules): Fix indentation after complex selectors
+	Fixes: debbugs:20282
+	* lisp/textmodes/css-mode.el (css-smie-rules): Don't get confused by
+	inner structure of selectors.
+
+2015-04-08  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+	python.el: Indent docstring lines to base-indent
+	Fixes: debbugs:19595
+	Thanks to immerrr <immerrr@gmail.com> for reporting and providing
+	an initial patch.
+	* lisp/progmodes/python.el
+	(python-indent-context): Add :inside-docstring context.
+	(python-indent--calculate-indentation): Handle :inside-docstring.
+	(python-indent-region): Re-indent docstrings.
+	* test/automated/python-tests.el (python-indent-region-5)
+	(python-indent-inside-string-2): Fix tests.
+
+	python.el: Increase native completion robustness
+	Fixes: debbugs:19755
+	Thanks to Carlos Pita <carlosjosepita@gmail.com> for reporting
+	this and providing useful ideas.
+	* lisp/progmodes/python.el
+	(python-shell-completion-native-output-timeout): Increase value.
+	(python-shell-completion-native-try-output-timeout): New var.
+	(python-shell-completion-native-try): Use it.
+	(python-shell-completion-native-setup): New readline setup avoids
+	polluting current context, ensures output when no-completions are
+	available and includes output end marker.
+	(python-shell-completion-native-get-completions): Trigger with one
+	tab only.  Call accept-process-output until output end is found or
+	python-shell-completion-native-output-timeout is exceeded.
+
+2015-04-08  Samer Masterson  <samer@samertm.com>
+
+	* lisp/eshell: Make backslash a no-op in front of normal chars
+	Fixes: debbugs:8531
+	* lisp/eshell/esh-arg.el (eshell-parse-argument-hook): Update comment.
+	(eshell-parse-backslash): Return escaped character after backslash
+	if it is special.  Otherwise, if the backslash is not in a quoted
+	string, ignore the backslash and return the character after; if
+	the backslash is in a quoted string, return the backslash and the
+	character after.
+	* test/automated/eshell.el (eshell-test/escape-nonspecial)
+	(eshell-test/escape-nonspecial-unicode)
+	(eshell-test/escape-nonspecial-quoted)
+	(eshell-test/escape-special-quoted): Add tests for new
+	`eshell-parse-backslash' behavior.
+
+2015-04-08  Gustav Hållberg  <gustav@gmail.com>  (tiny change)
+
+	* lisp/vc/diff-mode.el (diff-hunk-file-names): Don't require a TAB
+	after the file name.
+	Fixes: debbugs:20276
+
+2015-04-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Minor quoting etc. fixes to Emacs manual
+	* doc/emacs/Makefile.in, doc/emacs/ack.texi, doc/emacs/building.texi:
+	* doc/emacs/calendar.texi, doc/emacs/cmdargs.texi:
+	* doc/emacs/custom.texi, doc/emacs/dired.texi, doc/emacs/emacs.texi:
+	* doc/emacs/files.texi, doc/emacs/glossary.texi, doc/emacs/gnu.texi:
+	* doc/emacs/indent.texi, doc/emacs/macos.texi:
+	* doc/emacs/maintaining.texi, doc/emacs/makefile.w32-in:
+	* doc/emacs/programs.texi, doc/emacs/rmail.texi:
+	* doc/emacs/search.texi, doc/emacs/trouble.texi:
+	* doc/emacs/vc1-xtra.texi:
+	Use American-style double quoting in ordinary text,
+	and quote 'like this' when single-quoting in ASCII text.
+	Also, fix some minor spacing issues.
+
+	Minor quoting etc. fixes to elisp intro
+	* doc/lispintro/emacs-lisp-intro.texi: Consistently use
+	American-style double quoting in ordinary text.  In ASCII text,
+	consistently quote 'like this' instead of `like this', unless
+	Emacs requires the latter.
+
+2015-04-08  Dmitry Gutov  <dgutov@yandex.ru>
+
+	* CONTRIBUTE: Mention log-edit-insert-changelog.
+
+	* CONTRIBUTE: Emphasize creating the top-level ChangeLog file manually.
+
+2015-04-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* doc/misc/calc.texi (Summary): Avoid '@:' when usurped.
+
+2015-04-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	(eieio-copy-parents-into-subclass): Fix inheritance of initargs
+	Fixes: debbugs:20270
+	* lisp/emacs-lisp/eieio-core.el (eieio-copy-parents-into-subclass):
+	Fix inheritance of initargs.
+
+2015-04-08  Artur Malabarba  <bruce.connor.am@gmail.com>
+
+	* lisp/emacs-lisp/package.el (package-menu-mode): Mode-line notification
+	while dowloading information.
+
+	* lisp/emacs-lisp/package.el: More conservative `ensure-init-file'
+	(package--ensure-init-file): Check file contents before visiting.
+	(package-initialize): Call it.
+	(package-install-from-buffer, package-install): Don't call it.
+
+2015-04-08  Eli Zaretskii  <eliz@gnu.org>
+
+	* src/eval.c (init_eval_once): Bump max_lisp_eval_depth to 800
+	Fixes: bug#17517
+
+2015-04-08  Michael Albinus  <michael.albinus@gmx.de>
+
+	Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
+
+	Fix nasty scoping bug in tramp-cache.el
+	* lisp/net/tramp-cache.el (tramp-flush-file-property): Fix nasty scoping bug.
+
+2015-04-08  Tassilo Horn  <tsdh@gnu.org>
+
+	Add notice to visual commands section
+	* doc/misc/eshell.texi (Input/Output): Add notice that some tools
+	such as git call less with its -F option which omits pagination if
+	the contents is less than one page long.  This interferes with
+	eshell's visual (sub-)commands.
+
+2015-04-07  Dmitry Gutov  <dgutov@yandex.ru>
+
+	ffap: Support environment variable expansion in file names
+	Fixes: debbugs:19839
+	* lisp/ffap.el (ffap-string-at-point-mode-alist): Support
+	environment variable expansion in file names.
+
+2015-04-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Prefer double-quote to accent-grave in man pages
+
+2015-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	Fixes: debbugs:20257
+	* lisp/files.el (set-visited-file-name): Clear auto-save if nil.
+
+2015-04-07  Ivan Shmakov  <ivan@siamics.net>
+
+	Update etc/PROBLEMS.
+	* etc/PROBLEMS: Mention visible-cursor; a few more mentions of
+	~/.Xresources and xrdb(1); refer to 'GNU Coreutils' and
+	'X Window System' or 'X' (were: 'GNU Fileutils' and 'X Windows',
+	respectively); other minor updates and tweaks.  (Bug#20011)
+
+2015-04-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Add doc strings for some Isearch state vars
+	* lisp/misearch.el (multi-isearch-buffer-list)
+	(multi-isearch-file-list): Add doc strings.
+	Fixes: bug#20232
+
+2015-04-07  Alan Mackenzie  <acm@muc.de>
+
+	Always mark "<" and ">" in #include directives with text properties.
+	* lisp/progmodes/c-fonts.el (c-cpp-matchers): Replace a font-lock "anchored
+	matcher" with an invocation of c-make-font-lock-search-function to allow
+	fontification when there's no trailing space on an "#include <..>" line.
+
+2015-04-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Generate a ChangeLog file from commit logs
+	* .gitignore: Add 'ChangeLog'.
+	* build-aux/gitlog-to-changelog: New file, from Gnulib.
+	* build-aux/gitlog-to-emacslog: New file.
+	* CONTRIBUTE: Document the revised workflow.
+	* Makefile.in (clean): Remove *.tmp and etc/*.tmp*
+	instead of just special cases.
+	(CHANGELOG_HISTORY_INDEX_MAX, CHANGELOG_N, gen_origin): New vars.
+	(ChangeLog, unchanged-history-files, change-history)
+	(change-history-commit): New rules.
+	* admin/admin.el (make-manuals-dist--1):
+	Don't worry about doc/ChangeLog.
+	* admin/authors.el: Add a FIXME.
+	* admin/make-tarball.txt:
+	* lisp/calendar/icalendar.el:
+	* lisp/gnus/deuglify.el:
+	* lisp/obsolete/gulp.el:
+	* lwlib/README:
+	Adjust to renamed ChangeLog history files.
+	* admin/merge-gnulib (GNULIB_MODULES): Add gitlog-to-changelog.
+	* admin/notes/repo: Call it 'master' a la Git, not 'trunk' a la Bzr.
+	Remove obsolete discussion of merging ChangeLog files.
+	New section "Maintaining ChangeLog history".
+	* build-aux/git-hooks/pre-commit:
+	Reject attempts to commit files named 'ChangeLog'.
+	* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
+	* make-dist: Make and distribute top-level ChangeLog if there's a
+	.git directory.  Distribute the new ChangeLog history files
+	instead of scattered ChangeLog files.  Distribute the new files
+	gitlog-to-changelog and gitlog-to-emacslog.
+	Fixes: bug#19113
+
+	Rename ChangeLogs for gitlog-to-changelog
+	This patch was implemented via the following shell commands:
+	find * -name ChangeLog |
+	sed 's,.*,git mv & &.1,
+	s, lisp/ChangeLog\.1$, lisp/ChangeLog.17,
+	s, lisp/erc/ChangeLog\.1$, lisp/erc/ChangeLog.09,
+	s, lisp/gnus/ChangeLog\.1$, lisp/gnus/ChangeLog.3,
+	s, lisp/mh-e/ChangeLog\.1$, lisp/mh-e/ChangeLog.2,
+	s, src/ChangeLog\.1$, src/ChangeLog.13,' |
+	sh
+	git commit -am"[this commit message]"
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+
+  Copyright 2015 Free Software Foundation, Inc.
+
+  This file is part of GNU Emacs.
+
+  GNU Emacs is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/Makefile.in b/Makefile.in
index 8a45f2c..077cb50 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1101,7 +1101,7 @@ ChangeLog:
 # The ChangeLog history files are called ChangeLog.1, ChangeLog.2, ...,
 # ChangeLog.$(CHANGELOG_HISTORY_INDEX_MAX).  $(CHANGELOG_N) stands for
 # the newest (highest-numbered) ChangeLog history file.
-CHANGELOG_HISTORY_INDEX_MAX = 1
+CHANGELOG_HISTORY_INDEX_MAX = 2
 CHANGELOG_N = ChangeLog.$(CHANGELOG_HISTORY_INDEX_MAX)
 
 # Check that we are in a good state for changing history.
-- 
2.1.0


[-- Attachment #3: 0002-Standardize-names-of-ChangeLog-history-files.patch.gz --]
[-- Type: application/gzip, Size: 258799 bytes --]