summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2010-04-15 00:54:06 -0700
committerGlenn Morris <rgm@gnu.org>2010-04-15 00:54:06 -0700
commit4ebe99027b24546c5a88e56fa95bc530eb5bce97 (patch)
treec2f79d57bcfe9203c286e3f3d8a55bf128bf9452
parent2bf1d02de984a4b8d69ea14c8abe187775306f2b (diff)
downloademacs-4ebe99027b24546c5a88e56fa95bc530eb5bce97.tar.gz
Mention Dired VC diff and log in manual.
* dired.texi (Misc Dired Features): Mention VC diff and log. * maintaining.texi (Old Revisions, VC Change Log): Mention that diff and log work in Dired buffers.
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/dired.texi8
-rw-r--r--doc/emacs/maintaining.texi4
-rw-r--r--etc/NEWS2
4 files changed, 15 insertions, 3 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index d156d35faa2..a27d5bac6e7 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,9 @@
2010-04-15 Glenn Morris <rgm@gnu.org>
+ * dired.texi (Misc Dired Features): Mention VC diff and log.
+ * maintaining.texi (Old Revisions, VC Change Log):
+ Mention that diff and log work in Dired buffers.
+
* help.texi (Help Summary): Mention M-x info-finder.
* ack.texi (Acknowledgments): Add mpc.el
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index f1a8b0aa9c1..f6a4572f8dd 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -1,6 +1,7 @@
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Dired, Calendar/Diary, Rmail, Top
@chapter Dired, the Directory Editor
@@ -1339,6 +1340,11 @@ names into arguments for other Emacs commands. It also displays what
it added to the kill ring, so you can use it to display the list of
currently marked files in the echo area.
+@cindex Dired and version control
+ If the directory you are visiting is under version control
+(@pxref{Version Control}), then the normal VC diff and log commands
+will operate on the selected files.
+
@findex dired-compare-directories
The command @kbd{M-x dired-compare-directories} is used to compare
the current Dired buffer with another directory. It marks all the files
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 8cc5b97d919..f8e918ad8e3 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -653,7 +653,8 @@ its own (@code{vc-revision-other-window}).
@item C-x v =
Compare the files in the current fileset with the working revision(s)
you started from (@code{vc-diff}). With a prefix argument, prompt for
-two revisions of the current fileset and compare them.
+two revisions of the current fileset and compare them. You can call
+this command from a Dired buffer (@pxref{Dired}).
@item C-x v D
Compare the entire tree corresponding to the current fileset with the
@@ -895,6 +896,7 @@ i.e. the ones you enter via the @samp{*VC-Log*} buffer. @xref{Log
Buffer}.) Point is centered at the revision of the file currently
being visited. With a prefix argument, the command prompts for the
revision to center on, and the maximum number of revisions to display.
+You can call this command from a Dired buffer (@pxref{Dired}).
@findex vc-print-root-log
Type @kbd{C-x v L} (@code{vc-print-root-log}) to display a
diff --git a/etc/NEWS b/etc/NEWS
index 1c168090d6f..c3dd62c0944 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -333,7 +333,7 @@ instead of redisplaying the full log. The RCS, CVS and SCCS VC
backends do not support this.
---
*** When a file is not found, VC will not try to check it out of RCS anymore.
-
++++
*** Diff and log operations can be used from Dired buffers.
*** vc-git changes