diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-04-09 03:53:48 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-04-09 03:53:48 +0000 |
| commit | 0b2b62ff6dcaf77d2897a284013af3ff4b8ae268 (patch) | |
| tree | 67b16be433d61c9e01cec12cc429d55e1a60bd4e /lisp/bindings.el | |
| parent | 6e6c6aafa36e069bc544ceabca6a20315a409375 (diff) | |
| download | emacs-0b2b62ff6dcaf77d2897a284013af3ff4b8ae268.tar.gz | |
* mouse.el (mouse-menu-major-mode-map): New fun extracted from
mouse-major-mode-menu.
(mouse-menu-bar-map): New fun extracted from mouse-popup-menubar.
(mouse-major-mode-menu, mouse-popup-menubar)
(mouse-popup-menubar-stuff): Use them.
(C-down-mouse-3): Bind to a dynamic map rather than to
mouse-popup-menubar-stuff.
* bindings.el (mode-line-major-mode-keymap): Bind down-mouse-1
to mouse-menu-major-mode-map rather than to mouse-major-mode-menu.
Diffstat (limited to 'lisp/bindings.el')
| -rw-r--r-- | lisp/bindings.el | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lisp/bindings.el b/lisp/bindings.el index d1045002a04..af94fcd9d85 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -287,7 +287,9 @@ Menu of mode operations in the mode line.") (defvar mode-line-major-mode-keymap (let ((map (make-sparse-keymap))) - (define-key map [mode-line down-mouse-1] 'mouse-major-mode-menu) + (define-key map [mode-line down-mouse-1] + '(menu-item "Menu Bar" ignore + :filter (lambda (_) (mouse-menu-major-mode-map)))) (define-key map [mode-line mouse-2] 'describe-mode) (define-key map [mode-line down-mouse-3] mode-line-mode-menu) map) "\ @@ -565,12 +567,11 @@ Actually, STRING need not be a string; any possible mode-line element is okay. See `mode-line-format'.") ;; Don't use purecopy here--some people want to change these strings. (setq minor-mode-alist - (list - (list 'abbrev-mode " Abbrev") - '(overwrite-mode overwrite-mode) - (list 'auto-fill-function " Fill") - ;; not really a minor mode... - '(defining-kbd-macro " Def"))) + '((abbrev-mode " Abbrev") + (overwrite-mode overwrite-mode) + (auto-fill-function " Fill") + ;; not really a minor mode... + (defining-kbd-macro " Def"))) ;; These variables are used by autoloadable packages. ;; They are defined here so that they do not get overridden |