[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115002: Fix bug #15817 with TTY menus produced by m
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] trunk r115002: Fix bug #15817 with TTY menus produced by minor modes. |
Date: |
Wed, 06 Nov 2013 10:10:56 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115002
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15817
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2013-11-06 12:10:22 +0200
message:
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.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/menu-bar.el menubar.el-20091113204419-o5vbwnq5f7feedwu-546
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-11-06 09:06:05 +0000
+++ b/lisp/ChangeLog 2013-11-06 10:10:22 +0000
@@ -1,3 +1,9 @@
+2013-11-06 Eli Zaretskii <address@hidden>
+
+ * 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 <address@hidden>
* thingatpt.el (thing-at-point-looking-at): Add optional arg
=== modified file 'lisp/menu-bar.el'
--- a/lisp/menu-bar.el 2013-10-20 09:26:15 +0000
+++ b/lisp/menu-bar.el 2013-11-06 10:10:22 +0000
@@ -2192,7 +2192,9 @@
(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 @@
(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))))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115002: Fix bug #15817 with TTY menus produced by minor modes.,
Eli Zaretskii <=