(vc-svn-parse-status): Use when instead of if.
Fix 2008-01-01 change: use a shy group to not affect subsequent match calls.
This commit is contained in:
parent
5573794231
commit
245cacf131
2 changed files with 8 additions and 2 deletions
|
@ -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):
|
||||
|
|
|
@ -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."
|
||||
|
|
Loading…
Add table
Reference in a new issue