diff options
| author | Eric S. Raymond | 2008-05-06 01:41:34 +0000 |
|---|---|---|
| committer | Eric S. Raymond | 2008-05-06 01:41:34 +0000 |
| commit | 821677fb4d3b4d19a24531be285578a338e27d2e (patch) | |
| tree | f98b7d02e366df7a382eb5454e3510a496bb36ab | |
| parent | a8b0c38b6493b9f3e2bd5f67f9e778dfeaaeca75 (diff) | |
| download | emacs-821677fb4d3b4d19a24531be285578a338e27d2e.tar.gz emacs-821677fb4d3b4d19a24531be285578a338e27d2e.zip | |
Move a customization variable.
| -rw-r--r-- | lisp/vc-dispatcher.el | 25 | ||||
| -rw-r--r-- | lisp/vc.el | 5 |
2 files changed, 24 insertions, 6 deletions
diff --git a/lisp/vc-dispatcher.el b/lisp/vc-dispatcher.el index b680421ac07..014d9492a2d 100644 --- a/lisp/vc-dispatcher.el +++ b/lisp/vc-dispatcher.el | |||
| @@ -27,6 +27,8 @@ | |||
| 27 | ;;; Credits: | 27 | ;;; Credits: |
| 28 | 28 | ||
| 29 | ;; Designed and implemented by Eric S. Raymond, originally as part of VC mode. | 29 | ;; Designed and implemented by Eric S. Raymond, originally as part of VC mode. |
| 30 | ;; Stefan Monnier and Dan Nicolaescu contributed substinituial work on the | ||
| 31 | ;; vc-dir front end. | ||
| 30 | 32 | ||
| 31 | ;;; Commentary: | 33 | ;;; Commentary: |
| 32 | 34 | ||
| @@ -87,7 +89,23 @@ | |||
| 87 | ;; about the semantics of individual states, but mark and unmark commands | 89 | ;; about the semantics of individual states, but mark and unmark commands |
| 88 | ;; treat all entries with the same state as the currently selected one as | 90 | ;; treat all entries with the same state as the currently selected one as |
| 89 | ;; a unit. | 91 | ;; a unit. |
| 90 | 92 | ||
| 93 | ;; The interface | ||
| 94 | ;; | ||
| 95 | ;; The main interface to the lower level is vc-do-command. This launches a | ||
| 96 | ;; comand, synchronously or asynchronously, making the output available | ||
| 97 | ;; in a command log buffer. Two other functions, (vc-start-annotation) and | ||
| 98 | ;; (vc-finish-logentry), allow you to associate a command closure with an | ||
| 99 | ;; abbotation buffer so that when the user confirms the comment the closure | ||
| 100 | ;; is run (with the comment as part of its context). | ||
| 101 | ;; | ||
| 102 | ;; The interface to the upper level has the two main entry points (vc-dir) | ||
| 103 | ;; and (vc-dispatcher-selection-set) and a couple of convenience functions. | ||
| 104 | ;; (vc-dir) sets up a dispatcher browsing buffer; (vc-dispatcher-selection-set) | ||
| 105 | ;; returns a selection set of files, either the marked files in a browsing | ||
| 106 | ;; buffer or the singleton set consisting of the file visited by the current | ||
| 107 | ;; buffer (when that is appropriate). | ||
| 108 | |||
| 91 | ;; To do: | 109 | ;; To do: |
| 92 | ;; | 110 | ;; |
| 93 | ;; - vc-dir-kill-dir-status-process should not be specific to dir-status, | 111 | ;; - vc-dir-kill-dir-status-process should not be specific to dir-status, |
| @@ -141,6 +159,11 @@ preserve the setting." | |||
| 141 | :type 'boolean | 159 | :type 'boolean |
| 142 | :group 'vc) | 160 | :group 'vc) |
| 143 | 161 | ||
| 162 | (defcustom vc-suppress-confirm nil | ||
| 163 | "If non-nil, treat user as expert; suppress yes-no prompts on some things." | ||
| 164 | :type 'boolean | ||
| 165 | :group 'vc) | ||
| 166 | |||
| 144 | ;; Variables the user doesn't need to know about. | 167 | ;; Variables the user doesn't need to know about. |
| 145 | 168 | ||
| 146 | (defvar vc-log-operation nil) | 169 | (defvar vc-log-operation nil) |
diff --git a/lisp/vc.el b/lisp/vc.el index 30d8b18046c..4b900087b83 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -688,11 +688,6 @@ | |||
| 688 | "Version-control system in Emacs." | 688 | "Version-control system in Emacs." |
| 689 | :group 'tools) | 689 | :group 'tools) |
| 690 | 690 | ||
| 691 | (defcustom vc-suppress-confirm nil | ||
| 692 | "If non-nil, treat user as expert; suppress yes-no prompts on some things." | ||
| 693 | :type 'boolean | ||
| 694 | :group 'vc) | ||
| 695 | |||
| 696 | (defcustom vc-initial-comment nil | 691 | (defcustom vc-initial-comment nil |
| 697 | "If non-nil, prompt for initial comment when a file is registered." | 692 | "If non-nil, prompt for initial comment when a file is registered." |
| 698 | :type 'boolean | 693 | :type 'boolean |