# HG changeset patch
# User Martin Rudalics <rudalics@gmx.at>
# Date 1231149173 0
# Node ID 5860868ca728b117dc777a37da4a8dc13b5e711a
# Parent  a9dc0e7c3f2b98db41a060e887503a516864a8d6
(display-buffer): Fix last fix.

diff -r a9dc0e7c3f2b -r 5860868ca728 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Jan 05 03:18:22 2009 +0000
+++ b/lisp/ChangeLog	Mon Jan 05 09:52:53 2009 +0000
@@ -1,3 +1,7 @@
+2009-01-05  Martin Rudalics  <rudalics@gmx.at>
+
+	* window.el (display-buffer): Fix last fix.
+
 2009-01-05  Juanma Barranquero  <lekktu@gmail.com>
 
 	* desktop.el (desktop-save-in-desktop-dir): Use `abbreviate-file-name'
diff -r a9dc0e7c3f2b -r 5860868ca728 lisp/window.el
--- a/lisp/window.el	Mon Jan 05 03:18:22 2009 +0000
+++ b/lisp/window.el	Mon Jan 05 09:52:53 2009 +0000
@@ -1008,10 +1008,9 @@
 			(last-nonminibuffer-frame))))
 	(setq window-to-use
 	      (catch 'found
-		;; Search all visible and iconified frames for a window
-		;; displaying BUFFER.  Return the selected window only
-		;; if can-use-selected-window says we may do so.
-		(dolist (window (get-buffer-window-list buffer 'nomini 0))
+		;; Search frames for a window displaying BUFFER.  Return
+		;; the selected window only if we are allowed to do so.
+		(dolist (window (get-buffer-window-list buffer 'nomini frames))
 		  (when (or can-use-selected-window
 			    (not (eq (selected-window) window)))
 		    (throw 'found window))))))