diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/edmacro.el | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e00e3593e46..22b03a99290 100644 --- 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 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)) |