From: Paul Eggert <eggert@twinsun.com>
Date: Mon, 26 Feb 1996 00:53:13 +0000 (+0000)
Subject: (vc-find-cvs-master): Don't require a "/" after the modification time
X-Git-Tag: emacs-19.34~1184
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d5c8e97af581c93baa090a26c12ca76ee9bb9863;p=emacs.git

(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 ea4fd6543f5..4ac1668c842 100644
--- 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