diff options
| author | Nick Roberts | 2007-04-13 03:57:37 +0000 |
|---|---|---|
| committer | Nick Roberts | 2007-04-13 03:57:37 +0000 |
| commit | 0bb48bffd6aaa23e89af05a175114cd84e902c56 (patch) | |
| tree | bf5657d1c43988e8359ab5d1a154de23052c2815 | |
| parent | 41a023e3b7585191a525608a4c0a774337b5fff2 (diff) | |
| download | emacs-0bb48bffd6aaa23e89af05a175114cd84e902c56.tar.gz emacs-0bb48bffd6aaa23e89af05a175114cd84e902c56.zip | |
(tmm-get-keybind): Use car-safe to avoid errors with
inherited keymaps.
| -rw-r--r-- | lisp/tmm.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/tmm.el b/lisp/tmm.el index d441db76235..087d864d0c3 100644 --- a/lisp/tmm.el +++ b/lisp/tmm.el | |||
| @@ -547,9 +547,9 @@ of `menu-bar-final-items'." | |||
| 547 | ;; the global list. | 547 | ;; the global list. |
| 548 | (dolist (minor minorbind) | 548 | (dolist (minor minorbind) |
| 549 | (dolist (item (cdr minor)) | 549 | (dolist (item (cdr minor)) |
| 550 | (setq globalbind (assq-delete-all (car item) globalbind)))) | 550 | (setq globalbind (assq-delete-all (car-safe item) globalbind)))) |
| 551 | (dolist (item (cdr localbind)) | 551 | (dolist (item (cdr localbind)) |
| 552 | (setq globalbind (assq-delete-all (car item) globalbind))) | 552 | (setq globalbind (assq-delete-all (car-safe item) globalbind))) |
| 553 | 553 | ||
| 554 | (setq globalbind (cons 'keymap globalbind)) | 554 | (setq globalbind (cons 'keymap globalbind)) |
| 555 | (setq allbind (cons globalbind (cons localbind minorbind))) | 555 | (setq allbind (cons globalbind (cons localbind minorbind))) |