[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master e8d4839 3/7: Merge from origin/emacs-26
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master e8d4839 3/7: Merge from origin/emacs-26 |
Date: |
Sun, 21 Apr 2019 10:55:59 -0400 (EDT) |
branch: master
commit e8d483971fe6e67f72349a084dcacb365f42d7a8
Merge: 5185b39 aae8cc3
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Merge from origin/emacs-26
aae8cc3 * admin/admin.el (set-version): Add NEWS headers for a .50 ve...
---
admin/admin.el | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/admin/admin.el b/admin/admin.el
index d411b97..030bd54 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -138,7 +138,10 @@ Root must be the root of an Emacs source tree."
(if (eq 2 (length newversion)) 0 1))))
(majorbump (and oldversion (not (equal oldmajor newmajor))))
(minorbump (and oldversion (not majorbump)
- (not (equal (cadr oldversion) (cadr newversion)))))
+ (or (not (equal (cadr oldversion)
+ (cadr newversion)))
+ (and (equal (cadr oldversion) (cadr newversion))
+ (equal (nth 2 newversion) 50)))))
(newsfile (expand-file-name "etc/NEWS" root))
(oldnewsfile (expand-file-name (format "etc/NEWS.%s" oldmajor) root)))
(unless (> (length newversion) 2) ; pretest or release candidate?
- [Emacs-diffs] master updated (3f90aa7 -> d9664f0), Glenn Morris, 2019/04/21
- [Emacs-diffs] master 828a6eb 5/7: Merge from origin/emacs-26, Glenn Morris, 2019/04/21
- [Emacs-diffs] master d9664f0 7/7: Merge from origin/emacs-26, Glenn Morris, 2019/04/21
- [Emacs-diffs] master 5185b39 2/7: ; Merge from origin/emacs-26, Glenn Morris, 2019/04/21
- [Emacs-diffs] master d2b78ea 6/7: ; Merge from origin/emacs-26, Glenn Morris, 2019/04/21
- [Emacs-diffs] master 86a8b49 4/7: ; Merge from origin/emacs-26, Glenn Morris, 2019/04/21
- [Emacs-diffs] master e8d4839 3/7: Merge from origin/emacs-26,
Glenn Morris <=
- [Emacs-diffs] master 50d00e7 1/7: Merge from origin/emacs-26, Glenn Morris, 2019/04/21