(cvs-mode-commit, cvs-mode-edit-log): Also pass a diff

function to log-edit.

2 files changed, 12 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a52a37c2816..79fcc774ecc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-02  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * pcvs.el (cvs-mode-commit, cvs-mode-edit-log): Also pass a diff
+        function to log-edit.
+
 2007-12-02  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/dbus.el: New file.
diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index 53bed601a36..f9c71c34192 100644
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -1457,7 +1457,9 @@ The POSTPROC specified there (typically `log-edit') is then called,
   (let ((buf (cvs-temp-buffer "message" 'normal 'nosetup))
         (setupfun (or (nth 2 (cdr (assoc "message" cvs-buffer-name-alist)))
                       'log-edit)))
-    (funcall setupfun 'cvs-do-commit setup 'cvs-commit-filelist buf)
+    (funcall setupfun 'cvs-do-commit setup 
+             '((log-edit-listfun . cvs-commit-filelist)
+               (log-edit-diff-function . cvs-mode-diff)) buf)
     (set (make-local-variable 'cvs-minor-wrap-function) 'cvs-commit-minor-wrap)
     (run-hooks 'cvs-mode-commit-hook)))
 
@@ -1520,7 +1522,10 @@ This is best called from a `log-view-mode' buffer."
       ;; Set the filename before, so log-edit can correctly setup its
       ;; log-edit-initial-files variable.
       (set (make-local-variable 'cvs-edit-log-files) (list file)))
-    (funcall setupfun 'cvs-do-edit-log nil 'cvs-edit-log-filelist buf)
+    (funcall setupfun 'cvs-do-edit-log nil 
+             '((log-edit-listfun . cvs-edit-log-filelist)
+               (log-edit-diff-function . cvs-mode-diff))
+             buf)
     (when text (erase-buffer) (insert text))
     (set (make-local-variable 'cvs-edit-log-revision) rev)
     (set (make-local-variable 'cvs-minor-wrap-function)