procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/vc/vc.el (vc-version-ediff): Call ediff-vc-internal directly, since

Browse source 
we're in VC after all.
This commit is contained in:
Stefan Monnier 2011-04-20 14:39:39 -03:00
parent 1c6c854ec7
commit 024ff1707e
4 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/emacs/ChangeLog
View file

@ -1,7 +1,6 @@
2011-04-20 Christoph Scholtes <cschol2112@googlemail.com>
* 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 <cyd@stupidchicken.com>

8
doc/emacs/maintaining.texi
View file

@ -746,10 +746,10 @@ current directory and its subdirectories.
@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

7
lisp/ChangeLog
View file

@ -1,7 +1,12 @@
2011-04-20 Stefan Monnier <monnier@iro.umontreal.ca>
* vc/vc.el (vc-version-ediff): Call ediff-vc-internal directly, since
we're in VC after all.
2011-04-20 Christoph Scholtes <cschol2112@googlemail.com>
* 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 <monnier@iro.umontreal.ca>

6
lisp/vc/vc.el
View file

@ -1704,10 +1704,8 @@ repository history using ediff."
;; 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"))))