add-log.el fix for multiple author entries (bug#8645)

* lisp/vc/add-log.el (add-change-log-entry): Don't start adding a new entry
in the middle of an existing one with multiple authors.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cf17318748f26ce99d036a6f74799b2e647ba69e..fd1af4255cd3b4aad634c57a2a88354cfd54d1a2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-05-14  Glenn Morris  <rgm@gnu.org>
 
+       * vc/add-log.el (add-change-log-entry): Don't start adding a new entry
+       in the middle of an existing one with multiple authors.  (Bug#8645)
+
        * calendar/appt.el (appt-check): Rename some local variables.
        Some simplification/reordering.
 

diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el
index 73e83414e99fc4ad77e06971436e68ff7afff35e..aecb0cd9ef6ddc4a6dcf3265a0394951a85f27b0 100644 (file)
--- a/lisp/vc/add-log.el
+++ b/lisp/vc/add-log.el
@@ -237,7 +237,7 @@ Note: The search is conducted only within 10%, at the beginning of the file."
 (defvar change-log-font-lock-keywords
   `(;;
     ;; Date lines, new (2000-01-01) and old (Sat Jan  1 00:00:00 2000) styles.
-    ;; Fixme: this regepx is just an approximate one and may match
+    ;; Fixme: this regexp is just an approximate one and may match
     ;; wrongly with a non-date line existing as a random note.  In
     ;; addition, using any kind of fixed setting like this doesn't
     ;; work if a user customizes add-log-time-format.
@@ -865,8 +865,12 @@ non-nil, otherwise in local time."
         (if (and (not add-log-always-start-new-record)
                  (let ((hit nil))
                    (dolist (entry new-entries hit)
-                     (when (looking-at (regexp-quote entry))
-                       (setq hit t)))))
+                     (and (looking-at (regexp-quote entry))
+                         ;; Reject multiple author entries.  (Bug#8645)
+                         (save-excursion
+                           (forward-line 1)
+                           (not (looking-at "[ \t]+.*<.*>$")))
+                         (setq hit t)))))
             (forward-line 1)
           (insert (nth (random (length new-entries))
                        new-entries)