aboutsummaryrefslogtreecommitdiffstats
path: root/admin/admin.el
diff options
context:
space:
mode:
authorGlenn Morris2017-01-17 16:10:03 -0500
committerGlenn Morris2017-01-17 16:10:03 -0500
commita1ef10e6a0a216e80551dd179fc511ea8fdc4c88 (patch)
tree8feeab9ccbfea38f1079d457e2edfbe1bae9405b /admin/admin.el
parent3993dc500d9b56723ced7530ead8d11c0ae42319 (diff)
downloademacs-a1ef10e6a0a216e80551dd179fc511ea8fdc4c88.tar.gz
emacs-a1ef10e6a0a216e80551dd179fc511ea8fdc4c88.zip
More NEWS checking for admin.el's set-version
* admin/admin.el (set-version): Warn if temporary NEWS markup still present in release candidates.
Diffstat (limited to 'admin/admin.el')
-rw-r--r--admin/admin.el7
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.
152Documentation 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)