Mercurial > hg > xemacs-beta

comparison man/ediff.texi @ 82:6a378aca36af r20-0b91

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-0b91
author cvs
date Mon, 13 Aug 2007 09:07:36 +0200
parents 1ce6082ce73f
children 4be1180a9e89
comparison
equal deleted inserted replaced
81:ebca3d831cea 82:6a378aca36af
793 This function can also be invoked from the Menubar. However, in some 793 This function can also be invoked from the Menubar. However, in some
794 cases, the change will take place only after you execute one of the Ediff 794 cases, the change will take place only after you execute one of the Ediff
795 commands, such as going to the next difference or redisplaying. 795 commands, such as going to the next difference or redisplaying.
796 @item ediff-toggle-use-toolbar 796 @item ediff-toggle-use-toolbar
797 @findex ediff-toggle-use-toolbar 797 @findex ediff-toggle-use-toolbar
798 Available in XEmacs only (in a forthcoming version). The Ediff toolbar 798 Available in XEmacs only. The Ediff toolbar provides quick access to some
799 provides quick access to some of the common Ediff functions. This function 799 of the common Ediff functions. This function toggles the display of the
800 toggles the display of the toolbar. If invoked from the menubar, the function 800 toolbar. If invoked from the menubar, the function may take sometimes
801 may take sometimes effect only after you execute an Ediff command, such as 801 effect only after you execute an Ediff command, such as going to the next
802 going to the next difference. 802 difference.
803 803
804 @item ediff-use-toolbar-p 804 @item ediff-use-toolbar-p
805 @vindex ediff-use-toolbar-p 805 @vindex ediff-use-toolbar-p
806 The use of the toolbar can also be specified via the variable 806 The use of the toolbar can also be specified via the variable
807 @code{ediff-use-toolbar-p} (default is @code{t}). This variable can be set 807 @code{ediff-use-toolbar-p} (default is @code{t}). This variable can be set
2161 Ediff was written by Michael Kifer <kifer@@cs.sunysb.edu>. It was inspired 2161 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 2162 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 2163 Boris Goldowsky <boris@@cs.rochester.edu> made it possible to highlight
2164 fine differences in Ediff buffers. Alastair Burt <burt@@dfki.uni-kl.de> 2164 fine differences in Ediff buffers. Alastair Burt <burt@@dfki.uni-kl.de>
2165 ported Ediff to XEmacs, Eric Freudenthal <freudent@@jan.ultra.nyu.edu> 2165 ported Ediff to XEmacs, Eric Freudenthal <freudent@@jan.ultra.nyu.edu>
2166 made it work with VC, and Marc Paquette <paquette@@crim.ca> wrote the 2166 made it work with VC, and Marc Paquette <marcpa@@cam.org> wrote the
2167 toolbar support package for Ediff. 2167 toolbar support package for Ediff.
2168 2168
2169 Many people provided help with bug reports, patches, and advice. 2169 Many people provided help with bug reports, patches, and advice.
2170 Without them, Ediff would not be nearly as useful as it is today. 2170 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): 2171 Here is a full list of contributors (I hope I didn't miss anyone):