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

[bpt/emacs.git] / lisp / menu-bar.el

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 375de58..25e019f 100644 (file)
--- 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