From: Nick Roberts <nickrob@snap.net.nz>
Subject: [PATCH] misc.texi, files.texi
Date: Wed, 3 May 2006 11:24:15 +1200 [thread overview]
Message-ID: <17495.59935.582619.357092@farnswood.snap.net.nz> (raw)
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 ----
next reply other threads:[~2006-05-02 23:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-05-02 23:24 Nick Roberts [this message]
2006-05-04 14:17 ` [PATCH] misc.texi, files.texi Richard Stallman
2006-05-04 21:37 ` Nick Roberts
2006-05-05 4:38 ` Nick Roberts
2006-05-06 14:24 ` Richard Stallman
2006-05-07 1:32 ` Nick Roberts
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=17495.59935.582619.357092@farnswood.snap.net.nz \
--to=nickrob@snap.net.nz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.