diff options
| author | Juri Linkov <juri@jurta.org> | 2005-12-20 21:41:31 +0000 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2005-12-20 21:41:31 +0000 |
| commit | 55d42133d454b6c2d4032513fc5ee529e8fa4162 (patch) | |
| tree | 76ed1b60f94402230efd29f25b18f171a7738551 /lisp/menu-bar.el | |
| parent | c1d9dffd9a69144ddf27d46e67eaf7344fea0beb (diff) | |
| download | emacs-55d42133d454b6c2d4032513fc5ee529e8fa4162.tar.gz | |
(menu-bar-menu-frame-live-and-visible-p)
(menu-bar-non-minibuffer-window-p): Instead of checking display-multi-frame-p,
use selected-frame when menu-updating-frame is nil.
Diffstat (limited to 'lisp/menu-bar.el')
| -rw-r--r-- | lisp/menu-bar.el | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 6fa8c8b0f03..afc207bc9f0 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -1418,8 +1418,7 @@ key, a click, or a menu-item")) (defun menu-bar-menu-frame-live-and-visible-p () "Return non-nil if the menu frame is alive and visible. The menu frame is the frame for which we are updating the menu." - (let ((menu-frame (if (display-multi-frame-p) menu-updating-frame - (selected-frame)))) + (let ((menu-frame (or menu-updating-frame (selected-frame)))) (and (frame-live-p menu-frame) (frame-visible-p menu-frame)))) @@ -1428,8 +1427,7 @@ The menu frame is the frame for which we are updating the menu." See the documentation of `menu-bar-menu-frame-live-and-visible-p' for the definition of the menu frame." - (let ((menu-frame (if (display-multi-frame-p) menu-updating-frame - (selected-frame)))) + (let ((menu-frame (or menu-updating-frame (selected-frame)))) (not (window-minibuffer-p (frame-selected-window menu-frame))))) (defun kill-this-buffer () ; for the menu bar |