# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1239755567 0
# Node ID 04e540897dd13549008d3b93c48c984a6990b3ed
# Parent  9980dd970cf98cc114c9b54de572eff6b4d932ae
(vc-svn-after-dir-status): Fix regexp to allow for
file names with leading spaces.  Ignore "." if it appears as a
filename.

diff -r 9980dd970cf9 -r 04e540897dd1 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Apr 15 00:08:23 2009 +0000
+++ b/lisp/ChangeLog	Wed Apr 15 00:32:47 2009 +0000
@@ -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 -r 9980dd970cf9 -r 04e540897dd1 lisp/vc-svn.el
--- a/lisp/vc-svn.el	Wed Apr 15 00:08:23 2009 +0000
+++ b/lisp/vc-svn.el	Wed Apr 15 00:32:47 2009 +0000
@@ -164,7 +164,7 @@
                      (?? . 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 @@
 	     ;; 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)))