summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/window.el7
2 files changed, 7 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 988a1689d3d..10fcc280be8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/window.el b/lisp/window.el
index da49107f7d1..c529e272ce2 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -1008,10 +1008,9 @@ consider all visible or iconified frames."
(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))))))