mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-25 10:47:00 +00:00
Code Issues Releases Activity

(easy-menu-get-map): Fix bugs in prev change.

Browse Source
This commit is contained in:
Richard M. Stallman 1999-01-15 03:21:44 +00:00
parent 820cd5291f
commit bec64ef6b8
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lisp/emacs-lisp/easymenu.el
View File

@ -479,14 +479,17 @@ 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)
(setq map (or (lookup-key (current-local-map)
(vconcat '(menu-bar) (mapcar 'intern path)))
(lookup-key global-map
(vconcat '(menu-bar) (mapcar 'intern path)))
(let ((new (make-sparse-keymap)))
(define-key (current-local-map)
(vconcat '(menu-bar) (mapcar 'intern path)) new)
new)))
(let ((local (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)))
(setq map local)
(if (and global (not (integerp global)))
(setq map global)
(setq map (make-sparse-keymap))
(define-key (current-local-map)
(vconcat '(menu-bar) (mapcar 'intern path)) map))))
(if (and (symbolp map) (not (keymapp map)))
(setq map (symbol-value map)))
(if path (setq map (lookup-key map (vconcat (mapcar 'intern path))))))