From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 27 Jun 1995 19:06:15 +0000 (+0000)
Subject: (vc-consult-rcs-headers): Use an even more
X-Git-Tag: emacs-19.34~3457
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ce27f2642eec3e03f4cac171634c2dd494c2636a;p=emacs.git

(vc-consult-rcs-headers): Use an even more
pedantic regexp to match RCS time strings.  Improved
efficiency by using looking-at instead of re-search "\\=...
---

diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 1b31024ac8d..1ae9ecfe642 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -346,29 +346,30 @@ value of this flag.")
 	(let ((rev (buffer-substring (match-beginning 1)
 				     (match-end 1))))
 	  ;; ... and check for the locking state
-	  (if (re-search-forward 
-	       (concat "\\=[0-9]+[/-][0-9]+[/-][0-9]+ "             ; date
-		          "[0-9]+:[0-9]+:[0-9]+\\([+-][0-9:]+\\)? " ; time
-		          "[^ ]+ [^ ]+ ")                 ; author & state
-	       nil t)
-	      (cond 
-	       ;; unlocked revision
-	       ((looking-at "\\$")
-		(vc-file-setprop file 'vc-workfile-version rev)
-		(vc-file-setprop file 'vc-locking-user 'none)
-		'rev-and-lock)
-	       ;; revision is locked by some user
-	       ((looking-at "\\([^ ]+\\) \\$")
-		(vc-file-setprop file 'vc-workfile-version rev)
-		(vc-file-setprop file 'vc-locking-user 
-				 (buffer-substring (match-beginning 1)
-						   (match-end 1)))
-		'rev-and-lock)
-	       ;; everything else: false
-	       (nil))
-	    ;; unexpected information in
-	    ;; keyword string --> quit
-	    nil)))
+	  (cond 
+	   ((looking-at
+	     (concat "[0-9]+[/-][01][0-9][/-][0-3][0-9] "             ; date
+	      "[0-2][0-9]:[0-5][0-9]+:[0-6][0-9]+\\([+-][0-9:]+\\)? " ; time
+		     "[^ ]+ [^ ]+ "))                       ; author & state
+	    (goto-char (match-end 0)) ; [0-6] in regexp handles leap seconds
+	    (cond 
+	     ;; unlocked revision
+	     ((looking-at "\\$")
+	      (vc-file-setprop file 'vc-workfile-version rev)
+	      (vc-file-setprop file 'vc-locking-user 'none)
+	      'rev-and-lock)
+	     ;; revision is locked by some user
+	     ((looking-at "\\([^ ]+\\) \\$")
+	      (vc-file-setprop file 'vc-workfile-version rev)
+	      (vc-file-setprop file 'vc-locking-user 
+			       (buffer-substring (match-beginning 1)
+						 (match-end 1)))
+	      'rev-and-lock)
+	     ;; everything else: false
+	     (nil)))
+	   ;; unexpected information in
+	   ;; keyword string --> quit
+	   (nil))))
        ;; search for $Revision
        ;; --------------------
        ((re-search-forward (concat "\\$"