[Emacs-diffs] Changes to emacs/lisp/vc-arch.el

[Stefan Monnier]

Index: emacs/lisp/vc-arch.el
diff -c emacs/lisp/vc-arch.el:1.14 emacs/lisp/vc-arch.el:1.15
*** emacs/lisp/vc-arch.el:1.14  Sun Jan  2 22:00:06 2005
--- emacs/lisp/vc-arch.el       Sun Jan  2 22:07:52 2005
***************
*** 270,276 ****
  (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 
"\\`\\(address@hidden/\n]+\\)/\\(\\(\\(.*\\)\\(--.*\\)?\\)--.*\\)\\'" 
defbranch))
        (let* ((archive (match-string 1 defbranch))
             (category (match-string 4 defbranch))
             (branch (match-string 3 defbranch))
--- 270,276 ----
  (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 
"\\`\\(address@hidden/\n]+\\)/\\(\\(\\(.*?\\)\\(?:--.*\\)?\\)--.*\\)\\'" 
defbranch))
        (let* ((archive (match-string 1 defbranch))
             (category (match-string 4 defbranch))
             (branch (match-string 3 defbranch))