mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-27 10:54:40 +00:00
Code Issues Releases Activity

2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>

Browse Source 
* ediff.texi: Replaced @command with @code & acknowledgements.
	* viper.texi: acknowledgements.
This commit is contained in:
Michael Kifer 2000-10-29 05:24:20 +00:00
parent dace60cfea
commit d63f8c1a2c
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
man/ChangeLog
View File

@ -1,3 +1,8 @@
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
* ediff.texi: Replaced @command with @code & acknowledgements.
* viper.texi: acknowledgements.
2000-10-28 John Wiegley <johnw@gnu.org>
* eshell.texi: Further editing, and finished the "bugs" section.

20
man/ediff.texi
View File

@ -114,7 +114,7 @@ you don't like).
Ediff even understands multi-file patches and can apply them interactively!
(Ediff can recognize multi-file patches only if they are in the context
format or GNU unified format. All other patches are treated as 1-file
patches. Ediff is [hopefully] using the same algorithm as @command{patch} to
patches. Ediff is [hopefully] using the same algorithm as @code{patch} to
determine which files need to be patched.)
Ediff is aware of version control, which lets you compare
@ -222,7 +222,7 @@ the case. To avoid this extra prompt, you can invoke this command with a
prefix argument. With an odd prefix argument, Ediff assumes the patch
is in a file; with an even argument, a buffer is assumed.
Note that @code{ediff-patch-file} will actually use the @command{patch}
Note that @code{ediff-patch-file} will actually use the @code{patch}
utility to change the the original files on disk. This is not that
dangerous, since you will always have the original contents of the file
saved in another file that has the extension @file{.orig}.
@ -249,7 +249,7 @@ appears in some other buffer that has the name ending with @emph{_patched}.
This function would refuse to apply a multifile patch to a buffer. Use
@code{ediff-patch-file} for that (and when you want the original file to be
modified by the @command{patch} utility).
modified by the @code{patch} utility).
Since the patch might be in a buffer or a file, you will be asked which is
the case. To avoid this extra prompt, you can invoke this command with a
@ -340,7 +340,7 @@ the VMS version of @code{diff}.
The functions @code{ediff-files}, @code{ediff-buffers},
@code{ediff-files3}, @code{ediff-buffers3} first display the coarse,
line-based difference regions, as reported by the @command{diff} program. The
line-based difference regions, as reported by the @code{diff} program. The
total number of difference regions and the current difference number are
always displayed in the mode line of the control window.
@ -446,9 +446,9 @@ Scrolls buffers to the right.
@item wd
Saves the output from the diff utility, for further reference.
With prefix argument, saves the plain output from @command{diff} (see
With prefix argument, saves the plain output from @code{diff} (see
@code{ediff-diff-program} and @code{ediff-diff-options}). Without the
argument, it saves customized @command{diff} output (see
argument, it saves customized @code{diff} output (see
@code{ediff-custom-diff-program} and @code{ediff-custom-diff-options}), if
it is available.
@ -669,7 +669,7 @@ Runs @code{ediff-custom-diff-program} on the variants and displays the
buffer containing the output. This is useful when you must send the output
to your Mom.
With a prefix argument, displays the plain @command{diff} output.
With a prefix argument, displays the plain @code{diff} output.
@xref{Patch and Diff Programs}, for details.
@item R
@ -980,7 +980,7 @@ this variable globally.
@cindex Multi-file patches
A multi-file patch is a concatenated output of several runs of the Unix
@command{diff} command (some versions of @command{diff} let you create a
@code{diff} command (some versions of @code{diff} let you create a
multi-file patch in just one run). Ediff facilitates creation of
multi-file patches as follows. If you are in a session group buffer
created in response to @code{ediff-directories} or
@ -988,7 +988,7 @@ created in response to @code{ediff-directories} or
desired Ediff sessions and then type @kbd{P} to create a
multi-file patch of those marked sessions.
Ediff will then display a buffer containing the patch.
The patch is generated by invoking @command{diff} on all marked individual
The patch is generated by invoking @code{diff} on all marked individual
sessions (represented by files) and session groups (represented by
directories). Ediff will also recursively descend into any @emph{unmarked}
session group and will search for marked sessions there. In this way, you
@ -1773,7 +1773,7 @@ output from @code{diff} in your preferred format, which is specified via
the above two variables.
The output generated by @code{ediff-custom-diff-program} (which doesn't
even have to be a standard-style @command{diff}!)@: is not used by Ediff. It is
even have to be a standard-style @code{diff}!)@: is not used by Ediff. It is
provided exclusively so that you can
refer to
it later, send it over email, etc. For instance, after reviewing the