summaryrefslogtreecommitdiff
path: root/doc/emacs/maintaining.texi
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2011-04-20 14:39:39 -0300
committerStefan Monnier <monnier@iro.umontreal.ca>2011-04-20 14:39:39 -0300
commit024ff1707e4a301b21b9de14ab64a406b92dd19f (patch)
treee30153c180570c2ac7b6b7e3e7411dfc4dfb0f6c /doc/emacs/maintaining.texi
parent1c6c854ec7faf9184115245c7e300df89f1795bc (diff)
* lisp/vc/vc.el (vc-version-ediff): Call ediff-vc-internal directly, since
we're in VC after all.
Diffstat (limited to 'doc/emacs/maintaining.texi')
-rw-r--r--doc/emacs/maintaining.texi8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index bc7484b055..8f395ba956 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