(edmacro-format-keys): Use current-active-maps.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e00e3593e463cd24f623bd9f98a6da4dcc44988c..22b03a9929082c20f37e0d6b4982bd7da494aade 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2007-05-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * edmacro.el (edmacro-format-keys): Use current-active-maps.
+
        * ediff-init.el (ediff-defvar-local, ediff-with-current-buffer):
        Add indentation and debugging info.  Fix up comment convention.
 

diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index 0842d63836fb7bce3ba3803917fedff38cb4b199..6dd1bcfa2525ac3fbd7787cf5029dd60152e6807 100644 (file)
--- 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))