diff options
| author | Vagn Johansen <gonz808@hotmail.com> | 2011-03-02 23:27:52 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-03-02 23:27:52 -0800 |
| commit | 614b85f89ea5e2cfec13f3f1363b710f06cc332c (patch) | |
| tree | fe20c2535eb6aaba84d20f2bd70208ca47e6487f /lisp/vc/vc-svn.el | |
| parent | e7b21e2b5b7ca20a7c6d3be16f70806100fc0294 (diff) | |
| download | emacs-614b85f89ea5e2cfec13f3f1363b710f06cc332c.tar.gz | |
vc-svn fix for bug#7663 on MS Windows. (tiny change)
* lisp/vc/vc-svn.el (vc-svn-after-dir-status): Some MS Windows svn client
programs output backslashes.
Diffstat (limited to 'lisp/vc/vc-svn.el')
| -rw-r--r-- | lisp/vc/vc-svn.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index 20c7689f401..7362258a42d 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -174,7 +174,9 @@ If you want to force an empty list of arguments, use t." (while (re-search-forward re nil t) (let ((state (cdr (assq (aref (match-string 1) 0) state-map))) (propstat (cdr (assq (aref (match-string 2) 0) state-map))) - (filename (match-string 4))) + (filename (if (memq system-type '(windows-nt ms-dos)) + (replace-regexp-in-string "\\\\" "/" (match-string 4)) + (match-string 4)))) (and (memq propstat '(conflict edited)) (not (eq state 'conflict)) ; conflict always wins (setq state propstat)) |