doc/misc/ediff.texi

352 and display it in a convenient form.  At present, Ediff understands only
357 @code{ediff-files3}, @code{ediff-buffers3} first display the coarse,
368 On a color display, fine differences are highlighted with color; on a
369 monochrome display, they are underlined.  @xref{Highlighting Difference
573 this case, the variants will be positioned so that each would display this
618 display.  This is useful when comparing files side-by-side.
623 Toggles the horizontal/vertical split of the Ediff display.  Horizontal
832 Toggle to display the ancestor file in 3way merges.
940 Changes the display from the multi-frame mode (where the quick help window
953 of the common Ediff functions.  This function toggles the display of the
961 @code{ediff-use-toolbar-p} (default is @code{t}).  This variable can be set
993 called @emph{*Ediff Registry*}.  You can display this buffer by typing
1094 set on a per-buffer basis.  Therefore, use @code{setq-default} to change
1106 Ediff will then display a buffer containing the patch.
1174 refer to Emacs manual for the information on how to set Emacs X resources.
1214 run right after the default bindings are set but before
1233 used to set desired window configurations, delete files Ediff didn't
1308 @item ediff-display-help-hook
1309 @vindex ediff-display-help-hook
1316 This hook is run just after Ediff mode is set up in the control
1318 set local variables that alter the look of the display.
1341 @code{ediff-meta-buffer-map} is a local variable, you can set different
1359 is set to @code{nil}, meaning that the short message is used.
1372 On a non-windowing display, Ediff sets things up in one frame, splitting
1378 On a window display, Ediff sets up a dedicated frame for Ediff Control
1398 Ediff uses the following variables to set up its control panel
1406 X-windows, you can use this name to set up preferences in your
1456 To start Ediff with an iconified Control Panel, you should set this
1472 The following variable controls how windows are set up:
1481 default on a non-windowing display (or in an xterm window).  In fact,
1538 Typing @kbd{#f} and @kbd{#h} toggles selective browsing on and off.
1540 Note that selective browsing affects only @code{ediff-next-difference}
1548 selective browsing.  To change the default Ediff function, add a function to
1563 selective browsing is currently in effect.
1570 default, set these variables in @file{.emacs} using @code{setq-default}.
1588 are fine differences between regions.  On devices where Emacs can display
1615 ignoring letter case or not. It can be set in @file{.emacs} using
1638 cannot display faces.  Ediff uses different flags to highlight regions that
1648 Emacs can display faces.  These and subsequently described faces can be set
1651 the information on how to set X resources.
1682 can be used, the user can set this variable to @code{t} to make sure that
1687 Indicates whether---on a windowing display---Ediff should highlight
1694 should set @code{ediff-highlight-all-diffs} to @code{nil}.  Type @kbd{h} to
1736             (set-face-foreground
1738             (set-face-background
1744 @strong{Please note:} to set Ediff's faces, use only @code{copy-face}
1745 or @code{set/make-face-@dots{}} as shown above. Emacs's low-level
1768 If @code{t}, Ediff narrows the display to the appropriate range when it
1796 @kbd{@@}.  You can also turn off display of refining that has
1801 auto-refining and display of refining are both turned off, fine
1927 be properly set.  If your patch program takes the option @option{-b},
1929 @code{ediff-backup-extension} must still be set so Ediff will know
1969 display @samp{[=diff(C)]} and the mode line of buffer C will display
1987 @comment Use @set to avoid triggering merge conflict detectors like CVS.
1988 @set seven-left <<<<<<<
1989 @set seven-right >>>>>>>
2031 @code{ediff-default-variant} was set to @code{default-A}) then
2072 display @samp{=diff(A) prefer-B}.  This indicates that the difference
2128 buffers A and B disagrees with the ancestor.  To do this, set the
2156 set in a per-buffer manner.  Therefore, use @code{setq-default} to globally
2239 (@code{split-window-vertically}, but you can set it to
2261 @item ediff-make-wide-display-function
2262 @vindex ediff-make-wide-display-function
2265 @code{ediff-make-wide-display-function} for details.  It is also
2267 @code{ediff-make-wide-display}.
2269 You can toggle wide/regular display by typing @kbd{m}.  In the wide
2270 display mode, buffers A, B (and C, when applicable) are displayed in a
2272 useful when files are compared side-by-side.  By default, the display is
2337 above variable, if set to @code{maybe}, will prevent Ediff from grabbing
2365 Make sure the variable @code{ediff-job-name} and @code{ediff-word-mode} are set
2368 Finally, if you want custom-tailored help messages, you can set the
2411 non-@code{nil} only if Ediff uses the multiframe display, i.e., when