* gnus-win.el (gnus-configure-windows): Protect against reading ephemeral groups...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ee91cdf..ba5421b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-win.el (gnus-configure-windows): Protect against reading
+       ephemeral groups outside of Gnus.
+
 2011-10-06  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * shr.el (shr-tag-img): Don't get images displayed in tables.

diff --git a/lisp/gnus-win.el b/lisp/gnus-win.el
index c38f57d..a1a8abc 100644 (file)
--- a/lisp/gnus-win.el
+++ b/lisp/gnus-win.el
@@ -358,8 +358,13 @@ See the Gnus manual for an explanation of the syntax used.")
 (defvar gnus-frame-split-p nil)
 
 (defun gnus-configure-windows (setting &optional force)
-  (if (window-configuration-p setting)
-      (set-window-configuration setting)
+  (cond
+   ((null setting)
+    ;; Do nothing.
+    )
+   ((window-configuration-p setting)
+    (set-window-configuration setting))
+   (t
     (setq gnus-current-window-configuration setting)
     (setq force (or force gnus-always-force-window-configuration))
     (let ((split (if (symbolp setting)
@@ -410,7 +415,7 @@ See the Gnus manual for an explanation of the syntax used.")
           (run-hooks 'gnus-configure-windows-hook)
           (when gnus-window-frame-focus
             (gnus-select-frame-set-input-focus
-             (window-frame gnus-window-frame-focus))))))))
+             (window-frame gnus-window-frame-focus)))))))))
 
 (defun gnus-delete-windows-in-gnusey-frames ()
   "Do a `delete-other-windows' in all frames that have Gnus windows."