From f0db3488160698cb48206d53742f938b71d1aeeb Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 2 Oct 2014 20:42:28 -0400 Subject: [PATCH] * 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 --- lisp/ChangeLog | 6 ++++++ lisp/vc/vc-svn.el | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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 + + * 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 * 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) -- 2.39.2