[Emacs-diffs] trunk r114630: Fix popping down a menu by a second mouse click.

[Eli Zaretskii]

------------------------------------------------------------
revno: 114630
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2013-10-11 21:20:08 +0300
message:
  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.
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-11 17:44:41 +0000
+++ b/lisp/ChangeLog    2013-10-11 18:20:08 +0000
@@ -1,6 +1,8 @@
 2013-10-11  Eli Zaretskii  <address@hidden>
 
        * 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  <address@hidden>
 

=== modified file 'lisp/menu-bar.el'
--- a/lisp/menu-bar.el  2013-10-11 17:44:41 +0000
+++ b/lisp/menu-bar.el  2013-10-11 18:20:08 +0000
@@ -2333,16 +2333,7 @@
 
     ;; 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)