diff options
| author | Dan Nicolaescu | 2009-12-10 14:24:42 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2009-12-10 14:24:42 +0000 |
| commit | f1943c1ba5cd799e4b24542ef2c0089a42542d69 (patch) | |
| tree | fecb04104299cce7176f94cc20e13086f79c2b0a | |
| parent | c7dcb0f11883f8bded95b8aab64b8600dde69c1f (diff) | |
| download | emacs-f1943c1ba5cd799e4b24542ef2c0089a42542d69.tar.gz emacs-f1943c1ba5cd799e4b24542ef2c0089a42542d69.zip | |
(vc-svn-after-dir-status): Fix regexp. (Bug#4741)
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/vc-svn.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ed1a708a29d..d455328a9e1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2009-12-10 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * vc-svn.el (vc-svn-after-dir-status): Fix regexp. (Bug#4741) | ||
| 4 | |||
| 1 | 2009-12-10 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2009-12-10 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | Let loaddefs.el adjust to changes in autoload-excludes (bug#5162). | 7 | Let loaddefs.el adjust to changes in autoload-excludes (bug#5162). |
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el index 3c7e2730df9..1176cdb7693 100644 --- a/lisp/vc-svn.el +++ b/lisp/vc-svn.el | |||
| @@ -166,7 +166,7 @@ want to force an empty list of arguments, use t." | |||
| 166 | (?? . unregistered) | 166 | (?? . unregistered) |
| 167 | ;; This is what vc-svn-parse-status does. | 167 | ;; This is what vc-svn-parse-status does. |
| 168 | (?~ . edited))) | 168 | (?~ . edited))) |
| 169 | (re (if remote "^\\(.\\)..... \\([ *]\\) +\\(?:[-0-9]+\\)? \\(.*\\)$" | 169 | (re (if remote "^\\(.\\)...... \\([ *]\\) +\\(?:[-0-9]+\\)? \\(.*\\)$" |
| 170 | ;; Subexp 2 is a dummy in this case, so the numbers match. | 170 | ;; Subexp 2 is a dummy in this case, so the numbers match. |
| 171 | "^\\(.\\)....\\(.\\) \\(.*\\)$")) | 171 | "^\\(.\\)....\\(.\\) \\(.*\\)$")) |
| 172 | result) | 172 | result) |