Fix copyright.el comment and add a test

* lisp/emacs-lisp/copyright.el (copyright-find-copyright): Fix
comment (bug#7179).

Do not merge to master.

diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el
index 09c6ded295096585c61af70883a7f19200ce09fd..23b90808d9098d05a181f5dfb5d05e2ea9ac72ac 100644 (file)
--- a/lisp/emacs-lisp/copyright.el
+++ b/lisp/emacs-lisp/copyright.el
@@ -150,7 +150,7 @@ This function sets the match data that `copyright-update-year' uses."
       (when (copyright-re-search regexp (copyright-limit) t)
         ;; We may accidentally have landed in the middle of a
         ;; copyright line, so re-perform the search without the
-        ;; search.  (Otherwise we may be inserting the new year in the
+        ;; limit.  (Otherwise we may be inserting the new year in the
         ;; middle of the list of years.)
         (goto-char (match-beginning 0))
         (copyright-re-search regexp nil t)))))

diff --git a/test/lisp/emacs-lisp/copyright-tests.el b/test/lisp/emacs-lisp/copyright-tests.el
index dc82974a99ed950211457abf05cbde519210a946..120cd5a6b5e20005db8d9a876b9f4a014cec9242 100644 (file)
--- a/test/lisp/emacs-lisp/copyright-tests.el
+++ b/test/lisp/emacs-lisp/copyright-tests.el
@@ -50,5 +50,16 @@
   (dolist (test copyright-tests--data)
     (with-copyright-test (car test) (cdr test))))
 
+(ert-deftest test-end-chop ()
+  (should
+   (equal
+    (with-temp-buffer
+      (let ((copyright-query nil))
+        (insert (make-string (- copyright-limit 14) ?x) "\n"
+                "\nCopyright 2006, 2007, 2008 Foo Bar\n\n")
+        (copyright-update)
+        (buffer-substring (- (point-max) 42) (point-max))))
+    "Copyright 2006, 2007, 2008, 2022 Foo Bar\n\n")))
+
 (provide 'copyright-tests)
 ;;; copyright-tests.el ends here