From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 4 May 1997 06:49:53 +0000 (+0000)
Subject: (vc-find-cvs-master): Accept ...+ in a normal entry.
X-Git-Tag: emacs-20.1~2303
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9f49ec7384af42656928aab935f1be366a0214bb;p=emacs.git

(vc-find-cvs-master): Accept ...+ in a normal entry.
---

diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 7a59ccc9f0f..da673ecdab4 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -786,7 +786,7 @@ For CVS, the full name of CVS/Entries is returned."
 	       ;; normal entry
 	       ((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 
@@ -797,16 +797,16 @@ For CVS, the full name of CVS/Entries is returned."
 		;; If the file hasn't been modified since checkout,
 		;; store the checkout-time.
 		(let ((mtime (nth 5 (file-attributes file)))
-		      (second (string-to-number (match-string 6)))
-		      (minute (string-to-number (match-string 5)))
-		      (hour (string-to-number (match-string 4)))
-		      (day (string-to-number (match-string 3)))
-		      (year (string-to-number (match-string 7))))
+		      (second (string-to-number (match-string 7)))
+		      (minute (string-to-number (match-string 6)))
+		      (hour (string-to-number (match-string 5)))
+		      (day (string-to-number (match-string 4)))
+		      (year (string-to-number (match-string 8))))
 		  (if (equal mtime
 			     (encode-time
 			      second minute hour day
 			      (/ (string-match
-				  (match-string 2)
+				  (match-string 3)
 				  "xxxJanFebMarAprMayJunJulAugSepOctNovDec")
 				 3)
 			      year 0))