* admin/admin.el (set-version): Check for increase in version length,

rather than a .50 version.
This commit is contained in:
Glenn Morris 2019-04-22 21:24:22 -04:00
parent 93912baefd
commit 9ec18fbd56

View file

@ -138,10 +138,10 @@ Root must be the root of an Emacs source tree."
(if (eq 2 (length newversion)) 0 1)))) (if (eq 2 (length newversion)) 0 1))))
(majorbump (and oldversion (not (equal oldmajor newmajor)))) (majorbump (and oldversion (not (equal oldmajor newmajor))))
(minorbump (and oldversion (not majorbump) (minorbump (and oldversion (not majorbump)
(or (not (equal (cadr oldversion) (or (not (equal (cadr oldversion) (cadr newversion)))
(cadr newversion))) ;; Eg 26.2 -> 26.2.50.
(and (equal (cadr oldversion) (cadr newversion)) (and (> (length newversion)
(equal (nth 2 newversion) 50))))) (length oldversion))))))
(newsfile (expand-file-name "etc/NEWS" root)) (newsfile (expand-file-name "etc/NEWS" root))
(oldnewsfile (expand-file-name (format "etc/NEWS.%s" oldmajor) root))) (oldnewsfile (expand-file-name (format "etc/NEWS.%s" oldmajor) root)))
(unless (> (length newversion) 2) ; pretest or release candidate? (unless (> (length newversion) 2) ; pretest or release candidate?