diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2005-01-02 22:07:52 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2005-01-02 22:07:52 +0000 |
| commit | c771f3d67a0e0ee67f1c65960cab3b374971fb66 (patch) | |
| tree | f43accc973e5dff3cc64c8be3a74ddc7feac46ce | |
| parent | 5e39b98a2965ba20a68fd98aecb780f4d6246219 (diff) | |
| download | emacs-c771f3d67a0e0ee67f1c65960cab3b374971fb66.tar.gz | |
(vc-arch-workfile-version): Fix last change.
| -rw-r--r-- | lisp/vc-arch.el | 2 |
1 files changed, 1 insertions, 1 deletions
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)) |