/[emacs]/emacs/man/ediff.texi
ViewVC logotype

Diff of /emacs/man/ediff.texi

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.26.2.3 by miles, Fri Nov 21 00:36:12 2003 UTC revision 1.26.2.4 by miles, Tue Jul 6 10:23:38 2004 UTC
# Line 1067  the only such group-level operation is t Line 1067  the only such group-level operation is t
1067  @vindex ediff-autostore-merges  @vindex ediff-autostore-merges
1068  For group sessions created to merge files, Ediff can store all merges  For group sessions created to merge files, Ediff can store all merges
1069  automatically in a directory.  The user is asked to specify such directory  automatically in a directory.  The user is asked to specify such directory
1070  if the value of @code{ediff-autostore-merges} is non-nil.  If the value is  if the value of @code{ediff-autostore-merges} is non-@code{nil}.  If the value is
1071  @code{nil}, nothing is done to the merge buffers---it will be the user's  @code{nil}, nothing is done to the merge buffers---it will be the user's
1072  responsibility to save them.  If the value is @code{t}, the user will be  responsibility to save them.  If the value is @code{t}, the user will be
1073  asked where to save the merge buffers in all merge jobs, even those that do  asked where to save the merge buffers in all merge jobs, even those that do
# Line 2338  The second of the data buffers being com Line 2338  The second of the data buffers being com
2338  @item ediff-buffer-C  @item ediff-buffer-C
2339  In three-way comparisons, this is the third buffer being compared.  In three-way comparisons, this is the third buffer being compared.
2340  In merging, this is the merge buffer.  In merging, this is the merge buffer.
2341  In two-way comparison, this variable is nil.  In two-way comparison, this variable is @code{nil}.
2342    
2343  @item ediff-window-A  @item ediff-window-A
2344  The window displaying buffer A.  If buffer A is not visible, this variable  The window displaying buffer A.  If buffer A is not visible, this variable
2345  is nil or it may be a dead window.  is @code{nil} or it may be a dead window.
2346    
2347  @item ediff-window-B  @item ediff-window-B
2348  The window displaying buffer B.  The window displaying buffer B.
# Line 2351  The window displaying buffer B. Line 2351  The window displaying buffer B.
2351  The window displaying buffer C, if any.  The window displaying buffer C, if any.
2352    
2353  @item ediff-control-frame  @item ediff-control-frame
2354  A dedicated frame displaying the control buffer, if it exists.  A dedicated frame displaying the control buffer, if it exists.  It is
2355  It is non-nil only if Ediff uses the multiframe display, i.e., when the  non-@code{nil} only if Ediff uses the multiframe display, i.e., when
2356  control buffer is in its own frame.  the control buffer is in its own frame.
2357  @end table  @end table
2358    
2359  @node Credits, Index, Customization, Top  @node Credits, Index, Customization, Top

Legend:
Removed from v.1.26.2.3  
changed lines
  Added in v.1.26.2.4

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26