diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2020-08-25 15:29:38 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2020-08-25 15:29:38 +0200 |
| commit | 36f2f67c96d44c82ce31dafb38cd4e2622a5a372 (patch) | |
| tree | 61f4d8cb918bfc22c7deab7258f00e2ae36d4482 /admin | |
| parent | 478c2e23620eeda65030458762a843231f7e9b35 (diff) | |
| parent | 44104a607aeb7fd73bf7edcbbe6a508eee36dd0f (diff) | |
| download | emacs-36f2f67c96d44c82ce31dafb38cd4e2622a5a372.tar.gz | |
Merge from origin/emacs-27
44104a607a Fix error in GMP test
e26e63444d Add Feature testing for Windows binaries
4e2caef384 ; * src/character.c (str_as_multibyte): Fix the commentary.
d3a4ce8420 Revert "; * etc/NEWS: Remove temporary note on documentati...
16f00e36dc * admin/admin.el (set-version): Trap yet another NEWS error.
121be3e118 ; * etc/NEWS: Remove temporary note on documentation. (Bu...
5fcb97dabd Fix cond jump table compilation (bug#42919)
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/admin.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/admin.el b/admin/admin.el index 923f0100820..310cd54e957 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -151,7 +151,7 @@ Root must be the root of an Emacs source tree." (display-warning 'admin "NEWS file contains empty sections - remove them?")) (goto-char (point-min)) - (if (re-search-forward "^\\(\\+\\+\\+ *\\|--- *\\)$" nil t) + (if (re-search-forward "^\\(\\+\\+\\+ *$\\|--- *$\\|Temporary note:\\)" nil t) (display-warning 'admin "NEWS file still contains temporary markup. Documentation changes might not have been completed!")))) |