Mercurial > emacs
diff lisp/vc/vc-svn.el @ 109409:ff42e5c5f789
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Wed, 16 Jun 2010 22:49:55 +0000 |
parents | e93288477c43 6c39bda25895 |
children | 1b626601d32d |
line wrap: on
line diff
--- a/lisp/vc/vc-svn.el Tue Jun 15 22:55:36 2010 +0000 +++ b/lisp/vc/vc-svn.el Wed Jun 16 22:49:55 2010 +0000 @@ -170,7 +170,7 @@ (?? . unregistered) ;; This is what vc-svn-parse-status does. (?~ . edited))) - (re (if remote "^\\(.\\)...... \\([ *]\\) +\\(?:[-0-9]+\\)? \\(.*\\)$" + (re (if remote "^\\(.\\)......? \\([ *]\\) +\\(?:[-0-9]+\\)? \\(.*\\)$" ;; Subexp 2 is a dummy in this case, so the numbers match. "^\\(.\\)....\\(.\\) \\(.*\\)$")) result)