summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 @@
+2010-06-12 Bob Rogers <rogers-emacs@rgrjr.dyndns.org> (tiny change)
+
+ * vc-svn.el (vc-svn-after-dir-status): Fix regexp for Subversions
+ older than version 1.6. (Bug#6361)
+
2010-06-12 Helmut Eller <eller.helmut@gmail.com>
* 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."
(?? . unregistered)
;; This is what vc-svn-parse-status does.
(?~ . edited)))
- (re (if remote "^\\(.\\)...... \\([ *]\\) +\\(?:[-0-9]+\\)? \\(.*\\)$"
+ (re (if remote "^\\(.\\)......? \\([ *]\\) +\\(?:[-0-9]+\\)? \\(.*\\)$"
;; Subexp 2 is a dummy in this case, so the numbers match.
"^\\(.\\)....\\(.\\) \\(.*\\)$"))
result)