diff options
| author | YAMAMOTO Mitsuharu | 2019-05-23 10:53:23 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2019-05-23 10:53:23 +0900 |
| commit | b40dde705af4d53853de6185a2468153b442dc9a (patch) | |
| tree | e8dabba695163c2d07439fad6accff761f8f714c /admin/admin.el | |
| parent | 5d7dafacf4afc888511649f6fc24c28210cd0dfc (diff) | |
| parent | 03feb9376b54c489e24478954a11061e9b0d6db7 (diff) | |
| download | emacs-b40dde705af4d53853de6185a2468153b442dc9a.tar.gz emacs-b40dde705af4d53853de6185a2468153b442dc9a.zip | |
Merge branch 'master' into harfbuzz
Diffstat (limited to 'admin/admin.el')
| -rw-r--r-- | admin/admin.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/admin/admin.el b/admin/admin.el index 030bd54b521..d3a477fde80 100644 --- a/admin/admin.el +++ b/admin/admin.el | |||
| @@ -138,10 +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 | (or (not (equal (cadr oldversion) | 141 | (or (not (equal (cadr oldversion) (cadr newversion))) |
| 142 | (cadr newversion))) | 142 | ;; Eg 26.2 -> 26.2.50. |
| 143 | (and (equal (cadr oldversion) (cadr newversion)) | 143 | (and (> (length newversion) |
| 144 | (equal (nth 2 newversion) 50))))) | 144 | (length oldversion)))))) |
| 145 | (newsfile (expand-file-name "etc/NEWS" root)) | 145 | (newsfile (expand-file-name "etc/NEWS" root)) |
| 146 | (oldnewsfile (expand-file-name (format "etc/NEWS.%s" oldmajor) root))) | 146 | (oldnewsfile (expand-file-name (format "etc/NEWS.%s" oldmajor) root))) |
| 147 | (unless (> (length newversion) 2) ; pretest or release candidate? | 147 | (unless (> (length newversion) 2) ; pretest or release candidate? |