summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2003-04-30 20:53:04 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2003-04-30 20:53:04 +0000
commitdca6b77cab8309734a9539ab375f5160210882f5 (patch)
treef5364b36acd91f7e23863819564120150002dd56 /lisp/emacs-lisp
parentbb5cde6646c64dd79d2ab06dbbc0229f23e44313 (diff)
downloademacs-dca6b77cab8309734a9539ab375f5160210882f5.tar.gz
emacs-dca6b77cab8309734a9539ab375f5160210882f5.tar.bz2
emacs-dca6b77cab8309734a9539ab375f5160210882f5.zip
(easy-menu-get-map): Correctly handle non-submap bindings.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/easymenu.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index 5779cd2b9d6..2bed70866a1 100644
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -600,12 +600,12 @@ In some cases we use that to select between the local and global maps."
;; Prefer a map that already contains the to-be-modified entry.
(when to-modify
(dolist (map maps)
- (when (and map (not (integerp map))
+ (when (and (keymapp map)
(easy-menu-get-map-look-for-name to-modify map))
(throw 'found map))))
;; Use the first valid map.
(dolist (map maps)
- (when (and map (not (integerp map)))
+ (when (keymapp map)
(throw 'found map)))
;; Otherwise, make one up.
;; Hardcoding current-local-map is lame, but it's difficult