diff options
| author | Glenn Morris | 2019-04-21 07:51:37 -0700 |
|---|---|---|
| committer | Glenn Morris | 2019-04-21 07:51:37 -0700 |
| commit | e8d483971fe6e67f72349a084dcacb365f42d7a8 (patch) | |
| tree | 6d09893bb37b70df3c817c07eff4a8348aeb2db7 /admin | |
| parent | 5185b391064ef54c6f3aae10371f682e7001f4d2 (diff) | |
| parent | aae8cc3304f1d769f06794fa10d9b66f74a6198c (diff) | |
| download | emacs-e8d483971fe6e67f72349a084dcacb365f42d7a8.tar.gz emacs-e8d483971fe6e67f72349a084dcacb365f42d7a8.zip | |
Merge from origin/emacs-26
aae8cc3 * admin/admin.el (set-version): Add NEWS headers for a .50 ve...
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/admin.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/admin/admin.el b/admin/admin.el index d411b97ebbc..030bd54b521 100644 --- a/admin/admin.el +++ b/admin/admin.el | |||
| @@ -138,7 +138,10 @@ Root must be the root of an Emacs source tree." | |||
| 138 | (if (eq 2 (length newversion)) 0 1)))) | 138 | (if (eq 2 (length newversion)) 0 1)))) |
| 139 | (majorbump (and oldversion (not (equal oldmajor newmajor)))) | 139 | (majorbump (and oldversion (not (equal oldmajor newmajor)))) |
| 140 | (minorbump (and oldversion (not majorbump) | 140 | (minorbump (and oldversion (not majorbump) |
| 141 | (not (equal (cadr oldversion) (cadr newversion))))) | 141 | (or (not (equal (cadr oldversion) |
| 142 | (cadr newversion))) | ||
| 143 | (and (equal (cadr oldversion) (cadr newversion)) | ||
| 144 | (equal (nth 2 newversion) 50))))) | ||
| 142 | (newsfile (expand-file-name "etc/NEWS" root)) | 145 | (newsfile (expand-file-name "etc/NEWS" root)) |
| 143 | (oldnewsfile (expand-file-name (format "etc/NEWS.%s" oldmajor) root))) | 146 | (oldnewsfile (expand-file-name (format "etc/NEWS.%s" oldmajor) root))) |
| 144 | (unless (> (length newversion) 2) ; pretest or release candidate? | 147 | (unless (> (length newversion) 2) ; pretest or release candidate? |