mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 16:51:06 -07:00
Code Issues Projects Releases Wiki Activity

(menu-bar-menu-frame-live-and-visible-p)

Browse source 
(menu-bar-non-minibuffer-window-p): Instead of checking display-multi-frame-p,
use selected-frame when menu-updating-frame is nil.
This commit is contained in:
Juri Linkov 2005-12-20 21:41:31 +00:00
parent c1d9dffd9a
commit 55d42133d4
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/menu-bar.el
View file

@ -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