[Emacs-diffs] emacs/doc/emacs ChangeLog maintaining.texi

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/12/03 07:57:23

Modified files:
        doc/emacs      : ChangeLog maintaining.texi 

Log message:
        (Old Revisions): Fix diff-switches description.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/emacs/ChangeLog?cvsroot=emacs&r1=1.242&r2=1.243
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/emacs/maintaining.texi?cvsroot=emacs&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/doc/emacs/ChangeLog,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -b -r1.242 -r1.243
--- ChangeLog   1 Dec 2008 06:58:38 -0000       1.242
+++ ChangeLog   3 Dec 2008 07:57:23 -0000       1.243
@@ -1,3 +1,7 @@
+2008-12-03  Glenn Morris  <address@hidden>
+
+       * maintaining.texi (Old Revisions): Fix diff-switches description.
+
 2008-12-01  Martin Rudalics  <address@hidden>
 
        * emacs.texi (Top): Fix typo.

Index: maintaining.texi
===================================================================
RCS file: /sources/emacs/emacs/doc/emacs/maintaining.texi,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- maintaining.texi    1 Nov 2008 04:12:14 -0000       1.11
+++ maintaining.texi    3 Dec 2008 07:57:23 -0000       1.12
@@ -707,14 +707,15 @@
 @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
address@hidden (@pxref{Comparing Files}), it receives those
-specified by @code{vc-diff-switches}, plus those specified for the
-specific back end by @address@hidden  For
-instance, when the version control back end is CVS, @code{diff} uses
-the options in @code{vc-cvs-diff-switches}.  The
address@hidden@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 address@hidden
+value of @address@hidden, @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 @address@hidden variables are all either @code{nil}
+or @code{t} (for those version control systems that do not accept common
address@hidden 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