From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 6 Nov 2013 17:18:02 +0000 (-0500)
Subject: * lisp/menu-bar.el (popup-menu): Use key-binding.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~926
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5ca114d1a897f57d5570e2e5b243dc7111ab1c73;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4740eab6ee6..619bca2076b 100644
--- 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 ae1edabf583..13c4c36be17 100644
--- 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.