aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric S. Raymond <[email protected]>2008-05-11 18:15:59 +0000
committerEric S. Raymond <[email protected]>2008-05-11 18:15:59 +0000
commita970a27e03a46a6c6c866723f1b3f55391e645e4 (patch)
treecfa70b4c5acced21331a48a43d145f182f335db3
parent08a1ccb0d8a707b563ef817bbdc5a6698d9a5abb (diff)
Remove dead code.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc-hooks.el13
2 files changed, 7 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 05d6da8f3e..93da1b8486 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-11 Eric S. Raymond <[email protected]>
+
+ * vc-hooks.el (vc-recompute-state): Removed (dead code).
+
2008-05-10 Dan Nicolaescu <[email protected]>
* vc-dispatcher.el (ewoc): Require.
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index e8c0468461..f9b82aab49 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -531,12 +531,11 @@ For registered files, the value returned is one of:
A return of nil from this function means we have no information on the
status of this file."
- ;; Note: in Emacs 22 and older, return of nil meant the file was unregistered.
- ;; This is potentially a source of backward-compatibility bugs.
+ ;; Note: in Emacs 22 and older, return of nil meant the file was
+ ;; unregistered. This is potentially a source of
+ ;; backward-compatibility bugs.
;; FIXME: New (sub)states needed (?):
- ;; - `conflict' (i.e. `edited' with conflict markers)
- ;; - `removed'
;; - `copied' and `moved' (might be handled by `removed' and `added')
(or (vc-file-getprop file 'vc-state)
(when (> (length file) 0)
@@ -546,12 +545,6 @@ status of this file."
file 'vc-state
(vc-call-backend backend 'state-heuristic file)))))))
-(defun vc-recompute-state (file)
- "Recompute the version control state of FILE, and return it.
-This calls the possibly expensive function vc-BACKEND-state,
-rather than the heuristic."
- (vc-file-setprop file 'vc-state (vc-call state file)))
-
(defsubst vc-up-to-date-p (file)
"Convenience function that checks whether `vc-state' of FILE is `up-to-date'."
(eq (vc-state file) 'up-to-date))