From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sun, 2 Jan 2005 22:07:52 +0000 (+0000)
Subject: (vc-arch-workfile-version): Fix last change.
X-Git-Tag: ttn-vms-21-2-B4~2960
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c771f3d67a0e0ee67f1c65960cab3b374971fb66;p=emacs.git

(vc-arch-workfile-version): Fix last change.
---

diff --git a/lisp/vc-arch.el b/lisp/vc-arch.el
index 3ea023b41cb..40ec2fb3884 100644
--- a/lisp/vc-arch.el
+++ b/lisp/vc-arch.el
@@ -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))