comparison lisp/window-xemacs.el @ 259:11cf20601dec r20-5b28

Import from CVS: tag r20-5b28
author cvs
date Mon, 13 Aug 2007 10:23:02 +0200
parents 0e522484dd2a
children c5d627a313b1
comparison
equal deleted inserted replaced
258:58424f6abf56 259:11cf20601dec
459 (setq target-frame 0)) 459 (setq target-frame 0))
460 460
461 ;; Otherwise, find some window that it's already in, and 461 ;; Otherwise, find some window that it's already in, and
462 ;; return that, unless that window is the selected window 462 ;; return that, unless that window is the selected window
463 ;; and that isn't ok. What a contorted mess! 463 ;; and that isn't ok. What a contorted mess!
464 (setq window (get-buffer-window buffer target-frame)) 464 (setq window (or (if (not explicit-frame)
465 ;; search the selected frame
466 ;; first if the user didn't
467 ;; specify an explicit frame.
468 (get-buffer-window buffer nil))
469 (get-buffer-window buffer target-frame)))
465 (if (and window 470 (if (and window
466 (or (not not-this-window-p) 471 (or (not not-this-window-p)
467 (not (eq window (selected-window))))) 472 (not (eq window (selected-window)))))
468 (throw 'done (display-buffer-1 window))) 473 (throw 'done (display-buffer-1 window)))
469 474