From f52d10f2b76fa768d2ea58258fc31301a2f0425a Mon Sep 17 00:00:00 2001 From: Dave Love Date: Wed, 1 Oct 2003 13:23:34 +0000 Subject: [PATCH] (vc-cvs-parse-entry): Revert last change to allow bootstrap. --- lisp/ChangeLog | 5 +++++ lisp/vc-cvs.el | 25 +++++++++++++------------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 15010688aac..b759ade1458 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2003-10-01 Dave Love + + * vc-cvs.el (vc-cvs-parse-entry): Revert last change to allow + bootstrap. + 2003-09-30 Richard M. Stallman * dired.el (dired-mode): Handle dired-directory as a list. diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index cdbd225412c..048cb6ccfb4 100644 --- a/lisp/vc-cvs.el +++ b/lisp/vc-cvs.el @@ -5,7 +5,7 @@ ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel -;; $Id: vc-cvs.el,v 1.64 2003/09/24 11:55:45 spiegel Exp $ +;; $Id$ ;; This file is part of GNU Emacs. @@ -927,17 +927,18 @@ is non-nil." ;; This is intentionally different from the algorithm that CVS uses ;; (which is based on textual comparison), because there can be problems ;; generating a time string that looks exactly like the one from CVS. - (let ((mtime (nth 5 (file-attributes file))) - (parsed-time - (parse-time-string (concat (match-string 2) " +0000")))) - (cond ((and (not (string-match "\\+" (match-string 2))) - (car parsed-time) - (equal mtime (apply 'encode-time parsed-time))) - (vc-file-setprop file 'vc-checkout-time mtime) - (if set-state (vc-file-setprop file 'vc-state 'up-to-date))) - (t - (vc-file-setprop file 'vc-checkout-time 0) - (if set-state (vc-file-setprop file 'vc-state 'edited)))))))) + (let ((mtime (nth 5 (file-attributes file)))) + (require 'parse-time) + (let ((parsed-time + (parse-time-string (concat (match-string 2) " +0000")))) + (cond ((and (not (string-match "\\+" (match-string 2))) + (car parsed-time) + (equal mtime (apply 'encode-time parsed-time))) + (vc-file-setprop file 'vc-checkout-time mtime) + (if set-state (vc-file-setprop file 'vc-state 'up-to-date))) + (t + (vc-file-setprop file 'vc-checkout-time 0) + (if set-state (vc-file-setprop file 'vc-state 'edited))))))))) (provide 'vc-cvs) -- 2.39.2