Commit 2f6e161e authored by Masatake YAMATO's avatar Masatake YAMATO
Browse files

* lisp/menu-bar.el (menu-bar-open): Don't use popup-menu if

menu-bar is hidden.
parent a18180b9
2013-10-10 Masatake YAMATO <yamato@redhat.com>
* menu-bar.el (menu-bar-open): Don't use popup-menu if
menu-bar is hidden.
2013-10-10 Martin Rudalics <rudalics@gmx.at>
* window.el (pop-to-buffer-same-window): Fix doc-string.
......
......@@ -2359,7 +2359,8 @@ If FRAME is nil or not given, use the selected frame."
(cond
((eq type 'x) (x-menu-bar-open frame))
((eq type 'w32) (w32-menu-bar-open frame))
((null tty-menu-open-use-tmm)
((and (null tty-menu-open-use-tmm)
(not (zerop (or (frame-parameter nil 'menu-bar-lines) 0))))
(let* ((x tty-menu--initial-menu-x)
(menu (menu-bar-menu-at-x-y x 0 frame)))
(popup-menu (or
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment