Guarantee that all buffers in a buffer layout are alive at the time of

selection.

diff --git a/v7/src/edwin/curren.scm b/v7/src/edwin/curren.scm
index 295a6333cc7365ce74603a6c90f520465a4214c1..b4e19f41b098f629f1a27673795033ca526e23d8 100644 (file)
--- a/v7/src/edwin/curren.scm
+++ b/v7/src/edwin/curren.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: curren.scm,v 1.129 2000/10/26 02:42:07 cph Exp $
+;;; $Id: curren.scm,v 1.130 2000/10/26 02:50:03 cph Exp $
 ;;;
 ;;; Copyright (c) 1986, 1989-2000 Massachusetts Institute of Technology
 ;;;
@@ -531,10 +531,18 @@ The buffer is guaranteed to be selected at that time."
          (delete-other-windows window)))
     (let ((layout (buffer-get buffer buffer-layout-key #f)))
       (if layout
-         (begin
-           (hash-table/put! screen-buffer-layouts screen layout)
-           (delete-other-windows window)
-           ((car layout) window (weak-list->list (cdr layout))))
+         (let ((buffers (weak-list->list (cdr layout))))
+           (if (for-all? buffers
+                 (lambda (buffer)
+                   (and buffer
+                        (buffer-alive? buffer))))
+               (begin
+                 (hash-table/put! screen-buffer-layouts screen layout)
+                 (delete-other-windows window)
+                 ((car layout) window buffers))
+               (begin
+                 (delete-buffer-layout buffer)
+                 (set-window-buffer! window buffer))))
          (set-window-buffer! window buffer)))))
 
 (define (delete-buffer-layout buffer)