Mercurial > emacs
diff lisp/ediff-init.el @ 42205:7308bbc423d5
Doc fixes.
| author | Pavel Janík <Pavel@Janik.cz> |
|---|---|
| date | Thu, 20 Dec 2001 18:59:32 +0000 |
| parents | 8dccf2552307 |
| children | 3ce98f3e0608 |
line wrap: on
line diff
--- a/lisp/ediff-init.el Thu Dec 20 18:43:45 2001 +0000 +++ b/lisp/ediff-init.el Thu Dec 20 18:59:32 2001 +0000 @@ -590,7 +590,7 @@ 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. + "*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,7 +1241,7 @@ (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 +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))