diff options
| author | John Paul Wallington | 2003-03-24 12:21:02 +0000 |
|---|---|---|
| committer | John Paul Wallington | 2003-03-24 12:21:02 +0000 |
| commit | 4b0cbff96945f424a62e13fbe1143603cddb5100 (patch) | |
| tree | 8d6038e8b9c6b2db34506516da1ba2ff51d3afe6 | |
| parent | 48ce734b52d73b11de1d772889ec3edd829055c3 (diff) | |
| download | emacs-4b0cbff96945f424a62e13fbe1143603cddb5100.tar.gz emacs-4b0cbff96945f424a62e13fbe1143603cddb5100.zip | |
(easy-menu-add-item): Don't default to the global map.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/emacs-lisp/easymenu.el | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 91b66be53ab..2390fbd90d0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -10,6 +10,9 @@ | |||
| 10 | 10 | ||
| 11 | 2003-03-24 John Paul Wallington <jpw@gnu.org> | 11 | 2003-03-24 John Paul Wallington <jpw@gnu.org> |
| 12 | 12 | ||
| 13 | * emacs-lisp/easymenu.el (easy-menu-add-item): Don't default to | ||
| 14 | the global map. | ||
| 15 | |||
| 13 | * emerge.el (emerge-show-file-name): Read event irrespective of | 16 | * emerge.el (emerge-show-file-name): Read event irrespective of |
| 14 | whether minibuffer window is resized. Clear minibuffer when done. | 17 | whether minibuffer window is resized. Clear minibuffer when done. |
| 15 | 18 | ||
diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el index 47880408d75..6ed2903f8ae 100644 --- a/lisp/emacs-lisp/easymenu.el +++ b/lisp/emacs-lisp/easymenu.el | |||
| @@ -516,9 +516,6 @@ submenu is then traversed recursively with the remaining elements of PATH. | |||
| 516 | ITEM is either defined as in `easy-menu-define' or a non-nil value returned | 516 | ITEM is either defined as in `easy-menu-define' or a non-nil value returned |
| 517 | by `easy-menu-item-present-p' or `easy-menu-remove-item' or a menu defined | 517 | by `easy-menu-item-present-p' or `easy-menu-remove-item' or a menu defined |
| 518 | earlier by `easy-menu-define' or `easy-menu-create-menu'." | 518 | earlier by `easy-menu-define' or `easy-menu-create-menu'." |
| 519 | (unless map | ||
| 520 | (setq map (current-global-map)) | ||
| 521 | (push 'menu-bar path)) | ||
| 522 | (setq map (easy-menu-get-map map path | 519 | (setq map (easy-menu-get-map map path |
| 523 | (and (null map) (null path) | 520 | (and (null map) (null path) |
| 524 | (stringp (car-safe item)) | 521 | (stringp (car-safe item)) |