From: Stefan Kangas <stefan@marxist.se>
Date: Sun, 26 Sep 2021 00:02:52 +0000 (+0200)
Subject: checkdoc: Library footer must match package.el requirement
X-Git-Tag: emacs-28.0.90~614
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=90948eb9d7e2f0770533f71931f4427757c2ad82;p=emacs.git

checkdoc: Library footer must match package.el requirement

* lisp/emacs-lisp/checkdoc.el (checkdoc-file-comments-engine):
Don't accept footer format unless it matches the requirement in
package.el.
---

diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index 74c27343bc4..24e1ae3f097 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -2474,10 +2474,9 @@ Code:, and others referenced in the style guide."
 	(save-excursion
 	  (goto-char (point-max))
 	  (if (not (re-search-backward
-		    (concat "^;;;[ \t]+" (regexp-quote fn) "\\(" (regexp-quote fe)
-			    "\\)?[ \t]+ends here[ \t]*$"
-			    "\\|^;;;[ \t]+ End of file[ \t]+"
-			    (regexp-quote fn) "\\(" (regexp-quote fe) "\\)?")
+                    ;; This should match the requirement in
+                    ;; `package-buffer-info'.
+                    (concat "^;;; " (regexp-quote (concat fn fe)) " ends here")
 		    nil t))
               (if (checkdoc-y-or-n-p "No identifiable footer!  Add one?")
 		  (progn