diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc-svn.el | 2 |
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 @@ | |||
| 1 | 2010-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 | |||
| 1 | 2010-06-12 Helmut Eller <eller.helmut@gmail.com> | 6 | 2010-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) |