[Emacs-diffs] trunk r115005: * lisp/menu-bar.el (popup-menu): Use key-binding.

[Stefan Monnier]

------------------------------------------------------------
revno: 115005
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2013-11-06 12:18:02 -0500
message:
  * lisp/menu-bar.el (popup-menu): Use key-binding.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/menu-bar.el               menubar.el-20091113204419-o5vbwnq5f7feedwu-546

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-11-06 10:10:22 +0000
+++ b/lisp/ChangeLog    2013-11-06 17:18:02 +0000
@@ -1,3 +1,7 @@
+2013-11-06  Stefan Monnier  <address@hidden>
+
+       * menu-bar.el (popup-menu): Use key-binding.
+
 2013-11-06  Eli Zaretskii  <address@hidden>
 
        * menu-bar.el (popup-menu, menu-bar-open): When displaying TTY

=== modified file 'lisp/menu-bar.el'
--- a/lisp/menu-bar.el  2013-11-06 10:10:22 +0000
+++ b/lisp/menu-bar.el  2013-11-06 17:18:02 +0000
@@ -2189,12 +2189,7 @@
                (setq position (list menu-symbol (list frame '(menu-bar)
                                                 event 0)))
                (setq map
-                     (or
-                      (lookup-key global-map (vector 'menu-bar menu-symbol))
-                      (lookup-key (current-local-map) (vector 'menu-bar
-                                                              menu-symbol))
-                      (cdar (minor-mode-key-binding (vector 'menu-bar
-                                                            menu-symbol)))))))
+                     (key-binding (vector 'menu-bar menu-symbol)))))
             ((and (not (keymapp map)) (listp map))
              ;; We were given a list of keymaps.  Search them all
              ;; in sequence until a first binding is found.