From a9253a1e3947ecd865443749788f34839287f4b8 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 3 Dec 2008 07:57:23 +0000 Subject: [PATCH] (Old Revisions): Fix diff-switches description. --- doc/emacs/ChangeLog | 4 ++++ doc/emacs/maintaining.texi | 17 +++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index e38caf23838..0fa3cf85d95 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2008-12-03 Glenn Morris + + * maintaining.texi (Old Revisions): Fix diff-switches description. + 2008-12-01 Martin Rudalics * emacs.texi (Top): Fix typo. diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index 220d29c6068..ee0f2c51b01 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -707,14 +707,15 @@ current directory and its subdirectories. @vindex vc-diff-switches @vindex vc-rcs-diff-switches @kbd{C-x v =} works by running a variant of the @code{diff} utility -designed to work with the version control system in use. When you -invoke @code{diff} this way, in addition to the options specified by -@code{diff-switches} (@pxref{Comparing Files}), it receives those -specified by @code{vc-diff-switches}, plus those specified for the -specific back end by @code{vc-@var{backend}-diff-switches}. For -instance, when the version control back end is CVS, @code{diff} uses -the options in @code{vc-cvs-diff-switches}. The -@samp{vc@dots{}diff-switches} variables are @code{nil} by default. +designed to work with the version control system in use. The options +to pass to the @code{diff} command are taken from the first non-@code{nil} +value of @code{vc-@var{backend}-diff-switches}, @code{vc-diff-switches}, +and @code{diff-switches} (@pxref{Comparing Files}), in that order. +Since @code{nil} means to check the next variable in the sequence, +either of the first two may use the value @code{t} to mean no switches at all. +The @samp{vc@dots{}diff-switches} variables are all either @code{nil} +or @code{t} (for those version control systems that do not accept common +@code{diff} options) by default. The buffer produced by @kbd{C-x v =} supports the commands of Compilation mode (@pxref{Compilation Mode}), such as @kbd{C-x `} and -- 2.39.2