diff options
| -rw-r--r-- | lisp/vc-hooks.el | 12 |
1 files changed, 6 insertions, 6 deletions
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." | |||
| 559 | "Return non-nil if FILE has not changed since the last checkout." | 559 | "Return non-nil if FILE has not changed since the last checkout." |
| 560 | (let ((checkout-time (vc-file-getprop file 'vc-checkout-time)) | 560 | (let ((checkout-time (vc-file-getprop file 'vc-checkout-time)) |
| 561 | (lastmod (nth 5 (file-attributes file)))) | 561 | (lastmod (nth 5 (file-attributes file)))) |
| 562 | (if (and checkout-time | 562 | (or (and checkout-time |
| 563 | ;; Tramp and Ange-FTP return this when they don't know the time. | 563 | ;; Tramp and Ange-FTP return this when they don't know the time. |
| 564 | (not (equal lastmod '(0 0)))) | 564 | (not (equal lastmod '(0 0))) |
| 565 | (equal checkout-time lastmod) | 565 | (equal checkout-time lastmod)) |
| 566 | (let ((unchanged (vc-call workfile-unchanged-p file))) | 566 | (let ((unchanged (vc-call workfile-unchanged-p file))) |
| 567 | (vc-file-setprop file 'vc-checkout-time (if unchanged lastmod 0)) | 567 | (vc-file-setprop file 'vc-checkout-time (if unchanged lastmod 0)) |
| 568 | unchanged)))) | 568 | unchanged)))) |
| 569 | 569 | ||
| 570 | (defun vc-default-workfile-unchanged-p (backend file) | 570 | (defun vc-default-workfile-unchanged-p (backend file) |
| 571 | "Check if FILE is unchanged by diffing against the master version. | 571 | "Check if FILE is unchanged by diffing against the master version. |