(vc-svn-after-dir-status): Fix regexp to allow for

file names with leading spaces.  Ignore "." if it appears as a
filename.

2 files changed, 8 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e41ee9a19d7..3f0a3110cbb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-15  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * vc-svn.el (vc-svn-after-dir-status): Fix regexp to allow for
+        file names with leading spaces.  Ignore "." if it appears as a
+        filename.
+
 2009-04-14  Juanma Barranquero  <lekktu@gmail.com>
 
         * help-at-pt.el (help-at-pt-kbd-string): Reflow docstring.
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index a2e455a8702..6eeb8985bfd 100644
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -164,7 +164,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)
@@ -176,7 +176,7 @@ want to force an empty list of arguments, use t."
              ;; FIXME are there other possible combinations?
              (cond ((eq state 'edited) (setq state 'needs-merge))
                    ((not state) (setq state 'needs-update))))
-       (when state
+        (when (and state (not (string= "." filename)))
          (setq result (cons (list filename state) result)))))
     (funcall callback result)))