# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1269876181 14400
# Node ID 11f529f4b5bd797d55cb5d6c38740246616f7bcb
# Parent  360db9adc3477dbfef19fa310981cec8c8dea4df
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.

diff -r 360db9adc347 -r 11f529f4b5bd lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Mar 29 10:18:13 2010 +0000
+++ b/lisp/ChangeLog	Mon Mar 29 11:23:01 2010 -0400
@@ -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)
diff -r 360db9adc347 -r 11f529f4b5bd lisp/tmm.el
--- a/lisp/tmm.el	Mon Mar 29 10:18:13 2010 +0000
+++ b/lisp/tmm.el	Mon Mar 29 11:23:01 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)))