Mercurial > emacs

changeset 81078:f8e9adbebabb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(edmacro-format-keys): Use current-active-maps.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 25 May 2007 16:43:24 +0000
parents eaa1a54ec3ee
children 506d3398a966
files lisp/ChangeLog lisp/edmacro.el
diffstat 2 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri May 25 16:42:10 2007 +0000
+++ b/lisp/ChangeLog	Fri May 25 16:43:24 2007 +0000
@@ -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.
 
--- a/lisp/edmacro.el	Fri May 25 16:42:10 2007 +0000
+++ b/lisp/edmacro.el	Fri May 25 16:43:24 2007 +0000
@@ -430,10 +430,7 @@
 
 (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))