From: Glenn Morris Date: Tue, 23 Apr 2019 01:24:22 +0000 (-0400) Subject: * admin/admin.el (set-version): Check for increase in version length, X-Git-Tag: emacs-26.2.90~83 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9ec18fbd560526ab19c6171aff15995d1307233e;p=emacs.git * admin/admin.el (set-version): Check for increase in version length, rather than a .50 version. --- diff --git a/admin/admin.el b/admin/admin.el index fda6708d4cd..d7de42e0782 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?