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

[Eric S. Raymond]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Eric S. Raymond <esr>   08/05/04 23:24:49

Index: vc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc.el,v
retrieving revision 1.629
retrieving revision 1.630
diff -u -b -r1.629 -r1.630
--- vc.el       4 May 2008 13:20:50 -0000       1.629
+++ vc.el       4 May 2008 23:24:49 -0000       1.630
@@ -2180,8 +2180,9 @@
 ;; FIXME: Replace these with a more efficient dispatch
 
 (defun vc-generic-status-printer (fileentry)
-  (let ((backend (vc-responsible-backend (vc-dir-fileinfo->name fileentry))))
-    (vc-call-backend backend 'status-printer fileentry)))
+  (let* ((file (vc-dir-fileinfo->name fileentry))
+        ((backend (vc-responsible-backend file))))
+    (vc-call-backend backend 'status-printer file)))
   
 (defun vc-generic-state (file)
   (let ((backend (vc-responsible-backend file)))
@@ -2196,6 +2197,7 @@
     (vc-dir-headers backend dir)))
 
 (defun vc-make-backend-object (file-or-dir)
+  "Create the backend capability object needed by vc-dispatcher."
   (vc-create-client-object 
    "VC status"
    (let ((backend (vc-responsible-backend file-or-dir)))
@@ -2210,7 +2212,7 @@
   "Show the VC status for DIR."
   (interactive "DVC status for directory: ")
   (pop-to-buffer (vc-dir-prepare-status-buffer dir))
-  (if (eq major-mode 'vc-dir-mode)
+  (if (and (eq major-mode 'vc-dir-mode) (boundp 'client-object))
       (vc-dir-refresh)
     ;; Otherwise, initialize a new view using the dispatcher layer
     (progn