diff options
| author | Miles Bader <miles@gnu.org> | 2007-05-26 21:55:39 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-05-26 21:55:39 +0000 |
| commit | 3a4336e6def99c0e15e2f9ae36e6f31b3d6dad69 (patch) | |
| tree | 8db6743f0f1118a867ad67faa542ecccecdeb89d /lisp/edmacro.el | |
| parent | 779903bd6e149edae6131f84f2a1ac069ef50b2e (diff) | |
| parent | 3b8c0c70a77c4f580672552b796f46ac07e65867 (diff) | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 773)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-211
Diffstat (limited to 'lisp/edmacro.el')
| -rw-r--r-- | lisp/edmacro.el | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lisp/edmacro.el b/lisp/edmacro.el index e21dbaa8f35..86a26b9b714 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)) |