summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/easymenu.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/emacs-lisp/easymenu.el')
-rw-r--r--lisp/emacs-lisp/easymenu.el5
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)))