diff options
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/vc-cvs.el | 2 | ||||
| -rw-r--r-- | lisp/vc/vc-hg.el | 4 | ||||
| -rw-r--r-- | lisp/vc/vc-hooks.el | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index 1f81ff2e0fe..52cc42791fa 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el @@ -250,7 +250,7 @@ See also variable `vc-cvs-sticky-date-format-string'." (let ((checkout-time (vc-file-getprop file 'vc-checkout-time)) (lastmod (file-attribute-modification-time (file-attributes file)))) (cond - ((equal checkout-time lastmod) 'up-to-date) + ((time-equal-p checkout-time lastmod) 'up-to-date) ((string= (vc-working-revision file) "0") 'added) ((null checkout-time) 'unregistered) (t 'edited)))) diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 026f125396e..5fba2b3908a 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -966,7 +966,7 @@ REPO must be the directory name of an hg repository." (attr (file-attributes (nth 0 fs))) (current-mtime (file-attribute-modification-time attr)) (current-size (file-attribute-size attr))) - (unless (and (equal saved-mtime current-mtime) + (unless (and (time-equal-p saved-mtime current-mtime) (equal saved-size current-size)) (setf valid nil)))) valid)) @@ -1037,7 +1037,7 @@ Avoids the need to repeatedly scan dirstate on repeated calls to ) (if (and cache (equal dirstate (pop cache)) - (equal mtime (pop cache)) + (time-equal-p mtime (pop cache)) (equal size (pop cache)) (equal ascii-fname (pop cache))) (pop cache) diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index 80508570f32..405c9bc2ca4 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -631,9 +631,10 @@ Before doing that, check if there are any old backups and get rid of them." (cond ((null backend)) ((eq (vc-checkout-model backend (list file)) 'implicit) - ;; If the file was saved in the same second in which it was + ;; If the file was saved at the same time that it was ;; checked out, clear the checkout-time to avoid confusion. - (if (equal (vc-file-getprop file 'vc-checkout-time) + (if (time-equal-p + (vc-file-getprop file 'vc-checkout-time) (file-attribute-modification-time (file-attributes file))) (vc-file-setprop file 'vc-checkout-time nil)) (if (vc-state-refresh file backend) |