[Emacs-diffs] Changes to emacs/lisp/vc-hooks.el,v

[Eric S. Raymond]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Eric S. Raymond <esr>   08/05/11 18:16:00

Index: vc-hooks.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-hooks.el,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -b -r1.255 -r1.256
--- vc-hooks.el 10 May 2008 03:55:00 -0000      1.255
+++ vc-hooks.el 11 May 2008 18:15:59 -0000      1.256
@@ -531,12 +531,11 @@
 
 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 @@
              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))