[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/man/files.texi
From: |
Richard M. Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/man/files.texi |
Date: |
Thu, 04 May 2006 00:25:54 +0000 |
Index: emacs/man/files.texi
diff -u emacs/man/files.texi:1.139 emacs/man/files.texi:1.140
--- emacs/man/files.texi:1.139 Wed Apr 12 00:27:50 2006
+++ emacs/man/files.texi Thu May 4 00:25:54 2006
@@ -30,6 +30,7 @@
* Version Control:: Version control systems (RCS, CVS and SCCS).
* Directories:: Creating, deleting, and listing file directories.
* Comparing Files:: Finding where two files differ.
+* Diff Mode:: Mode for editing file differences.
* Misc File Ops:: Other things you can do on files.
* Compressed Files:: Accessing compressed files.
* File Archives:: Operating on tar, zip, jar etc. archive files.
@@ -2159,6 +2160,8 @@
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.
address@hidden,, Diff, diff, Comparing and Merging Files}, for more
+information about @command{diff} output formats.
@findex diff-backup
The command @kbd{M-x diff-backup} compares a specified file with its most
@@ -2166,20 +2169,6 @@
@code{diff-backup} compares it with the source file that it is a backup
of.
address@hidden diff-goto-source
address@hidden diff-mode
address@hidden Diff mode
- The @samp{*diff*} buffer uses Diff mode, which enables you to use
address@hidden `} 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.
-
address@hidden patches
- Differences between versions of files are often distributed as
-patches, which are the output from the @command{diff} program. You
-can use Diff mode to operate on a patch by typing @kbd{M-x diff-mode}.
-
@findex compare-windows
The command @kbd{M-x compare-windows} compares the text in the
current window with that in the next window. (For more information
@@ -2219,6 +2208,86 @@
@inforef{Emerge,, emacs-xtra} for the Emerge facility, which
provides a powerful interface for merging files.
address@hidden Diff Mode
address@hidden Diff Mode
address@hidden Diff mode
address@hidden diff-mode
address@hidden patches, editing
+
+ The @samp{*diff*} buffer uses Diff mode (@pxref{Diff Mode}). Diff
+mode is also useful for editing patches and comparisons produced by
+the @command{diff} program. To select Diff mode manually, type
address@hidden diff-mode}.
+
+ One general feature of Diff mode is that manual edits to the patch
+automatically correct line numbers, including those in the hunk
+header, so that you can actually apply the edited patch. Diff mode
+also provides the following commands to navigate, manipulate and apply
+parts of patches:
+
address@hidden @kbd
address@hidden M-n
+Move to the next hunk-start (@code{diff-hunk-next}).
+
address@hidden M-p
+Move to the previous hunk-start (@code{diff-hunk-prev}).
+
address@hidden address@hidden
+Move to the next file-start, in a multi-file patch
+(@code{diff-file-next}).
+
address@hidden address@hidden
+Move to the previous file-start, in a multi-file patch
+(@code{diff-file-prev}).
+
address@hidden M-k
+Kill the hunk at point (@code{diff-hunk-kill}).
+
address@hidden M-K
+In a multi-file patch, kill the current file part.
+(@code{diff-file-kill}).
+
address@hidden C-c C-a
+Apply this hunk to its target file (@code{diff-apply-hunk}). With a
+prefix argument of @kbd{C-u}, revert this hunk.
+
address@hidden C-c C-c
+Go to the source corresponding to this hunk (@code{diff-goto-source}).
+
address@hidden C-c C-e
+Start an Ediff session with the patch (@code{diff-ediff-patch}).
address@hidden, Ediff, Ediff, ediff, The Ediff Manual}.
+
address@hidden C-c C-n
+Restrict the view to the current hunk (@code{diff-restrict-view}).
address@hidden 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}.
+
address@hidden C-c C-r
+Reverse the direction of comparison for the entire buffer
+(@code{diff-reverse-direction}).
+
address@hidden C-c C-s
+Split the hunk at point (@code{diff-split-hunk}). This is for
+manually editing patches, and only works with the unified diff format.
+
address@hidden C-c C-u
+Convert the entire buffer to unified format
+(@code{diff-context->unified}). With a prefix argument, convert
+unified format to context format. In Transient Mark mode, when the
+mark is active, this command operates only on the region.
+
address@hidden C-c C-w
+Refine the current hunk so that it disregards changes in whitespace
+(@code{diff-refine-hunk}).
address@hidden 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
- [Emacs-diffs] Changes to emacs/man/files.texi,
Richard M. Stallman <=
- [Emacs-diffs] Changes to emacs/man/files.texi, Eli Zaretskii, 2006/05/05
- [Emacs-diffs] Changes to emacs/man/files.texi, Richard M. Stallman, 2006/05/05
- [Emacs-diffs] Changes to emacs/man/files.texi, Eli Zaretskii, 2006/05/06
- [Emacs-diffs] Changes to emacs/man/files.texi, Eli Zaretskii, 2006/05/06
- [Emacs-diffs] Changes to emacs/man/files.texi, Eli Zaretskii, 2006/05/06
- [Emacs-diffs] Changes to emacs/man/files.texi, Eli Zaretskii, 2006/05/12
- [Emacs-diffs] Changes to emacs/man/files.texi, Richard M. Stallman, 2006/05/17
- [Emacs-diffs] Changes to emacs/man/files.texi, Eli Zaretskii, 2006/05/20