Protect against trying to restore window configurations containing buffers that are...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c83ac33..398086d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-03-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * gnus-win.el (gnus-configure-frame): Protect against trying to restore
+       window configurations containing buffers that are now dead.
+
        * nnimap.el (nnimap-parse-flags): Remove all MODSEQ entries before
        parsing to avoid integer overflows.
        (nnimap-parse-flags): Simplify the last change.

diff --git a/lisp/gnus-win.el b/lisp/gnus-win.el
index 156f9a0..c38f57d 100644 (file)
--- a/lisp/gnus-win.el
+++ b/lisp/gnus-win.el
@@ -268,8 +268,10 @@ See the Gnus manual for an explanation of the syntax used.")
            (error "Invalid buffer type: %s" type))
          (let ((buf (gnus-get-buffer-create
                      (gnus-window-to-buffer-helper buffer))))
-           (if (eq buf (window-buffer (selected-window))) (set-buffer buf)
-             (switch-to-buffer buf)))
+           (when (buffer-name buf)
+             (if (eq buf (window-buffer (selected-window)))
+                 (set-buffer buf)
+               (switch-to-buffer buf))))
          (when (memq 'frame-focus split)
            (setq gnus-window-frame-focus window))
          ;; We return the window if it has the `point' spec.