[PATCH] misc.texi, files.texi

[Nick Roberts]

The recenty added node "Diff Mode" overlaps slightly and lacks cohesion
with the existing node "Comparing Files".  This patch attempts to address
that.

OK to apply?

-- 
Nick                                           http://www.inet.net.nz/~nickrob


*** misc.texi   03 May 2006 10:22:09 +1200      1.82
--- misc.texi   03 May 2006 10:46:49 +1200      
***************
*** 1830,1835 ****
--- 1830,1836 ----
  @node Diff Mode, Two-Column, Narrowing, Top
  @section Diff Mode
  @cindex Diff mode
+ @findex diff-mode
  
    Diff mode is useful for editing patches and comparisons produced by
  the @command{diff} program.  You can select Diff mode by typing
***************
*** 1901,1906 ****
--- 1902,1911 ----
  (@code{diff-refine-hunk}).
  @end table
  
+   You can also use @kbd{C-x `} to visit successive changed locations
+ in the two source files, as in Compilation mode (@pxref{Compilation
+ Mode}.)
+ 
    @kbd{C-x 4 a} in Diff mode operates on behalf of the target file,
  but gets the function name from the patch itself.  @xref{Change Log}.
  This is useful for making log entries for functions that are deleted


*** files.texi  13 Apr 2006 09:12:42 +1200      1.139
--- files.texi  03 May 2006 10:48:23 +1200      
***************
*** 2159,2164 ****
--- 2159,2166 ----
  running the @code{diff} program, using options taken from the variable
  @code{diff-switches}.  The value of @code{diff-switches} should be a
  string; the default is @code{"-c"} to specify a context diff.
+ The @samp{*diff*} buffer uses Diff mode (@pxref{Diff Mode}).
+ 
  
  @findex diff-backup
    The command @kbd{M-x diff-backup} compares a specified file with its most
***************
*** 2166,2180 ****
  @code{diff-backup} compares it with the source file that it is a backup
  of.
  
- @findex diff-goto-source
- @findex diff-mode
- @cindex Diff mode
-   The @samp{*diff*} buffer uses Diff mode, which enables you to use
- @kbd{C-x `} to visit successive changed locations in the two source
- files, as in Compilation mode (@pxref{Compilation Mode}.)  You can
- also move to a particular hunk of changes and type @kbd{C-c C-c}
- (@code{diff-goto-source}) to visit the corresponding source location.
- 
  @cindex patches
    Differences between versions of files are often distributed as
  patches, which are the output from the @command{diff} program.  You
--- 2168,2173 ----