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

Fix bug #15817 with TTY menus produced by minor modes.

Browse source 
lisp/menu-bar.el (popup-menu, menu-bar-open): When displaying TTY
 menus, support also the menus produced by minor modes.
This commit is contained in:
Eli Zaretskii 2013-11-06 12:10:22 +02:00
parent 5d5c701ef9
commit f72552bd38
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2013-11-06 Eli Zaretskii <eliz@gnu.org>
* menu-bar.el (popup-menu, menu-bar-open): When displaying TTY
menus, support also the menus produced by minor modes.
(Bug#15817)
2013-11-06 Leo Liu <sdl.web@gmail.com>
* thingatpt.el (thing-at-point-looking-at): Add optional arg

7
lisp/menu-bar.el
View file

@ -2192,7 +2192,9 @@ FROM-MENU-BAR, if non-nil, means we are dropping one of menu-bar's menus."
(or
(lookup-key global-map (vector 'menu-bar menu-symbol))
(lookup-key (current-local-map) (vector 'menu-bar
menu-symbol))))))
menu-symbol))
(cdar (minor-mode-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.
@ -2278,7 +2280,8 @@ If FRAME is nil or not given, use the selected frame."
(menu (menu-bar-menu-at-x-y x 0 frame)))
(popup-menu (or
(lookup-key global-map (vector 'menu-bar menu))
(lookup-key (current-local-map) (vector 'menu-bar menu)))
(lookup-key (current-local-map) (vector 'menu-bar menu))
(cdar (minor-mode-key-binding (vector 'menu-bar menu))))
(posn-at-x-y x 0 nil t) nil t)))
(t (with-selected-frame (or frame (selected-frame))
(tmm-menubar))))))