diff options
| author | Eli Zaretskii | 2019-04-21 14:21:52 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2019-04-21 14:21:52 +0300 |
| commit | fd6ff29506cd55ace8fdfa1c3f370cbc7e074ec2 (patch) | |
| tree | 794cb9b0a28e6cedeb6ad8bbb322b7ac7c9b89ad /admin | |
| parent | bacdaa5b25f9946290d81325e8f7b94c1705c0a2 (diff) | |
| parent | cd2204f0ee018ef29c2d8536b7e6d41dc9b10052 (diff) | |
| download | emacs-fd6ff29506cd55ace8fdfa1c3f370cbc7e074ec2.tar.gz emacs-fd6ff29506cd55ace8fdfa1c3f370cbc7e074ec2.zip | |
Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26
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 c1f6174874b..fda6708d4cd 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? |