[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 9ec18fb: * admin/admin.el (set-version): Check fo
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs-26 9ec18fb: * admin/admin.el (set-version): Check for increase in version length, |
Date: |
Mon, 22 Apr 2019 21:24:29 -0400 (EDT) |
branch: emacs-26
commit 9ec18fbd560526ab19c6171aff15995d1307233e
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
* admin/admin.el (set-version): Check for increase in version length,
rather than a .50 version.
---
admin/admin.el | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/admin/admin.el b/admin/admin.el
index fda6708..d7de42e 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -138,10 +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)
- (or (not (equal (cadr oldversion)
- (cadr newversion)))
- (and (equal (cadr oldversion) (cadr newversion))
- (equal (nth 2 newversion) 50)))))
+ (or (not (equal (cadr oldversion) (cadr newversion)))
+ ;; Eg 26.2 -> 26.2.50.
+ (and (> (length newversion)
+ (length oldversion))))))
(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?
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 9ec18fb: * admin/admin.el (set-version): Check for increase in version length,,
Glenn Morris <=