[Emacs-diffs] /srv/bzr/emacs/trunk r104236: add-log.el fix for multiple author entries (bug#8645)

[Glenn Morris]

------------------------------------------------------------
revno: 104236
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2011-05-14 16:27:09 -0700
message:
  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.
modified:
  lisp/ChangeLog
  lisp/vc/add-log.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-05-14 19:13:40 +0000
+++ b/lisp/ChangeLog    2011-05-14 23:27:09 +0000
@@ -1,5 +1,8 @@
 2011-05-14  Glenn Morris  <address@hidden>
 
+       * 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.
 

=== modified file 'lisp/vc/add-log.el'
--- a/lisp/vc/add-log.el        2011-04-18 20:35:18 +0000
+++ b/lisp/vc/add-log.el        2011-05-14 23:27:09 +0000
@@ -237,7 +237,7 @@
 (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 @@
         (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)