From 17ef2d64e4a61f86bff695e0a28ded92c27f86e6 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Wed, 1 Oct 2025 21:06:10 +0100 Subject: [PATCH] ; * doc/emacs/vc1-xtra.texi (Other Working Trees): Better example. --- doc/emacs/vc1-xtra.texi | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi index 70a60202ff5..98af4a6f6c5 100644 --- a/doc/emacs/vc1-xtra.texi +++ b/doc/emacs/vc1-xtra.texi @@ -482,20 +482,17 @@ do and do not exist. In other words, the file or directory the current buffer visits probably exists in other working trees too, and this command lets you switch to those versions of the file. -@c FIXME: It would be better to use @kbd{=} from a *vc-change-log* -@c buffer as the example here, because 'C-x v =' and 'C-x v D' are more -@c likely to be uncommitted changes on which you'd use 'C-x v w a'. -@c That requires a new node for bindings available in *vc-change-log*s. @kbd{C-x v w w} also works in Diff mode (@pxref{Diff Mode}) and Log View -mode (@pxref{Old Revisions}). Instead of switching to a different +mode (@pxref{VC Change Log}). Instead of switching to a different buffer, the command changes the default directory of the buffer to the corresponding directory under another working tree. This is -particularly useful with Diff mode buffers generated by VC commands, -such as @kbd{C-x v =} and @kbd{C-x v D} (@pxref{Old Revisions}). You -can use @kbd{C-x v w w} and then standard Diff mode commands like -@w{@kbd{C-c C-a}} (@code{diff-apply-hunk}) and @kbd{C-c RET C-a} -(@code{diff-apply-buffer}) to apply hunks from one working tree to -another. +particularly useful from Log View mode buffers generated by commands +like @kbd{C-x v L} (@pxref{VC Change Log}). After using @kbd{C-x v w w} +to change the default directory of the Log View buffer, you can move +point to a revision of interest and type @kbd{=} (@code{log-view-diff}) +to open a Diff mode buffer with that revision's changes. Then you can +use standard Diff mode commands like @w{@kbd{C-c C-a}} +(@code{diff-apply-hunk}) to apply hunks to the other working tree. @kindex C-x v w k @findex vc-kill-other-working-tree-buffers