From: Eli Zaretskii Date: Wed, 6 Nov 2013 10:10:22 +0000 (+0200) Subject: Fix bug #15817 with TTY menus produced by minor modes. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~929 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f72552bd387e3bef50507a3e5b37a8ca19946941;p=emacs.git Fix bug #15817 with TTY menus produced by minor modes. lisp/menu-bar.el (popup-menu, menu-bar-open): When displaying TTY menus, support also the menus produced by minor modes. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d775afd9c5b..4740eab6ee6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2013-11-06 Eli Zaretskii + + * 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 * thingatpt.el (thing-at-point-looking-at): Add optional arg diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 7ffc97b55de..ae1edabf583 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -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))))))