Mercurial > emacs
comparison lisp/edmacro.el @ 81078:f8e9adbebabb
(edmacro-format-keys): Use current-active-maps.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 25 May 2007 16:43:24 +0000 |
parents | e3694f1cb928 |
children | b98604865ea0 4c726a40604c 03ec96a627ba |
comparison
equal
deleted
inserted
replaced
81077:eaa1a54ec3ee | 81078:f8e9adbebabb |
---|---|
428 | 428 |
429 ;;; Formatting a keyboard macro as human-readable text. | 429 ;;; Formatting a keyboard macro as human-readable text. |
430 | 430 |
431 (defun edmacro-format-keys (macro &optional verbose) | 431 (defun edmacro-format-keys (macro &optional verbose) |
432 (setq macro (edmacro-fix-menu-commands macro)) | 432 (setq macro (edmacro-fix-menu-commands macro)) |
433 (let* ((maps (append (current-minor-mode-maps) | 433 (let* ((maps (current-active-maps)) |
434 (if (current-local-map) | |
435 (list (current-local-map))) | |
436 (list (current-global-map)))) | |
437 (pkeys '(end-macro ?0 ?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9 ?- ?\C-u | 434 (pkeys '(end-macro ?0 ?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9 ?- ?\C-u |
438 ?\M-- ?\M-0 ?\M-1 ?\M-2 ?\M-3 ?\M-4 ?\M-5 ?\M-6 | 435 ?\M-- ?\M-0 ?\M-1 ?\M-2 ?\M-3 ?\M-4 ?\M-5 ?\M-6 |
439 ?\M-7 ?\M-8 ?\M-9)) | 436 ?\M-7 ?\M-8 ?\M-9)) |
440 (mdigs (nthcdr 13 pkeys)) | 437 (mdigs (nthcdr 13 pkeys)) |
441 (maxkey (if edmacro-eight-bits 255 127)) | 438 (maxkey (if edmacro-eight-bits 255 127)) |