2001-12-19 01:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* gnus-win.el (gnus-frames-on-display-list): New.
	(gnus-get-buffer-window): Use it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index af9717a..13079a4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-19 01:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-win.el (gnus-frames-on-display-list): New.
+       (gnus-get-buffer-window): Use it.
+
 2001-12-19 00:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * nnwarchive.el (nnwarchive-mail-archive-xover): Fix the regexp.

diff --git a/lisp/gnus-win.el b/lisp/gnus-win.el
index 402fc87..701d16d 100644 (file)
--- a/lisp/gnus-win.el
+++ b/lisp/gnus-win.el
@@ -562,13 +562,24 @@ should have point."
       (mapcar (lambda (b) (delete-windows-on b t))
              (delq lowest-buf bufs)))))
 
+(eval-and-compile
+  (cond 
+   ((fboundp 'frames-on-display-list)
+    (defalias 'gnus-frames-on-display-list 'frames-on-display-list))
+   ((and (featurep 'xemacs) (fboundp 'frame-device))
+    (defun gnus-frames-on-display-list ()
+      (apply 'filtered-frame-list 'identity (list (frame-device nil)))))
+   (t
+    (defalias 'gnus-frames-on-display-list 'frame-list))))
+
 (defun gnus-get-buffer-window (buffer &optional frame)
   (cond ((and (null gnus-use-frames-on-any-display)
              (memq frame '(t 0 visible)))
-        (car (gnus-delete-if (lambda (win) 
-                               (not (member (window-frame win)
-                                            (frames-on-display-list))))
-                             (get-buffer-window-list buffer nil frame))))
+        (car 
+         (let ((frames (gnus-frames-on-display-list)))
+           (gnus-delete-if (lambda (win) (not (memq (window-frame win) 
+                                                    frames)))
+                           (get-buffer-window-list buffer nil frame)))))
        (t
         (get-buffer-window buffer frame))))