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

[Michael Kifer]

Index: emacs/lisp/ediff-init.el
diff -c emacs/lisp/ediff-init.el:1.52 emacs/lisp/ediff-init.el:1.53
*** emacs/lisp/ediff-init.el:1.52       Thu Dec 20 13:37:58 2001
--- emacs/lisp/ediff-init.el    Mon Dec 24 00:50:31 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 prompt to remove unmodified buffers A/B/C at session end.
  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 else
  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))