[Emacs-diffs] /srv/bzr/emacs/trunk r99807: * tmm.el (tmm-get-keymap): Check with symbolp before passing value to fboundp.

[Jan D.]

------------------------------------------------------------
revno: 99807 [merge]
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Fri 2010-04-02 11:46:07 +0200
message:
  * tmm.el (tmm-get-keymap): Check with symbolp before passing value to fboundp.
modified:
  lisp/ChangeLog
  lisp/tmm.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-03-31 22:22:17 +0000
+++ b/lisp/ChangeLog    2010-04-02 09:44:50 +0000
@@ -1,3 +1,8 @@
+2010-04-02  Jan Djärv  <address@hidden>
+
+       * tmm.el (tmm-get-keymap): Check with symbolp before passing
+       value to fboundp, it may not be a symbol.
+
 2010-03-31  Chong Yidong  <address@hidden>
 
        * cus-edit.el (custom-buffer-sort-alphabetically): Update

=== modified file 'lisp/tmm.el'
--- a/lisp/tmm.el       2010-03-29 15:23:01 +0000
+++ b/lisp/tmm.el       2010-04-02 09:44:50 +0000
@@ -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)))