aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2014-10-02 20:42:28 -0400
committerStefan Monnier2014-10-02 20:42:28 -0400
commitf0db3488160698cb48206d53742f938b71d1aeeb (patch)
tree858b0e9695aca2694677e6b07baba752b5e216f3
parent6d5bb00fd1d77d4ff9c4fc6598c593337bf28625 (diff)
downloademacs-f0db3488160698cb48206d53742f938b71d1aeeb.tar.gz
emacs-f0db3488160698cb48206d53742f938b71d1aeeb.zip
* 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/ChangeLog6
-rw-r--r--lisp/vc/vc-svn.el2
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 @@
12014-10-03 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * vc/vc-svn.el (vc-svn-after-dir-status): Fix the non-remote regexp,
4 similarly to Roger's 2010-06-12 change for the remote change
5 (bug#18605).
6
12014-10-01 Glenn Morris <rgm@gnu.org> 72014-10-01 Glenn Morris <rgm@gnu.org>
2 8
3 * emacs-lisp/package.el (package-import-keyring): 9 * 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."
195 (?~ . edited))) 195 (?~ . edited)))
196 (re (if remote "^\\(.\\)\\(.\\).....? \\([ *]\\) +\\(?:[-0-9]+\\)? \\(.*\\)$" 196 (re (if remote "^\\(.\\)\\(.\\).....? \\([ *]\\) +\\(?:[-0-9]+\\)? \\(.*\\)$"
197 ;; Subexp 3 is a dummy in this case, so the numbers match. 197 ;; Subexp 3 is a dummy in this case, so the numbers match.
198 "^\\(.\\)\\(.\\)...\\(.\\) \\(.*\\)$")) 198 "^\\(.\\)\\(.\\)...\\(.\\).? \\(.*\\)$"))
199 result) 199 result)
200 (goto-char (point-min)) 200 (goto-char (point-min))
201 (while (re-search-forward re nil t) 201 (while (re-search-forward re nil t)