diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2017-06-24 17:54:21 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-06-24 17:57:56 -0700 |
commit | 431471376440a69a2f5ca2a49e3c7e09c834c132 (patch) | |
tree | ef5764ed8b74f85ecb4188b11b3b98b80983b3b6 /lisp/emacs-lisp | |
parent | c75eb1030fbb606765cc8a5e5ecbab4a9cf435ed (diff) | |
download | emacs-431471376440a69a2f5ca2a49e3c7e09c834c132.tar.gz emacs-431471376440a69a2f5ca2a49e3c7e09c834c132.tar.bz2 emacs-431471376440a69a2f5ca2a49e3c7e09c834c132.zip |
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.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r-- | lisp/emacs-lisp/lisp-mnt.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el index fc3caf3359a..a1c5b6977f8 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. |