procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(easy-menu-get-map): Don't crash if (current-local-map) is nil.

Browse source
This commit is contained in:
Richard M. Stallman 1999-02-18 01:10:46 +00:00
parent 0a162908c8
commit 3373a131db
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/emacs-lisp/easymenu.el
View file

@ -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)))