Synch with Oort Gnus.

[elisp/gnus.git-] / lisp / gnus-win.el

diff --git a/lisp/gnus-win.el b/lisp/gnus-win.el
index 51934fd..acb00f9 100644 (file)
--- a/lisp/gnus-win.el
+++ b/lisp/gnus-win.el
@@ -1,5 +1,5 @@
 ;;; gnus-win.el --- window configuration functions for Gnus
 ;;; gnus-win.el --- window configuration functions for Gnus

-;; Copyright (C) 1996, 1997, 1998, 1999, 2000
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001

 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>

@@ -145,7 +145,7 @@
               ("*Shell Command Output*" 1.0)))
     (bug
      (vertical 1.0
               ("*Shell Command Output*" 1.0)))
     (bug
      (vertical 1.0

-              ("*Gnus Help Bug*" 0.5)
+              (if gnus-bug-create-help-buffer '("*Gnus Help Bug*" 0.5))

               ("*Gnus Bug*" 1.0 point)))
     (score-trace
      (vertical 1.0
               ("*Gnus Bug*" 1.0 point)))
     (score-trace
      (vertical 1.0

@@ -165,7 +165,10 @@
     (compose-bounce
      (vertical 1.0
               (article 0.5)
     (compose-bounce
      (vertical 1.0
               (article 0.5)

-              (message 1.0 point))))
+              (message 1.0 point)))
+    (display-term
+     (vertical 1.0
+              ("*display*" 1.0))))

   "Window configuration for all possible Gnus buffers.
 See the Gnus manual for an explanation of the syntax used.")
 
   "Window configuration for all possible Gnus buffers.
 See the Gnus manual for an explanation of the syntax used.")
 

@@ -433,7 +436,7 @@ See the Gnus manual for an explanation of the syntax used.")
          ;; put point in the assigned buffer, and do not touch the
          ;; winconf.
          (select-window all-visible)
          ;; put point in the assigned buffer, and do not touch the
          ;; winconf.
          (select-window all-visible)

-       
+

        ;; Make sure "the other" buffer, nntp-server-buffer, is live.
        (unless (gnus-buffer-live-p nntp-server-buffer)
          (nnheader-init-server-buffer))
        ;; Make sure "the other" buffer, nntp-server-buffer, is live.
        (unless (gnus-buffer-live-p nntp-server-buffer)
          (nnheader-init-server-buffer))

@@ -452,11 +455,15 @@ See the Gnus manual for an explanation of the syntax used.")
                    (gnus-delete-windows-in-gnusey-frames))
                ;; Just remove some windows.
                (gnus-remove-some-windows)
                    (gnus-delete-windows-in-gnusey-frames))
                ;; Just remove some windows.
                (gnus-remove-some-windows)

-               (set-buffer nntp-server-buffer))
+               (if (featurep 'xemacs)
+                   (switch-to-buffer nntp-server-buffer)
+                 (set-buffer nntp-server-buffer)))

            (select-frame frame)))
 
        (let (gnus-window-frame-focus)
            (select-frame frame)))
 
        (let (gnus-window-frame-focus)

-         (set-buffer nntp-server-buffer)
+         (if (featurep 'xemacs)
+             (switch-to-buffer nntp-server-buffer)
+           (set-buffer nntp-server-buffer))

          (gnus-configure-frame split)
          (when gnus-window-frame-focus
            (select-frame (window-frame gnus-window-frame-focus))))))))
          (gnus-configure-frame split)
          (when gnus-window-frame-focus
            (select-frame (window-frame gnus-window-frame-focus))))))))

@@ -541,8 +548,11 @@ should have point."
                  lowest-buf buf))))
       (when lowest-buf
        (pop-to-buffer lowest-buf)
                  lowest-buf buf))))
       (when lowest-buf
        (pop-to-buffer lowest-buf)

-       (set-buffer nntp-server-buffer))
-      (mapcar (lambda (b) (delete-windows-on b t)) bufs))))
+       (if (featurep 'xemacs)
+           (switch-to-buffer nntp-server-buffer)
+         (set-buffer nntp-server-buffer)))
+      (mapcar (lambda (b) (delete-windows-on b t))
+             (delq lowest-buf bufs)))))

 
 (provide 'gnus-win)
 
 
 (provide 'gnus-win)