diff options
| author | Sam Steingold | 2014-11-27 13:17:42 -0500 |
|---|---|---|
| committer | Sam Steingold | 2014-11-27 13:17:42 -0500 |
| commit | 07efa3f0ba196c1eea130032c765d5d1a62fa627 (patch) | |
| tree | 05b13fd8da1c8b2dee5a6b638fb2ece74a000f7c | |
| parent | 574988509898f8022145b047df780c9c807af4b3 (diff) | |
| download | emacs-07efa3f0ba196c1eea130032c765d5d1a62fa627.tar.gz emacs-07efa3f0ba196c1eea130032c765d5d1a62fa627.zip | |
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).
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/menu-bar.el | 3 |
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 @@ | |||
| 1 | 2014-11-27 Sam Steingold <sds@gnu.org> | ||
| 2 | |||
| 3 | * menu-bar.el (menu-bar-open): When everything else fails, | ||
| 4 | use (mouse-menu-bar-map). | ||
| 5 | |||
| 1 | 2014-11-27 Ulf Jasper <ulf.jasper@web.de> | 6 | 2014-11-27 Ulf Jasper <ulf.jasper@web.de> |
| 2 | 7 | ||
| 3 | * net/newst-treeview.el (newsticker-groups-filename): Change | 8 | * 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." | |||
| 2303 | global-map (vector 'menu-bar menu)) | 2303 | global-map (vector 'menu-bar menu)) |
| 2304 | (lookup-key-ignore-too-long | 2304 | (lookup-key-ignore-too-long |
| 2305 | (current-local-map) (vector 'menu-bar menu)) | 2305 | (current-local-map) (vector 'menu-bar menu)) |
| 2306 | (cdar (minor-mode-key-binding (vector 'menu-bar menu)))) | 2306 | (cdar (minor-mode-key-binding (vector 'menu-bar menu))) |
| 2307 | (mouse-menu-bar-map)) | ||
| 2307 | (posn-at-x-y x 0 nil t) nil t))) | 2308 | (posn-at-x-y x 0 nil t) nil t))) |
| 2308 | (t (with-selected-frame (or frame (selected-frame)) | 2309 | (t (with-selected-frame (or frame (selected-frame)) |
| 2309 | (tmm-menubar)))))) | 2310 | (tmm-menubar)))))) |