[Emacs-diffs] Changes to emacs/lisp/vc-hooks.el,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/08/28 17:48:16

Index: vc-hooks.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-hooks.el,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -b -r1.262 -r1.263
--- vc-hooks.el 27 Aug 2008 20:39:33 -0000      1.262
+++ vc-hooks.el 28 Aug 2008 17:48:15 -0000      1.263
@@ -559,10 +559,13 @@
   "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))))
-    (or (and checkout-time
+    ;; This is a shortcut for determining when the workfile is
+    ;; unchanged.  It can fail under some circumstances; see the
+    ;; discussion in bug#694.
+    (if (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))
+            (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))))