mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-07 08:00:48 -08:00
Code Issues Projects Releases Wiki Activity

vc-svn fix for bug#7663 on MS Windows. (tiny change)

Browse source 
* lisp/vc/vc-svn.el (vc-svn-after-dir-status): Some MS Windows svn client
programs output backslashes.
This commit is contained in:
Vagn Johansen 2011-03-02 23:27:52 -08:00 • committed by Glenn Morris
parent e7b21e2b5b
commit 614b85f89e
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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.

4
lisp/vc/vc-svn.el
View file

@ -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))