Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
42204:73e75f765479 | 42205:7308bbc423d5 |
---|---|
588 (ediff-defvar-local ediff-quit-widened t | 588 (ediff-defvar-local ediff-quit-widened t |
589 "*Non-nil means: when finished, Ediff widens buffers A/B. | 589 "*Non-nil means: when finished, Ediff widens buffers A/B. |
590 Actually, Ediff restores the scope of visibility that existed at startup.") | 590 Actually, Ediff restores the scope of visibility that existed at startup.") |
591 | 591 |
592 (defcustom ediff-keep-variants t | 592 (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. | 593 "*nil means that non-modified variant buffers should be removed at the end of the session after some interrogation. |
594 Supplying a prefix argument to the quit command `q' temporarily reverses the | 594 Supplying a prefix argument to the quit command `q' temporarily reverses the |
595 meaning of this variable." | 595 meaning of this variable." |
596 :type 'boolean | 596 :type 'boolean |
597 :group 'ediff) | 597 :group 'ediff) |
598 | 598 |
1239 ;; if nil, this silences some messages | 1239 ;; if nil, this silences some messages |
1240 (defconst ediff-verbose-p t) | 1240 (defconst ediff-verbose-p t) |
1241 | 1241 |
1242 (defcustom ediff-autostore-merges 'group-jobs-only | 1242 (defcustom ediff-autostore-merges 'group-jobs-only |
1243 "*Save the results of merge jobs automatically. | 1243 "*Save the results of merge jobs automatically. |
1244 Nil means don't save automatically. t means always save. Anything but nil or t | 1244 nil means don't save automatically. t means always save. Anything but nil or t |
1245 means save automatically only if the merge job is part of a group of jobs, such | 1245 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'." | 1246 as `ediff-merge-directory' or `ediff-merge-directory-revisions'." |
1247 :type '(choice (const nil) (const t) (const group-jobs-only)) | 1247 :type '(choice (const nil) (const t) (const group-jobs-only)) |
1248 :group 'ediff-merge) | 1248 :group 'ediff-merge) |
1249 (make-variable-buffer-local 'ediff-autostore-merges) | 1249 (make-variable-buffer-local 'ediff-autostore-merges) |