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

cc72026b · Stefan Monnier · effb6952 · cc72026b · cc72026b
Commit cc72026b authored Jan 06, 2008 by Stefan Monnier
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

lisp/ChangeLog lisp/ChangeLog +4 -0

lisp/vc.el lisp/vc.el +1 -0

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+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.

--- 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))))