From 614b85f89ea5e2cfec13f3f1363b710f06cc332c Mon Sep 17 00:00:00 2001 From: Vagn Johansen Date: Wed, 2 Mar 2011 23:27:52 -0800 Subject: [PATCH] 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. --- lisp/ChangeLog | 5 +++++ lisp/vc/vc-svn.el | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 87d7cf03eb2..969017bcf1c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-03-03 Vagn Johansen (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 * 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 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)) -- 2.39.2