[Emacs-diffs] emacs-24 r117197: Fix TTY menu invocation via M-x.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117197
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-06-02 21:58:36 +0300
message:
  Fix TTY menu invocation via M-x.
  
   lisp/menu-bar.el (menu-bar-open): Fix invocation via M-x by forcing
   the update of the menu bar.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/menu-bar.el               menubar.el-20091113204419-o5vbwnq5f7feedwu-546

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-06-01 15:19:14 +0000
+++ b/lisp/ChangeLog    2014-06-02 18:58:36 +0000
@@ -1,3 +1,7 @@
+2014-06-02  Eli Zaretskii  <address@hidden>
+
+       * menu-bar.el (menu-bar-open): Fix invocation via M-x.
+
 2014-06-01  Eli Zaretskii  <address@hidden>
 
        * simple.el (keyboard-quit): Force update of mode lines, to remove

=== modified file 'lisp/menu-bar.el'
--- a/lisp/menu-bar.el  2014-05-21 16:35:31 +0000
+++ b/lisp/menu-bar.el  2014-06-02 18:58:36 +0000
@@ -2267,6 +2267,12 @@
      ((eq type 'w32) (w32-menu-bar-open frame))
      ((and (null tty-menu-open-use-tmm)
           (not (zerop (or (frame-parameter nil 'menu-bar-lines) 0))))
+      ;; Make sure the menu bar is up to date.  One situation where
+      ;; this is important is when this function is invoked by name
+      ;; via M-x, in which case the menu bar includes the "Minibuf"
+      ;; menu item that should be removed when we exit the minibuffer.
+      (force-mode-line-update)
+      (sit-for 0)
       (let* ((x tty-menu--initial-menu-x)
             (menu (menu-bar-menu-at-x-y x 0 frame)))
        (popup-menu (or