]> git.eshelyaron.com Git - emacs.git/commitdiff
(vc-arch-workfile-version): Fix last change.
authorStefan Monnier <monnier@iro.umontreal.ca>
Sun, 2 Jan 2005 22:07:52 +0000 (22:07 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Sun, 2 Jan 2005 22:07:52 +0000 (22:07 +0000)
lisp/vc-arch.el

index 3ea023b41cb8d9902a0fe90441c59ae0a4780605..40ec2fb3884a9f95c247d7f868e17bbdaa5cdcc5 100644 (file)
@@ -270,7 +270,7 @@ Return non-nil if FILE is unchanged."
 (defun vc-arch-workfile-version (file)
   (let* ((root (expand-file-name "{arch}" (vc-arch-root file)))
         (defbranch (vc-arch-default-version file)))
-    (when (and defbranch (string-match "\\`\\(.+@[^/\n]+\\)/\\(\\(\\(.*\\)\\(--.*\\)?\\)--.*\\)\\'" defbranch))
+    (when (and defbranch (string-match "\\`\\(.+@[^/\n]+\\)/\\(\\(\\(.*?\\)\\(?:--.*\\)?\\)--.*\\)\\'" defbranch))
       (let* ((archive (match-string 1 defbranch))
             (category (match-string 4 defbranch))
             (branch (match-string 3 defbranch))