aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric S. Raymond2008-05-11 18:15:59 +0000
committerEric S. Raymond2008-05-11 18:15:59 +0000
commita970a27e03a46a6c6c866723f1b3f55391e645e4 (patch)
treecfa70b4c5acced21331a48a43d145f182f335db3
parent08a1ccb0d8a707b563ef817bbdc5a6698d9a5abb (diff)
downloademacs-a970a27e03a46a6c6c866723f1b3f55391e645e4.tar.gz
emacs-a970a27e03a46a6c6c866723f1b3f55391e645e4.zip
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 05d6da8f3e5..93da1b84860 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12008-05-11 Eric S. Raymond <esr@snark.thyrsus.com>
2
3 * vc-hooks.el (vc-recompute-state): Removed (dead code).
4
12008-05-10 Dan Nicolaescu <dann@ics.uci.edu> 52008-05-10 Dan Nicolaescu <dann@ics.uci.edu>
2 6
3 * vc-dispatcher.el (ewoc): Require. 7 * vc-dispatcher.el (ewoc): Require.
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index e8c04684619..f9b82aab497 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -531,12 +531,11 @@ For registered files, the value returned is one of:
531 531
532A return of nil from this function means we have no information on the 532A return of nil from this function means we have no information on the
533status of this file." 533status of this file."
534 ;; Note: in Emacs 22 and older, return of nil meant the file was unregistered. 534 ;; Note: in Emacs 22 and older, return of nil meant the file was
535 ;; This is potentially a source of backward-compatibility bugs. 535 ;; unregistered. This is potentially a source of
536 ;; backward-compatibility bugs.
536 537
537 ;; FIXME: New (sub)states needed (?): 538 ;; FIXME: New (sub)states needed (?):
538 ;; - `conflict' (i.e. `edited' with conflict markers)
539 ;; - `removed'
540 ;; - `copied' and `moved' (might be handled by `removed' and `added') 539 ;; - `copied' and `moved' (might be handled by `removed' and `added')
541 (or (vc-file-getprop file 'vc-state) 540 (or (vc-file-getprop file 'vc-state)
542 (when (> (length file) 0) 541 (when (> (length file) 0)
@@ -546,12 +545,6 @@ status of this file."
546 file 'vc-state 545 file 'vc-state
547 (vc-call-backend backend 'state-heuristic file))))))) 546 (vc-call-backend backend 'state-heuristic file)))))))
548 547
549(defun vc-recompute-state (file)
550 "Recompute the version control state of FILE, and return it.
551This calls the possibly expensive function vc-BACKEND-state,
552rather than the heuristic."
553 (vc-file-setprop file 'vc-state (vc-call state file)))
554
555(defsubst vc-up-to-date-p (file) 548(defsubst vc-up-to-date-p (file)
556 "Convenience function that checks whether `vc-state' of FILE is `up-to-date'." 549 "Convenience function that checks whether `vc-state' of FILE is `up-to-date'."
557 (eq (vc-state file) 'up-to-date)) 550 (eq (vc-state file) 'up-to-date))