Re: lm-verify, long copyright line

[Paul Eggert <eggert@cs.ucla.edu>]

[-- Attachment #1: Type: text/plain, Size: 467 bytes --]

Mike Kupfer wrote:
> I guess the question is how likely would this be to introduce a new set
> of problems.

Reasonably likely, I'd say, as the tradition outside Emacs is to indent 
copyright notices the same as other text. Let's make lm-verify a bit more 
generous about copyright notice format; this is a good thing to do regardless of 
whether we change update-copyright. I installed the attached patch into master; 
does it suffice to solve the problem?

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Adjust-lm-verify-to-accept-current-notices.patch --]
[-- Type: text/x-patch; name="0001-Adjust-lm-verify-to-accept-current-notices.patch", Size: 1492 bytes --]

From f587a81c5247e79f75c7ec03f4e97a7dd883167b Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 24 Jun 2017 17:54:21 -0700
Subject: [PATCH] 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 @@ lm-crack-copyright
 	  (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.
-- 
2.7.4