From: Andreas Schwab <schwab@suse.de>
Date: Sat, 6 Nov 2004 14:43:43 +0000 (+0000)
Subject: (easy-menu-get-map): Fix last change.
X-Git-Tag: ttn-vms-21-2-B4~4157
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cffe562a9f6b41ba541daf86af7aba1883cc1c22;p=emacs.git

(easy-menu-get-map): Fix last change.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9f4fd1b78b9..a108244d62c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-06  Andreas Schwab  <schwab@suse.de>
+
+	* emacs-lisp/easymenu.el (easy-menu-get-map): Fix last change.
+
 2004-11-06  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/easymenu.el (easy-menu-get-map-look-for-name): Remove.
diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index 91de4e670f7..7b18756fd7e 100644
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -622,7 +622,7 @@ In some cases we use that to select between the local and global maps."
 	(catch 'found
 	  (if (and map (symbolp map) (not (keymapp map)))
 	      (setq map (symbol-value map)))
-	  (let ((maps (or map (current-active-maps))))
+	  (let ((maps (if map (list map) (current-active-maps))))
 	    ;; Look for PATH in each map.
 	    (unless map (push 'menu-bar path))
 	    (dolist (name path)