From: Glenn Morris Date: Sat, 14 May 2011 23:27:09 +0000 (-0700) Subject: add-log.el fix for multiple author entries (bug#8645) X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~264 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7210a7391fe7b02cf27e55a90af5b828d7558384;p=emacs.git 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 cf17318748f..fd1af4255cd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2011-05-14 Glenn Morris + * 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 73e83414e99..aecb0cd9ef6 100644 --- 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)