Make tmm-menubar work for the Buffers menu again.

* tmm.el (tmm-prompt): Also handle keymap entries in the form of
vectors rather than cons cells, as used in menu-bar-update-buffers.
This commit is contained in:
Stefan Monnier 2010-03-29 11:23:01 -04:00
parent a2c9fe4366
commit fe59d70512
2 changed files with 11 additions and 1 deletions

View file

@ -1,3 +1,9 @@
2010-03-29 Stefan Monnier <monnier@iro.umontreal.ca>
Make tmm-menubar work for the Buffers menu again.
* tmm.el (tmm-prompt): Also handle keymap entries in the form of
vectors rather than cons cells, as used in menu-bar-update-buffers.
2010-03-28 Chong Yidong <cyd@stupidchicken.com>
* progmodes/js.el (js-auto-indent-flag, js-mode-map)

View file

@ -170,7 +170,11 @@ Its value should be an event that has a binding in MENU."
(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)))