[Emacs-diffs] Changes to emacs/man/ediff.texi [emacs-unicode-2]

[Miles Bader]

Index: emacs/man/ediff.texi
diff -c emacs/man/ediff.texi:1.30.2.1 emacs/man/ediff.texi:1.30.2.2
*** emacs/man/ediff.texi:1.30.2.1       Fri Apr 16 12:50:41 2004
--- emacs/man/ediff.texi        Tue Jun 29 16:45:45 2004
***************
*** 1067,1073 ****
  @vindex ediff-autostore-merges
  For group sessions created to merge files, Ediff can store all merges
  automatically in a directory.  The user is asked to specify such directory
! if the value of @code{ediff-autostore-merges} is non-nil.  If the value is
  @code{nil}, nothing is done to the merge buffers---it will be the user's
  responsibility to save them.  If the value is @code{t}, the user will be
  asked where to save the merge buffers in all merge jobs, even those that do
--- 1067,1073 ----
  @vindex ediff-autostore-merges
  For group sessions created to merge files, Ediff can store all merges
  automatically in a directory.  The user is asked to specify such directory
! if the value of @code{ediff-autostore-merges} is address@hidden  If the value 
is
  @code{nil}, nothing is done to the merge buffers---it will be the user's
  responsibility to save them.  If the value is @code{t}, the user will be
  asked where to save the merge buffers in all merge jobs, even those that do
***************
*** 2338,2348 ****
  @item ediff-buffer-C
  In three-way comparisons, this is the third buffer being compared.
  In merging, this is the merge buffer.
! In two-way comparison, this variable is nil.
  
  @item ediff-window-A
  The window displaying buffer A.  If buffer A is not visible, this variable
! is nil or it may be a dead window.
  
  @item ediff-window-B
  The window displaying buffer B.
--- 2338,2348 ----
  @item ediff-buffer-C
  In three-way comparisons, this is the third buffer being compared.
  In merging, this is the merge buffer.
! In two-way comparison, this variable is @code{nil}.
  
  @item ediff-window-A
  The window displaying buffer A.  If buffer A is not visible, this variable
! is @code{nil} or it may be a dead window.
  
  @item ediff-window-B
  The window displaying buffer B.
***************
*** 2351,2359 ****
  The window displaying buffer C, if any.
  
  @item ediff-control-frame
! A dedicated frame displaying the control buffer, if it exists.
! It is non-nil only if Ediff uses the multiframe display, i.e., when the
! control buffer is in its own frame.
  @end table
  
  @node Credits, Index, Customization, Top
--- 2351,2359 ----
  The window displaying buffer C, if any.
  
  @item ediff-control-frame
! A dedicated frame displaying the control buffer, if it exists.  It is
! address@hidden only if Ediff uses the multiframe display, i.e., when
! the control buffer is in its own frame.
  @end table
  
  @node Credits, Index, Customization, Top