* vc-bzr.el (vc-bzr-log-edit-mode): Add --fixes support to

log-edit-before-checkin-process.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6891a5f64beb7db708d29fcc164a545b6b1b4a22..b9992188bf416c43aa4ee0ca23fefde03b19bf6e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-03-24  Glenn Morris  <rgm@gnu.org>
 
+       * 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 --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index 046046055d59ef4c19adfd055b13e4fda624ab69..35c84f39da9d14045d3cc7917b2cab2ce94e8f84 100644 (file)
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -553,12 +553,14 @@ REV non-nil gets an error."
   "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."