procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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.
This commit is contained in:
Glenn Morris 2011-05-14 16:27:09 -07:00
parent ccd1ad0793
commit 7210a7391f
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -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.

10
lisp/vc/add-log.el
View file

@ -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)