Mercurial > emacs
changeset 15633:186632053420
(mouse-major-mode-menu-1): Always return just a keymap;
never (STRING . KEYMAP).
(mouse-major-mode-menu): Discard the `keymap' from the front of
the keymap we get from mouse-major-mode-menu-1.
Construct the menu name string from major-mode.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Mon, 08 Jul 1996 00:17:35 +0000 |
| parents | b7fddad951a0 |
| children | 08bcd5d2c8ab |
| files | lisp/mouse.el |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/mouse.el Mon Jul 08 00:08:49 1996 +0000 +++ b/lisp/mouse.el Mon Jul 08 00:17:35 1996 +0000 @@ -51,10 +51,10 @@ (unread-command-events (list event))) ;; Make a keymap in which our last command leads to a menu (define-key newmap (vector (car event)) - (nconc (make-sparse-keymap "Menu") - (mouse-major-mode-menu-1 - (and (current-local-map) - (lookup-key (current-local-map) [menu-bar]))))) + (nconc (make-sparse-keymap (concat mode-name " Mode")) + (cdr (mouse-major-mode-menu-1 + (and (current-local-map) + (lookup-key (current-local-map) [menu-bar])))))) (mouse-major-mode-menu-compute-equiv-keys newmap) ;; Make NEWMAP override the usual definition ;; of the mouse button that got us here. @@ -100,7 +100,7 @@ (setq submap (cdr (car tail))))) (setq tail (cdr tail))) (if (eq submap t) menubar - submap)))) + (cdr submap))))) ;; Commands that operate on windows.