aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2007-06-11 18:41:09 +0000
committerStefan Monnier2007-06-11 18:41:09 +0000
commite4cc3f57aa79387e1ef550bef9e971a66a6cc27f (patch)
tree749d276f165d007fb6acd8ef5aca480340b0067f
parent29d696617974c2ae878e5c2e3f5604459889c8e2 (diff)
downloademacs-e4cc3f57aa79387e1ef550bef9e971a66a6cc27f.tar.gz
emacs-e4cc3f57aa79387e1ef550bef9e971a66a6cc27f.zip
(vc-svn-program): New var.
(vc-svn-command): Use it.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc-svn.el7
2 files changed, 11 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ab55f730a3..a9fefcfce89 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-06-11 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * vc-svn.el (vc-svn-program): New var.
4 (vc-svn-command): Use it.
5
12007-06-11 Juanma Barranquero <lekktu@gmail.com> 62007-06-11 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * server.el (server-switch-buffer): Remove redundant check. 8 * server.el (server-switch-buffer): Remove redundant check.
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index 1538a2a1ab3..b109f48d91d 100644
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -464,11 +464,16 @@ NAME is assumed to be a URL."
464;;; Internal functions 464;;; Internal functions
465;;; 465;;;
466 466
467(defcustom vc-svn-program "svn"
468 "Name of the svn executable."
469 :type 'string
470 :group 'vc)
471
467(defun vc-svn-command (buffer okstatus file &rest flags) 472(defun vc-svn-command (buffer okstatus file &rest flags)
468 "A wrapper around `vc-do-command' for use in vc-svn.el. 473 "A wrapper around `vc-do-command' for use in vc-svn.el.
469The difference to vc-do-command is that this function always invokes `svn', 474The difference to vc-do-command is that this function always invokes `svn',
470and that it passes `vc-svn-global-switches' to it before FLAGS." 475and that it passes `vc-svn-global-switches' to it before FLAGS."
471 (apply 'vc-do-command buffer okstatus "svn" file 476 (apply 'vc-do-command buffer okstatus vc-svn-program file
472 (if (stringp vc-svn-global-switches) 477 (if (stringp vc-svn-global-switches)
473 (cons vc-svn-global-switches flags) 478 (cons vc-svn-global-switches flags)
474 (append vc-svn-global-switches 479 (append vc-svn-global-switches