*Group* incorrectly popping up in a new frame

[Stefan]

My *Group* buffer sometimes pops up in a new frame (I use Gnus within
a single frame, but I have set pop-up-frames and
special-display-buffer-names to get lots of pop up frames otherwise).

It turns out it's because of a suspicious call to pop-to-buffer in
gnus-summary-exit.  So I suggest the patch below.
I also included a patch to gnus-win.el which removes redundant code (at
least, my reading of code makes those 3 lines redundant since the same
swith-to-buffer-or-set-buffer will happen immediately afterwards anyway).

This code looks a bit too tricky for me to be 100% confident and install the
patch directly in Emacs's CVS repository, so please double check it for me,
thank you,


        Stefan


--- orig/lisp/gnus/gnus-sum.el
+++ mod/lisp/gnus/gnus-sum.el
@@ -6677,15 +6677,12 @@
        (when (eq mode 'gnus-summary-mode)
          (gnus-kill-buffer buf)))
       (setq gnus-current-select-method gnus-select-method)
-      (if leave-hidden
-         (set-buffer gnus-group-buffer)
-       (pop-to-buffer gnus-group-buffer))
-      (if (not quit-config)
-         (progn
-           (goto-char group-point)
-           (unless leave-hidden
-             (gnus-configure-windows 'group 'force)))
-       (gnus-handle-ephemeral-exit quit-config))
+      (set-buffer gnus-group-buffer)
+      (if quit-config
+         (gnus-handle-ephemeral-exit quit-config)
+       (goto-char group-point)
+       (unless leave-hidden
+         (gnus-configure-windows 'group 'force)))
       ;; Clear the current group name.
       (unless quit-config
        (setq gnus-newsgroup-name nil)))))


--- orig/lisp/gnus/gnus-win.el
+++ mod/lisp/gnus/gnus-win.el
@@ -1,5 +1,5 @@
 ;;; gnus-win.el --- window configuration functions for Gnus
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <address@hidden>
@@ -457,10 +457,7 @@
                    ;; on all frames.
                    (gnus-delete-windows-in-gnusey-frames))
                ;; Just remove some windows.
-               (gnus-remove-some-windows)
-               (if (featurep 'xemacs)
-                   (switch-to-buffer nntp-server-buffer)
-                 (set-buffer nntp-server-buffer)))
+               (gnus-remove-some-windows))
            (select-frame frame)))
 
        (let (gnus-window-frame-focus)