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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 87d7cf03eb2f4fd09c9f9fd8b86d36ccc8c08d44..969017bcf1c5227d0e8bac87260feac09cf0b4de 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-03  Vagn Johansen  <gonz808@hotmail.com>  (tiny change)
+
+       * vc/vc-svn.el (vc-svn-after-dir-status): Some MS Windows svn client
+       programs output backslashes.  (Bug#7663)
+
 2011-03-03  Glenn Morris  <rgm@gnu.org>
 
        * mail/sendmail.el (mail-mode-map): Remove mail-sent-via.

diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index 20c7689f4012d695a9287a5f79fc82b96778fd9c..7362258a42de30dd272aab002be0e0b3ff11bee3 100644 (file)
--- 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))