(vc-ensure-vc-buffer): Check liveness of vc-parent-buffer.

2 files changed, 5 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4896c2c1f14..095ef8e6783 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * vc.el (vc-ensure-vc-buffer): Check liveness of vc-parent-buffer.
+
 2008-01-06  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * vc.el (vc-status-fileinfo): New defstruct.
diff --git a/lisp/vc.el b/lisp/vc.el
index 9e5df686546..61a2c67d9d4 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -1310,6 +1310,7 @@ Otherwise, throw an error."
   (if vc-dired-mode
       (set-buffer (find-file-noselect (dired-get-filename)))
     (while (and vc-parent-buffer
+                (buffer-live-p vc-parent-buffer)
                 ;; Avoid infinite looping when vc-parent-buffer and
                 ;; current buffer are the same buffer.
                 (not (eq vc-parent-buffer (current-buffer))))