From: Nick Roberts <nickrob@snap.net.nz>
Date: Fri, 13 Apr 2007 03:57:37 +0000 (+0000)
Subject: (tmm-get-keybind): Use car-safe to avoid errors with
X-Git-Tag: emacs-pretest-22.0.98~107
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0bb48bffd6aaa23e89af05a175114cd84e902c56;p=emacs.git

(tmm-get-keybind): Use car-safe to avoid errors with
inherited keymaps.
---

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'."
 	  ;; the global list.
 	  (dolist (minor minorbind)
 	    (dolist (item (cdr minor))
-	      (setq globalbind (assq-delete-all (car item) globalbind))))
+	      (setq globalbind (assq-delete-all (car-safe item) globalbind))))
 	  (dolist (item (cdr localbind))
-	    (setq globalbind (assq-delete-all (car item) globalbind)))
+	    (setq globalbind (assq-delete-all (car-safe item) globalbind)))
 
 	  (setq globalbind (cons 'keymap globalbind))
 	  (setq allbind (cons globalbind (cons localbind minorbind)))