* 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 d219bade1d926508016b0daf5fc19b9ea351ae32..8f9450f0db8d16e0445bbe020727052833ed539b 100644 (file)
--- 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 375de582f991d79fb911b1b6027359764c3ab600..25e019f6c3cf130cc021d5b13b02f863f4bd2f27 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