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

diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index 04c4a94e5d60137a0ac0c530130a6bfbae41a485..a8a50db923e6738a717bb0a84c4915e1d211ac50 100644 (file)
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -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))))))