Re: New function: vc-ediff

[Stefan Monnier]

>> Here is a new version of the `vc-ediff' patch. No changes on the `ediff'
>> side, all new functions and refactoring in vc.el.
> Ping.

Thanks, installed, with the subsequent tweaks below.


        Stefan


=== modified file 'doc/emacs/ChangeLog'
--- doc/emacs/ChangeLog 2011-04-20 17:33:09 +0000
+++ doc/emacs/ChangeLog 2011-04-20 17:34:11 +0000
@@ -1,7 +1,6 @@
 2011-04-20  Christoph Scholtes  <address@hidden>
 
-       * maintaining.texi (Old Revisions): Add paragraph on new function
-       vc-ediff.
+       * maintaining.texi (Old Revisions): Mention new function vc-ediff.
 
 2011-03-26  Chong Yidong  <address@hidden>
 

=== modified file 'doc/emacs/maintaining.texi'
--- doc/emacs/maintaining.texi  2011-04-20 17:33:09 +0000
+++ doc/emacs/maintaining.texi  2011-04-20 17:34:38 +0000
@@ -746,10 +746,10 @@
 
 @findex vc-ediff
 The function @code{vc-ediff} works like @code{vc-diff} and provides a way to
-visually compare two revisions of a file an Ediff session, @pxref{Top, Ediff,
-ediff, The Ediff Manual}.  It compares the file associated with the current
-buffer with the last repository revision.  To compare two arbitrary revisions
-of the current file, call @code{vc-ediff} with a prefix argument.
+visually compare two revisions of a file in an Ediff session, @pxref{Top,
+Ediff, ediff, The Ediff Manual}.  It compares the file associated with the
+current buffer with the last repository revision.  To compare two arbitrary
+revisions of the current file, call @code{vc-ediff} with a prefix argument.
 
 @vindex vc-diff-switches
 @vindex vc-rcs-diff-switches

=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog      2011-04-20 17:33:09 +0000
+++ lisp/ChangeLog      2011-04-20 17:39:15 +0000
@@ -1,7 +1,12 @@
+2011-04-20  Stefan Monnier  <address@hidden>
+
+       * vc/vc.el (vc-version-ediff): Call ediff-vc-internal directly, since
+       we're in VC after all.
+
 2011-04-20  Christoph Scholtes  <address@hidden>
 
        * vc/vc.el (vc-diff-build-argument-list-internal)
-       (vc-version-ediff, vc-ediff): New functions.
+       (vc-version-ediff, vc-ediff): New commands.
        (vc-version-diff): Use vc-diff-build-argument-list-internal.
 
 2011-04-20  Stefan Monnier  <address@hidden>

=== modified file 'lisp/vc/vc.el'
--- lisp/vc/vc.el       2011-04-20 17:33:09 +0000
+++ lisp/vc/vc.el       2011-04-20 17:37:18 +0000
@@ -1704,10 +1704,8 @@
    ;; We could spin off an ediff session per file in the file set.
    ((= (length files) 1)
     (ediff-load-version-control)
-    (find-file (car files))
-    (funcall
-     (intern (format "ediff-%S-internal" ediff-version-control-package))
-     rev1 rev2 nil))
+    (find-file (car files))             ;FIXME: find-file from Elisp is bad.
+    (ediff-vc-internal rev1 rev2 nil))
    (t
     (error "More than one file is not supported"))))