diff options
| author | André Spiegel | 2002-09-04 20:47:08 +0000 |
|---|---|---|
| committer | André Spiegel | 2002-09-04 20:47:08 +0000 |
| commit | fd4ca8fb12ba5950e8b84a70ff40a761c76bf98d (patch) | |
| tree | 88bd490f5d0aa05dcaca44455d0a474cfaa3eafa | |
| parent | e767004f7ae880264a604ce64eaed93c48169e4e (diff) | |
| download | emacs-fd4ca8fb12ba5950e8b84a70ff40a761c76bf98d.tar.gz emacs-fd4ca8fb12ba5950e8b84a70ff40a761c76bf98d.zip | |
(vc-workfile-unchanged-p, vc-default-workfile-unchanged-p): Moved to
vc-hooks.el.
| -rw-r--r-- | lisp/vc.el | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index becfc4cdc4e..8a6cdb3ac1a 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
| 7 | ;; Keywords: tools | 7 | ;; Keywords: tools |
| 8 | 8 | ||
| 9 | ;; $Id: vc.el,v 1.334 2002/07/19 13:20:02 spiegel Exp $ | 9 | ;; $Id: vc.el,v 1.335 2002/07/22 18:52:04 spiegel Exp $ |
| 10 | 10 | ||
| 11 | ;; This file is part of GNU Emacs. | 11 | ;; This file is part of GNU Emacs. |
| 12 | 12 | ||
| @@ -1071,21 +1071,6 @@ NOT-URGENT means it is ok to continue if the user says not to save." | |||
| 1071 | (unless not-urgent | 1071 | (unless not-urgent |
| 1072 | (error "Aborted"))))) | 1072 | (error "Aborted"))))) |
| 1073 | 1073 | ||
| 1074 | (defun vc-workfile-unchanged-p (file) | ||
| 1075 | "Return non-nil if FILE has not changed since the last checkout." | ||
| 1076 | (let ((checkout-time (vc-file-getprop file 'vc-checkout-time)) | ||
| 1077 | (lastmod (nth 5 (file-attributes file)))) | ||
| 1078 | (if checkout-time | ||
| 1079 | (equal checkout-time lastmod) | ||
| 1080 | (let ((unchanged (vc-call workfile-unchanged-p file))) | ||
| 1081 | (vc-file-setprop file 'vc-checkout-time (if unchanged lastmod 0)) | ||
| 1082 | unchanged)))) | ||
| 1083 | |||
| 1084 | (defun vc-default-workfile-unchanged-p (backend file) | ||
| 1085 | "Check if FILE is unchanged by diffing against the master version. | ||
| 1086 | Return non-nil if FILE is unchanged." | ||
| 1087 | (zerop (vc-call diff file (vc-workfile-version file)))) | ||
| 1088 | |||
| 1089 | (defun vc-default-latest-on-branch-p (backend file) | 1074 | (defun vc-default-latest-on-branch-p (backend file) |
| 1090 | "Return non-nil if FILE is the latest on its branch. | 1075 | "Return non-nil if FILE is the latest on its branch. |
| 1091 | This default implementation always returns non-nil, which means that | 1076 | This default implementation always returns non-nil, which means that |