diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-04-20 14:39:39 -0300 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-04-20 14:39:39 -0300 |
| commit | 024ff1707e4a301b21b9de14ab64a406b92dd19f (patch) | |
| tree | e30153c180570c2ac7b6b7e3e7411dfc4dfb0f6c | |
| parent | 1c6c854ec7faf9184115245c7e300df89f1795bc (diff) | |
| download | emacs-024ff1707e4a301b21b9de14ab64a406b92dd19f.tar.gz | |
* lisp/vc/vc.el (vc-version-ediff): Call ediff-vc-internal directly, since
we're in VC after all.
| -rw-r--r-- | doc/emacs/ChangeLog | 3 | ||||
| -rw-r--r-- | doc/emacs/maintaining.texi | 8 | ||||
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/vc/vc.el | 6 |
4 files changed, 13 insertions, 11 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index d20c529f043..c6405019ddb 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -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> diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index bc7484b0557..8f395ba9563 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -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 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0f6608d2fc1..6e98a03dd24 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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> diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 06abde21d4f..1639cd7b1b1 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -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")))) |