aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-11-22 03:27:18 +0000
committerGlenn Morris2008-11-22 03:27:18 +0000
commitf9d5dc48249d23e6f63d58394c11268bbb8bd845 (patch)
treeec3787a494b82bf15f62c2cc04b54c4eec84257b
parent2a5b0cd2ee31c83db6b0aaa446568e85201e012d (diff)
downloademacs-f9d5dc48249d23e6f63d58394c11268bbb8bd845.tar.gz
emacs-f9d5dc48249d23e6f63d58394c11268bbb8bd845.zip
Remove leading `*' from defcustom doc-strings.
(vc-svn-program): Move defcustom to start. (vc-svn-create-repo, vc-svn-modify-change-comment): Use vc-svn-program rather than hard-coded "svn".
-rw-r--r--lisp/vc-svn.el21
1 files changed, 11 insertions, 10 deletions
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index a53b478d226..d94920df62b 100644
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -35,8 +35,14 @@
35;;; Customization options 35;;; Customization options
36;;; 36;;;
37 37
38;; FIXME there is also svnadmin.
39(defcustom vc-svn-program "svn"
40 "Name of the SVN executable."
41 :type 'string
42 :group 'vc)
43
38(defcustom vc-svn-global-switches nil 44(defcustom vc-svn-global-switches nil
39 "*Global switches to pass to any SVN command." 45 "Global switches to pass to any SVN command."
40 :type '(choice (const :tag "None" nil) 46 :type '(choice (const :tag "None" nil)
41 (string :tag "Argument String") 47 (string :tag "Argument String")
42 (repeat :tag "Argument List" 48 (repeat :tag "Argument List"
@@ -46,7 +52,7 @@
46 :group 'vc) 52 :group 'vc)
47 53
48(defcustom vc-svn-register-switches nil 54(defcustom vc-svn-register-switches nil
49 "*Extra switches for registering a file into SVN. 55 "Extra switches for registering a file into SVN.
50A string or list of strings passed to the checkin program by 56A string or list of strings passed to the checkin program by
51\\[vc-register]." 57\\[vc-register]."
52 :type '(choice (const :tag "None" nil) 58 :type '(choice (const :tag "None" nil)
@@ -72,7 +78,7 @@ If you want to force an empty list of arguments, use t."
72 :group 'vc) 78 :group 'vc)
73 79
74(defcustom vc-svn-header (or (cdr (assoc 'SVN vc-header-alist)) '("\$Id\$")) 80(defcustom vc-svn-header (or (cdr (assoc 'SVN vc-header-alist)) '("\$Id\$"))
75 "*Header keywords to be inserted by `vc-insert-headers'." 81 "Header keywords to be inserted by `vc-insert-headers'."
76 :version "22.1" 82 :version "22.1"
77 :type '(repeat string) 83 :type '(repeat string)
78 :group 'vc) 84 :group 'vc)
@@ -245,7 +251,7 @@ RESULT is a list of conses (FILE . STATE) for directory DIR."
245(defun vc-svn-create-repo () 251(defun vc-svn-create-repo ()
246 "Create a new SVN repository." 252 "Create a new SVN repository."
247 (vc-do-command "*vc*" 0 "svnadmin" '("create" "SVN")) 253 (vc-do-command "*vc*" 0 "svnadmin" '("create" "SVN"))
248 (vc-do-command "*vc*" 0 "svn" '(".") 254 (vc-do-command "*vc*" 0 vc-svn-program '(".")
249 "checkout" (concat "file://" default-directory "SVN"))) 255 "checkout" (concat "file://" default-directory "SVN")))
250 256
251(defun vc-svn-register (files &optional rev comment) 257(defun vc-svn-register (files &optional rev comment)
@@ -408,7 +414,7 @@ This is only supported if the repository access method is either file://
408or svn+ssh://." 414or svn+ssh://."
409 (let (tempfile host remotefile directory fileurl-p) 415 (let (tempfile host remotefile directory fileurl-p)
410 (with-temp-buffer 416 (with-temp-buffer
411 (vc-do-command (current-buffer) 0 "svn" nil "info") 417 (vc-do-command (current-buffer) 0 vc-svn-program nil "info")
412 (goto-char (point-min)) 418 (goto-char (point-min))
413 (unless (re-search-forward "Repository Root: \\(file://\\(/.*\\)\\)\\|\\(svn\\+ssh://\\([^/]+\\)\\(/.*\\)\\)" nil t) 419 (unless (re-search-forward "Repository Root: \\(file://\\(/.*\\)\\)\\|\\(svn\\+ssh://\\([^/]+\\)\\(/.*\\)\\)" nil t)
414 (error "Repository information is unavailable")) 420 (error "Repository information is unavailable"))
@@ -548,11 +554,6 @@ NAME is assumed to be a URL."
548;;; Internal functions 554;;; Internal functions
549;;; 555;;;
550 556
551(defcustom vc-svn-program "svn"
552 "Name of the SVN executable."
553 :type 'string
554 :group 'vc)
555
556(defun vc-svn-command (buffer okstatus file-or-list &rest flags) 557(defun vc-svn-command (buffer okstatus file-or-list &rest flags)
557 "A wrapper around `vc-do-command' for use in vc-svn.el. 558 "A wrapper around `vc-do-command' for use in vc-svn.el.
558The difference to vc-do-command is that this function always invokes `svn', 559The difference to vc-do-command is that this function always invokes `svn',