diff options
author | Michael Kifer <kifer@cs.stonybrook.edu> | 2009-08-15 06:00:38 +0000 |
---|---|---|
committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2009-08-15 06:00:38 +0000 |
commit | 9ff0b02b3a91a32c76a99a984f5d48cd77efa561 (patch) | |
tree | df7c602584be6b632c540a8fddfd8dd52bc024ba /doc/misc/ediff.texi | |
parent | 68b962d42a9cc126759448484d23e10e2102d622 (diff) | |
download | emacs-9ff0b02b3a91a32c76a99a984f5d48cd77efa561.tar.gz |
2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff.texi (ediff-current-file): added information about this new function.
* viper.text: Added information about C-s in viper's search command.
Diffstat (limited to 'doc/misc/ediff.texi')
-rw-r--r-- | doc/misc/ediff.texi | 202 |
1 files changed, 104 insertions, 98 deletions
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi index 80540ea19e8..53259f9bbf6 100644 --- a/doc/misc/ediff.texi +++ b/doc/misc/ediff.texi @@ -158,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. @@ -2425,104 +2430,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 |