X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/24236bd83e64a3cfa96f01af3b2a925dd234612d..ddb74107ac1650f160ffed5dd52b9c6359f65573:/lisp/edmacro.el

diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index 5ef9e25b3f..abd08f4b0b 100644
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -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))