[Emacs-diffs] master 4314713: Adjust lm-verify to accept current notices

[Paul Eggert]

branch: master
commit 431471376440a69a2f5ca2a49e3c7e09c834c132
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Adjust lm-verify to accept current notices
    
    Problem reported by Mike Kupfer in:
    http://lists.gnu.org/archive/html/emacs-devel/2017-06/msg00512.html
    * lisp/emacs-lisp/lisp-mnt.el (lm-crack-copyright):
    Do not require later lines in a copyright notice to have more
    indentation than earlier lines.
---
 lisp/emacs-lisp/lisp-mnt.el | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el
index fc3caf3..a1c5b69 100644
--- a/lisp/emacs-lisp/lisp-mnt.el
+++ b/lisp/emacs-lisp/lisp-mnt.el
@@ -326,12 +326,13 @@ Return argument is of the form (\"HOLDER\" \"YEAR1\" ... 
\"YEARN\")"
          (start (point))
          (end (line-end-position)))
       ;; Cope with multi-line copyright `lines'.  Assume the second
-      ;; line is indented (with the same commenting style).
+      ;; line is indented at least as much as the original, with the
+      ;; same commenting style.
       (save-excursion
        (beginning-of-line 2)
-       (let ((str (concat (match-string-no-properties 1) "[ \t]+")))
+       (let ((str (match-string-no-properties 1)))
          (beginning-of-line)
-         (while (looking-at str)
+         (while (and (looking-at str) (not (looking-at lm-copyright-prefix)))
            (setq end (line-end-position))
            (beginning-of-line 2))))
       ;; Make a single line and parse that.