aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/tmm.el11
1 files changed, 7 insertions, 4 deletions
diff --git a/lisp/tmm.el b/lisp/tmm.el
index b016e8231bf..d294f41d4d2 100644
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -392,16 +392,18 @@ It uses the free variable `tmm-table-undef' to keep undefined keys."
392 (or 392 (or
393 (assoc event tmm-table-undef) 393 (assoc event tmm-table-undef)
394 (and (if (listp elt) 394 (and (if (listp elt)
395 (keymapp elt) 395 (or (keymapp elt) (eq (car elt) 'lambda))
396 (fboundp elt)) 396 (fboundp elt))
397 (setq km elt)) 397 (setq km elt))
398 (and (if (listp (cdr-safe elt)) 398 (and (if (listp (cdr-safe elt))
399 (keymapp (cdr-safe elt)) 399 (or (keymapp (cdr-safe elt))
400 (eq (car (cdr-safe elt)) 'lambda))
400 (fboundp (cdr-safe elt))) 401 (fboundp (cdr-safe elt)))
401 (setq km (cdr elt)) 402 (setq km (cdr elt))
402 (and (stringp (car elt)) (setq str (car elt)))) 403 (and (stringp (car elt)) (setq str (car elt))))
403 (and (if (listp (cdr-safe (cdr-safe elt))) 404 (and (if (listp (cdr-safe (cdr-safe elt)))
404 (keymapp (cdr-safe (cdr-safe elt))) 405 (or (keymapp (cdr-safe (cdr-safe elt)))
406 (eq (car (cdr-safe (cdr-safe elt))) 'lambda))
405 (fboundp (cdr-safe (cdr-safe elt)))) 407 (fboundp (cdr-safe (cdr-safe elt))))
406 (setq km (cdr (cdr elt))) 408 (setq km (cdr (cdr elt)))
407 (and (stringp (car elt)) (setq str (car elt))) 409 (and (stringp (car elt)) (setq str (car elt)))
@@ -410,7 +412,8 @@ It uses the free variable `tmm-table-undef' to keep undefined keys."
410 (setq cache (cdr (car (cdr elt)))) 412 (setq cache (cdr (car (cdr elt))))
411 cache (setq str (concat str cache))) str)) 413 cache (setq str (concat str cache))) str))
412 (and (if (listp (cdr-safe (cdr-safe (cdr-safe elt)))) 414 (and (if (listp (cdr-safe (cdr-safe (cdr-safe elt))))
413 (keymapp (cdr-safe (cdr-safe (cdr-safe elt)))) 415 (or (keymapp (cdr-safe (cdr-safe (cdr-safe elt))))
416 (eq (car (cdr-safe (cdr-safe (cdr-safe elt)))) 'lambda))
414 (fboundp (cdr-safe (cdr-safe (cdr-safe elt))))) 417 (fboundp (cdr-safe (cdr-safe (cdr-safe elt)))))
415 ; New style of easy-menu 418 ; New style of easy-menu
416 (setq km (cdr (cdr (cdr elt)))) 419 (setq km (cdr (cdr (cdr elt))))