aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-12-04 07:01:22 +0000
committerGlenn Morris2008-12-04 07:01:22 +0000
commit891eb9c48612b128dad0f370bbc0e4c75b96615f (patch)
tree6fae418efa05d80e77a7a735773cffb0dc03a987
parente5c741d9e2a3db3f659590b50652a1c53a6f0f92 (diff)
downloademacs-891eb9c48612b128dad0f370bbc0e4c75b96615f.tar.gz
emacs-891eb9c48612b128dad0f370bbc0e4c75b96615f.zip
(vc-mcvs-register-switches): Doc fix. Add t as option.
(vc-mcvs-register): Doc fix.
-rw-r--r--lisp/vc-mcvs.el20
1 files changed, 9 insertions, 11 deletions
diff --git a/lisp/vc-mcvs.el b/lisp/vc-mcvs.el
index d7b7a70e1a7..97a6d1ecec6 100644
--- a/lisp/vc-mcvs.el
+++ b/lisp/vc-mcvs.el
@@ -70,14 +70,14 @@
70 :group 'vc) 70 :group 'vc)
71 71
72(defcustom vc-mcvs-register-switches nil 72(defcustom vc-mcvs-register-switches nil
73 "Extra switches for registering a file into Meta-CVS. 73 "Switches for registering a file into Meta-CVS.
74A string or list of strings passed to the checkin program by 74A string or list of strings passed to the checkin program by
75\\[vc-register]." 75\\[vc-register]. If nil, use the value of `vc-register-switches'.
76 :type '(choice (const :tag "None" nil) 76If t, use no switches."
77 :type '(choice (const :tag "Unspecified" nil)
78 (const :tag "None" t)
77 (string :tag "Argument String") 79 (string :tag "Argument String")
78 (repeat :tag "Argument List" 80 (repeat :tag "Argument List" :value ("") string))
79 :value ("")
80 string))
81 :version "22.1" 81 :version "22.1"
82 :group 'vc) 82 :group 'vc)
83 83
@@ -183,14 +183,12 @@ This is only meaningful if you don't use the implicit checkout model
183;;; State-changing functions 183;;; State-changing functions
184;;; 184;;;
185 185
186;; FIXME the doc is wrong re switches.
187(defun vc-mcvs-register (files &optional rev comment) 186(defun vc-mcvs-register (files &optional rev comment)
188 "Register FILES into the Meta-CVS version-control system. 187 "Register FILES into the Meta-CVS version-control system.
189COMMENT can be used to provide an initial description of FILE. 188COMMENT can be used to provide an initial description of FILE.
190 189Passes either `vc-mcvs-register-switches' or `vc-register-switches'
191`vc-register-switches' and `vc-mcvs-register-switches' are passed to 190to the Meta-CVS command."
192the Meta-CVS command (in that order)." 191 ;; FIXME: multiple-file case should be made to work.
193 ;; FIXME: multiple-file case should be made to work
194 (if (> (length files) 1) (error "Registering filesets is not yet supported.")) 192 (if (> (length files) 1) (error "Registering filesets is not yet supported."))
195 (let* ((file (car files)) 193 (let* ((file (car files))
196 (filename (file-name-nondirectory file)) 194 (filename (file-name-nondirectory file))