(vc-svn-parse-status): Use when instead of if.

Fix 2008-01-01 change: use a shy group to not affect subsequent
match calls.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 50128348afce79ebb4f8e9cf6ad84cfb3de55c4b..6459bbfe6f7d3e707bb1ae8eecfe926b482d7fdd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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):

diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index 30bf8d4ccf9f2dd8b5ba123c5686ad07b74c6953..854e66e3d1d9d659ae14874f571b0531270f6e8b 100644 (file)
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -604,7 +604,7 @@ information about FILENAME and return its status."
     (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 @@ information about FILENAME and return its status."
          ((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."