1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-29 07:58:28 +00:00

Merge from origin/emacs-26

aae8cc3 * admin/admin.el (set-version): Add NEWS headers for a .50 ve...
This commit is contained in:
Glenn Morris 2019-04-21 07:51:37 -07:00
commit e8d483971f

View File

@ -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?