2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 74aae97943d..c567b0f8c4d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-08  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (window-deletable-p): Make sure window is live before
+        invoking window-prev-buffers.
+
 2011-09-08  Leo Liu  <sdl.web@gmail.com>
 
         * net/rcirc.el (rcirc-cmd-invite): New rcirc command.  (Bug#9453)
diff --git a/lisp/window.el b/lisp/window.el
index d771f9ffdcd..88675c08624 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -2305,7 +2305,8 @@ its buffer or has no previous buffer to show instead."
          (dedicated (and (window-buffer window) (window-dedicated-p window)))
          ;; prev non-nil means there is another buffer we can show
          ;; in WINDOW instead.
-         (prev (and (window-prev-buffers window)
+         (prev (and (window-live-p window)
+                    (window-prev-buffers window)
                     (or (cdr (window-prev-buffers window))
                         (not (eq (caar (window-prev-buffers window))
                                  buffer))))))