# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1082668090 0
# Node ID 2c9194855ec94d11f8045a1a95eacc918b1ec1ef
# Parent  27537b30e6d9039e0c6b2f91de5776edf625b754
(special-display-popup-frame, next-multiframe-window)
(previous-multiframe-window): Only consider frames on same display.

diff -r 27537b30e6d9 -r 2c9194855ec9 lisp/frame.el
--- a/lisp/frame.el	Thu Apr 22 19:49:45 2004 +0000
+++ b/lisp/frame.el	Thu Apr 22 21:08:10 2004 +0000
@@ -1,6 +1,6 @@
 ;;; frame.el --- multi-frame management independent of window systems
 
-;; Copyright (C) 1993, 1994, 1996, 1997, 2000, 2001, 2003
+;; Copyright (C) 1993, 1994, 1996, 1997, 2000, 2001, 2003, 2004
 ;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
@@ -113,7 +113,7 @@
 Pass it BUFFER as first arg, and (cdr ARGS) gives the rest of the args."
   (if (and args (symbolp (car args)))
       (apply (car args) buffer (cdr args))
-    (let ((window (get-buffer-window buffer t)))
+    (let ((window (get-buffer-window buffer 0)))
       (or
        ;; If we have a window already, make it visible.
        (when window
@@ -131,6 +131,7 @@
 	 (let* ((pop-up-frames nil) (pop-up-windows t)
 		special-display-regexps special-display-buffer-names
 		(window (display-buffer buffer)))
+	   ;; Only do it if this is a new window:
 	   ;; (set-window-dedicated-p window t)
 	   window))
        ;; If no window yet, make one in a new frame.
@@ -552,7 +553,7 @@
   (interactive)
   (select-window (next-window (selected-window)
 			      (> (minibuffer-depth) 0)
-			      t))
+			      0))
   (select-frame-set-input-focus (selected-frame)))
 
 (defun previous-multiframe-window ()
@@ -560,7 +561,7 @@
   (interactive)
   (select-window (previous-window (selected-window)
 				  (> (minibuffer-depth) 0)
-				  t))
+				  0))
   (select-frame-set-input-focus (selected-frame)))
 
 (defun make-frame-on-display (display &optional parameters)