aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-04-15 00:54:06 -0700
committerGlenn Morris2010-04-15 00:54:06 -0700
commit4ebe99027b24546c5a88e56fa95bc530eb5bce97 (patch)
treec2f79d57bcfe9203c286e3f3d8a55bf128bf9452
parent2bf1d02de984a4b8d69ea14c8abe187775306f2b (diff)
downloademacs-4ebe99027b24546c5a88e56fa95bc530eb5bce97.tar.gz
emacs-4ebe99027b24546c5a88e56fa95bc530eb5bce97.zip
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 @@
12010-04-15 Glenn Morris <rgm@gnu.org> 12010-04-15 Glenn Morris <rgm@gnu.org>
2 2
3 * dired.texi (Misc Dired Features): Mention VC diff and log.
4 * maintaining.texi (Old Revisions, VC Change Log):
5 Mention that diff and log work in Dired buffers.
6
3 * help.texi (Help Summary): Mention M-x info-finder. 7 * help.texi (Help Summary): Mention M-x info-finder.
4 8
5 * ack.texi (Acknowledgments): Add mpc.el 9 * 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 @@
1@c This is part of the Emacs manual. 1@c This is part of the Emacs manual.
2@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, 2@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
3@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 3@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
4@c Free Software Foundation, Inc.
4@c See file emacs.texi for copying conditions. 5@c See file emacs.texi for copying conditions.
5@node Dired, Calendar/Diary, Rmail, Top 6@node Dired, Calendar/Diary, Rmail, Top
6@chapter Dired, the Directory Editor 7@chapter Dired, the Directory Editor
@@ -1339,6 +1340,11 @@ names into arguments for other Emacs commands. It also displays what
1339it added to the kill ring, so you can use it to display the list of 1340it added to the kill ring, so you can use it to display the list of
1340currently marked files in the echo area. 1341currently marked files in the echo area.
1341 1342
1343@cindex Dired and version control
1344 If the directory you are visiting is under version control
1345(@pxref{Version Control}), then the normal VC diff and log commands
1346will operate on the selected files.
1347
1342@findex dired-compare-directories 1348@findex dired-compare-directories
1343 The command @kbd{M-x dired-compare-directories} is used to compare 1349 The command @kbd{M-x dired-compare-directories} is used to compare
1344the current Dired buffer with another directory. It marks all the files 1350the 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}).
653@item C-x v = 653@item C-x v =
654Compare the files in the current fileset with the working revision(s) 654Compare the files in the current fileset with the working revision(s)
655you started from (@code{vc-diff}). With a prefix argument, prompt for 655you started from (@code{vc-diff}). With a prefix argument, prompt for
656two revisions of the current fileset and compare them. 656two revisions of the current fileset and compare them. You can call
657this command from a Dired buffer (@pxref{Dired}).
657 658
658@item C-x v D 659@item C-x v D
659Compare the entire tree corresponding to the current fileset with the 660Compare 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
895Buffer}.) Point is centered at the revision of the file currently 896Buffer}.) Point is centered at the revision of the file currently
896being visited. With a prefix argument, the command prompts for the 897being visited. With a prefix argument, the command prompts for the
897revision to center on, and the maximum number of revisions to display. 898revision to center on, and the maximum number of revisions to display.
899You can call this command from a Dired buffer (@pxref{Dired}).
898 900
899@findex vc-print-root-log 901@findex vc-print-root-log
900 Type @kbd{C-x v L} (@code{vc-print-root-log}) to display a 902 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
333backends do not support this. 333backends do not support this.
334--- 334---
335*** When a file is not found, VC will not try to check it out of RCS anymore. 335*** When a file is not found, VC will not try to check it out of RCS anymore.
336 336+++
337*** Diff and log operations can be used from Dired buffers. 337*** Diff and log operations can be used from Dired buffers.
338 338
339*** vc-git changes 339*** vc-git changes