Mercurial > hg > xemacs-beta

comparison man/ediff.texi @ 14:9ee227acff29 r19-15b90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-15b90
author cvs
date Mon, 13 Aug 2007 08:48:42 +0200
parents bcdc7deadc19
children 0293115a14e9
comparison
equal deleted inserted replaced
13:13c6d0aaafe5 14:9ee227acff29
788 is in a separate frame) to the single-frame mode (where all Ediff buffers 788 is in a separate frame) to the single-frame mode (where all Ediff buffers
789 share the same frame), and vice versa. See 789 share the same frame), and vice versa. See
790 @code{ediff-window-setup-function} for details on how to make either of 790 @code{ediff-window-setup-function} for details on how to make either of
791 these modes the default one. 791 these modes the default one.
792 792
793 This function can also be invoked from Ediff menus. However, in this case, 793 This function can also be invoked from the Menubar. However, in some
794 it will affect only @emph{new} Ediff sessions, not the currently running 794 cases, the change will take place only after you execute one of the Ediff
795 ones. 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. The Ediff toolbar provides quick access to some 798 Available in XEmacs only (in a forthcoming version). The Ediff toolbar
799 of the common Ediff functions. This function toggles the display of the 799 provides quick access to some of the common Ediff functions. This function
800 toolbar. If invoked from the menu, the function will not have immediate 800 toggles the display of the toolbar. If invoked from the menubar, the function
801 effect---you will have to perform an action that changes Ediff window 801 may take sometimes effect only after you execute an Ediff command, such as
802 configuration to see the effect (e.g., you could try to change the window 802 going to the next difference.
803 split).
804 803
805 @item ediff-use-toolbar-p 804 @item ediff-use-toolbar-p
806 @vindex ediff-use-toolbar-p 805 @vindex ediff-use-toolbar-p
807 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
808 @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
1285 @code{ediff-setup-windows-multiframe} function, which is the default on 1284 @code{ediff-setup-windows-multiframe} function, which is the default on
1286 windowing displays. The plain setup, one where all windows are always 1285 windowing displays. The plain setup, one where all windows are always
1287 in one frame, is done by @code{ediff-setup-windows-plain}, which is the 1286 in one frame, is done by @code{ediff-setup-windows-plain}, which is the
1288 default on a non-windowing display (or in an xterm window). In fact, 1287 default on a non-windowing display (or in an xterm window). In fact,
1289 under Emacs, you can switch freely between these two setups by executing 1288 under Emacs, you can switch freely between these two setups by executing
1290 the command @code{ediff-toggle-multiframe} using the Minibuffer. 1289 the command @code{ediff-toggle-multiframe} using the Minibuffer of the
1290 Menubar.
1291 @findex ediff-setup-windows-multiframe 1291 @findex ediff-setup-windows-multiframe
1292 @findex ediff-setup-windows-plain 1292 @findex ediff-setup-windows-plain
1293 @findex ediff-toggle-multiframe 1293 @findex ediff-toggle-multiframe
1294 1294
1295 If you don't like any of these setups, write your own function. See the 1295 If you don't like any of these setups, write your own function. See the