mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-25 19:11:56 +00:00
Code Issues Releases Activity

Handle dead frame in menu-bar-non-minibuffer-window-p. (Bug#19728)

Browse Source 
* menu-bar.el (menu-bar-non-minibuffer-window-p): Return nil when
the menu frame is dead.  (Bug#19728)
This commit is contained in:
Martin Rudalics 2015-01-31 19:38:58 +01:00
parent 017a03afc9
commit 618931b5b6
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2015-01-31 Martin Rudalics <rudalics@gmx.at>
* menu-bar.el (menu-bar-non-minibuffer-window-p): Return nil when
the menu frame is dead. (Bug#19728)
2015-01-30 Fabián Ezequiel Gallina <fgallina@gnu.org>
python.el: Handle tabs in python-indent-dedent-line.

12
lisp/menu-bar.el
View File

@ -1737,12 +1737,14 @@ The menu frame is the frame for which we are updating the menu."
(frame-visible-p menu-frame))))
(defun menu-bar-non-minibuffer-window-p ()
"Return non-nil if selected window of the menu frame is not a minibuf window.
See the documentation of `menu-bar-menu-frame-live-and-visible-p'
for the definition of the menu frame."
"Return non-nil if the menu frame's selected window is no minibuffer window.
Return nil if the menu frame is dead or its selected window is a
minibuffer window. The menu frame is the frame for which we are
updating the menu."
(let ((menu-frame (or menu-updating-frame (selected-frame))))
(not (window-minibuffer-p (frame-selected-window menu-frame)))))
(and (frame-live-p menu-frame)
(not (window-minibuffer-p
(frame-selected-window menu-frame))))))
(defun kill-this-buffer () ; for the menu bar
"Kill the current buffer.