diff options
| author | Richard M. Stallman <rms@gnu.org> | 1999-02-18 01:10:46 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1999-02-18 01:10:46 +0000 |
| commit | 3373a131dbf45da9ad119fd2bc9ea6522e7369c5 (patch) | |
| tree | 583a397a08a6c9af3ac83528eef5a0f12e182cc6 /lisp | |
| parent | 0a162908c83e159c307b3256a114eae2f90e47a2 (diff) | |
| download | emacs-3373a131dbf45da9ad119fd2bc9ea6522e7369c5.tar.gz | |
(easy-menu-get-map): Don't crash if (current-local-map) is nil.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/emacs-lisp/easymenu.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el index a8a50db923e..0b02508c2c9 100644 --- a/lisp/emacs-lisp/easymenu.el +++ b/lisp/emacs-lisp/easymenu.el @@ -479,8 +479,9 @@ NAME should be a string, the name of the element to be removed." ;; Return a sparse keymap in which to add or remove an item. ;; MAP and PATH are as defined in `easy-menu-add-item'. (if (null map) - (let ((local (lookup-key (current-local-map) - (vconcat '(menu-bar) (mapcar 'intern path)))) + (let ((local (and (current-local-map) + (lookup-key (current-local-map) + (vconcat '(menu-bar) (mapcar 'intern path))))) (global (lookup-key global-map (vconcat '(menu-bar) (mapcar 'intern path))))) (if (and local (not (integerp local))) |