[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog vc-svn.el
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog vc-svn.el |
Date: |
Wed, 15 Apr 2009 00:32:52 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 09/04/15 00:32:51
Modified files:
lisp : ChangeLog vc-svn.el
Log message:
(vc-svn-after-dir-status): Fix regexp to allow for
file names with leading spaces. Ignore "." if it appears as a
filename.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15588&r2=1.15589
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-svn.el?cvsroot=emacs&r1=1.112&r2=1.113
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15588
retrieving revision 1.15589
diff -u -b -r1.15588 -r1.15589
--- ChangeLog 14 Apr 2009 21:54:49 -0000 1.15588
+++ ChangeLog 15 Apr 2009 00:32:47 -0000 1.15589
@@ -1,3 +1,9 @@
+2009-04-15 Dan Nicolaescu <address@hidden>
+
+ * 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 <address@hidden>
* help-at-pt.el (help-at-pt-kbd-string): Reflow docstring.
Index: vc-svn.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-svn.el,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- vc-svn.el 10 Feb 2009 05:59:14 -0000 1.112
+++ vc-svn.el 15 Apr 2009 00:32:51 -0000 1.113
@@ -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)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp ChangeLog vc-svn.el,
Dan Nicolaescu <=