diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/emacs-lisp/easymenu.el | 2 |
2 files changed, 5 insertions, 1 deletions
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) |