diff lisp/vc.el @ 86908:6e9e38d61817

* log-edit.el (log-edit-show-diff): New function. (log-edit-mode-map, log-edit-menu): Bind it. (log-edit-diff-function): New variable. (log-edit): Change the 3rd param to be an alist and accept a function that computes a diff for the files involved. * vc.el (vc-log-edit): Add a diff function parameter to log-edit.

--- a/lisp/vc.el	Sat Dec 01 15:57:41 2007 +0000
+++ b/lisp/vc.el	Sat Dec 01 19:37:20 2007 +0000
@@ -83,8 +83,8 @@
 ;; to be installed somewhere on Emacs's path for executables.
 ;;
 ;; If your site uses the ChangeLog convention supported by Emacs, the
-;; function log-edit-comment-to-change-log could prove a useful checkin hook,
-;; although you might prefer to use C-c C-a (i.e. log-edit-insert-changelog)
+;; function `log-edit-comment-to-change-log' could prove a useful checkin hook,
+;; although you might prefer to use C-c C-a (i.e. `log-edit-insert-changelog')
 ;; from the commit buffer instead or to set `log-edit-setup-invert'.
 ;;
 ;; The vc code maintains some internal state in order to reduce expensive
@@ -3577,7 +3577,10 @@
   "Set up `log-edit' for use with VC on FILE."
   (setq default-directory
 	(with-current-buffer vc-parent-buffer default-directory))
-  (log-edit 'vc-finish-logentry nil `(lambda () ',fileset))
+  (log-edit 'vc-finish-logentry
+	    nil
+	    `((log-edit-listfun . (lambda () ',fileset))
+	      (log-edit-diff-function . (lambda () (vc-diff nil)))))
   (set (make-local-variable 'vc-log-fileset) fileset)
   (make-local-variable 'vc-log-revision)
   (set-buffer-modified-p nil)