From: Glenn Morris <rgm@gnu.org>
Date: Tue, 17 Jan 2017 21:10:03 +0000 (-0500)
Subject: More NEWS checking for admin.el's set-version
X-Git-Tag: emacs-25.2-rc1~21
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a1ef10e6a0a216e80551dd179fc511ea8fdc4c88;p=emacs.git

More NEWS checking for admin.el's set-version

* admin/admin.el (set-version): Warn if temporary NEWS markup
still present in release candidates.
---

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."
                          (not (equal (cadr oldversion) (cadr newversion)))))
          (newsfile (expand-file-name "etc/NEWS" root))
          (oldnewsfile (expand-file-name (format "etc/NEWS.%s" oldmajor) root)))
+    (unless (> (length newversion) 2)   ; pretest or release candidate?
+      (with-temp-buffer
+        (insert-file-contents newsfile)
+        (if (re-search-forward "^\\(+++ *\\|--- *\\)$" nil t)
+            (display-warning 'admin
+                             "NEWS file still contains temporary markup.
+Documentation changes might not have been completed!"))))
     (when (and majorbump
                (not (file-exists-p oldnewsfile)))
       (rename-file newsfile oldnewsfile)