diff options
| author | Eli Zaretskii | 2023-04-09 15:27:52 -0400 |
|---|---|---|
| committer | Eli Zaretskii | 2023-04-09 15:27:52 -0400 |
| commit | 2b91567bf616b8bf074993dc343bca170d57452f (patch) | |
| tree | 6a01c905ffd7b4814cdb4d91180435a25e12e095 /Makefile.in | |
| parent | 5ef7ff05736b9d1b4d806cfe04ec5d99c090e748 (diff) | |
| download | emacs-2b91567bf616b8bf074993dc343bca170d57452f.tar.gz emacs-2b91567bf616b8bf074993dc343bca170d57452f.zip | |
Update ChangeLog and AUTHORS for Emacs 29
* admin/authors.el: Update for Emacs 29.
* etc/AUTHORS: Re-generate for Emacs 29.
* ChangeLog.4: New generated file.
* Makefile.in (PREFERRED_BRANCH): Update to emacs-29.
(CHANGELOG_HISTORY_INDEX_MAX): Bump to 4.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 4f2f2f15c97..8b77aac38cd 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -1270,7 +1270,7 @@ emacslog = build-aux/gitlog-to-emacslog | |||
| 1270 | # The ChangeLog history files are called ChangeLog.1, ChangeLog.2, ..., | 1270 | # The ChangeLog history files are called ChangeLog.1, ChangeLog.2, ..., |
| 1271 | # ChangeLog.$(CHANGELOG_HISTORY_INDEX_MAX). $(CHANGELOG_N) stands for | 1271 | # ChangeLog.$(CHANGELOG_HISTORY_INDEX_MAX). $(CHANGELOG_N) stands for |
| 1272 | # the newest (highest-numbered) ChangeLog history file. | 1272 | # the newest (highest-numbered) ChangeLog history file. |
| 1273 | CHANGELOG_HISTORY_INDEX_MAX = 3 | 1273 | CHANGELOG_HISTORY_INDEX_MAX = 4 |
| 1274 | CHANGELOG_N = ChangeLog.$(CHANGELOG_HISTORY_INDEX_MAX) | 1274 | CHANGELOG_N = ChangeLog.$(CHANGELOG_HISTORY_INDEX_MAX) |
| 1275 | 1275 | ||
| 1276 | # Convert git commit log to ChangeLog file. make-dist uses this. | 1276 | # Convert git commit log to ChangeLog file. make-dist uses this. |
| @@ -1280,7 +1280,7 @@ ChangeLog: | |||
| 1280 | ./$(emacslog) -o $(CHANGELOG) -n $(CHANGELOG_HISTORY_INDEX_MAX) | 1280 | ./$(emacslog) -o $(CHANGELOG) -n $(CHANGELOG_HISTORY_INDEX_MAX) |
| 1281 | 1281 | ||
| 1282 | # Check that we are in a good state for changing history. | 1282 | # Check that we are in a good state for changing history. |
| 1283 | PREFERRED_BRANCH = emacs-28 | 1283 | PREFERRED_BRANCH = emacs-29 |
| 1284 | preferred-branch-is-current: | 1284 | preferred-branch-is-current: |
| 1285 | git branch | grep -q '^\* $(PREFERRED_BRANCH)$$' | 1285 | git branch | grep -q '^\* $(PREFERRED_BRANCH)$$' |
| 1286 | unchanged-history-files: | 1286 | unchanged-history-files: |