# HG changeset patch # User Glenn Morris # Date 1227324438 0 # Node ID 6be2d293279462e811d27c6abe056aa51ccf0459 # Parent 4f6e2e2864be4e90966f5ffc012e55d7a5adad26 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". diff -r 4f6e2e2864be -r 6be2d2932794 lisp/vc-svn.el --- a/lisp/vc-svn.el Sat Nov 22 03:24:10 2008 +0000 +++ b/lisp/vc-svn.el Sat Nov 22 03:27:18 2008 +0000 @@ -35,8 +35,14 @@ ;;; Customization options ;;; +;; FIXME there is also svnadmin. +(defcustom vc-svn-program "svn" + "Name of the SVN executable." + :type 'string + :group 'vc) + (defcustom vc-svn-global-switches nil - "*Global switches to pass to any SVN command." + "Global switches to pass to any SVN command." :type '(choice (const :tag "None" nil) (string :tag "Argument String") (repeat :tag "Argument List" @@ -46,7 +52,7 @@ :group 'vc) (defcustom vc-svn-register-switches nil - "*Extra switches for registering a file into SVN. + "Extra switches for registering a file into SVN. A string or list of strings passed to the checkin program by \\[vc-register]." :type '(choice (const :tag "None" nil) @@ -72,7 +78,7 @@ :group 'vc) (defcustom vc-svn-header (or (cdr (assoc 'SVN vc-header-alist)) '("\$Id\$")) - "*Header keywords to be inserted by `vc-insert-headers'." + "Header keywords to be inserted by `vc-insert-headers'." :version "22.1" :type '(repeat string) :group 'vc) @@ -245,7 +251,7 @@ (defun vc-svn-create-repo () "Create a new SVN repository." (vc-do-command "*vc*" 0 "svnadmin" '("create" "SVN")) - (vc-do-command "*vc*" 0 "svn" '(".") + (vc-do-command "*vc*" 0 vc-svn-program '(".") "checkout" (concat "file://" default-directory "SVN"))) (defun vc-svn-register (files &optional rev comment) @@ -408,7 +414,7 @@ or svn+ssh://." (let (tempfile host remotefile directory fileurl-p) (with-temp-buffer - (vc-do-command (current-buffer) 0 "svn" nil "info") + (vc-do-command (current-buffer) 0 vc-svn-program nil "info") (goto-char (point-min)) (unless (re-search-forward "Repository Root: \\(file://\\(/.*\\)\\)\\|\\(svn\\+ssh://\\([^/]+\\)\\(/.*\\)\\)" nil t) (error "Repository information is unavailable")) @@ -548,11 +554,6 @@ ;;; Internal functions ;;; -(defcustom vc-svn-program "svn" - "Name of the SVN executable." - :type 'string - :group 'vc) - (defun vc-svn-command (buffer okstatus file-or-list &rest flags) "A wrapper around `vc-do-command' for use in vc-svn.el. The difference to vc-do-command is that this function always invokes `svn',