# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1196618163 0
# Node ID 7e4a56acd6da47f19d0fd647f0b82639548a0a6b
# Parent  9ae2c39a9be6d4c009043ad4dff1261baef9e22d
(cvs-mode-commit, cvs-mode-edit-log): Also pass a diff
function to log-edit.

diff -r 9ae2c39a9be6 -r 7e4a56acd6da lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Dec 02 17:19:17 2007 +0000
+++ b/lisp/ChangeLog	Sun Dec 02 17:56:03 2007 +0000
@@ -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 -r 9ae2c39a9be6 -r 7e4a56acd6da lisp/pcvs.el
--- a/lisp/pcvs.el	Sun Dec 02 17:19:17 2007 +0000
+++ b/lisp/pcvs.el	Sun Dec 02 17:56:03 2007 +0000
@@ -1457,7 +1457,9 @@
   (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 @@
       ;; 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)