From: André Spiegel <spiegel@gnu.org>
Date: Mon, 20 Nov 2000 14:01:35 +0000 (+0000)
Subject: Undo prev change.
X-Git-Tag: emacs-pretest-21.0.92~278
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2ce63cb7f58e540c18be064c9185f6ca6d5f7890;p=emacs.git

Undo prev change.
---

diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 53108653f04..9f7bab9c1d2 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -365,26 +365,14 @@ It simply calls the real state computation function `vc-BACKEND-state'
 and does not employ any heuristic at all."
    (vc-call-backend backend 'state file))
 
-(defun vc-workfile-unchanged-p (file)
-  "Has FILE changed since last checkout?"
-  (let ((checkout-time (vc-file-getprop file 'vc-checkout-time))
-        (lastmod (nth 5 (file-attributes file))))
-    (if checkout-time
-        (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 (file)
-  "Default check whether FILE is unchanged: diff against master version."
-  (zerop (vc-call diff file (vc-workfile-version file))))
-
 (defun vc-workfile-version (file)
   "Return version level of the current workfile FILE."
   (or (vc-file-getprop file 'vc-workfile-version)
       (vc-file-setprop file 'vc-workfile-version
                        (vc-call workfile-version file))))
 
+;;; actual version-control code starts here
+
 (defun vc-default-registered (backend file)
   "Check if FILE is registered in BACKEND using vc-BACKEND-master-templates."
   (let ((sym (vc-make-backend-sym backend 'master-templates)))
diff --git a/lisp/vc.el b/lisp/vc.el
index a82d579de65..f77ebb1dc1d 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -825,6 +825,20 @@ NOT-URGENT means it is ok to continue if the user says not to save."
 	(unless not-urgent
 	  (error "Aborted")))))
 
+(defun vc-workfile-unchanged-p (file)
+  "Has FILE changed since last checkout?"
+  (let ((checkout-time (vc-file-getprop file 'vc-checkout-time))
+        (lastmod (nth 5 (file-attributes file))))
+    (if checkout-time
+        (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 (file)
+  "Default check whether FILE is unchanged: diff against master version."
+  (zerop (vc-call diff file (vc-workfile-version file))))
+
 (defun vc-recompute-state (file)
   "Force a recomputation of the version control state of FILE.
 The state is computed using the exact, and possibly expensive