procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Stefan Monnier 2013-11-06 12:18:02 -05:00
parent cfeda39028
commit 5ca114d1a8
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -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

7
lisp/menu-bar.el
View file

@ -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.