[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99696: Make tmm-menubar work for the Buffers menu again.

[Stefan Monnier]

------------------------------------------------------------
revno: 99696
committer: Stefan Monnier <address@hidden>
branch nick: emacs-23
timestamp: Mon 2010-03-29 11:23:01 -0400
message:
  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.
modified:
  lisp/ChangeLog
  lisp/tmm.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-03-28 20:41:37 +0000
+++ b/lisp/ChangeLog    2010-03-29 15:23:01 +0000
@@ -1,3 +1,9 @@
+2010-03-29  Stefan Monnier  <address@hidden>
+
+       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  <address@hidden>
 
        * progmodes/js.el (js-auto-indent-flag, js-mode-map)

=== modified file 'lisp/tmm.el'
--- a/lisp/tmm.el       2010-01-13 08:35:10 +0000
+++ b/lisp/tmm.el       2010-03-29 15:23:01 +0000
@@ -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)))