diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-19 12:29:06 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-19 12:29:06 -0700 |
| commit | e6fd84d2d5ca256797ff210c915a2fa773d4d742 (patch) | |
| tree | ba2ba64a65705a3259a0ecb66098f834e741fb4b /admin | |
| parent | d86bcedd880b3cb6383641082d406075aa6e70e2 (diff) | |
| parent | ab0a60a1b334fafc7d805eb44e6069ea314ad486 (diff) | |
| download | emacs-e6fd84d2d5ca256797ff210c915a2fa773d4d742.tar.gz | |
Merge from origin/emacs-25
ab0a60a ; * CONTRIBUTE (Generating ChangeLog entries): Drop duplicate...
7e02a47 Index byte-compile-debug
7c1e598 Document `byte-compile-debug' in the ELisp manual
4d81eb4 Document variable `byte-compile-debug'
72ef710 Fix call to debugger on assertion failure
ae8264c Call modification hooks in org-src fontify buffers
b3139da ; Fix last change in doc/lispref/strings.texi
c331f39 Improve documentation of 'format' conversions
9f52f67 Remove stale functions from ert manual
c416b14 Fix a typo in Eshell manual
06695a0 ; Fix a typo in ediff-merg.el
954e9e9 Improve documentation of hooks related to saving buffers
9fcab85 Improve documentation of auto-save-visited-file-name
2236c53 fix typo in mailcap-mime-extensions
85a3e4e Fix typos in flymake.el
a1ef10e More NEWS checking for admin.el's set-version
# Conflicts:
# lisp/emacs-lisp/bytecomp.el
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 a6ef19c9aba..5428e3a10bc 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -141,6 +141,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) |