master 90948eb 1/2: checkdoc: Library footer must match package.el requirement

[Stefan Kangas]

branch: master
commit 90948eb9d7e2f0770533f71931f4427757c2ad82
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    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.
---
 lisp/emacs-lisp/checkdoc.el | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index 74c2734..24e1ae3 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