diff options
| author | Miles Bader <miles@gnu.org> | 2007-05-30 14:44:47 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-05-30 14:44:47 +0000 |
| commit | 34c6724464237db4bfd5b3fa57e8b0f66a92f618 (patch) | |
| tree | bbfe4aea433c943f0f6a67b3e49ee31647e12d92 /lisp/edmacro.el | |
| parent | 30790a37efea5c6fed87ee0dd0d54c31ac9eea11 (diff) | |
| parent | 7a781a5480b9a1f55d28a76e1d1f89aaa2421f97 (diff) | |
| download | emacs-34c6724464237db4bfd5b3fa57e8b0f66a92f618.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 771-780)
- Update from CVS
- Merge from emacs--rel--22
- Merge from emacs--rel--22, gnus--rel--5.10
- Fix tq.el edge case
* emacs--rel--22 (patch 26-32)
- Update from CVS
- lisp/vc-hooks.el (vc-find-root): Fix file attribute test
* gnus--rel--5.10 (patch 224-225)
- Merge from emacs--devo--0, emacs--rel--22
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-18
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 5ef9e25b3f9..86d5fb65fcf 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)) |