]> git.eshelyaron.com Git - emacs.git/commitdiff
* admin/admin.el (set-version): Check for increase in version length,
authorGlenn Morris <rgm@gnu.org>
Tue, 23 Apr 2019 01:24:22 +0000 (21:24 -0400)
committerGlenn Morris <rgm@gnu.org>
Tue, 23 Apr 2019 01:24:22 +0000 (21:24 -0400)
rather than a .50 version.

admin/admin.el

index fda6708d4cd5485a3c2327a3205d0135bf4fd0d5..d7de42e07823306c093c40eeafed5307fc1b0b62 100644 (file)
@@ -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?