Merge from emacs-23

[gnu-emacs] / lisp / vc / vc-hooks.el

diff --git a/lisp/vc-hooks.el b/lisp/vc/vc-hooks.el
similarity index 99%
rename from lisp/vc-hooks.el
rename to lisp/vc/vc-hooks.el
index 401b483ae8c4379a0d247ff067b5f62200af6cec..38bc121e70952577b5c68804ab6bdd3d9decdea6 100644 (file)
--- a/lisp/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -6,6 +6,7 @@
 
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
+;; Package: vc
 
 ;; This file is part of GNU Emacs.
 
@@ -48,9 +49,6 @@ vc-BACKEND-master-templates.  To enable or disable VC for a given
 BACKEND, use `vc-handled-backends'."
  "21.1")
 
-(defvar vc-header-alist ())
-(make-obsolete-variable 'vc-header-alist 'vc-BACKEND-header "21.1")
-
 (defcustom vc-ignore-dir-regexp
   ;; Stop SMB, automounter, AFS, and DFS host lookups.
   locate-dominating-stop-dir-regexp
@@ -84,13 +82,6 @@ An empty list disables VC altogether."
   :type '(repeat string)
   :group 'vc)
 
-(defcustom vc-path nil
-  "List of extra directories to search for version control commands."
-  :type '(repeat directory)
-  :group 'vc)
-
-(make-obsolete-variable 'vc-path "should not be necessary anymore." "23.2")
-
 (defcustom vc-make-backup-files nil
   "If non-nil, backups of registered files are made as with other files.
 If nil (the default), files covered by version control don't get backups."
@@ -467,6 +458,9 @@ For registered files, the value returned is one of:
   'edited            The working file has been edited by the user.  If
                      locking is used for the file, this state means that
                      the current version is locked by the calling user.
+                     This status should *not* be reported for files 
+                     which have a changed mtime but the same content 
+                     as the repo copy.
 
   USER               The current version of the working file is locked by
                      some other USER (a string).