diff options
| author | André Spiegel | 2000-11-19 09:52:45 +0000 |
|---|---|---|
| committer | André Spiegel | 2000-11-19 09:52:45 +0000 |
| commit | 5675c431ba46f1ac0dcf27759ca2f9c1df3df6b6 (patch) | |
| tree | 3bd49f47edc1d3caeaf4514f398144ddb6a85b9b | |
| parent | 036f45faec1e44ffe5569160b10dde299d76dbdd (diff) | |
| download | emacs-5675c431ba46f1ac0dcf27759ca2f9c1df3df6b6.tar.gz emacs-5675c431ba46f1ac0dcf27759ca2f9c1df3df6b6.zip | |
(vc-workfile-unchanged-p, vc-default-workfile-unchanged-p): Moved to
vc-hooks.el.
| -rw-r--r-- | lisp/vc.el | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index 6c4396a0d29..a82d579de65 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | ;; Author: FSF (see below for full credits) | 5 | ;; Author: FSF (see below for full credits) |
| 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
| 7 | 7 | ||
| 8 | ;; $Id: vc.el,v 1.289 2000/11/16 18:17:26 spiegel Exp $ | 8 | ;; $Id: vc.el,v 1.290 2000/11/16 18:28:11 monnier Exp $ |
| 9 | 9 | ||
| 10 | ;; This file is part of GNU Emacs. | 10 | ;; This file is part of GNU Emacs. |
| 11 | 11 | ||
| @@ -825,20 +825,6 @@ NOT-URGENT means it is ok to continue if the user says not to save." | |||
| 825 | (unless not-urgent | 825 | (unless not-urgent |
| 826 | (error "Aborted"))))) | 826 | (error "Aborted"))))) |
| 827 | 827 | ||
| 828 | (defun vc-workfile-unchanged-p (file) | ||
| 829 | "Has FILE changed since last checkout?" | ||
| 830 | (let ((checkout-time (vc-file-getprop file 'vc-checkout-time)) | ||
| 831 | (lastmod (nth 5 (file-attributes file)))) | ||
| 832 | (if checkout-time | ||
| 833 | (equal checkout-time lastmod) | ||
| 834 | (let ((unchanged (vc-call workfile-unchanged-p file))) | ||
| 835 | (vc-file-setprop file 'vc-checkout-time (if unchanged lastmod 0)) | ||
| 836 | unchanged)))) | ||
| 837 | |||
| 838 | (defun vc-default-workfile-unchanged-p (file) | ||
| 839 | "Default check whether FILE is unchanged: diff against master version." | ||
| 840 | (zerop (vc-call diff file (vc-workfile-version file)))) | ||
| 841 | |||
| 842 | (defun vc-recompute-state (file) | 828 | (defun vc-recompute-state (file) |
| 843 | "Force a recomputation of the version control state of FILE. | 829 | "Force a recomputation of the version control state of FILE. |
| 844 | The state is computed using the exact, and possibly expensive | 830 | The state is computed using the exact, and possibly expensive |