Mercurial > hg > xemacs-beta

comparison man/ediff.texi @ 175:2d532a89d707 r20-3b14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-3b14
author cvs
date Mon, 13 Aug 2007 09:50:14 +0200
parents 4be1180a9e89
children bfd6434d15b3
comparison
equal deleted inserted replaced
174:bb3568571b84 175:2d532a89d707
3 @c Written by Michael Kifer 3 @c Written by Michael Kifer
4 4
5 @comment %**start of header (This is for running Texinfo on a region.) 5 @comment %**start of header (This is for running Texinfo on a region.)
6 6
7 @comment Using ediff.info instead of ediff in setfilename breaks DOS. 7 @comment Using ediff.info instead of ediff in setfilename breaks DOS.
8 @comment @setfilename ediff
9 @comment @setfilename ediff.info
8 @setfilename ediff 10 @setfilename ediff
9 @comment @setfilename ediff.info
10 11
11 @settitle Ediff User's Manual 12 @settitle Ediff User's Manual
12 @synindex vr cp 13 @synindex vr cp
13 @synindex fn cp 14 @synindex fn cp
14 @synindex pg cp 15 @synindex pg cp
37 38
38 @iftex 39 @iftex
39 @titlepage 40 @titlepage
40 @title Ediff User's Manual 41 @title Ediff User's Manual
41 @sp 4 42 @sp 4
42 @subtitle Ediff version 2.62 43 @subtitle Ediff version 2.66
43 @sp 1 44 @sp 1
44 @subtitle July 1996 45 @subtitle July 1997
45 @sp 5 46 @sp 5
46 @author Michael Kifer 47 @author Michael Kifer
47 @page 48 @page
48 49
49 @vskip 0pt plus 1filll 50 @vskip 0pt plus 1filll
50 @noindent 51 @noindent
51 Copyright @copyright{} 1995, 1996 Free Software Foundation, Inc. 52 Copyright @copyright{} 1995, 1996, 1997 Free Software Foundation, Inc.
52 53
53 Permission is granted to make and distribute verbatim copies of 54 Permission is granted to make and distribute verbatim copies of
54 this manual provided the copyright notice and this permission notice 55 this manual provided the copyright notice and this permission notice
55 are preserved on all copies. 56 are preserved on all copies.
56 @end titlepage 57 @end titlepage
57 @page 58 @page
58 @end iftex 59 @end iftex
59 60
60 @node Top, Introduction, (dir), (dir) 61 @node Top, Introduction, (dir), (dir)
61 62
63
62 @menu 64 @menu
63 * Introduction:: About Ediff. 65 * Introduction:: About Ediff 2.66.
64 * Major Entry Points:: How to use Ediff. 66 * Major Entry Points:: How to use Ediff.
65 * Session Commands:: Ediff commands used within a session. 67 * Session Commands:: Ediff commands used within a session.
66 * Registry of Ediff Sessions:: Keeping track of multiple Ediff sessions. 68 * Registry of Ediff Sessions:: Keeping track of multiple Ediff sessions.
67 * Session Groups:: Comparing and merging directories. 69 * Session Groups:: Comparing and merging directories.
68 * Remote and Compressed Files:: You may want to know about this. 70 * Remote and Compressed Files:: You may want to know about this.
112 Ediff is aware of version control, which lets you compare 114 Ediff is aware of version control, which lets you compare
113 files with their older versions. Ediff also works with remote and 115 files with their older versions. Ediff also works with remote and
114 compressed files, automatically ftp'ing them over and uncompressing them. 116 compressed files, automatically ftp'ing them over and uncompressing them.
115 @xref{Remote and Compressed Files}, for details. 117 @xref{Remote and Compressed Files}, for details.
116 118
117 This package builds upon ideas borrowed from Emerge and several Ediff's 119 This package builds upon ideas borrowed from Emerge, and several of Ediff's
118 functions are adaptations from Emerge. Although Ediff subsumes and greatly 120 functions are adaptations from Emerge. Although Ediff subsumes and greatly
119 extends Emerge, much of the functionality in Ediff is influenced by Emerge. 121 extends Emerge, much of the functionality in Ediff is influenced by Emerge.
120 The architecture and the interface are, of course, drastically different. 122 The architecture and the interface are, of course, drastically different.
121 123
122 @node Major Entry Points, Session Commands, Introduction, Top 124 @node Major Entry Points, Session Commands, Introduction, Top
1681 @code{ediff-patch-options}, @code{ediff-backup-specs}, and 1683 @code{ediff-patch-options}, @code{ediff-backup-specs}, and
1682 @code{ediff-backup-extension} as described below. 1684 @code{ediff-backup-extension} as described below.
1683 @item ediff-patch-options 1685 @item ediff-patch-options
1684 Options to pass to @code{ediff-patch-program}. 1686 Options to pass to @code{ediff-patch-program}.
1685 1687
1686 Note: the `-b' option should be specified in `ediff-backup-specs'. 1688 Note: the `-b' and `-z' options should be specified in
1689 `ediff-backup-specs', not in @code{ediff-patch-options}.
1687 1690
1688 It is recommended to pass the `-f' option to the patch program, so it won't 1691 It is recommended to pass the `-f' option to the patch program, so it won't
1689 ask questions. However, some implementations don't accept this option, in 1692 ask questions. However, some implementations don't accept this option, in
1690 which case the default value of this variable should be changed. 1693 which case the default value of this variable should be changed.
1691 1694
1700 system-dependent. Therefore, Ediff needs to know the backup extension used 1703 system-dependent. Therefore, Ediff needs to know the backup extension used
1701 by the patch program. 1704 by the patch program.
1702 1705
1703 Some versions of the patch program let the user specify `-b backup-extension'. 1706 Some versions of the patch program let the user specify `-b backup-extension'.
1704 Other versions only permit `-b', which (usually) assumes the extension `.orig'. 1707 Other versions only permit `-b', which (usually) assumes the extension `.orig'.
1708 Yet others force you to use `-z<backup-extension>'.
1705 1709
1706 Note that both `ediff-backup-extension' and `ediff-backup-specs' must be 1710 Note that both `ediff-backup-extension' and `ediff-backup-specs' must be
1707 properly set. If your patch program takes the option `-b', but not 1711 properly set. If your patch program takes the option `-b', but not
1708 `-b extension', the variable `ediff-backup-extension' must still 1712 `-b extension', the variable `ediff-backup-extension' must still
1709 be set so Ediff will know which extension to use. 1713 be set so Ediff will know which extension to use.
2051 2055
2052 The default function that Ediff uses simply toggles the read-only property, 2056 The default function that Ediff uses simply toggles the read-only property,
2053 unless the file is under version control. For a checked-in file under 2057 unless the file is under version control. For a checked-in file under
2054 version control, Ediff first tries to check the file out. 2058 version control, Ediff first tries to check the file out.
2055 2059
2060 @item ediff-make-buffers-readonly-at-startup nil
2061 @vindex ediff-make-buffers-readonly-at-startup
2062 If t, all variant buffers are made read-only at Ediff startup.
2063
2056 @item ediff-keep-variants 2064 @item ediff-keep-variants
2057 @vindex @code{ediff-keep-variants} 2065 @vindex @code{ediff-keep-variants}
2058 The default is @code{t}, meaning that the buffers being compared or merged will 2066 The default is @code{t}, meaning that the buffers being compared or merged will
2059 be preserved when Ediff quits. Setting this to @code{nil} causes Ediff to 2067 be preserved when Ediff quits. Setting this to @code{nil} causes Ediff to
2060 offer the user a chance to delete these buffers (if they are not modified). 2068 offer the user a chance to delete these buffers (if they are not modified).
2161 Ediff was written by Michael Kifer <kifer@@cs.sunysb.edu>. It was inspired 2169 Ediff was written by Michael Kifer <kifer@@cs.sunysb.edu>. It was inspired
2162 by emerge.el written by Dale R. Worley <drw@@math.mit.edu>. An idea due to 2170 by emerge.el written by Dale R. Worley <drw@@math.mit.edu>. An idea due to
2163 Boris Goldowsky <boris@@cs.rochester.edu> made it possible to highlight 2171 Boris Goldowsky <boris@@cs.rochester.edu> made it possible to highlight
2164 fine differences in Ediff buffers. Alastair Burt <burt@@dfki.uni-kl.de> 2172 fine differences in Ediff buffers. Alastair Burt <burt@@dfki.uni-kl.de>
2165 ported Ediff to XEmacs, Eric Freudenthal <freudent@@jan.ultra.nyu.edu> 2173 ported Ediff to XEmacs, Eric Freudenthal <freudent@@jan.ultra.nyu.edu>
2166 made it work with VC, and Marc Paquette <marcpa@@cam.org> wrote the 2174 made it work with VC, Marc Paquette <marcpa@@cam.org> wrote the
2167 toolbar support package for Ediff. 2175 toolbar support package for Ediff, and Hrvoje Niksic <hniksic@@srce.hr>
2176 adapted it to the Emacs customization package.
2168 2177
2169 Many people provided help with bug reports, patches, and advice. 2178 Many people provided help with bug reports, patches, and advice.
2170 Without them, Ediff would not be nearly as useful as it is today. 2179 Without them, Ediff would not be nearly as useful as it is today.
2171 Here is a full list of contributors (I hope I didn't miss anyone): 2180 Here is a full list of contributors (I hope I didn't miss anyone):
2172 2181
2173 @example 2182 @example
2174 Neal Becker (neal@@ctd.comsat.com), 2183 Neal Becker (neal@@ctd.comsat.com),
2175 Alastair Burt (burt@@dfki.uni-kl.de), Paul Bibilo (peb@@delcam.co.uk), 2184 Alastair Burt (burt@@dfki.uni-kl.de),
2185 Paul Bibilo (peb@@delcam.co.uk),
2176 Kevin Broadey (KevinB@@bartley.demon.co.uk), 2186 Kevin Broadey (KevinB@@bartley.demon.co.uk),
2177 Harald Boegeholz (hwb@@machnix.mathematik.uni-stuttgart.de), 2187 Harald Boegeholz (hwb@@machnix.mathematik.uni-stuttgart.de),
2178 Bradley A. Bosch (brad@@lachman.com), 2188 Bradley A. Bosch (brad@@lachman.com),
2179 Michael D. Carney (carney@@ltx-tr.com), 2189 Michael D. Carney (carney@@ltx-tr.com),
2180 Jin S. Choi (jin@@atype.com), 2190 Jin S. Choi (jin@@atype.com),
2191 Scott Cummings (cummings@@adc.com),
2181 Albert Dvornik (bert@@mit.edu), 2192 Albert Dvornik (bert@@mit.edu),
2182 Eric Eide (eeide@@asylum.cs.utah.edu), 2193 Eric Eide (eeide@@asylum.cs.utah.edu),
2183 Kevin Esler (esler@@ch.hp.com), Robert Estes (estes@@ece.ucdavis.edu), 2194 Paul Eggert (eggert@@twinsun.com),
2195 Kevin Esler (esler@@ch.hp.com),
2196 Robert Estes (estes@@ece.ucdavis.edu),
2184 Xavier Fornari (xavier@@europe.cma.fr), 2197 Xavier Fornari (xavier@@europe.cma.fr),
2185 Eric Freudenthal (freudent@@jan.ultra.nyu.edu), 2198 Eric Freudenthal (freudent@@jan.ultra.nyu.edu),
2186 Job Ganzevoort (Job.Ganzevoort@@cwi.nl), 2199 Job Ganzevoort (Job.Ganzevoort@@cwi.nl),
2187 Boris Goldowsky (boris@@cs.rochester.edu), 2200 Boris Goldowsky (boris@@cs.rochester.edu),
2188 Allan Gottlieb (gottlieb@@allan.ultra.nyu.edu), 2201 Allan Gottlieb (gottlieb@@allan.ultra.nyu.edu),
2189 Xiaoli Huang (hxl@@epic.com), 2202 Xiaoli Huang (hxl@@epic.com),
2190 Lars Magne Ingebrigtsen (larsi@@ifi.uio.no), 2203 Lars Magne Ingebrigtsen (larsi@@ifi.uio.no),
2191 Larry Gouge (larry@@itginc.com), Karl Heuer (kwzh@@gnu.ai.mit.edu), 2204 Larry Gouge (larry@@itginc.com),
2192 (irvine@@lks.csi.com), (jaffe@@chipmunk.cita.utoronto.ca), 2205 Karl Heuer (kwzh@@gnu.ai.mit.edu),
2206 (irvine@@lks.csi.com),
2207 (jaffe@@chipmunk.cita.utoronto.ca),
2193 David Karr (dkarr@@nmo.gtegsc.com), 2208 David Karr (dkarr@@nmo.gtegsc.com),
2194 Norbert Kiesel (norbert@@i3.informatik.rwth-aachen.de), 2209 Norbert Kiesel (norbert@@i3.informatik.rwth-aachen.de),
2195 Leigh L Klotz (klotz@@adoc.xerox.com), Fritz Knabe (Fritz.Knabe@@ecrc.de), 2210 Leigh L Klotz (klotz@@adoc.xerox.com),
2211 Fritz Knabe (Fritz.Knabe@@ecrc.de),
2196 Heinz Knutzen (hk@@informatik.uni-kiel.d400.de), 2212 Heinz Knutzen (hk@@informatik.uni-kiel.d400.de),
2197 Andrew Koenig (ark@@research.att.com), 2213 Andrew Koenig (ark@@research.att.com),
2198 Ken Laprade (laprade@@dw3f.ess.harris.com), Will C Lauer (wcl@@cadre.com), 2214 Ken Laprade (laprade@@dw3f.ess.harris.com),
2199 Richard Levitte (levitte@@e.kth.se), Mike Long (mike.long@@analog.com), 2215 Will C Lauer (wcl@@cadre.com),
2216 Richard Levitte (levitte@@e.kth.se),
2217 Mike Long (mike.long@@analog.com),
2200 Martin Maechler (maechler@@stat.math.ethz.ch), 2218 Martin Maechler (maechler@@stat.math.ethz.ch),
2201 Simon Marshall (Simon.Marshall@@gnu.ai.mit.edu), 2219 Simon Marshall (simon@@gnu.ai.mit.edu),
2202 Richard Mlynarik (mly@@adoc.xerox.com), 2220 Richard Mlynarik (mly@@adoc.xerox.com),
2203 Chris Murphy (murphycm@@sun.aston.ac.uk), 2221 Chris Murphy (murphycm@@sun.aston.ac.uk),
2204 Erik Naggum (erik@@naggum.no), 2222 Erik Naggum (erik@@naggum.no),
2205 Eyvind Ness (Eyvind.Ness@@hrp.no), Ray Nickson (nickson@@cs.uq.oz.au), 2223 Eyvind Ness (Eyvind.Ness@@hrp.no),
2224 Ray Nickson (nickson@@cs.uq.oz.au),
2206 David Petchey (petchey_david@@jpmorgan.com), 2225 David Petchey (petchey_david@@jpmorgan.com),
2207 Benjamin Pierce (benjamin.pierce@@cl.cam.ac.uk), 2226 Benjamin Pierce (benjamin.pierce@@cl.cam.ac.uk),
2208 Tibor Polgar (tlp00@@spg.amdahl.com), 2227 Tibor Polgar (tlp00@@spg.amdahl.com),
2209 David Prince (dave0d@@fegs.co.uk), 2228 David Prince (dave0d@@fegs.co.uk),
2210 Paul Raines (raines@@slac.stanford.edu), 2229 Paul Raines (raines@@slac.stanford.edu),
2211 C.S. Roberson (roberson@@aur.alcatel.com), 2230 C.S. Roberson (roberson@@aur.alcatel.com),
2212 Kevin Rodgers (kevin.rodgers@@ihs.com), 2231 Kevin Rodgers (kevin.rodgers@@ihs.com),
2213 Sandy Rutherford (sandy@@ibm550.sissa.it), 2232 Sandy Rutherford (sandy@@ibm550.sissa.it),
2214 Heribert Schuetz (schuetz@@ecrc.de), Andy Scott (ascott@@pcocd2.intel.com), 2233 Heribert Schuetz (schuetz@@ecrc.de),
2234 Andy Scott (ascott@@pcocd2.intel.com),
2215 Axel Seibert (axel@@tumbolia.ppp.informatik.uni-muenchen.de), 2235 Axel Seibert (axel@@tumbolia.ppp.informatik.uni-muenchen.de),
2216 Scott O. Sherman (Scott.Sherman@@mci.com), 2236 Scott O. Sherman (Scott.Sherman@@mci.com),
2217 Richard Stallman (rms@@gnu.ai.mit.edu), 2237 Richard Stallman (rms@@gnu.ai.mit.edu),
2218 Richard Stanton (stanton@@haas.berkeley.edu), 2238 Richard Stanton (stanton@@haas.berkeley.edu),
2219 Ake Stenhoff (etxaksf@@aom.ericsson.se), Stig (stig@@hackvan.com), 2239 Ake Stenhoff (etxaksf@@aom.ericsson.se),
2220 Peter Stout (Peter_Stout@@cs.cmu.edu), Chuck Thompson (cthomp@@cs.uiuc.edu), 2240 Stig (stig@@hackvan.com),
2241 Peter Stout (Peter_Stout@@cs.cmu.edu),
2242 Chuck Thompson (cthomp@@cs.uiuc.edu),
2221 Ray Tomlinson (tomlinso@@bbn.com), 2243 Ray Tomlinson (tomlinso@@bbn.com),
2222 Raymond Toy (toy@@rtp.ericsson.se), 2244 Raymond Toy (toy@@rtp.ericsson.se),
2223 Philippe Waroquiers (philippe.waroquiers@@eurocontrol.be), 2245 Philippe Waroquiers (philippe.waroquiers@@eurocontrol.be),
2246 Klaus Weber (gizmo@@zork.north.de),
2224 Ben Wing (wing@@666.com), 2247 Ben Wing (wing@@666.com),
2225 Ilya Zakharevich (ilya@@math.ohio-state.edu), 2248 Ilya Zakharevich (ilya@@math.ohio-state.edu),
2226 Eli Zaretskii (eliz@@is.elta.co.il) 2249 Eli Zaretskii (eliz@@is.elta.co.il)
2227 @end example 2250 @end example
2228 2251