aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Spiegel2005-04-01 17:21:52 +0000
committerAndré Spiegel2005-04-01 17:21:52 +0000
commit04e777784e5bb69ef5c25b45973613b5171e8e5b (patch)
tree2db8e549d912d9ad4a44e42d1d770b9fde8a7a58
parentb75122e4bdff6eeff9365c7531190f20fb43e2b5 (diff)
downloademacs-04e777784e5bb69ef5c25b45973613b5171e8e5b.tar.gz
emacs-04e777784e5bb69ef5c25b45973613b5171e8e5b.zip
(vc-workfile-unchanged-p): Disable mtime check when we go via Tramp or
Ange-FTP. Suggested by Kai Grossjohann.
-rw-r--r--lisp/vc-hooks.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 81a18eadd87..52b4659cec6 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -481,7 +481,9 @@ and does not employ any heuristic at all."
481 "Return non-nil if FILE has not changed since the last checkout." 481 "Return non-nil if FILE has not changed since the last checkout."
482 (let ((checkout-time (vc-file-getprop file 'vc-checkout-time)) 482 (let ((checkout-time (vc-file-getprop file 'vc-checkout-time))
483 (lastmod (nth 5 (file-attributes file)))) 483 (lastmod (nth 5 (file-attributes file))))
484 (if checkout-time 484 (if (and checkout-time
485 ;; Tramp and Ange-FTP return this when they don't know the time.
486 (not (equal lastmod '(0 0))))
485 (equal checkout-time lastmod) 487 (equal checkout-time lastmod)
486 (let ((unchanged (vc-call workfile-unchanged-p file))) 488 (let ((unchanged (vc-call workfile-unchanged-p file)))
487 (vc-file-setprop file 'vc-checkout-time (if unchanged lastmod 0)) 489 (vc-file-setprop file 'vc-checkout-time (if unchanged lastmod 0))