mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Code Issues Releases Activity

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

Browse Source 
file names with leading spaces.  Ignore "." if it appears as a
filename.
This commit is contained in:
Dan Nicolaescu 2009-04-15 00:32:47 +00:00
parent d65859c36e
commit 524a655d93
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -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.

4
lisp/vc-svn.el
View File

@ -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)))