Mercurial > emacs
comparison lisp/menu-bar.el @ 67705:4fc189896464
(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.
| author | Juri Linkov <juri@jurta.org> |
|---|---|
| date | Tue, 20 Dec 2005 21:41:31 +0000 |
| parents | 6b7e5db3f184 |
| children | 31f77129bc92 |
comparison
equal
deleted
inserted
replaced
| 67704:06f3a72bffb2 | 67705:4fc189896464 |
|---|---|
| 1416 :help "Learn how to use Emacs")) | 1416 :help "Learn how to use Emacs")) |
| 1417 | 1417 |
| 1418 (defun menu-bar-menu-frame-live-and-visible-p () | 1418 (defun menu-bar-menu-frame-live-and-visible-p () |
| 1419 "Return non-nil if the menu frame is alive and visible. | 1419 "Return non-nil if the menu frame is alive and visible. |
| 1420 The menu frame is the frame for which we are updating the menu." | 1420 The menu frame is the frame for which we are updating the menu." |
| 1421 (let ((menu-frame (if (display-multi-frame-p) menu-updating-frame | 1421 (let ((menu-frame (or menu-updating-frame (selected-frame)))) |
| 1422 (selected-frame)))) | |
| 1423 (and (frame-live-p menu-frame) | 1422 (and (frame-live-p menu-frame) |
| 1424 (frame-visible-p menu-frame)))) | 1423 (frame-visible-p menu-frame)))) |
| 1425 | 1424 |
| 1426 (defun menu-bar-non-minibuffer-window-p () | 1425 (defun menu-bar-non-minibuffer-window-p () |
| 1427 "Return non-nil if selected window of the menu frame is not a minibuf window. | 1426 "Return non-nil if selected window of the menu frame is not a minibuf window. |
| 1428 | 1427 |
| 1429 See the documentation of `menu-bar-menu-frame-live-and-visible-p' | 1428 See the documentation of `menu-bar-menu-frame-live-and-visible-p' |
| 1430 for the definition of the menu frame." | 1429 for the definition of the menu frame." |
| 1431 (let ((menu-frame (if (display-multi-frame-p) menu-updating-frame | 1430 (let ((menu-frame (or menu-updating-frame (selected-frame)))) |
| 1432 (selected-frame)))) | |
| 1433 (not (window-minibuffer-p (frame-selected-window menu-frame))))) | 1431 (not (window-minibuffer-p (frame-selected-window menu-frame))))) |
| 1434 | 1432 |
| 1435 (defun kill-this-buffer () ; for the menu bar | 1433 (defun kill-this-buffer () ; for the menu bar |
| 1436 "Kill the current buffer." | 1434 "Kill the current buffer." |
| 1437 (interactive) | 1435 (interactive) |