aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVagn Johansen2011-03-02 23:27:52 -0800
committerGlenn Morris2011-03-02 23:27:52 -0800
commit614b85f89ea5e2cfec13f3f1363b710f06cc332c (patch)
treefe20c2535eb6aaba84d20f2bd70208ca47e6487f
parente7b21e2b5b7ca20a7c6d3be16f70806100fc0294 (diff)
downloademacs-614b85f89ea5e2cfec13f3f1363b710f06cc332c.tar.gz
emacs-614b85f89ea5e2cfec13f3f1363b710f06cc332c.zip
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.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc/vc-svn.el4
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 87d7cf03eb2..969017bcf1c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-03-03 Vagn Johansen <gonz808@hotmail.com> (tiny change)
2
3 * vc/vc-svn.el (vc-svn-after-dir-status): Some MS Windows svn client
4 programs output backslashes. (Bug#7663)
5
12011-03-03 Glenn Morris <rgm@gnu.org> 62011-03-03 Glenn Morris <rgm@gnu.org>
2 7
3 * mail/sendmail.el (mail-mode-map): Remove mail-sent-via. 8 * 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."
174 (while (re-search-forward re nil t) 174 (while (re-search-forward re nil t)
175 (let ((state (cdr (assq (aref (match-string 1) 0) state-map))) 175 (let ((state (cdr (assq (aref (match-string 1) 0) state-map)))
176 (propstat (cdr (assq (aref (match-string 2) 0) state-map))) 176 (propstat (cdr (assq (aref (match-string 2) 0) state-map)))
177 (filename (match-string 4))) 177 (filename (if (memq system-type '(windows-nt ms-dos))
178 (replace-regexp-in-string "\\\\" "/" (match-string 4))
179 (match-string 4))))
178 (and (memq propstat '(conflict edited)) 180 (and (memq propstat '(conflict edited))
179 (not (eq state 'conflict)) ; conflict always wins 181 (not (eq state 'conflict)) ; conflict always wins
180 (setq state propstat)) 182 (setq state propstat))