diff options
| author | Fabrice Popineau <fabrice.popineau@gmail.com> | 2015-07-07 18:06:53 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2015-07-07 18:06:53 +0300 |
| commit | f8006664095c380ef3ed14b33b0587c1ac563e56 (patch) | |
| tree | 34c8b6aea66e8c0a95a7116167e65ae02d19fe2f /lisp/vc/vc-svn.el | |
| parent | b25770ab64f121a6c8f358c3b7b64936adc55ab6 (diff) | |
| download | emacs-f8006664095c380ef3ed14b33b0587c1ac563e56.tar.gz | |
Make vc-tests work with MSYS svn program
* lisp/vc/vc-svn.el (vc-svn-create-repo): Fix the file:// URL when
svn is an MSYS program.
Diffstat (limited to 'lisp/vc/vc-svn.el')
| -rw-r--r-- | lisp/vc/vc-svn.el | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index f97e2ab17e9..8d6eae58d25 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -279,7 +279,13 @@ RESULT is a list of conses (FILE . STATE) for directory DIR." ;; Expand default-directory because svn gets confused by eg ;; file://~/path/to/file. (Bug#15446). (vc-svn-command "*vc*" 0 "." "checkout" - (let ((defdir (expand-file-name default-directory))) + (let ((defdir (expand-file-name default-directory)) + (svn-prog (executable-find "svn"))) + (when (and (fboundp 'w32-application-type) + (eq (w32-application-type svn-prog) 'msys)) + (setq defdir + (replace-regexp-in-string "^\\(.\\):/" "/\\1/" + defdir))) (concat (if (and (stringp defdir) (eq (aref defdir 0) ?/)) "file://" |