diff options
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/admin.el | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/admin/admin.el b/admin/admin.el index 4892045a690..7b9f01f64a1 100644 --- a/admin/admin.el +++ b/admin/admin.el | |||
| @@ -143,6 +143,13 @@ Root must be the root of an Emacs source tree." | |||
| 143 | (not (equal (cadr oldversion) (cadr newversion))))) | 143 | (not (equal (cadr oldversion) (cadr newversion))))) |
| 144 | (newsfile (expand-file-name "etc/NEWS" root)) | 144 | (newsfile (expand-file-name "etc/NEWS" root)) |
| 145 | (oldnewsfile (expand-file-name (format "etc/NEWS.%s" oldmajor) root))) | 145 | (oldnewsfile (expand-file-name (format "etc/NEWS.%s" oldmajor) root))) |
| 146 | (unless (> (length newversion) 2) ; pretest or release candidate? | ||
| 147 | (with-temp-buffer | ||
| 148 | (insert-file-contents newsfile) | ||
| 149 | (if (re-search-forward "^\\(+++ *\\|--- *\\)$" nil t) | ||
| 150 | (display-warning 'admin | ||
| 151 | "NEWS file still contains temporary markup. | ||
| 152 | Documentation changes might not have been completed!")))) | ||
| 146 | (when (and majorbump | 153 | (when (and majorbump |
| 147 | (not (file-exists-p oldnewsfile))) | 154 | (not (file-exists-p oldnewsfile))) |
| 148 | (rename-file newsfile oldnewsfile) | 155 | (rename-file newsfile oldnewsfile) |