Mercurial > emacs

changeset 107746:accaa16963c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* tmm.el (tmm-get-keymap): Check with symbolp before passing value to fboundp.
author Jan D. <jan.h.d@swipnet.se>
date Fri, 02 Apr 2010 11:46:07 +0200
parents 02181f9edbbf (current diff) df7bafcc5fb7 (diff)
children 94a453a3e40a ede2e6005460
files
diffstat 2 files changed, 11 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Apr 02 12:35:01 2010 +0300
+++ b/lisp/ChangeLog	Fri Apr 02 11:46:07 2010 +0200
@@ -1,3 +1,8 @@
+2010-04-02  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* tmm.el (tmm-get-keymap): Check with symbolp before passing
+	value to fboundp, it may not be a symbol.
+
 2010-03-31  Chong Yidong  <cyd@stupidchicken.com>
 
 	* cus-edit.el (custom-buffer-sort-alphabetically): Update
--- a/lisp/tmm.el	Fri Apr 02 12:35:01 2010 +0300
+++ b/lisp/tmm.el	Fri Apr 02 11:46:07 2010 +0200
@@ -452,20 +452,21 @@
       (unless (assoc event tmm-table-undef)
 	(cond ((if (listp elt)
 		   (or (keymapp elt) (eq (car elt) 'lambda))
-		 (fboundp elt))
+		 (and (symbolp elt) (fboundp elt)))
 	       (setq km elt))
 
 	      ((if (listp (cdr-safe elt))
 		   (or (keymapp (cdr-safe elt))
 		       (eq (car (cdr-safe elt)) 'lambda))
-		 (fboundp (cdr-safe elt)))
+		 (and (symbolp (cdr-safe elt)) (fboundp (cdr-safe elt))))
 	       (setq km (cdr elt))
 	       (and (stringp (car elt)) (setq str (car elt))))
 
 	      ((if (listp (cdr-safe (cdr-safe elt)))
 		   (or (keymapp (cdr-safe (cdr-safe elt)))
 		       (eq (car (cdr-safe (cdr-safe elt))) 'lambda))
-		 (fboundp (cdr-safe (cdr-safe elt))))
+		 (and (symbolp (cdr-safe (cdr-safe elt))
+			       (fboundp (cdr-safe (cdr-safe elt))))))
 	       (setq km (cddr elt))
 	       (and (stringp (car elt)) (setq str (car elt)))
 	       (and str
@@ -499,7 +500,8 @@
 	      ((if (listp (cdr-safe (cdr-safe (cdr-safe elt))))
 		   (or (keymapp (cdr-safe (cdr-safe (cdr-safe elt))))
 		       (eq (car (cdr-safe (cdr-safe (cdr-safe elt)))) 'lambda))
-		 (fboundp (cdr-safe (cdr-safe (cdr-safe elt)))))
+		 (and (symbolp (cdr-safe (cdr-safe (cdr-safe elt))))
+		      (fboundp (cdr-safe (cdr-safe (cdr-safe elt))))))
 					 ; New style of easy-menu
 	       (setq km (cdr (cddr elt)))
 	       (and (stringp (car elt)) (setq str (car elt)))