From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 15 Jan 1999 03:21:44 +0000 (+0000)
Subject: (easy-menu-get-map): Fix bugs in prev change.
X-Git-Tag: emacs-20.4~874
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bec64ef6b86b331a7c074681508da95779006c44;p=emacs.git

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

diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index 04c4a94e5d6..a8a50db923e 100644
--- 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))))))