summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/menu-bar.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3665d19bcbd..d412404efbe 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-27 Sam Steingold <sds@gnu.org>
+
+ * menu-bar.el (menu-bar-open): When everything else fails,
+ use (mouse-menu-bar-map).
+
2014-11-27 Ulf Jasper <ulf.jasper@web.de>
* net/newst-treeview.el (newsticker-groups-filename): Change
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 5ae5da9aff2..12fb192c355 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))))))