Commit 614b85f8 authored by Vagn Johansen's avatar Vagn Johansen Committed by Glenn Morris
Browse files

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.
parent e7b21e2b
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.
......
......@@ -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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment