/[emacs]/emacs/lisp/ediff-init.el
ViewVC logotype

Diff of /emacs/lisp/ediff-init.el

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

revision 1.52 by pj, Thu Dec 20 18:37:58 2001 UTC revision 1.53 by kifer, Mon Dec 24 05:50:31 2001 UTC
# Line 590  highlighted using ASCII flags." Line 590  highlighted using ASCII flags."
590  Actually, Ediff restores the scope of visibility that existed at startup.")  Actually, Ediff restores the scope of visibility that existed at startup.")
591    
592  (defcustom ediff-keep-variants t  (defcustom ediff-keep-variants t
593    "*nil means that non-modified variant buffers should be removed at the end of the session after some interrogation.    "*nil means prompt to remove unmodified buffers A/B/C at session end.
594  Supplying a prefix argument to the quit command `q' temporarily reverses the  Supplying a prefix argument to the quit command `q' temporarily reverses the
595  meaning of this variable."  meaning of this variable."
596    :type 'boolean    :type 'boolean
# Line 1241  This property can be toggled interactive Line 1241  This property can be toggled interactive
1241    
1242  (defcustom ediff-autostore-merges  'group-jobs-only  (defcustom ediff-autostore-merges  'group-jobs-only
1243    "*Save the results of merge jobs automatically.    "*Save the results of merge jobs automatically.
1244  nil means don't save automatically.  t means always save.  Anything but nil or t  nil means don't save automatically.  t means always save.  Anything else
1245  means save automatically only if the merge job is part of a group of jobs, such  means save automatically only if the merge job is part of a group of jobs, such
1246  as `ediff-merge-directory' or `ediff-merge-directory-revisions'."  as `ediff-merge-directory' or `ediff-merge-directory-revisions'."
1247    :type '(choice (const nil) (const t) (const group-jobs-only))    :type '(choice (const nil) (const t) (const group-jobs-only))

Legend:
Removed from v.1.52  
changed lines
  Added in v.1.53

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