Mercurial > emacs
changeset 93343:a461250ed6bf
(vc-status-kill-dir-status-process): Simplify.
(vc-status-refresh): Make sure the buffer is live.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Fri, 28 Mar 2008 18:16:09 +0000 |
| parents | f6e488e577db |
| children | 744a5e8c50ac |
| files | lisp/ChangeLog lisp/vc.el |
| diffstat | 2 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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):
--- 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)