From c771f3d67a0e0ee67f1c65960cab3b374971fb66 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 2 Jan 2005 22:07:52 +0000 Subject: [PATCH] (vc-arch-workfile-version): Fix last change. --- lisp/vc-arch.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)) -- 2.39.5