summaryrefslogtreecommitdiff
path: root/lisp/edmacro.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2007-05-25 16:43:24 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2007-05-25 16:43:24 +0000
commit6db93fd915892fe3da1b8910a33120378b094240 (patch)
tree5ca040c7eff309c79c5e50652d74fa5c0d253f9d /lisp/edmacro.el
parent4a1074247d6aabc2892125c682f805562713292b (diff)
downloademacs-6db93fd915892fe3da1b8910a33120378b094240.tar.gz
(edmacro-format-keys): Use current-active-maps.
Diffstat (limited to 'lisp/edmacro.el')
-rw-r--r--lisp/edmacro.el5
1 files changed, 1 insertions, 4 deletions
diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index 0842d63836f..6dd1bcfa252 100644
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -430,10 +430,7 @@ doubt, use whitespace."
(defun edmacro-format-keys (macro &optional verbose)
(setq macro (edmacro-fix-menu-commands macro))
- (let* ((maps (append (current-minor-mode-maps)
- (if (current-local-map)
- (list (current-local-map)))
- (list (current-global-map))))
+ (let* ((maps (current-active-maps))
(pkeys '(end-macro ?0 ?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9 ?- ?\C-u
?\M-- ?\M-0 ?\M-1 ?\M-2 ?\M-3 ?\M-4 ?\M-5 ?\M-6
?\M-7 ?\M-8 ?\M-9))