* lisp/menu-bar.el (popup-menu): Use key-binding.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4740eab6ee6bd5564cea3112e74d040e06bcf8da..619bca2076bfd01c90cfaa828d4c4f74c57bd4ab 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * menu-bar.el (popup-menu): Use key-binding.
+
 2013-11-06  Eli Zaretskii  <eliz@gnu.org>
 
        * menu-bar.el (popup-menu, menu-bar-open): When displaying TTY

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index ae1edabf58390957340cd2529e449745d25bd080..13c4c36be17e775fedcc1af977f5f85be4c9a1f8 100644 (file)
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -2189,12 +2189,7 @@ FROM-MENU-BAR, if non-nil, means we are dropping one of menu-bar's menus."
                (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.