Mercurial > emacs
changeset 97336:701c14eb5b26
(vc-svn-parse-status): Use when instead of if.
Fix 2008-01-01 change: use a shy group to not affect subsequent
match calls.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Wed, 06 Aug 2008 16:49:23 +0000 |
| parents | 5814e7199b5e |
| children | eb328facb6f6 |
| files | lisp/ChangeLog lisp/vc-svn.el |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Aug 06 16:20:46 2008 +0000 +++ b/lisp/ChangeLog Wed Aug 06 16:49:23 2008 +0000 @@ -1,3 +1,9 @@ +2008-08-06 Dan Nicolaescu <dann@ics.uci.edu> + + * vc-svn.el (vc-svn-parse-status): Use when instead of if. + Fix 2008-01-01 change: use a shy group to not affect subsequent + match calls. + 2008-08-06 Reto Zimmermann <reto@gnu.org> * progmodes/vera-mode.el (vera-electric-tab):
--- a/lisp/vc-svn.el Wed Aug 06 16:20:46 2008 +0000 +++ b/lisp/vc-svn.el Wed Aug 06 16:49:23 2008 +0000 @@ -604,7 +604,7 @@ (goto-char (point-min)) (while (re-search-forward ;; Ignore the files with status X. - "^\\(\\?\\|[ ACDGIMR!~][ MC][ L][ +][ S]..\\([ *]\\) +\\([-0-9]+\\) +\\([0-9?]+\\) +\\([^ ]+\\)\\) +" nil t) + "^\\(?:\\?\\|[ ACDGIMR!~][ MC][ L][ +][ S]..\\([ *]\\) +\\([-0-9]+\\) +\\([0-9?]+\\) +\\([^ ]+\\)\\) +" nil t) ;; If the username contains spaces, the output format is ambiguous, ;; so don't trust the output's filename unless we have to. (setq file (or filename @@ -643,7 +643,7 @@ ((eq status ?R) (vc-file-setprop file 'vc-state 'removed)) (t 'edited))))) - (if filename (vc-file-getprop filename 'vc-state)))) + (when filename (vc-file-getprop filename 'vc-state)))) (defun vc-svn-valid-symbolic-tag-name-p (tag) "Return non-nil if TAG is a valid symbolic tag name."