From: Masatake YAMATO Date: Thu, 10 Oct 2013 10:47:11 +0000 (+0900) Subject: * lisp/menu-bar.el (menu-bar-open): Don't use popup-menu if X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1299 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2f6e161e3e7d2b6dd6f3b96dc69207e607b11181;p=emacs.git * lisp/menu-bar.el (menu-bar-open): Don't use popup-menu if menu-bar is hidden. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d219bade1d9..8f9450f0db8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-10-10 Masatake YAMATO + + * menu-bar.el (menu-bar-open): Don't use popup-menu if + menu-bar is hidden. + 2013-10-10 Martin Rudalics * window.el (pop-to-buffer-same-window): Fix doc-string. diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 375de582f99..25e019f6c3c 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -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