Mercurial > emacs
diff lisp/tmm.el @ 107709:6db4a0b4404d
Merge from emacs-23 branch
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 30 Mar 2010 22:37:57 -0400 |
| parents | 11f529f4b5bd |
| children | db1729fac410 f35b8e7b8a1f |
line wrap: on
line diff
--- a/lisp/tmm.el Tue Mar 30 22:08:05 2010 -0400 +++ b/lisp/tmm.el Tue Mar 30 22:37:57 2010 -0400 @@ -170,7 +170,11 @@ (mapc (lambda (elt) (if (stringp elt) (setq gl-str elt) - (and (listp elt) (tmm-get-keymap elt not-menu)))) + (cond + ((listp elt) (tmm-get-keymap elt not-menu)) + ((vectorp elt) + (dotimes (i (length elt)) + (tmm-get-keymap (cons i (aref elt i)) not-menu)))))) menu) ;; Choose an element of tmm-km-list; put it in choice. (if (and not-menu (= 1 (length tmm-km-list)))