From: Chong Yidong <cyd@stupidchicken.com>
Date: Wed, 27 Aug 2008 20:39:33 +0000 (+0000)
Subject: (vc-workfile-unchanged-p): If the checkout time is not the same as the
X-Git-Tag: emacs-pretest-23.0.90~3221
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5d3351276ef2016222ad308732e640596e8a5eeb;p=emacs.git

(vc-workfile-unchanged-p): If the checkout time is not the same as the
last modification time, fall back on the backend-specific check.
---

diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 260e6a8a8c4..6b90fa1381f 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -559,13 +559,13 @@ and does not employ any heuristic at all."
   "Return non-nil if FILE has not changed since the last checkout."
   (let ((checkout-time (vc-file-getprop file 'vc-checkout-time))
         (lastmod (nth 5 (file-attributes file))))
-    (if (and checkout-time
+    (or (and checkout-time
              ;; Tramp and Ange-FTP return this when they don't know the time.
-             (not (equal lastmod '(0 0))))
-        (equal checkout-time lastmod)
-      (let ((unchanged (vc-call workfile-unchanged-p file)))
-        (vc-file-setprop file 'vc-checkout-time (if unchanged lastmod 0))
-        unchanged))))
+	     (not (equal lastmod '(0 0)))
+	     (equal checkout-time lastmod))
+	(let ((unchanged (vc-call workfile-unchanged-p file)))
+	  (vc-file-setprop file 'vc-checkout-time (if unchanged lastmod 0))
+	  unchanged))))
 
 (defun vc-default-workfile-unchanged-p (backend file)
   "Check if FILE is unchanged by diffing against the master version.