diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2009-04-15 00:32:47 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2009-04-15 00:32:47 +0000 |
| commit | 524a655d93e4e535ccab96f6650a18f8d1816e03 (patch) | |
| tree | b051f4c38cd5bc68e53d0805091deb8fa3ce64b8 /lisp/vc-svn.el | |
| parent | d65859c36e21f1e9c44655c19f3d8e34acc3a5cb (diff) | |
| download | emacs-524a655d93e4e535ccab96f6650a18f8d1816e03.tar.gz | |
(vc-svn-after-dir-status): Fix regexp to allow for
file names with leading spaces. Ignore "." if it appears as a
filename.
Diffstat (limited to 'lisp/vc-svn.el')
| -rw-r--r-- | lisp/vc-svn.el | 4 |
1 files changed, 2 insertions, 2 deletions
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))) |