From: Glenn Morris <rgm@gnu.org>
Date: Wed, 24 Mar 2010 03:38:17 +0000 (-0700)
Subject: * vc.el (vc-modify-change-comment): Pass MODE to vc-start-logentry.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~667
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5ac92c5f31c0d010a30c2e1ea205f17ea9e295fe;p=emacs.git

* vc.el (vc-modify-change-comment): Pass MODE to vc-start-logentry.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 12de6f8876d..8cca842ee60 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,8 @@
 2010-03-24  Glenn Morris  <rgm@gnu.org>
 
-	* vc-bzr.el, vc-hg.el (log-edit-mode): Declare.
+	* vc.el (vc-modify-change-comment): Pass MODE to vc-start-logentry.
+
+	* vc.el, vc-bzr.el, vc-hg.el (log-edit-mode): Declare.
 
 	* vc-dispatcher.el (vc-start-logentry): Doc fix.
 	(log-view-process-buffer, log-edit-extra-flags): Declare.
diff --git a/lisp/vc.el b/lisp/vc.el
index dee4ce9c841..6a48b626136 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -1744,17 +1744,18 @@ The headers are reset to their non-expanded form."
 
 (defun vc-modify-change-comment (files rev oldcomment)
   "Edit the comment associated with the given files and revision."
-  (vc-start-logentry
-   files rev oldcomment t
-   "Enter a replacement change comment."
-   "*VC-log*"
-   (lambda (files rev comment ignored)
-     (vc-call-backend
-      ;; Less of a kluge than it looks like; log-view mode only passes
-      ;; this function a singleton list.  Arguments left in this form in
-      ;; case the more general operation ever becomes meaningful.
-      (vc-responsible-backend (car files))
-      'modify-change-comment files rev comment))))
+  ;; Less of a kluge than it looks like; log-view mode only passes
+  ;; this function a singleton list.  Arguments left in this form in
+  ;; case the more general operation ever becomes meaningful.
+  (let ((backend (vc-responsible-backend (car files))))
+    (vc-start-logentry
+     files rev oldcomment t
+     "Enter a replacement change comment."
+     "*VC-log*"
+     (lambda () (vc-call-backend backend 'log-edit-mode))
+     (lambda (files rev comment ignored)
+       (vc-call-backend backend
+                        'modify-change-comment files rev comment)))))
 
 ;;;###autoload
 (defun vc-merge ()
@@ -2433,6 +2434,8 @@ to provide the `find-revision' operation instead."
 
 (defalias 'vc-default-check-headers 'ignore)
 
+(declare-function log-edit-mode "log-edit" ())
+
 (defun vc-default-log-edit-mode (backend) (log-edit-mode))
 
 (defun vc-default-log-view-mode (backend) (log-view-mode))