From: Glenn Morris <rgm@gnu.org>
Date: Wed, 24 Mar 2010 06:32:45 +0000 (-0700)
Subject: * vc-bzr.el (vc-bzr-log-edit-mode): Add --fixes support to
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~665
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7e26396796ba951b629d44766390b1f1843bab7d;p=emacs.git

* 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 6891a5f64be..b9992188bf4 100644
--- 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 046046055d5..35c84f39da9 100644
--- 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."