]> git.eshelyaron.com Git - emacs.git/commitdiff
Adapt 'make change-history' to coding cookie
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 9 Apr 2015 17:16:08 +0000 (10:16 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 9 Apr 2015 17:22:42 +0000 (10:22 -0700)
* Makefile.in (change-history): Adjust to change of format of
ChangeLog file, which now has a coding cookie before an indented
copyright notice.

Makefile.in

index 55fb54a156ca998d870b1e9bb87fbc8e454370f5..a61cbc627b74cd57e58d4e0925fc81cbc4a86f98 100644 (file)
@@ -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/" \