aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2013-11-06 12:18:02 -0500
committerStefan Monnier2013-11-06 12:18:02 -0500
commit5ca114d1a897f57d5570e2e5b243dc7111ab1c73 (patch)
tree614989fdb58b74dd752b2a6258455d6afc1bc3d5
parentcfeda3902887b85bc719534678262e16745b8fd2 (diff)
downloademacs-5ca114d1a897f57d5570e2e5b243dc7111ab1c73.tar.gz
emacs-5ca114d1a897f57d5570e2e5b243dc7111ab1c73.zip
* lisp/menu-bar.el (popup-menu): Use key-binding.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/menu-bar.el7
2 files changed, 5 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4740eab6ee6..619bca2076b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12013-11-06 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * menu-bar.el (popup-menu): Use key-binding.
4
12013-11-06 Eli Zaretskii <eliz@gnu.org> 52013-11-06 Eli Zaretskii <eliz@gnu.org>
2 6
3 * menu-bar.el (popup-menu, menu-bar-open): When displaying TTY 7 * 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."
2189 (setq position (list menu-symbol (list frame '(menu-bar) 2189 (setq position (list menu-symbol (list frame '(menu-bar)
2190 event 0))) 2190 event 0)))
2191 (setq map 2191 (setq map
2192 (or 2192 (key-binding (vector 'menu-bar menu-symbol)))))
2193 (lookup-key global-map (vector 'menu-bar menu-symbol))
2194 (lookup-key (current-local-map) (vector 'menu-bar
2195 menu-symbol))
2196 (cdar (minor-mode-key-binding (vector 'menu-bar
2197 menu-symbol)))))))
2198 ((and (not (keymapp map)) (listp map)) 2193 ((and (not (keymapp map)) (listp map))
2199 ;; We were given a list of keymaps. Search them all 2194 ;; We were given a list of keymaps. Search them all
2200 ;; in sequence until a first binding is found. 2195 ;; in sequence until a first binding is found.