From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 9 Apr 2015 17:16:08 +0000 (-0700)
Subject: Adapt 'make change-history' to coding cookie
X-Git-Tag: emacs-25.0.90~2516
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7bb614e399300a80a68cd5196c1fd1f96d44e0af;p=emacs.git

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.
---

diff --git a/Makefile.in b/Makefile.in
index 55fb54a156c..a61cbc627b7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1110,7 +1110,7 @@ unchanged-history-files:
 # Copy newer commit messages to the start of the ChangeLog history file,
 # and consider them to be older.
 change-history: ChangeLog unchanged-history-files
-	(sed '/^Copyright/,$$d' <ChangeLog && cat $(CHANGELOG_N)) \
+	(sed '/^;; Local Variables:/,$$d' <ChangeLog && cat $(CHANGELOG_N)) \
 	  >$(CHANGELOG_N).tmp
 	new_origin=$$(git log --pretty=format:%H HEAD^!) && \
 	sed 's/^\(gen_origin *= *\).*/\1'"$$new_origin/" \