From f56d71a5961e6b6ccc5108ee624d6292d562661d Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Fri, 28 Mar 2008 18:16:09 +0000 Subject: [PATCH] (vc-status-kill-dir-status-process): Simplify. (vc-status-refresh): Make sure the buffer is live. --- lisp/ChangeLog | 5 +++++ lisp/vc.el | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 15c07a27b7d..df6d515aec5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-03-28 Dan Nicolaescu + + * vc.el (vc-status-kill-dir-status-process): Simplify. + (vc-status-refresh): Make sure the buffer is live. + 2008-03-28 Wilson Snyder * progmodes/verilog-mode.el (verilog-auto-inout-module): diff --git a/lisp/vc.el b/lisp/vc.el index c2653d90c74..048f665e66e 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -2981,16 +2981,16 @@ Throw an error if another update process is in progress." ;; 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) -- 2.39.2