From e331bbf3be9e142fcd6d2024d5ec26c31de5b35c Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Sun, 4 Jan 2009 19:03:09 +0000 Subject: [PATCH] (display-buffer): When a buffer is displayed in the selected and some other window, and not-this-window is non-nil, try to return that other window instead of popping up a new frame. (Bug#30) --- lisp/ChangeLog | 7 +++++++ lisp/window.el | 14 ++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 08ee4028c59..5841f1f0680 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2009-01-04 Martin Rudalics + + * window.el (display-buffer): When a buffer is displayed in the + selected and some other window, and not-this-window is non-nil, + try to return that other window instead of popping up a new + frame. (Bug#30) + 2009-01-04 Chong Yidong * simple.el (visual-line-mode-map): Remove M-[ and M-] bindings. diff --git a/lisp/window.el b/lisp/window.el index 53ec4a665db..b43eee2f9fe 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -1006,10 +1006,16 @@ consider all visible or iconified frames." (not (last-nonminibuffer-frame))) 0) (last-nonminibuffer-frame)))) - (and (setq window-to-use (get-buffer-window buffer frames)) - (or can-use-selected-window - (not (eq (selected-window) window-to-use))))) - ;; If the buffer is already displayed in some window use that. + (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)) + (when (or can-use-selected-window + (not (eq (selected-window) window))) + (throw 'found window)))))) + ;; The buffer is already displayed in some window; use that. (window--display-buffer-1 window-to-use)) ((and special-display-function ;; `special-display-p' returns either t or a list of frame -- 2.39.2