Tweak format of list of old files in NEWS header

* etc/NEWS: Stop list of old NEWS files growing without limit.
* admin/admin.el (set-version): Handle either NEWS header format.

diff --git a/admin/admin.el b/admin/admin.el
index b2adfbf9f761d08cda4bd8fc2bc08b1617256b19..bedb6b2c03240005ac680fde66bfe3c0e085be95 100644 (file)
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -158,11 +158,17 @@ Documentation changes might not have been completed!"))))
         (re-search-forward "is about changes in Emacs version \\([0-9]+\\)")
         (replace-match (number-to-string newmajor) nil nil nil 1)
         (re-search-forward "^See files \\(NEWS\\)")
-        (replace-match (format "NEWS.%s, NEWS" oldmajor) nil nil nil 1)
-        (let ((start (line-beginning-position)))
-          (search-forward "in older Emacs versions")
-          (or (equal start (line-beginning-position))
-              (fill-region start (line-beginning-position 2))))
+        (unless (save-match-data
+                  (when (looking-at "\\(\\..*\\), \\(\\.\\.\\.\\|…\\)")
+                    (replace-match
+                     (format ".%s, NEWS.%s" oldmajor (1- oldmajor))
+                     nil nil nil 1)
+                    t))
+          (replace-match (format "NEWS.%s, NEWS" oldmajor) nil nil nil 1)
+          (let ((start (line-beginning-position)))
+            (search-forward "in older Emacs versions")
+            (or (equal start (line-beginning-position))
+                (fill-region start (line-beginning-position 2)))))
         (re-search-forward "^\f$")
         (forward-line -1)
         (let ((start (point)))
@@ -893,3 +899,7 @@ changes (in a non-trivial way).  This function does not check for that."
 (provide 'admin)
 
 ;;; admin.el ends here
+
+;; Local Variables:
+;; coding: utf-8
+;; End:

diff --git a/etc/NEWS b/etc/NEWS
index b40d578e5fac894c6067ce89043dab8489044106..97b21f7dd86bb2405ebe7933230311789287cbbd 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -9,8 +9,8 @@ If possible, use M-x report-emacs-bug.
 This file is about changes in Emacs version 26.
 
 See file HISTORY for a list of GNU Emacs versions and release dates.
-See files NEWS.25, NEWS.24, NEWS.23, NEWS.22, NEWS.21, NEWS.20,
-NEWS.19, NEWS.18, and NEWS.1-17 for changes in older Emacs versions.
+See files NEWS.25, NEWS.24, ..., NEWS.18, and NEWS.1-17 for changes
+in older Emacs versions.
 
 You can narrow news to a specific version by calling 'view-emacs-news'
 with a prefix argument or by typing C-u C-h C-n.