comparison lisp/window.el @ 5473:ac37a5f7e5be

Merge with trunk.
author Mats Lidell <matsl@xemacs.org>
date Thu, 17 Mar 2011 23:42:59 +0100
parents 308d34e9f07d f00192e1cd49
children cc6f0266bc36
comparison
equal deleted inserted replaced
5472:e79980ee5efe 5473:ac37a5f7e5be
581 ;; and other visible frames exist. 581 ;; and other visible frames exist.
582 (and (or (window-minibuffer-p) (window-dedicated-p window)) 582 (and (or (window-minibuffer-p) (window-dedicated-p window))
583 (delq frame (visible-frame-list)) 583 (delq frame (visible-frame-list))
584 window-solitary 584 window-solitary
585 (if (and (eq default-minibuffer-frame frame) 585 (if (and (eq default-minibuffer-frame frame)
586 (= 1 (length (minibuffer-frame-list)))) 586 (eql 1 (length (minibuffer-frame-list))))
587 (setq window nil) 587 (setq window nil)
588 (delete-frame frame) 588 (delete-frame frame)
589 (setq window-handled t))) 589 (setq window-handled t)))
590 590
591 ;; Deal with the buffer. 591 ;; Deal with the buffer.