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

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/03/28 18:16:17

Index: vc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc.el,v
retrieving revision 1.559
retrieving revision 1.560
diff -u -b -r1.559 -r1.560
--- vc.el       28 Mar 2008 03:50:25 -0000      1.559
+++ vc.el       28 Mar 2008 18:16:08 -0000      1.560
@@ -2981,16 +2981,16 @@
       ;; be asynchronous.  It should compute the results and call the
       ;; function passed as a an arg to update the vc-status buffer with
       ;; the results.
-      (setq vc-status-process-buffer
-           (vc-call-backend
+      (let ((buf (vc-call-backend
             backend 'dir-status default-directory
-            #'vc-update-vc-status-buffer (current-buffer))))))
+                 #'vc-update-vc-status-buffer (current-buffer))))
+       (setq vc-status-process-buffer
+             (if (buffer-live-p buf) buf nil))))))
 
 (defun vc-status-kill-dir-status-process ()
   "Kill the temporary buffer and associated process."
   (interactive)
-  (when (and (bufferp vc-status-process-buffer)
-            (buffer-live-p vc-status-process-buffer))
+  (when (buffer-live-p vc-status-process-buffer)
     (let ((proc (get-buffer-process vc-status-process-buffer)))
       (when proc (delete-process proc))
       (setq vc-status-process-buffer nil)