bug#1415: 23.0.60; display-buffer doesn't honor NOT-THIS-WINDOW argument

[martin rudalics <rudalics@gmx.at>]

[-- Attachment #1: Type: text/plain, Size: 1142 bytes --]

 > I think that display-buffer returns sometimes the selected window even
 > if the NOT-THIS-WINDOW argument is true.  Here is a test case:
 >
 > (progn
 >   (defun display-buffer-checked (buffer)
 >     (let ((selected (selected-window))
 >           (window (display-buffer buffer t)))
 >       (when (eq selected window)
 >         (error "display-buffer returned selected window"))
 >       window))
 >
 >   (let ((foo (get-buffer-create "foo"))
 >         (bar (get-buffer-create "bar")))
 >     (select-window (get-buffer-window "*scratch*"))
 >     (save-selected-window
 >       (select-window (display-buffer-checked foo)))
 >     (save-selected-window
 >       (select-window (display-buffer-checked bar)))))
 >
 >
 > display-buffer-checked just calls display-buffer and checks that the
 > returned window isn't the selected window.  From looking at the code of
 > display-buffer, I would say that display-buffer returns the lru window
 > even if that's the selected window.

Nice bug.  Thanks for the precise report and test case!

Emacs 22 handled this, but I'm too lazy to figure out how.

Please try the attached patch.

martin

[-- Attachment #2: window.diff --]
[-- Type: text/plain, Size: 1870 bytes --]

*** window.el.~1.168.~	2008-11-18 22:26:34.390625000 +0100
--- window.el	2008-11-24 10:31:29.953125000 +0100
***************
*** 1038,1051 ****
  		     (window--try-to-split-window
  		      (get-lru-window frame-to-use t))))
  	   (window--display-buffer-2 buffer window-to-use)))
!      ((setq window-to-use
! 	    ;; Reuse an existing window.
! 	    (or (get-lru-window frame-to-use)
! 		(get-buffer-window buffer 'visible)
! 		(get-largest-window 'visible nil)
! 		(get-buffer-window buffer 0)
! 		(get-largest-window 0 nil)
! 		(frame-selected-window (funcall pop-up-frame-function))))
        (window--even-window-heights window-to-use)
        (window--display-buffer-2 buffer window-to-use)))))
  
--- 1038,1063 ----
  		     (window--try-to-split-window
  		      (get-lru-window frame-to-use t))))
  	   (window--display-buffer-2 buffer window-to-use)))
!      ((let ((window-to-undedicate
! 	     ;; When NOT-THIS-WINDOW is non-nil, temporarily dedicate
! 	     ;; the selected window to its buffer, to avoid that some of
! 	     ;; the routines below choose it.  (Bug#1415)
! 	     (and not-this-window
! 		  (not (window-dedicated-p (selected-window)))
! 		  (set-window-dedicated-p (selected-window) t)
! 		  (selected-window))))
! 	(unwind-protect
! 	    (setq window-to-use
! 		  ;; Reuse an existing window.
! 		  (or (get-lru-window frame-to-use)
! 		      (get-buffer-window buffer 'visible)
! 		      (get-largest-window 'visible)
! 		      (get-buffer-window buffer 0)
! 		      (get-largest-window 0)
! 		      (frame-selected-window (funcall pop-up-frame-function))))
! 	  (when (window-live-p window-to-undedicate)
! 	    ;; Restore dedicated status of selected window.
! 	    (set-window-dedicated-p window-to-undedicate nil))))
        (window--even-window-heights window-to-use)
        (window--display-buffer-2 buffer window-to-use)))))