Cleanup preparatory to getting rid of dired.

diff --git a/lisp/vc-dispatcher.el b/lisp/vc-dispatcher.el
index 3bfa65f915be213ca52a4f146c3480f0d3a048f4..11f9c137084fe098dfb3b23db88fae0d56cd48b4 100644 (file)
--- a/lisp/vc-dispatcher.el
+++ b/lisp/vc-dispatcher.el
@@ -1712,7 +1712,7 @@ Otherwise, throw an error."
     (dolist (file files)
       (let ((visited (get-file-buffer file)))
        (when visited
-         (if (or vc-dired-mode (eq major-mode 'vc-dir-mode))
+         (if (vc-dispatcher-browsing)
              (switch-to-buffer-other-window visited)
            (set-buffer visited))
          ;; Check relation of buffer and file, and make sure

diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 971c92ef7758050ddd3198583f004cf9fb9a6e74..22873993da95dae397b23b5ce033fc0eea094433 100644 (file)
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -771,7 +771,7 @@ Before doing that, check if there are any old backups and get rid of them."
         (vc-mode-line file)
         (when (featurep 'vc)
           ;; If VC is not loaded, then there can't be
-          ;; any VC Dired buffer to synchronize.
+          ;; any directory buffer to synchronize.
           (vc-directory-resynch-file file)))))
 
 (defvar vc-menu-entry

diff --git a/lisp/vc.el b/lisp/vc.el
index 3eeeb6dfad41da3693e490649de4416e6673adbd..06b83ef33b843a5a1699a0b3257b95c25d85f65d 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -45,15 +45,6 @@
 ;; with modern version-control systems that do commits by fileset
 ;; rather than per individual file.
 ;;
-;; Features in the new version:
-;; * Key commands (vc-next-action = C-x v v, vc-print-log = C-x v l, vc-revert
-;;   = C-x v u, vc-rollback = C-x v c, vc-diff = C-x v =, vc-update = C-x v +)
-;;   now operate on filesets rather than individual files.
-;; * The fileset for a command is either (a) all marked files in VC-dired
-;;   mode, (b) the currently visited file if it's under version control,
-;;   or (c) the current directory if the visited buffer is not under
-;;   version control and a wildcarding-enable flag has been set.
-;;
 ;; If you maintain a client of the mode or customize it in your .emacs,
 ;; note that some backend functions which formerly took single file arguments
 ;; now take a list of files.  These include: register, checkin, print-log,
@@ -184,10 +175,6 @@
 ;;   To provide more backend specific functionality for `vc-dir'
 ;;   the following functions might be needed: `status-extra-headers',
 ;;   `status-printer', `extra-status-menu' and `dir-status-files'.
-;;   This function is used by `vc-dir', a replacement for
-;;   `vc-dired'.  vc-dir is still under development, and is NOT
-;;   feature complete.  As such, the requirements for this function
-;;   might change.  This is a replacement for `dir-state'.
 ;;
 ;; - dir-status-files (dir files default-state update-function)
 ;;
@@ -2747,7 +2734,7 @@ to provide the `find-revision' operation instead."
          ((eq state 'needs-update) "(update)")
          ((eq state 'added) "(added)")
          ((eq state 'removed) "(removed)")
-          ((eq state 'ignored) "(ignored)")     ;; dired-hook filters this out
+          ((eq state 'ignored) "(ignored)")
           ((eq state 'unregistered) "?")
          ((eq state 'unlocked-changes) "(stale)")
          ((not state) "(unknown)")))