# HG changeset patch # User Glenn Morris # Date 1269412365 25200 # Node ID b958f43f6055a5bb2c82c1cf3abe5bddb76cff64 # Parent 16cde13bf410ec9e076a094ff29942357cbb80bf * vc-bzr.el (vc-bzr-log-edit-mode): Add --fixes support to log-edit-before-checkin-process. diff -r 16cde13bf410 -r b958f43f6055 lisp/ChangeLog --- a/lisp/ChangeLog Tue Mar 23 20:53:32 2010 -0700 +++ b/lisp/ChangeLog Tue Mar 23 23:32:45 2010 -0700 @@ -1,5 +1,8 @@ 2010-03-24 Glenn Morris + * vc-bzr.el (vc-bzr-log-edit-mode): Add --fixes support to + log-edit-before-checkin-process. + * vc.el (vc-modify-change-comment): Pass MODE to vc-start-logentry. * vc.el, vc-bzr.el, vc-hg.el (log-edit-mode): Declare. diff -r 16cde13bf410 -r b958f43f6055 lisp/vc-bzr.el --- a/lisp/vc-bzr.el Tue Mar 23 20:53:32 2010 -0700 +++ b/lisp/vc-bzr.el Tue Mar 23 23:32:45 2010 -0700 @@ -553,12 +553,14 @@ "Mode for editing Bzr commit logs. If a line like: Author: NAME -is present in the log, it is removed, and +is present in the log, it is removed, and --author NAME -is passed to the bzr commit command." +is passed to the bzr commit command. Similarly with Fixes: and --fixes." (set (make-local-variable 'log-edit-extra-flags) nil) (set (make-local-variable 'log-edit-before-checkin-process) - '(("^Author:[ \t]+\\(.*\\)[ \t]*$" . (list "--author" (match-string 1)))))) + '(("^\\(Author\\|Fixes\\):[ \t]+\\(.*\\)[ \t]*$" . + (list (format "--%s" (downcase (match-string 1))) + (match-string 2)))))) (defun vc-bzr-diff (files &optional rev1 rev2 buffer) "VC bzr backend for diff."