[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 07efa3f: Use `mouse-menu-bar-map' when no other men
From: |
Sam Steingold |
Subject: |
[Emacs-diffs] master 07efa3f: Use `mouse-menu-bar-map' when no other menus are available. |
Date: |
Thu, 27 Nov 2014 18:17:49 +0000 |
branch: master
commit 07efa3f0ba196c1eea130032c765d5d1a62fa627
Author: Sam Steingold <address@hidden>
Date: Thu Nov 27 13:17:42 2014 -0500
Use `mouse-menu-bar-map' when no other menus are available.
* lisp/menu-bar.el (menu-bar-open): When everything else fails,
use (mouse-menu-bar-map).
---
lisp/ChangeLog | 5 +++++
lisp/menu-bar.el | 3 ++-
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3665d19..d412404 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-27 Sam Steingold <address@hidden>
+
+ * menu-bar.el (menu-bar-open): When everything else fails,
+ use (mouse-menu-bar-map).
+
2014-11-27 Ulf Jasper <address@hidden>
* net/newst-treeview.el (newsticker-groups-filename): Change
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 5ae5da9..12fb192 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -2303,7 +2303,8 @@ If FRAME is nil or not given, use the selected frame."
global-map (vector 'menu-bar menu))
(lookup-key-ignore-too-long
(current-local-map) (vector 'menu-bar menu))
- (cdar (minor-mode-key-binding (vector 'menu-bar menu))))
+ (cdar (minor-mode-key-binding (vector 'menu-bar menu)))
+ (mouse-menu-bar-map))
(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] master 07efa3f: Use `mouse-menu-bar-map' when no other menus are available.,
Sam Steingold <=