diff options
| author | Glenn Morris | 2008-12-04 07:03:53 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-12-04 07:03:53 +0000 |
| commit | c8d6b4bc1ee5f6861e440d37da0819ceed75ba55 (patch) | |
| tree | f2b00647e9b2cab1f3f0072bcf7ab696f7625919 | |
| parent | 12fcd25aceea96c91e2bf0126fc4dc89a195f9ad (diff) | |
| download | emacs-c8d6b4bc1ee5f6861e440d37da0819ceed75ba55.tar.gz emacs-c8d6b4bc1ee5f6861e440d37da0819ceed75ba55.zip | |
(vc-svn-register-switches): Doc fix. Add t as option.
(vc-svn-register): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 11 | ||||
| -rw-r--r-- | lisp/vc-svn.el | 18 |
2 files changed, 19 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 92cefd19be8..0a37cb343fe 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,16 @@ | |||
| 1 | 2008-12-04 Glenn Morris <rgm@gnu.org> | 1 | 2008-12-04 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * vc-cvs.el (vc-cvs-register-switches): Doc fix. Add t as option. | ||
| 4 | (vc-cvs-register): Doc fix. | ||
| 5 | * vc-mcvs.el (vc-mcvs-register-switches): Doc fix. Add t as option. | ||
| 6 | (vc-mcvs-register): Doc fix. | ||
| 7 | * vc-rcs.el (vc-rcs-register-switches): Doc fix. Add t as option. | ||
| 8 | (vc-rcs-register): Doc fix. | ||
| 9 | * vc-sccs.el (vc-sccs-register-switches): Doc fix. Add t as option. | ||
| 10 | (vc-sccs-register): Doc fix. | ||
| 11 | * vc-svn.el (vc-svn-register-switches): Doc fix. Add t as option. | ||
| 12 | (vc-svn-register): Doc fix. | ||
| 13 | |||
| 3 | * files.el (toggle-read-only): Doc fix. | 14 | * files.el (toggle-read-only): Doc fix. |
| 4 | 15 | ||
| 5 | 2008-12-03 Stefan Monnier <monnier@iro.umontreal.ca> | 16 | 2008-12-03 Stefan Monnier <monnier@iro.umontreal.ca> |
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el index e11ec8f37cb..9e874d2db00 100644 --- a/lisp/vc-svn.el +++ b/lisp/vc-svn.el | |||
| @@ -52,14 +52,14 @@ | |||
| 52 | :group 'vc) | 52 | :group 'vc) |
| 53 | 53 | ||
| 54 | (defcustom vc-svn-register-switches nil | 54 | (defcustom vc-svn-register-switches nil |
| 55 | "Extra switches for registering a file into SVN. | 55 | "Switches for registering a file into SVN. |
| 56 | A string or list of strings passed to the checkin program by | 56 | A string or list of strings passed to the checkin program by |
| 57 | \\[vc-register]." | 57 | \\[vc-register]. If nil, use the value of `vc-register-switches'. |
| 58 | :type '(choice (const :tag "None" nil) | 58 | If t, use no switches." |
| 59 | :type '(choice (const :tag "Unspecified" nil) | ||
| 60 | (const :tag "None" t) | ||
| 59 | (string :tag "Argument String") | 61 | (string :tag "Argument String") |
| 60 | (repeat :tag "Argument List" | 62 | (repeat :tag "Argument List" :value ("") string)) |
| 61 | :value ("") | ||
| 62 | string)) | ||
| 63 | :version "22.1" | 63 | :version "22.1" |
| 64 | :group 'vc) | 64 | :group 'vc) |
| 65 | 65 | ||
| @@ -256,13 +256,11 @@ RESULT is a list of conses (FILE . STATE) for directory DIR." | |||
| 256 | (vc-do-command "*vc*" 0 vc-svn-program '(".") | 256 | (vc-do-command "*vc*" 0 vc-svn-program '(".") |
| 257 | "checkout" (concat "file://" default-directory "SVN"))) | 257 | "checkout" (concat "file://" default-directory "SVN"))) |
| 258 | 258 | ||
| 259 | ;; FIXME doc is wrong re switches. | ||
| 260 | (defun vc-svn-register (files &optional rev comment) | 259 | (defun vc-svn-register (files &optional rev comment) |
| 261 | "Register FILES into the SVN version-control system. | 260 | "Register FILES into the SVN version-control system. |
| 262 | The COMMENT argument is ignored This does an add but not a commit. | 261 | The COMMENT argument is ignored This does an add but not a commit. |
| 263 | 262 | Passes either `vc-svn-register-switches' or `vc-register-switches' | |
| 264 | `vc-register-switches' and `vc-svn-register-switches' are passed to | 263 | to the SVN command." |
| 265 | the SVN command (in that order)." | ||
| 266 | (apply 'vc-svn-command nil 0 files "add" (vc-switches 'SVN 'register))) | 264 | (apply 'vc-svn-command nil 0 files "add" (vc-switches 'SVN 'register))) |
| 267 | 265 | ||
| 268 | (defun vc-svn-responsible-p (file) | 266 | (defun vc-svn-responsible-p (file) |