diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-06-16 16:08:41 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-06-16 16:08:41 -0400 |
| commit | 2a64315a111fb4da67e9c40c9b69045c4f63d619 (patch) | |
| tree | 2e7ba99465f6eb5eae64361767af5bc5fff7aca4 /lisp/vc/vc-svn.el | |
| parent | 288cf4e907c0350eb24824016763bddd09df8ea8 (diff) | |
| parent | 36901266a8acb83880fefee50c93abb09f64533b (diff) | |
| download | emacs-2a64315a111fb4da67e9c40c9b69045c4f63d619.tar.gz emacs-2a64315a111fb4da67e9c40c9b69045c4f63d619.tar.bz2 emacs-2a64315a111fb4da67e9c40c9b69045c4f63d619.zip | |
Merge from emacs-23
Diffstat (limited to 'lisp/vc/vc-svn.el')
| -rw-r--r-- | lisp/vc/vc-svn.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index cd43d425af1..889a60c278e 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -170,7 +170,7 @@ want to force an empty list of arguments, use t." (?? . 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) |