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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9f4fd1b78b9d27d218b00457bea3eae58dde6b46..a108244d62c09bd7345dea366dec37d83c00fde1 100644 (file)
--- 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 91de4e670f702ec8a71707532f2fd938805b0e10..7b18756fd7e524a59f6ada553e191682bf01330e 100644 (file)
--- 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)