Fix popping down a menu by a second mouse click.

 lisp/menu-bar.el (tty-menu-navigation-map): Bind all menu-bar
 sequences to tty-menu-exit -- this pops down a dropped menu on
 second mouse click on the menu bar.

2 files changed, 3 insertions, 10 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index de3dfbc7cf7..3de056a26d3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,8 @@
 2013-10-11  Eli Zaretskii  <eliz@gnu.org>
 
         * menu-bar.el (tty-menu-navigation-map): Remap F10 to tty-menu-exit.
+        Bind all menu-bar sequences to tty-menu-exit -- this pops down a
+        dropped menu on second mouse click on the menu bar.
 
 2013-10-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 6c152c49208..43937d03905 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -2333,16 +2333,7 @@ If FRAME is nil or not given, use the selected frame."
 
     ;; The bindings of menu-bar items are so that clicking on the menu
     ;; bar when a menu is already shown pops down that menu.
-    ;; FIXME: we should iterate over all the visible menu-bar items,
-    ;; instead of naming them explicitly here.  Also, this doesn't
-    ;; include items added by current major mode.
-    ;;
-    ;; FIXME: Why not (define-key map [menu-bat t] 'tty-menu-exit) ?  --Stef
-    (dolist (event '(file edit options buffer tools help-menu))
-      (substitute-key-definition
-       (lookup-key (current-global-map) (vector 'menu-bar event))
-       'tty-menu-exit
-       map (current-global-map)))
+    (define-key map [menu-bar t] 'tty-menu-exit)
 
     (define-key map [?\C-r] 'tty-menu-select)
     (define-key map [?\C-j] 'tty-menu-select)