X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/6a2c4aece5e4cb3f03efc00540f917f688327da1..491384001301d37b038f3ee074b13f658d094966:/doc/misc/ediff.texi diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi index 1988344d29..0afcdd923d 100644 --- a/doc/misc/ediff.texi +++ b/doc/misc/ediff.texi @@ -25,8 +25,7 @@ This file documents Ediff, a comprehensive visual interface to Unix diff and patch utilities. -Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright @copyright{} 1995-2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -42,7 +41,7 @@ developing GNU and promoting software freedom.'' @end quotation @end copying -@dircategory Emacs +@dircategory Emacs misc features @direntry * Ediff: (ediff). A visual interface for comparing and merging programs. @end direntry @@ -61,9 +60,12 @@ developing GNU and promoting software freedom.'' @insertcopying @end titlepage +@contents @node Top, Introduction, (dir), (dir) +@top Ediff +@insertcopying @menu * Introduction:: About Ediff. @@ -156,6 +158,11 @@ Compare a file with its backup. If there are several numerical backups, use the latest. If the file is itself a backup, then compare it with its original. +@item ediff-current-file +@findex ediff-current-file +Compare the buffer with its file on disk. This function can be used as a +safe version of @code{revert-buffer}. + @item ediff-buffers @findex ediff-buffers Compare two buffers. @@ -327,18 +334,6 @@ Brings up Ediff session registry. This feature enables you to quickly find and restart active Ediff sessions. @end table -@noindent -If you want Ediff to be loaded from the very beginning of your Emacs -session, you should put this line in your @file{~/.emacs} file: - -@example -(require 'ediff) -@end example - -@noindent -Otherwise, Ediff will be loaded automatically when you use one of the -above functions, either directly or through the menus. - When the above functions are invoked, the user is prompted for all the necessary information---typically the files or buffers to compare, merge, or patch. Ediff tries to be smart about these prompts. For instance, in @@ -413,7 +408,7 @@ window by typing @kbd{?} again. The Quick Help commands are detailed below. Many Ediff commands take numeric prefix arguments. For instance, if you type a number, say 3, and then @kbd{j} (@code{ediff-jump-to-difference}), Ediff moves to the third difference region. Typing 3 and then @kbd{a} -(@code{ediff-diff-to-diff}) copies the 3d difference region from variant A +(@code{ediff-diff-to-diff}) copies the 3rd difference region from variant A to variant B. Likewise, 4 followed by @kbd{ra} restores the 4th difference region in buffer A (if it was previously written over via the command @kbd{a}). @@ -438,6 +433,8 @@ command (see @kbd{ga}, @kbd{gb}, and @kbd{gc}). @node Quick Help Commands,Other Session Commands,,Session Commands @section Quick Help Commands +@cindex command help +@cindex important commands @table @kbd @item ? @@ -752,7 +749,7 @@ Displays a list of currently active Ediff sessions---the Ediff Registry. You can then restart any of these sessions by either clicking on a session record or by putting the cursor over it and then typing the return key. -(Some poor souls leave so many active Ediff sessions around that they loose +(Some poor souls leave so many active Ediff sessions around that they lose track of them completely... The `R' command is designed to save these people from the recently discovered Ediff Proficiency Syndrome.) @@ -1212,7 +1209,7 @@ This hook can be used to alter bindings in Ediff's keymap, @code{ediff-mode-map}. These hooks are run right after the default bindings are set but before @code{ediff-load-hook}. The regular user needs not be concerned with this -hook---it is provided for implementors of other Emacs packages built on top +hook---it is provided for implementers of other Emacs packages built on top of Ediff. @item ediff-before-setup-windows-hook @@ -1251,7 +1248,7 @@ This hook is run just before @code{ediff-quit-hook}. This is a good place to do various cleanups, such as deleting the variant buffers. Ediff provides a function, @code{ediff-janitor}, as one such possible hook, which you can add to @code{ediff-cleanup-hook} with -@code{add-hooks}. +@code{add-hook}. @findex ediff-janitor This function kills buffers A, B, and, possibly, C, if these buffers aren't @@ -1736,7 +1733,7 @@ faces, you can modify them when Ediff is being loaded using @end smallexample @strong{Please note:} to set Ediff's faces, use only @code{copy-face} -or @code{set/make-face-@dots{}} as shown above. Emacs' low-level +or @code{set/make-face-@dots{}} as shown above. Emacs's low-level face-manipulation functions should be avoided. @node Narrowing, Refinement of Difference Regions, Highlighting Difference Regions, Customization @@ -2308,7 +2305,7 @@ other behavior. However, Ediff temporarily resets this variable to @code{t} if it is invoked via one of the "buffer" jobs, such as @code{ediff-buffers}. -This is because it is all too easy to loose day's work otherwise. +This is because it is all too easy to lose a day's work otherwise. Besides, in a "buffer" job, the variant buffers have already been loaded prior to starting Ediff, so Ediff just preserves status quo here. @@ -2423,104 +2420,105 @@ Without them, Ediff would not be nearly as useful as it is today. Here is a hopefully full list of contributors: @example -Adrian Aichner (aichner@@ecf.teradyne.com), -Drew Adams (drew.adams@@oracle.com), -Steve Baur (steve@@xemacs.org), -Neal Becker (neal@@ctd.comsat.com), -E.@: Jay Berkenbilt (ejb@@ql.org), -Alastair Burt (burt@@dfki.uni-kl.de), -Paul Bibilo (peb@@delcam.co.uk), -Kevin Broadey (KevinB@@bartley.demon.co.uk), -Harald Boegeholz (hwb@@machnix.mathematik.uni-stuttgart.de), -Bradley A.@: Bosch (brad@@lachman.com), -Michael D.@: Carney (carney@@ltx-tr.com), -Jin S.@: Choi (jin@@atype.com), -Scott Cummings (cummings@@adc.com), -Albert Dvornik (bert@@mit.edu), -Eric Eide (eeide@@asylum.cs.utah.edu), -Paul Eggert (eggert@@twinsun.com), -Urban Engberg (ue@@cci.dk), -Kevin Esler (esler@@ch.hp.com), -Robert Estes (estes@@ece.ucdavis.edu), -Jay Finger (jayf@@microsoft.com), -Xavier Fornari (xavier@@europe.cma.fr), -Eric Freudenthal (freudent@@jan.ultra.nyu.edu), -Job Ganzevoort (Job.Ganzevoort@@cwi.nl), -Felix Heinrich Gatzemeier (felix.g@@tzemeier.info), -Boris Goldowsky (boris@@cs.rochester.edu), -Allan Gottlieb (gottlieb@@allan.ultra.nyu.edu), -Aaron Gross (aaron@@bfr.co.il), -Thorbjoern Hansen (thorbjoern.hansen@@mchp.siemens.de), -Marcus Harnisch (marcus_harnisch@@mint-tech.com), -Steven E. Harris (seh@@panix.com), -Aaron S. Hawley (Aaron.Hawley@@uvm.edu), -Xiaoli Huang (hxl@@epic.com), -Andreas Jaeger (aj@@suse.de), -Lars Magne Ingebrigtsen (larsi@@ifi.uio.no), -Larry Gouge (larry@@itginc.com), -Karl Heuer (kwzh@@gnu.org), -(irvine@@lks.csi.com), -(jaffe@@chipmunk.cita.utoronto.ca), -David Karr (dkarr@@nmo.gtegsc.com), -Norbert Kiesel (norbert@@i3.informatik.rwth-aachen.de), -Steffen Kilb (skilb@@gmx.net), -Leigh L Klotz (klotz@@adoc.xerox.com), -Fritz Knabe (Fritz.Knabe@@ecrc.de), -Heinz Knutzen (hk@@informatik.uni-kiel.d400.de), -Andrew Koenig (ark@@research.att.com), -Hannu Koivisto (azure@@iki.fi), -Ken Laprade (laprade@@dw3f.ess.harris.com), -Will C Lauer (wcl@@cadre.com), -Richard Levitte (levitte@@e.kth.se), -Mike Long (mike.long@@analog.com), -Dave Love (d.love@@dl.ac.uk), -Martin Maechler (maechler@@stat.math.ethz.ch), -Simon Marshall (simon@@gnu.org), -Paul C. Meuse (pmeuse@@delcomsys.com), -Richard Mlynarik (mly@@adoc.xerox.com), -Stefan Monnier (monnier@@cs.yale.edu), -Chris Murphy (murphycm@@sun.aston.ac.uk), -Erik Naggum (erik@@naggum.no), -Eyvind Ness (Eyvind.Ness@@hrp.no), -Ray Nickson (nickson@@cs.uq.oz.au), -Dan Nicolaescu (dann@@ics.uci.edu), -David Petchey (petchey_david@@jpmorgan.com), -Benjamin Pierce (benjamin.pierce@@cl.cam.ac.uk), -Francois Pinard (pinard@@iro.umontreal.ca), -Tibor Polgar (tlp00@@spg.amdahl.com), -David Prince (dave0d@@fegs.co.uk), -Paul Raines (raines@@slac.stanford.edu), -Stefan Reicher (xsteve@@riic.at), -Charles Rich (rich@@merl.com), -Bill Richter (richter@@math.nwu.edu), -C.S.@: Roberson (roberson@@aur.alcatel.com), -Kevin Rodgers (kevin.rodgers@@ihs.com), -Sandy Rutherford (sandy@@ibm550.sissa.it), -Heribert Schuetz (schuetz@@ecrc.de), -Andy Scott (ascott@@pcocd2.intel.com), -Axel Seibert (axel@@tumbolia.ppp.informatik.uni-muenchen.de), -Vin Shelton (acs@@xemacs.org), -Scott O. Sherman (Scott.Sherman@@mci.com), -Nikolaj Schumacher (n_schumacher@@web.de), -Richard Stallman (rms@@gnu.org), -Richard Stanton (stanton@@haas.berkeley.edu), -Sam Steingold (sds@@goems.com), -Ake Stenhoff (etxaksf@@aom.ericsson.se), -Stig (stig@@hackvan.com), -Peter Stout (Peter_Stout@@cs.cmu.edu), -Chuck Thompson (cthomp@@cs.uiuc.edu), -Ray Tomlinson (tomlinso@@bbn.com), -Raymond Toy (toy@@rtp.ericsson.se), -Stephen J. Turnbull (stephen@@xemacs.org), -Jan Vroonhof (vroonhof@@math.ethz.ch), -Colin Walters (walters@@cis.ohio-state.edu), -Philippe Waroquiers (philippe.waroquiers@@eurocontrol.be), -Klaus Weber (gizmo@@zork.north.de), -Ben Wing (ben@@xemacs.org), -Tom Wurgler (twurgler@@goodyear.com), -Steve Youngs (youngs@@xemacs.org), -Ilya Zakharevich (ilya@@math.ohio-state.edu), -Eli Zaretskii (eliz@@is.elta.co.il) +Adrian Aichner (aichner at ecf.teradyne.com), +Drew Adams (drew.adams at oracle.com), +Steve Baur (steve at xemacs.org), +Neal Becker (neal at ctd.comsat.com), +E.@: Jay Berkenbilt (ejb at ql.org), +Lennart Borgman (ennart.borgman at gmail.com) +Alastair Burt (burt at dfki.uni-kl.de), +Paul Bibilo (peb at delcam.co.uk), +Kevin Broadey (KevinB at bartley.demon.co.uk), +Harald Boegeholz (hwb at machnix.mathematik.uni-stuttgart.de), +Bradley A.@: Bosch (brad at lachman.com), +Michael D.@: Carney (carney at ltx-tr.com), +Jin S.@: Choi (jin at atype.com), +Scott Cummings (cummings at adc.com), +Albert Dvornik (bert at mit.edu), +Eric Eide (eeide at asylum.cs.utah.edu), +Paul Eggert (eggert at twinsun.com), +Urban Engberg (ue at cci.dk), +Kevin Esler (esler at ch.hp.com), +Robert Estes (estes at ece.ucdavis.edu), +Jay Finger (jayf at microsoft.com), +Xavier Fornari (xavier at europe.cma.fr), +Eric Freudenthal (freudent at jan.ultra.nyu.edu), +Job Ganzevoort (Job.Ganzevoort at cwi.nl), +Felix Heinrich Gatzemeier (felix.g at tzemeier.info), +Boris Goldowsky (boris at cs.rochester.edu), +Allan Gottlieb (gottlieb at allan.ultra.nyu.edu), +Aaron Gross (aaron at bfr.co.il), +Thorbjoern Hansen (thorbjoern.hansen at mchp.siemens.de), +Marcus Harnisch (marcus_harnisch at mint-tech.com), +Steven E. Harris (seh at panix.com), +Aaron S. Hawley (Aaron.Hawley at uvm.edu), +Xiaoli Huang (hxl at epic.com), +Andreas Jaeger (aj at suse.de), +Lars Magne Ingebrigtsen (larsi at ifi.uio.no), +Larry Gouge (larry at itginc.com), +Karl Heuer (kwzh at gnu.org), +(irvine at lks.csi.com), +(jaffe at chipmunk.cita.utoronto.ca), +David Karr (dkarr at nmo.gtegsc.com), +Norbert Kiesel (norbert at i3.informatik.rwth-aachen.de), +Steffen Kilb (skilb at gmx.net), +Leigh L Klotz (klotz at adoc.xerox.com), +Fritz Knabe (Fritz.Knabe at ecrc.de), +Heinz Knutzen (hk at informatik.uni-kiel.d400.de), +Andrew Koenig (ark at research.att.com), +Hannu Koivisto (azure at iki.fi), +Ken Laprade (laprade at dw3f.ess.harris.com), +Will C Lauer (wcl at cadre.com), +Richard Levitte (levitte at e.kth.se), +Mike Long (mike.long at analog.com), +Dave Love (d.love at dl.ac.uk), +Martin Maechler (maechler at stat.math.ethz.ch), +Simon Marshall (simon at gnu.org), +Paul C. Meuse (pmeuse at delcomsys.com), +Richard Mlynarik (mly at adoc.xerox.com), +Stefan Monnier (monnier at cs.yale.edu), +Chris Murphy (murphycm at sun.aston.ac.uk), +Erik Naggum (erik at naggum.no), +Eyvind Ness (Eyvind.Ness at hrp.no), +Ray Nickson (nickson at cs.uq.oz.au), +Dan Nicolaescu (dann at ics.uci.edu), +David Petchey (petchey_david at jpmorgan.com), +Benjamin Pierce (benjamin.pierce at cl.cam.ac.uk), +Francois Pinard (pinard at iro.umontreal.ca), +Tibor Polgar (tlp00 at spg.amdahl.com), +David Prince (dave0d at fegs.co.uk), +Paul Raines (raines at slac.stanford.edu), +Stefan Reicher (xsteve at riic.at), +Charles Rich (rich at merl.com), +Bill Richter (richter at math.nwu.edu), +C.S.@: Roberson (roberson at aur.alcatel.com), +Kevin Rodgers (kevin.rodgers at ihs.com), +Sandy Rutherford (sandy at ibm550.sissa.it), +Heribert Schuetz (schuetz at ecrc.de), +Andy Scott (ascott at pcocd2.intel.com), +Axel Seibert (axel at tumbolia.ppp.informatik.uni-muenchen.de), +Vin Shelton (acs at xemacs.org), +Scott O. Sherman (Scott.Sherman at mci.com), +Nikolaj Schumacher (n_schumacher at web.de), +Richard Stallman (rms at gnu.org), +Richard Stanton (stanton at haas.berkeley.edu), +Sam Steingold (sds at goems.com), +Ake Stenhoff (etxaksf at aom.ericsson.se), +Stig (stig at hackvan.com), +Peter Stout (Peter_Stout at cs.cmu.edu), +Chuck Thompson (cthomp at cs.uiuc.edu), +Ray Tomlinson (tomlinso at bbn.com), +Raymond Toy (toy at rtp.ericsson.se), +Stephen J. Turnbull (stephen at xemacs.org), +Jan Vroonhof (vroonhof at math.ethz.ch), +Colin Walters (walters at cis.ohio-state.edu), +Philippe Waroquiers (philippe.waroquiers at eurocontrol.be), +Klaus Weber (gizmo at zork.north.de), +Ben Wing (ben at xemacs.org), +Tom Wurgler (twurgler at goodyear.com), +Steve Youngs (youngs at xemacs.org), +Ilya Zakharevich (ilya at math.ohio-state.edu), +Eli Zaretskii (eliz at is.elta.co.il) @end example @node GNU Free Documentation License, Index, Credits, Top @@ -2532,10 +2530,4 @@ Eli Zaretskii (eliz@@is.elta.co.il) @unnumbered Index @printindex cp -@setchapternewpage odd -@contents @bye - -@ignore - arch-tag: 165ecb88-d03c-44b1-a921-b93f50b05b46 -@end ignore