[Emacs-diffs] Changes to emacs/lisp/ediff-init.el

[Pavel Janík]

Index: emacs/lisp/ediff-init.el
diff -c emacs/lisp/ediff-init.el:1.51 emacs/lisp/ediff-init.el:1.52
*** emacs/lisp/ediff-init.el:1.51       Sun Sep  9 18:33:38 2001
--- emacs/lisp/ediff-init.el    Thu Dec 20 13:37:58 2001
***************
*** 590,596 ****
  Actually, Ediff restores the scope of visibility that existed at startup.")
  
  (defcustom ediff-keep-variants t
!   "*Nil means that non-modified variant buffers should be removed at the end 
of the session after some interrogation.
  Supplying a prefix argument to the quit command `q' temporarily reverses the
  meaning of this variable."
    :type 'boolean
--- 590,596 ----
  Actually, Ediff restores the scope of visibility that existed at startup.")
  
  (defcustom ediff-keep-variants t
!   "*nil means that non-modified variant buffers should be removed at the end 
of the session after some interrogation.
  Supplying a prefix argument to the quit command `q' temporarily reverses the
  meaning of this variable."
    :type 'boolean
***************
*** 1241,1247 ****
  
  (defcustom ediff-autostore-merges  'group-jobs-only
    "*Save the results of merge jobs automatically.
! Nil means don't save automatically.  t means always save.  Anything but nil 
or t
  means save automatically only if the merge job is part of a group of jobs, 
such
  as `ediff-merge-directory' or `ediff-merge-directory-revisions'."
    :type '(choice (const nil) (const t) (const group-jobs-only))
--- 1241,1247 ----
  
  (defcustom ediff-autostore-merges  'group-jobs-only
    "*Save the results of merge jobs automatically.
! nil means don't save automatically.  t means always save.  Anything but nil 
or t
  means save automatically only if the merge job is part of a group of jobs, 
such
  as `ediff-merge-directory' or `ediff-merge-directory-revisions'."
    :type '(choice (const nil) (const t) (const group-jobs-only))