From 93ea0d7d289ad384a5d71aefe9e68551abcffd24 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 14 May 2026 13:12:21 +0300 Subject: [PATCH] ; Improve documentation of VC commands in Dired * doc/emacs/dired.texi (Misc Dired Features): Move VC reference from here... (Operating on Files): ...to here. Add other VC commands supported by Dired. * doc/emacs/maintaining.texi (Old Revisions, VC Change Log): Fix cross-references. --- doc/emacs/dired.texi | 22 ++++++++++++++++------ doc/emacs/maintaining.texi | 8 ++++---- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi index 9abef21f459..1991ab0858a 100644 --- a/doc/emacs/dired.texi +++ b/doc/emacs/dired.texi @@ -761,7 +761,7 @@ that operates on the marked files finishes. @cindex operating on files in Dired This section describes the basic Dired commands to operate on one file -or several files. All of these commands are capital letters; all of +or several files. Many of these commands are capital letters; all of them use the minibuffer, either to read an argument or to ask for confirmation, before they act. All of them let you specify the files to manipulate in these ways: @@ -1022,6 +1022,21 @@ single archive anywhere on the file system. The default archive is controlled by the @code{dired-compress-directory-default-suffix} user option. Also see @code{dired-compress-files-alist}. +@cindex Dired and version control +@findex dired-vc-next-action +@kindex C-x v v @r{(Dired)} +@item C-x v v +@itemx C-x v = @r{(Dired)} +@itemx C-x v l @r{(Dired)} + If the directory you are visiting is under version control +(@pxref{Version Control}), then the normal VC commands will operate on +the selected files. For example, @kbd{C-x v v} invokes +@code{dired-vc-next-action}, which does the same as +@code{vc-next-action} in a buffer visiting a file under version control +(@pxref{Basic VC Editing}). Similarly, @kbd{C-x v =} shows the diffs +between the marked files and their committed versions, and @code{C-x v l} +shows the VC change history for the marked files. + @findex epa-dired-do-decrypt @kindex :d @r{(Dired)} @cindex decrypting files (in Dired) @@ -1947,11 +1962,6 @@ file/directory listings. To change this, customize the options @code{dired-hide-details-hide-symlink-targets} and @code{dired-hide-details-hide-information-lines}, respectively. -@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 2400440f951..a1825c5e515 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -862,7 +862,7 @@ v} to check-out the file and start editing it. Compare the work files in the current VC fileset with the versions you started from (@code{vc-diff}). With a prefix argument, prompt for two revisions of the current VC fileset and compare them. You can also -call this command from a Dired buffer (@pxref{Dired}). +call this command from a Dired buffer (@pxref{Operating on Files}). @ifnottex @item M-x vc-ediff @@ -1137,9 +1137,9 @@ Buffer}). If invoked from a buffer visiting a file, the current fileset consists of that single file, and point in the displayed @file{*vc-change-log*} buffer is centered at the revision of that file. If invoked from a VC Directory buffer (@pxref{VC Directory -Mode}) or from a Dired buffer (@pxref{Dired}), the fileset consists of -all the marked files, defaulting to the file shown on the current line -in the directory buffer if no file is marked. +Mode}) or from a Dired buffer (@pxref{Operating on Files}), the fileset +consists of all the marked files, defaulting to the file shown on the +current line in the directory buffer if no file is marked. If the fileset includes one or more directories, the resulting @file{*vc-change-log*} buffer shows a short log of changes (one line