# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1199635358 0
# Node ID 2425b933f90ad030c476d03268ba536d35d50732
# Parent  8f58e29f466a5e68f30613b37ebac3ac8e34afda
(vc-ensure-vc-buffer): Check liveness of vc-parent-buffer.

diff -r 8f58e29f466a -r 2425b933f90a lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Jan 06 11:49:25 2008 +0000
+++ b/lisp/ChangeLog	Sun Jan 06 16:02:38 2008 +0000
@@ -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 -r 8f58e29f466a -r 2425b933f90a lisp/vc.el
--- a/lisp/vc.el	Sun Jan 06 11:49:25 2008 +0000
+++ b/lisp/vc.el	Sun Jan 06 16:02:38 2008 +0000
@@ -1310,6 +1310,7 @@
   (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))))