diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-10-02 20:42:28 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-10-02 20:42:28 -0400 |
| commit | f0db3488160698cb48206d53742f938b71d1aeeb (patch) | |
| tree | 858b0e9695aca2694677e6b07baba752b5e216f3 | |
| parent | 6d5bb00fd1d77d4ff9c4fc6598c593337bf28625 (diff) | |
| download | emacs-f0db3488160698cb48206d53742f938b71d1aeeb.tar.gz | |
* lisp/vc/vc-svn.el (vc-svn-after-dir-status): Fix the non-remote regexp,
similarly to Roger's 2010-06-12 change for the remote change.
Fixes: debbugs:18605
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/vc/vc-svn.el | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index db08b101dc5..2aa8f2ab5b0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-10-03 Stefan Monnier <monnier@iro.umontreal.ca> + + * vc/vc-svn.el (vc-svn-after-dir-status): Fix the non-remote regexp, + similarly to Roger's 2010-06-12 change for the remote change + (bug#18605). + 2014-10-01 Glenn Morris <rgm@gnu.org> * emacs-lisp/package.el (package-import-keyring): diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index 85976db78bd..a336a952df1 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -195,7 +195,7 @@ If you want to force an empty list of arguments, use t." (?~ . edited))) (re (if remote "^\\(.\\)\\(.\\).....? \\([ *]\\) +\\(?:[-0-9]+\\)? \\(.*\\)$" ;; Subexp 3 is a dummy in this case, so the numbers match. - "^\\(.\\)\\(.\\)...\\(.\\) \\(.*\\)$")) + "^\\(.\\)\\(.\\)...\\(.\\).? \\(.*\\)$")) result) (goto-char (point-min)) (while (re-search-forward re nil t) |