diff options
| author | Masatake YAMATO <yamato@redhat.com> | 2013-10-10 19:47:11 +0900 |
|---|---|---|
| committer | Masatake YAMATO <yamato@redhat.com> | 2013-10-10 19:47:11 +0900 |
| commit | 2f6e161e3e7d2b6dd6f3b96dc69207e607b11181 (patch) | |
| tree | 04739b7aba67ec3280f75e9b9bc86813bd524a7f | |
| parent | a18180b9993af6579c0347360fb053c50a8b4c04 (diff) | |
| download | emacs-2f6e161e3e7d2b6dd6f3b96dc69207e607b11181.tar.gz | |
* lisp/menu-bar.el (menu-bar-open): Don't use popup-menu if
menu-bar is hidden.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/menu-bar.el | 3 |
2 files changed, 7 insertions, 1 deletions
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 <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. 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 |