diff --git a/lisp/ChangeLog b/lisp/ChangeLog index db08b101dc50e5355ff02e362da6696a0b02150f..2aa8f2ab5b0dd3b419869d56e1457c3f03316864 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 85976db78bd5849c308d49ed7171889a194f55cd..a336a952df1dd2b1a49ad838bdf32a622838f17c 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)