[Emacs-diffs] Changes to emacs/doc/emacs/files.texi,v

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    08/08/08 09:33:37

Index: files.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/doc/emacs/files.texi,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- files.texi  7 Aug 2008 05:21:28 -0000       1.28
+++ files.texi  8 Aug 2008 09:33:37 -0000       1.29
@@ -1804,11 +1804,14 @@
 for the opposite way of working---generating ChangeLog entries from
 the revision control log.
 
-  In the @samp{*VC-Log*} buffer, @kbd{C-c C-f} (@kbd{M-x
-log-edit-show-files}) shows the list of files to be committed in case
-you need to check that.  (This can be a list of more than one file if
-you use VC Directory Mode or PCL-CVS.)  @kbd{C-c C-f} (@kbd{M-x
-log-edit-show-diff}) shows the diff for the files to be committed.
address@hidden log-edit-show-files
address@hidden log-edit-show-diff
+  In the @samp{*VC-Log*} buffer, @kbd{C-c C-f}
+(@code{log-edit-show-files}) shows the list of files to be committed
+in case you need to check that.  (This can be a list of more than one
+file if you use VC Directory Mode or PCL-CVS.)  @kbd{C-c C-d}
+(@code{log-edit-show-diff}) shows the diffs for the files to be
+committed.
 @iftex
 @xref{VC Directory Mode,,,emacs-xtra, Specialized Emacs Features},
 @end iftex
@@ -2560,71 +2563,100 @@
 
 @table @kbd
 @item M-n
address@hidden diff-hunk-next
 Move to the next hunk-start (@code{diff-hunk-next}).
 
 @item M-p
address@hidden diff-hunk-prev
 Move to the previous hunk-start (@code{diff-hunk-prev}).
 
 @item address@hidden
address@hidden diff-file-next
 Move to the next file-start, in a multi-file patch
 (@code{diff-file-next}).
 
 @item address@hidden
address@hidden diff-file-prev
 Move to the previous file-start, in a multi-file patch
 (@code{diff-file-prev}).
 
 @item M-k
address@hidden diff-hunk-kill
 Kill the hunk at point (@code{diff-hunk-kill}).
 
 @item M-K
address@hidden diff-file-kill
 In a multi-file patch, kill the current file part.
 (@code{diff-file-kill}).
 
 @item C-c C-a
address@hidden diff-apply-hunk
 Apply this hunk to its target file (@code{diff-apply-hunk}).  With a
 prefix argument of @kbd{C-u}, revert this hunk.
 
 @item C-c C-c
-Go to the source corresponding to this hunk (@code{diff-goto-source}).
address@hidden diff-goto-source
+Go to the source file and line corresponding to this hunk
+(@code{diff-goto-source}).
 
 @item C-c C-e
address@hidden diff-ediff-patch
 Start an Ediff session with the patch (@code{diff-ediff-patch}).
 @xref{Top, Ediff, Ediff, ediff, The Ediff Manual}.
 
 @item C-c C-n
address@hidden diff-restrict-view
 Restrict the view to the current hunk (@code{diff-restrict-view}).
 @xref{Narrowing}.  With a prefix argument of @kbd{C-u}, restrict the
-view to the current patch of a multiple file patch.  To widen again,
-use @kbd{C-x n w}.
+view to the current file of a multiple-file patch.  To widen again,
+use @kbd{C-x n w} (@code{widen}).
 
 @item C-c C-r
address@hidden diff-reverse-direction
 Reverse the direction of comparison for the entire buffer
 (@code{diff-reverse-direction}).
 
 @item C-c C-s
address@hidden diff-split-hunk
 Split the hunk at point (@code{diff-split-hunk}).  This is for
-manually editing patches, and only works with the unified diff format.
+manually editing patches, and only works with the @dfn{unified diff
+format} produced by the @option{-u} or @option{--unified} options to
+the @command{diff} program.  If you need to split a hunk in the
address@hidden diff format} produced by the @option{-c} or
address@hidden options to @command{diff}, first convert the buffer
+to the unified diff format with @kbd{C-c C-u}.
+
address@hidden C-c C-d
address@hidden diff-unified->context
+Convert the entire buffer to the @dfn{context diff format}
+(@code{diff-context->unified}).  With a prefix argument, convert only
+the text within the region.
 
 @item C-c C-u
-Convert the entire buffer to unified format
address@hidden diff-context->unified
+Convert the entire buffer to unified diff format
 (@code{diff-context->unified}).  With a prefix argument, convert
 unified format to context format.  When the mark is active, convert
 only the text within the region.
 
 @item C-c C-w
address@hidden diff-refine-hunk
 Refine the current hunk so that it disregards changes in whitespace
 (@code{diff-refine-hunk}).
 
 @item C-x 4 A
-Iterates over the diff hunks and does a @kbd{C-x 4 a} for each one of
-them.  The goal is to create a skeleton for the ChangeLog that can be
-later filled in.
address@hidden diff-add-change-log-entries-other-window
address@hidden address@hidden, in Diff mode}
+Generate a ChangeLog entry, like @kbd{C-x 4 a} does (@pxref{Change
+Log}), for each one of the hunks
+(@code{diff-add-change-log-entries-other-window}).  This creates a
+skeleton of the log of changes that you can later fill with the actual
+descriptions of the changes.  @kbd{C-x 4 a} itself in Diff mode
+operates on behalf of the current hunk's file, but gets the function
+name from the patch itself.  This is useful for making log entries for
+functions that are deleted by the patch.
 @end table
 
-  @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
-by the patch.
 
 @node Misc File Ops
 @section Miscellaneous File Operations