# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1206728169 0
# Node ID a461250ed6bff285f33145667e4e39fa822d09c5
# Parent  f6e488e577db2789710f7d5d276d2590456a14bd
(vc-status-kill-dir-status-process): Simplify.
(vc-status-refresh): Make sure the buffer is live.

diff -r f6e488e577db -r a461250ed6bf lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Mar 28 17:24:51 2008 +0000
+++ b/lisp/ChangeLog	Fri Mar 28 18:16:09 2008 +0000
@@ -1,3 +1,8 @@
+2008-03-28  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* vc.el (vc-status-kill-dir-status-process): Simplify.
+	(vc-status-refresh): Make sure the buffer is live.
+
 2008-03-28  Wilson Snyder  <wsnyder@wsnyder.org>
 
 	* progmodes/verilog-mode.el (verilog-auto-inout-module):
diff -r f6e488e577db -r a461250ed6bf lisp/vc.el
--- a/lisp/vc.el	Fri Mar 28 17:24:51 2008 +0000
+++ b/lisp/vc.el	Fri Mar 28 18:16:09 2008 +0000
@@ -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
-	     backend 'dir-status default-directory
-	     #'vc-update-vc-status-buffer (current-buffer))))))
+      (let ((buf (vc-call-backend
+		  backend 'dir-status default-directory
+		  #'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)