diff options
| author | Gerd Moellmann | 1999-12-30 17:49:14 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 1999-12-30 17:49:14 +0000 |
| commit | cc8fdbd3c2e912340269367acc1b3d77e08131d3 (patch) | |
| tree | c293fec1edb4eb5ffb726f791f9ca385845b8ff1 | |
| parent | 8ccb9a546b981224e8e354ea2a818541e6e9b610 (diff) | |
| download | emacs-cc8fdbd3c2e912340269367acc1b3d77e08131d3.tar.gz emacs-cc8fdbd3c2e912340269367acc1b3d77e08131d3.zip | |
(make-mode-line-mouse-sensitive): Copy keymap
assigned to mode-line-mode-menu because bindings.el is dumped with
Emacs, and thus the lists used for menu-item definition will be
copied to pure space. Emacs' menu code (parse_menu_item) doesn't
like pure menu item definitions.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/bindings.el | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 584688ee19a..ff377e2e85a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,11 @@ | |||
| 1 | 1999-12-30 Gerd Moellmann <gerd@gnu.org> | 1 | 1999-12-30 Gerd Moellmann <gerd@gnu.org> |
| 2 | 2 | ||
| 3 | * bindings.el (make-mode-line-mouse-sensitive): Copy keymap | ||
| 4 | assigned to mode-line-mode-menu because bindings.el is dumped with | ||
| 5 | Emacs, and thus the lists used for menu-item definition will be | ||
| 6 | copied to pure space. Emacs' menu code (parse_menu_item) doesn't | ||
| 7 | like pure menu item definitions. | ||
| 8 | |||
| 3 | * expand.el (expand-abbrev-hook): Return t if expansion was | 9 | * expand.el (expand-abbrev-hook): Return t if expansion was |
| 4 | done, nil otherwise. | 10 | done, nil otherwise. |
| 5 | 11 | ||
diff --git a/lisp/bindings.el b/lisp/bindings.el index 2f71f624ccb..ccc4e905caa 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el | |||
| @@ -237,7 +237,7 @@ Menu of mode operations in the mode line.") | |||
| 237 | (define-key map [overwrite-mode] | 237 | (define-key map [overwrite-mode] |
| 238 | '(menu-item "Overwrite" overwrite-mode | 238 | '(menu-item "Overwrite" overwrite-mode |
| 239 | :active t :style toggle :selected overwrite-mode)) | 239 | :active t :style toggle :selected overwrite-mode)) |
| 240 | (setq mode-line-mode-menu map) | 240 | (setq mode-line-mode-menu (copy-keymap map)) |
| 241 | (defun mode-line-mode-menu (event) | 241 | (defun mode-line-mode-menu (event) |
| 242 | (interactive "@e") | 242 | (interactive "@e") |
| 243 | (x-popup-menu event mode-line-mode-menu))) | 243 | (x-popup-menu event mode-line-mode-menu))) |