[Emacs-diffs] trunk r114611: * lisp/menu-bar.el (menu-bar-open): Don't use popup-menu if

[Masatake YAMATO]

------------------------------------------------------------
revno: 114611
revision-id: address@hidden
parent: address@hidden
committer: Masatake YAMATO <address@hidden>
branch nick: trunk
timestamp: Thu 2013-10-10 19:47:11 +0900
message:
  * lisp/menu-bar.el (menu-bar-open): Don't use popup-menu if
  menu-bar is hidden.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/menu-bar.el               menubar.el-20091113204419-o5vbwnq5f7feedwu-546

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-10-10 07:57:28 +0000
+++ b/lisp/ChangeLog    2013-10-10 10:47:11 +0000
@@ -1,3 +1,8 @@
+2013-10-10  Masatake YAMATO  <address@hidden>
+
+       * menu-bar.el (menu-bar-open): Don't use popup-menu if
+       menu-bar is hidden.
+
 2013-10-10  Martin Rudalics  <address@hidden>
 
        * window.el (pop-to-buffer-same-window): Fix doc-string.

=== modified file 'lisp/menu-bar.el'
--- a/lisp/menu-bar.el  2013-10-10 02:33:35 +0000
+++ b/lisp/menu-bar.el  2013-10-10 10:47:11 +0000
@@ -2359,7 +2359,8 @@
     (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