* lisp/tmm.el (tmm-prompt): Use map-keymap.

* doc/lispref/keymaps.texi (Format of Keymaps): Document the multiple
inheritance format.

Fixes: debbugs:12744

2 files changed, 10 insertions, 0 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index fe12e27a070..6b3febba631 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keymaps.texi (Format of Keymaps): Document the multiple
+        inheritance format.
+
 2012-10-28  Martin Rudalics  <rudalics@gmx.at>
 
         * windows.texi (Basic Windows): Reformulate description of live,
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 8fe729d50f2..f658f7e66fb 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -210,6 +210,11 @@ Aside from elements that specify bindings for keys, a keymap can also
 have a string as an element.  This is called the @dfn{overall prompt
 string} and makes it possible to use the keymap as a menu.
 @xref{Defining Menus}.
+
+@item (keymap @dots{})
+If an element of a keymap is itself a keymap, it counts as if this inner keymap
+were inlined in the outer keymap.  This is used for multiple-inheritance, such
+as in @code{make-composed-keymap}.
 @end table
 
 When the binding is @code{nil}, it doesn't constitute a definition