aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Rogers2010-06-12 00:34:36 -0700
committerGlenn Morris2010-06-12 00:34:36 -0700
commita9de35feef40cef53f6205628cf8a8ebe9b0c99b (patch)
treec6d8d6487ab107bad778e9f3c033b5d1ffaf0337
parent7fb277a9f0bad84a19e8bf748d3bc6a3b7cc140c (diff)
downloademacs-a9de35feef40cef53f6205628cf8a8ebe9b0c99b.tar.gz
emacs-a9de35feef40cef53f6205628cf8a8ebe9b0c99b.zip
Close bug#6361.
* lisp/vc-svn.el (vc-svn-after-dir-status): Fix regexp for Subversions older than version 1.6.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc-svn.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1de8e4af69b..903c0d46f86 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-06-12 Bob Rogers <rogers-emacs@rgrjr.dyndns.org> (tiny change)
2
3 * vc-svn.el (vc-svn-after-dir-status): Fix regexp for Subversions
4 older than version 1.6. (Bug#6361)
5
12010-06-12 Helmut Eller <eller.helmut@gmail.com> 62010-06-12 Helmut Eller <eller.helmut@gmail.com>
2 7
3 * emacs-lisp/cl-macs.el (destructuring-bind): Bind `bind-enquote', 8 * emacs-lisp/cl-macs.el (destructuring-bind): Bind `bind-enquote',
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index 6883556f249..34ebc3bb949 100644
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -170,7 +170,7 @@ want to force an empty list of arguments, use t."
170 (?? . unregistered) 170 (?? . unregistered)
171 ;; This is what vc-svn-parse-status does. 171 ;; This is what vc-svn-parse-status does.
172 (?~ . edited))) 172 (?~ . edited)))
173 (re (if remote "^\\(.\\)...... \\([ *]\\) +\\(?:[-0-9]+\\)? \\(.*\\)$" 173 (re (if remote "^\\(.\\)......? \\([ *]\\) +\\(?:[-0-9]+\\)? \\(.*\\)$"
174 ;; Subexp 2 is a dummy in this case, so the numbers match. 174 ;; Subexp 2 is a dummy in this case, so the numbers match.
175 "^\\(.\\)....\\(.\\) \\(.*\\)$")) 175 "^\\(.\\)....\\(.\\) \\(.*\\)$"))
176 result) 176 result)