summaryrefslogtreecommitdiff
path: root/lisp/edmacro.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1994-10-01 03:53:40 +0000
committerRichard M. Stallman <rms@gnu.org>1994-10-01 03:53:40 +0000
commitc4aa9d002114033af1f0afa3267d6fca5cbff83e (patch)
tree3872d1363f5bfb1590e75e1d74f97bc491a02a9b /lisp/edmacro.el
parent8574d0ca09674a088ade7b8a133235be7c38c944 (diff)
downloademacs-c4aa9d002114033af1f0afa3267d6fca5cbff83e.tar.gz
(edmacro-format-keys): Cope if local keymap is nil.
Diffstat (limited to 'lisp/edmacro.el')
-rw-r--r--lisp/edmacro.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index ebf67b61854..5753ae216dd 100644
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -379,7 +379,9 @@ doubt, use whitespace."
(defun edmacro-format-keys (macro &optional verbose)
(setq macro (edmacro-fix-menu-commands macro))
(let* ((maps (append (current-minor-mode-maps)
- (list (current-local-map) (current-global-map))))
+ (if (current-local-map)
+ (list (current-local-map)))
+ (list (current-global-map))))
(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))