(vc-find-cvs-master): Don't require a "/" after the modification time

in CVS/Entries, since the time may be followed by a conflict notice
(in CVS 1.7) or by some other value (in CVS 1.3).

diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index ea4fd6543f5b27c56684854bc2b6069e44aedf7f..4ac1668c84214986d7c4d5bb80803031b453d946 100644 (file)
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -791,7 +791,7 @@ For CVS, the full name of CVS/Entries is returned."
              (cond
               ((re-search-forward
                 (concat "^/" (regexp-quote basename) 
-                        "/\\([^/]*\\)/[^ /]* \\([A-Z][a-z][a-z]\\) *\\([0-9]*\\) \\([0-9]*\\):\\([0-9]*\\):\\([0-9]*\\) \\([0-9]*\\)/")
+                        "/\\([^/]*\\)/[^ /]* \\([A-Z][a-z][a-z]\\) *\\([0-9]*\\) \\([0-9]*\\):\\([0-9]*\\):\\([0-9]*\\) \\([0-9]*\\)")
                 nil t)
                (setq case-fold-search fold)  ;; restore the old value
                ;; We found it.  Store away version number now that we