From dabb713eb05aff62deb6872a3498327934f18c8d Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Tue, 8 Aug 2023 19:04:48 +0200 Subject: [PATCH] Make lm-verify footer checking more strict * lisp/emacs-lisp/lisp-mnt.el (lm-verify): Make file footer regexp more strict to match requirement in old versions of package.el (now only a warning). --- lisp/emacs-lisp/lisp-mnt.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el index 67c9db29b7f..c21b67ed37e 100644 --- a/lisp/emacs-lisp/lisp-mnt.el +++ b/lisp/emacs-lisp/lisp-mnt.el @@ -519,6 +519,7 @@ says display \"OK\" in temp buffer for files that have no problems. Optional argument VERBOSE specifies verbosity level. Optional argument NON-FSF-OK if non-nil means a non-FSF copyright notice is allowed." + ;; FIXME: Make obsolete in favor of checkdoc? (interactive (list nil nil t)) (let* ((ret (and verbose "Ok")) name) @@ -562,9 +563,8 @@ copyright notice is allowed." (goto-char (point-max)) (not (re-search-backward - (concat "^;;;[ \t]+" name "[ \t]+ends here[ \t]*$" - "\\|^;;;[ \t]+ End of file[ \t]+" name) - nil t))) + (rx bol ";;; " (eval name) " ends here") + nil t))) "Can't find the footer line") ((not (and (lm-copyright-mark) (lm-crack-copyright))) "Can't find a valid copyright notice") -- 2.39.5